← Back to branch summary

~lifeeth/sahana-eden/ifrc

~lifeeth/sahana-eden/ifrc

Viewing all changes in revision 2159.1.13.

Committer: Michael Howden
Date: 2012-01-19 23:41:02 UTC
mfrom: (2178 ifrc)
mto: This revision was merged to the branch mainline in revision 2181.
Revision ID: michael@sahanafoundation.org-20120119234102-7tb7i3sxxpxntvaw

Merge IFRC

files added:
private/prepopulate/default/gis_layer_wms.csv

private/prepopulate/demo/ADAT/PMI(new).xls.Layout.csv

private/prepopulate/demo/ADAT/PMI(new).xls.Question.csv

private/prepopulate/demo/IFRC/gis_layer_wms.csv

private/prepopulate/demo/IFRC_Train/gis_layer_wms.csv

private/prepopulate/demo/Standard/gis_layer_wms.csv

static/formats/s3csv/gis/layer_wms.csv

static/formats/s3csv/gis/layer_wms.xsl

files modified:
VERSION

controllers/hrm.py

controllers/survey.py

languages/en-gb.py

models/survey.py

models/zzz_1st_run.py

modules/eden/gis.py

modules/eden/project.py

modules/s3/pyvttbl/__init__.py

modules/s3/s3chart.py

modules/s3/s3gis.py

modules/s3/s3model.py

modules/s3/s3report.py

modules/s3/s3survey.py

private/prepopulate/default/tasks.cfg

private/prepopulate/demo/ADAT/tasks.cfg

private/prepopulate/demo/IFRC/tasks.cfg

private/prepopulate/demo/IFRC_Train/ireport.csv

private/prepopulate/demo/IFRC_Train/tasks.cfg

private/prepopulate/demo/Standard/tasks.cfg

static/formats/s3csv/inv/inv_item.xsl

static/scripts/S3/S3.min.js

static/scripts/S3/s3.gis.layers.js

static/scripts/S3/s3.gis.min.js

static/scripts/S3/s3.report.js

static/scripts/S3/s3.timeline.js

static/scripts/tools/sahana.js.cfg

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

static/styles/ifrc/style.css

views/_report.html

views/survey/series_analysis.html

Show diffs side-by-side

added added

removed removed

controllers/hrm.py

controllers/survey.py

languages/en-gb.py

models/survey.py

models/zzz_1st_run.py

modules/eden/gis.py

modules/eden/project.py

modules/s3/pyvttbl/__init__.py

modules/s3/s3chart.py

modules/s3/s3gis.py

modules/s3/s3model.py

modules/s3/s3report.py

modules/s3/s3survey.py

private/prepopulate/default/gis_layer_wms.csv

private/prepopulate/default/tasks.cfg

private/prepopulate/demo/ADAT/PMI(new).xls.Layout.csv

private/prepopulate/demo/ADAT/PMI(new).xls.Question.csv

private/prepopulate/demo/ADAT/tasks.cfg

private/prepopulate/demo/IFRC/gis_layer_wms.csv

private/prepopulate/demo/IFRC/tasks.cfg

private/prepopulate/demo/IFRC_Train/gis_layer_wms.csv

private/prepopulate/demo/IFRC_Train/ireport.csv

private/prepopulate/demo/IFRC_Train/tasks.cfg

private/prepopulate/demo/Standard/gis_layer_wms.csv

private/prepopulate/demo/Standard/tasks.cfg

static/formats/s3csv/gis/layer_wms.csv

static/formats/s3csv/gis/layer_wms.xsl

static/formats/s3csv/inv/inv_item.xsl

static/scripts/S3/S3.min.js

static/scripts/S3/s3.gis.layers.js

static/scripts/S3/s3.gis.min.js

static/scripts/S3/s3.report.js

static/scripts/S3/s3.timeline.js

static/scripts/tools/sahana.js.cfg

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

static/styles/ifrc/style.css

views/_report.html

views/survey/series_analysis.html

Older »