/[drupal]/contributions/modules/carbon/carbon.module
ViewVC logotype

Log of /contributions/modules/carbon/carbon.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Tag:

Revision 1.34 - (view) (download) (as text) (annotate) - [select for diffs]
Tue May 12 13:48:37 2009 UTC (6 months, 2 weeks ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-6--1-0, HEAD
Changes since 1.33: +12 -11 lines
Diff to previous 1.33
changed text and legth of some settings fields. Remove superflous spaces generated by _format_date

Revision 1.33 - (view) (download) (as text) (annotate) - [select for diffs]
Tue May 5 14:45:41 2009 UTC (6 months, 3 weeks ago) by johnackers
Branch: MAIN
Changes since 1.32: +19 -8 lines
Diff to previous 1.32
allow colour palette to be customised

Revision 1.32 - (view) (download) (as text) (annotate) - [select for diffs]
Tue May 5 13:17:21 2009 UTC (6 months, 3 weeks ago) by johnackers
Branch: MAIN
Changes since 1.31: +46 -7 lines
Diff to previous 1.31
allow units of CO2 and money to be changed.

Revision 1.31 - (view) (download) (as text) (annotate) - [select for diffs]
Sat May 2 09:27:00 2009 UTC (6 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.30: +9 -16 lines
Diff to previous 1.30
carbon_transfer.inc included, otherwise node/add doesn't show whole form

Revision 1.30 - (view) (download) (as text) (annotate) - [select for diffs]
Sat May 2 08:49:20 2009 UTC (6 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.29: +3 -2 lines
Diff to previous 1.29
move carbon_transfer.inc off the static include list (to avoid reeclaration error).

Revision 1.29 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Apr 29 21:07:28 2009 UTC (7 months ago) by johnackers
Branch: MAIN
Changes since 1.28: +211 -257 lines
Diff to previous 1.28
move access check for edit/add links back to the calling functions.

Revision 1.28 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 28 17:08:12 2009 UTC (7 months ago) by johnackers
Branch: MAIN
Changes since 1.27: +38 -2 lines
Diff to previous 1.27
more careful handling of dates

Revision 1.27 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 28 11:06:41 2009 UTC (7 months ago) by johnackers
Branch: MAIN
Changes since 1.26: +18 -30 lines
Diff to previous 1.26
make date handling consistent and use format specified by drupal admin

Revision 1.26 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 28 08:11:10 2009 UTC (7 months ago) by johnackers
Branch: MAIN
Changes since 1.25: +6 -28 lines
Diff to previous 1.25
include carbon_transfer.inc, fix link to stamp

Revision 1.25 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Apr 20 22:38:28 2009 UTC (7 months, 1 week ago) by johnackers
Branch: MAIN
Changes since 1.24: +8 -6 lines
Diff to previous 1.24
carbon/%node/edit protection checked before entering settings

Revision 1.24 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Apr 20 15:44:38 2009 UTC (7 months, 1 week ago) by johnackers
Branch: MAIN
Changes since 1.23: +3 -3 lines
Diff to previous 1.23
carbon.css moved to misc/ dir.

Revision 1.23 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Apr 20 14:29:00 2009 UTC (7 months, 1 week ago) by johnackers
Branch: MAIN
Changes since 1.22: +575 -389 lines
Diff to previous 1.22
row editing using ajax and related changes

Revision 1.22 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jan 11 17:05:48 2009 UTC (10 months, 2 weeks ago) by johnackers
Branch: MAIN
Changes since 1.21: +71 -46 lines
Diff to previous 1.21
Put the admin pages back into new menu structure

Revision 1.21 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jan 10 15:46:14 2009 UTC (10 months, 2 weeks ago) by johnackers
Branch: MAIN
Changes since 1.20: +364 -311 lines
Diff to previous 1.20
first pass at drupal-6 version. gui also in transition.

Revision 1.20 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 6 22:19:26 2009 UTC (10 months, 3 weeks ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-5--0-2
Changes since 1.19: +8 -3 lines
Diff to previous 1.19
Replaced calls to drupal's format_date() with direct calls to date() routine that uses the same timezone as other php routines like strtotime().

Revision 1.19 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Jul 2 13:38:03 2008 UTC (16 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.18: +50 -12 lines
Diff to previous 1.18
work in progress

Revision 1.18 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Jul 2 12:53:08 2008 UTC (16 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.17: +256 -175 lines
Diff to previous 1.17
branch DRUPAL-5 merged in

Revision 1.17.2.13 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 19 09:23:57 2008 UTC (21 months, 1 week ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.12: +25 -3 lines
Diff to previous 1.17.2.12 , to branch point 1.17 , to next main 1.34
carbon purchases, transfers added. Report, calculation functions cleaned up.

Revision 1.17.2.12 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jun 21 06:51:44 2007 UTC (2 years, 5 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.11: +4 -4 lines
Diff to previous 1.17.2.11 , to branch point 1.17
disable carbon account sharing as not yet working

Revision 1.17.2.11 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jun 18 08:26:19 2007 UTC (2 years, 5 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.10: +6 -6 lines
Diff to previous 1.17.2.10 , to branch point 1.17
allow normal users to delete their own carbon stamps and accounts.

Revision 1.17.2.10 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jun 14 17:51:22 2007 UTC (2 years, 5 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.9: +58 -35 lines
Diff to previous 1.17.2.9 , to branch point 1.17
links improved, protection granularity sharpened. Other cosmetic changes.

Revision 1.17.2.9 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Jun 13 17:06:54 2007 UTC (2 years, 5 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.8: +18 -42 lines
Diff to previous 1.17.2.8 , to branch point 1.17
Menu changed and fixed bug so 'carbon source model filter' settings could be saved.

Revision 1.17.2.8 - (view) (download) (as text) (annotate) - [select for diffs]
Fri May 18 19:37:26 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.7: +35 -3 lines
Diff to previous 1.17.2.7 , to branch point 1.17
add carbon/crag links to menus and links

Revision 1.17.2.7 - (view) (download) (as text) (annotate) - [select for diffs]
Thu May 10 22:07:30 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.6: +13 -4 lines
Diff to previous 1.17.2.6 , to branch point 1.17
add menu entry to enable installation of default carbon sources

Revision 1.17.2.6 - (view) (download) (as text) (annotate) - [select for diffs]
Thu May 10 11:46:00 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.5: +108 -117 lines
Diff to previous 1.17.2.5 , to branch point 1.17
changed the entity 'carbon footprint' to 'carbon_account'

Revision 1.17.2.5 - (view) (download) (as text) (annotate) - [select for diffs]
Thu May 3 09:43:57 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.4: +5 -5 lines
Diff to previous 1.17.2.4 , to branch point 1.17
Tweaks. Help users install carbon sources if none present. Generate h1 tags if  footprint or source tables have zero rows to avoid format problem with bluebreeze.

Revision 1.17.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Wed May 2 22:39:27 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.3: +20 -1 lines
Diff to previous 1.17.2.3 , to branch point 1.17
Add enhancement 125959, allow default chart to be specifed on carbon footprint in settings.
Allow in situ carbon stamp editing to be enabled/disabled in setting.

Revision 1.17.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Tue May 1 23:19:55 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.2: +35 -26 lines
Diff to previous 1.17.2.2 , to branch point 1.17
fix admin menu

Revision 1.17.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Tue May 1 22:23:42 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17.2.1: +3 -3 lines
Diff to previous 1.17.2.1 , to branch point 1.17
fix carbon sources links

Revision 1.17.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Tue May 1 08:06:43 2007 UTC (2 years, 7 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.17: +10 -10 lines
Diff to previous 1.17
fix drupal 5 issues that prevented carbon_user generating hooks under my account, fix bar and pie chart links generated under table of footprints

Revision 1.17 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Mar 20 19:25:38 2007 UTC (2 years, 8 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-5--0-1
Branch point for: DRUPAL-5
Changes since 1.16: +4 -4 lines
Diff to previous 1.16
second version of drupal 5 port

Revision 1.16 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Mar 9 14:07:42 2007 UTC (2 years, 8 months ago) by johnackers
Branch: MAIN
Changes since 1.15: +60 -43 lines
Diff to previous 1.15
drupal 5 1st version

Revision 1.15 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Mar 7 11:46:59 2007 UTC (2 years, 8 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-7
Branch point for: DRUPAL-4-7
Changes since 1.14: +32 -19 lines
Diff to previous 1.14
give anonymous users the opportunity to see carbon footprints if permitted by their owners.

Revision 1.14 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Feb 25 23:32:02 2007 UTC (2 years, 9 months ago) by johnackers
Branch: MAIN
Changes since 1.13: +15 -9 lines
Diff to previous 1.13
include carbon_admin.inc.  Fix links at bottom of page so 'my links' is relative to owner of carbon footprint not the logged in user - this should help admins.

Revision 1.13 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Feb 14 14:36:34 2007 UTC (2 years, 9 months ago) by johnackers
Branch: MAIN
Changes since 1.12: +36 -6 lines
Diff to previous 1.12
add reverse video links, make carbon_access better for handling stamps.

Revision 1.12 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 30 20:19:33 2007 UTC (2 years, 9 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-6
Changes since 1.11: +9 -1 lines
Diff to previous 1.11
add chart links to views of carbon_footprint node

Revision 1.11 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jan 22 23:54:43 2007 UTC (2 years, 10 months ago) by johnackers
Branch: MAIN
Changes since 1.10: +2 -1 lines
Diff to previous 1.10
include carbon_chart.inc

Revision 1.10 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Jan 12 11:52:04 2007 UTC (2 years, 10 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-5
Changes since 1.9: +3 -3 lines
Diff to previous 1.9
Fixed bug http://drupal.org/node/108631, the edit pane for any user was not accessible. Caused by hook_user returning invalid data for operations other than  view.

Revision 1.9 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 9 16:13:29 2007 UTC (2 years, 10 months ago) by johnackers
Branch: MAIN
Changes since 1.8: +4 -3 lines
Diff to previous 1.8
fix bug http://drupal.org/node/107785, "My Footprint" shows up in teasers

Revision 1.8 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 20 13:46:34 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-3, DRUPAL-4-7--0-3-1, DRUPAL-4-7--0-4
Changes since 1.7: +37 -4 lines
Diff to previous 1.7
Setting variable names prepended with carbon.

Revision 1.7 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Dec 16 12:10:08 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.6: +3 -3 lines
Diff to previous 1.6
remove spurious links added to none carbon nodes.

Revision 1.6 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Dec 15 19:42:00 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-2
Changes since 1.5: +2 -2 lines
Diff to previous 1.5
don't include test file: carbon_console.inc

Revision 1.5 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Dec 15 11:27:47 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-1
Changes since 1.4: +105 -59 lines
Diff to previous 1.4
carbon_help, carbon_menu, carbon_access changed

Revision 1.4 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Dec 12 13:40:05 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.3: +105 -55 lines
Diff to previous 1.3
better implementation of hook_user

Revision 1.3 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Dec 2 19:43:11 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.2: +66 -42 lines
Diff to previous 1.2
menu interaction redone

Revision 1.2 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Dec 1 21:43:25 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.1: +231 -236 lines
Diff to previous 1.1
bug fixing, improve integration with user module

Revision 1.1 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Nov 29 15:28:38 2006 UTC (3 years ago) by johnackers
Branch: MAIN
first rough version that just works

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a

Sort log by:

  ViewVC Help
Powered by ViewVC 1.1.2