[drupal] Log of /contributions/modules/carbon/carbon

Revision 1.34 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Jul 3 12:24:40 2009 UTC (4 months, 3 weeks ago) by johnackers
Branch: MAIN
CVS Tags: HEAD
Changes since 1.33: +2 -2 lines
Diff to previous 1.33

Tell users that adjustment applies UP TO date of meter reading.

Revision 1.33 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jun 1 17:05:18 2009 UTC (5 months, 3 weeks ago) by johnackers
Branch: MAIN
Changes since 1.32: +2 -2 lines
Diff to previous 1.32

fix the carbon account link in the carbon stamp view.

Revision 1.32 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Apr 29 21:03:35 2009 UTC (6 months, 4 weeks ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-6--1-0
Changes since 1.31: +62 -85 lines
Diff to previous 1.31

change the way carbon sources are accessed

Revision 1.31 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 28 17:08:12 2009 UTC (6 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.30: +6 -7 lines
Diff to previous 1.30

more careful handling of dates

Revision 1.30 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 28 14:44:34 2009 UTC (6 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.29: +21 -19 lines
Diff to previous 1.29

change default period for repeating stamps to annual.

Revision 1.29 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 28 13:00:55 2009 UTC (6 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.28: +4 -4 lines
Diff to previous 1.28

Ensure that default scope value set correctly and corresponding text is shown.

Revision 1.28 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 28 11:06:41 2009 UTC (6 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.27: +9 -9 lines
Diff to previous 1.27

make date handling consistent and use format specified by drupal admin

Revision 1.27 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 28 08:02:22 2009 UTC (6 months, 4 weeks ago) by johnackers
Branch: MAIN
Changes since 1.26: +5 -5 lines
Diff to previous 1.26

text changes only

Revision 1.26 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Apr 20 14:28:24 2009 UTC (7 months, 1 week ago) by johnackers
Branch: MAIN
Changes since 1.25: +351 -422 lines
Diff to previous 1.25

row editing using ajax and related changes

Revision 1.25 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Mar 23 15:27:41 2009 UTC (8 months ago) by johnackers
Branch: MAIN
Changes since 1.24: +126 -199 lines
Diff to previous 1.24

Removed to ability to edit multiple carbon_stamps on one page (complicated and unmaintainable).

Revision 1.24 - (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.23: +2 -2 lines
Diff to previous 1.23

Put the admin pages back into new menu structure

Revision 1.23 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jan 11 14:52:39 2009 UTC (10 months, 2 weeks ago) by johnackers
Branch: MAIN
Changes since 1.22: +6 -11 lines
Diff to previous 1.22

use drupal_json() function included in drupal 6 instead of imported library.

Revision 1.22 - (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.21: +45 -21 lines
Diff to previous 1.21

first pass at drupal-6 version. gui also in transition.

Revision 1.21 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 6 22:19:26 2009 UTC (10 months, 2 weeks ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-5--0-2
Changes since 1.20: +13 -13 lines
Diff to previous 1.20

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.20 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 6 17:37:54 2009 UTC (10 months, 2 weeks ago) by johnackers
Branch: MAIN
Changes since 1.19: +27 -11 lines
Diff to previous 1.19

change prompts and decriptions around meters

Revision 1.19 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Jul 2 12:53:08 2008 UTC (16 months, 3 weeks ago) by johnackers
Branch: MAIN
Changes since 1.18: +249 -92 lines
Diff to previous 1.18

branch DRUPAL-5 merged in

Revision 1.18.2.8 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Oct 4 15:03:00 2007 UTC (2 years, 1 month ago) by johnackers
Branch: DRUPAL-5
Changes since 1.18.2.7: +4 -4 lines
Diff to previous 1.18.2.7 , to branch point 1.18 , to next main 1.34

legend change only

Revision 1.18.2.7 - (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.18.2.6: +61 -24 lines
Diff to previous 1.18.2.6 , to branch point 1.18

links improved, protection granularity sharpened. Other cosmetic changes.

Revision 1.18.2.6 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jun 12 16:56:28 2007 UTC (2 years, 5 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.18.2.5: +92 -8 lines
Diff to previous 1.18.2.5 , to branch point 1.18

weight carbon sources

Revision 1.18.2.5 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jun 11 10:12:54 2007 UTC (2 years, 5 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.18.2.4: +15 -7 lines
Diff to previous 1.18.2.4 , to branch point 1.18

Tweaked as a result of changes to reports in carbon_report.inc.

Revision 1.18.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Thu May 10 22:05:40 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.18.2.3: +10 -1 lines
Diff to previous 1.18.2.3 , to branch point 1.18

print warning if no carbon sources

Revision 1.18.2.3 - (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.18.2.2: +19 -19 lines
Diff to previous 1.18.2.2 , to branch point 1.18

changed the entity 'carbon footprint' to 'carbon_account'

Revision 1.18.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.18.2.1: +5 -6 lines
Diff to previous 1.18.2.1 , to branch point 1.18

fix carbon sources links

Revision 1.18.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Tue May 1 08:10:27 2007 UTC (2 years, 6 months ago) by johnackers
Branch: DRUPAL-5
Changes since 1.18: +57 -37 lines
Diff to previous 1.18

when you switch carbon stamp type, the screen prompts are changed with json routines

Revision 1.18 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Mar 9 14:07:12 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.17: +39 -38 lines
Diff to previous 1.17

drupal 5 1st version

Revision 1.17 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Mar 7 14:03: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.16: +3 -3 lines
Diff to previous 1.16

added second KwH column to carbon footprints, involves schema changes, database update required, see request http://drupal.org/node/122830

Revision 1.16 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Mar 7 11:44:37 2007 UTC (2 years, 8 months ago) by johnackers
Branch: MAIN
Changes since 1.15: +19 -13 lines
Diff to previous 1.15

tweaks. Changes to text only.

Revision 1.15 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Feb 14 14:45:36 2007 UTC (2 years, 9 months ago) by johnackers
Branch: MAIN
Changes since 1.14: +25 -14 lines
Diff to previous 1.14

add support for stamp cloning

Revision 1.14 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 30 20:13:57 2007 UTC (2 years, 9 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-6
Changes since 1.13: +12 -10 lines
Diff to previous 1.13

read kwh from carbon_source

Revision 1.13 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jan 22 23:39:49 2007 UTC (2 years, 10 months ago) by johnackers
Branch: MAIN
Changes since 1.12: +34 -15 lines
Diff to previous 1.12

when viewing carbon footprint allow carbon stamps to be sorted

Revision 1.12 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 9 18:33:32 2007 UTC (2 years, 10 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-5
Changes since 1.11: +8 -6 lines
Diff to previous 1.11

add a hard coded link to distance calculator.

Revision 1.11 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 9 17:18:51 2007 UTC (2 years, 10 months ago) by johnackers
Branch: MAIN
Changes since 1.10: +5 -3 lines
Diff to previous 1.10

prevent warning message on line 695 generated when you update a carbon stamp

Revision 1.10 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Dec 21 14:36:23 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-3-1, DRUPAL-4-7--0-4
Changes since 1.9: +52 -31 lines
Diff to previous 1.9

fix bug that caused the collapsible farmes on the footprint edit page to be corrupted. make footprint attachment to stamp more robust, hide the attachment checkbox when carbon stamp editing when there is only one footprint to attach to anyway. Print exact number of stamps in a footpriint on footprint page.

Revision 1.9 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Dec 21 08:40:26 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.8: +7 -7 lines
Diff to previous 1.8

fix bug http://drupal.org/node/104489- table prefixes missing for update 6.

Revision 1.8 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 20 13:30:13 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-3
Changes since 1.7: +12 -18 lines
Diff to previous 1.7

my stamps selection fixed

Revision 1.7 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Dec 19 22:43:37 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.6: +42 -34 lines
Diff to previous 1.6

Create default boxes for my home gas, my home elec, my commute etc on blank carbon footprints.

Revision 1.6 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Dec 17 10:40:12 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.5: +130 -29 lines
Diff to previous 1.5

when editing a carbon stamp, allow it to be inserted and removed from any carbon footprint owned by the logged in user.

Revision 1.5 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Dec 15 11:26:07 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
CVS Tags: DRUPAL-4-7--0-1, DRUPAL-4-7--0-2
Changes since 1.4: +30 -29 lines
Diff to previous 1.4

multiple inner join on array_load

Revision 1.4 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Dec 12 13:38:02 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.3: +188 -42 lines
Diff to previous 1.3

scope displayed in text, support for selection by user and group

Revision 1.3 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Dec 4 10:18:24 2006 UTC (2 years, 11 months ago) by johnackers
Branch: MAIN
Changes since 1.2: +29 -12 lines
Diff to previous 1.2

fix join between stamp and model to allow preferred model to work

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: +85 -112 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 (2 years, 11 months 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.

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

	Diffs between and
	Type of Diff should be a

	ViewVC Help
Powered by ViewVC 1.1.2

Log of /contributions/modules/carbon/carbon_stamp.inc