← Back to branch summary

~robbyoconnor/sahana-eden/surveytool

~robbyoconnor/sahana-eden/surveytool

Viewing all changes in revision 969.

Committer: Robert O'Connor
Date: 2010-09-29 13:37:51 UTC
mfrom: (840.1.480 eden)
Revision ID: robby.oconnor@gmail.com-20100929133751-g7q3g5jn673eqxr5

merge with trunk

files added:
languages/en-gb.py

languages/fr.py

models/03_sit.py

static/scripts/tools/compile.py

static/scripts/tools/languages.py

views/gis/legend.html

files removed:
views/default/footer.html

views/org/dashboard.html

files modified:
VERSION

controllers/admin.py

controllers/appadmin.py

controllers/budget.py

controllers/cr.py

controllers/delphi.py

controllers/doc.py

controllers/dvi.py

controllers/gis.py

controllers/hms.py

controllers/irs.py

controllers/mpr.py

controllers/msg.py

controllers/org.py

controllers/rat.py

controllers/rms.py

controllers/survey.py

controllers/sync.py

controllers/test.py

controllers/vol.py

languages/es.py

languages/ur.py

languages/zh-tw.py

models/000_config.py

models/00_settings.py

models/00_tables.py

models/00_utils.py

models/01_crud.py

models/01_menu.py

models/02_pr.py

models/03_gis.py

models/04_pr.py

models/05_org.py

models/06_doc.py

models/06_hms.py

models/06_lms.py

models/06_supply.py

models/07_logs.py

models/admin.py

models/budget.py

models/cr.py

models/dvi.py

models/flood.py

models/importer.py

models/inventory.py

models/irs.py

models/mpr.py

models/msg.py

models/project.py

models/rat.py

models/rms.py

models/sitrep.py

models/survey.py

models/sync.py

models/ticket.py

models/vol.py

models/zzz_1st_run.py

models/zzz_last.py

modules/s3gis.py

modules/s3tools.py

modules/s3vita.py

modules/s3xrc.py

static/scripts/S3/S3.min.js

static/scripts/gis/OpenLayers.js

static/scripts/tools/Eden-Python-Installer-Dev.nsi

static/scripts/tools/fabfile.py

static/scripts/tools/sahana.js.gis.cfg

static/scripts/tools/standalone_exe.py

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

static/styles/S3/template.css

views/admin/appadmin.html

views/admin/import_job_update.html

views/admin/index.html

views/auth/_register.html

views/budget/budget_staff_bundle_header.html

views/budget/bundle_kit_item_header.html

views/budget/index.html

views/cr/index.html

views/cr/shelter_optional_data.js

views/dataTables.html

views/delphi/index.html

views/delphi/summary.html

views/doc/index.html

views/dvi/index.html

views/dvr/index.html

views/flood/index.html

views/footer.html

views/gis/convert_gps.html

views/gis/feature_class_list.html

views/gis/feature_class_list_create.html

views/gis/index.html

views/gis/map_service_catalogue.html

views/hms/index.html

views/importer/gettoken.html

views/importer/index.html

views/importer/spreadsheet.html

views/inventory/index.html

views/irs/index.html

views/lms/index.html

views/mobile/index.html

views/mpr/index.html

views/msg/index.html

views/org/index.html

views/org/staff_create.html

views/org/staff_list_create.html

views/org/staff_popup.html

views/pr/index.html

views/rat/index.html

views/rms/index.html

views/sitrep/index.html

views/survey/index.html

views/sync/now.html

views/ticket/index.html

views/vol/index.html

views/vol/view_team_map.html

Show diffs side-by-side

added added

removed removed

controllers/admin.py

controllers/appadmin.py

controllers/budget.py

controllers/cr.py

controllers/delphi.py

controllers/doc.py

controllers/dvi.py

controllers/gis.py

controllers/hms.py

controllers/irs.py

controllers/mpr.py

controllers/msg.py

controllers/org.py

controllers/rat.py

controllers/rms.py

controllers/survey.py

controllers/sync.py

controllers/test.py

controllers/vol.py

languages/en-gb.py

languages/es.py

languages/fr.py

languages/ur.py

languages/zh-tw.py

models/000_config.py

models/00_settings.py

models/00_tables.py

models/00_utils.py

models/01_crud.py

models/01_menu.py

models/02_pr.py

models/03_gis.py

models/03_sit.py

models/04_pr.py

models/05_org.py

models/06_doc.py

models/06_hms.py

models/06_lms.py

models/06_supply.py

models/07_logs.py

models/admin.py

models/budget.py

models/flood.py

models/importer.py

models/inventory.py

models/project.py

models/sitrep.py

models/survey.py

models/ticket.py

models/zzz_1st_run.py

models/zzz_last.py

modules/s3gis.py

modules/s3tools.py

modules/s3vita.py

modules/s3xrc.py

static/scripts/S3/S3.min.js

static/scripts/gis/OpenLayers.js

static/scripts/tools/Eden-Python-Installer-Dev.nsi

static/scripts/tools/compile.py

static/scripts/tools/fabfile.py

static/scripts/tools/languages.py

static/scripts/tools/sahana.js.gis.cfg

static/scripts/tools/standalone_exe.py

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

static/styles/S3/template.css

views/admin/appadmin.html

views/admin/import_job_update.html

views/admin/index.html

views/auth/_register.html

views/budget/budget_staff_bundle_header.html

views/budget/bundle_kit_item_header.html

views/budget/index.html

views/cr/index.html

views/cr/shelter_optional_data.js

views/dataTables.html

views/delphi/index.html

views/delphi/summary.html

views/doc/index.html

views/dvi/index.html

views/dvr/index.html

views/flood/index.html

views/gis/convert_gps.html

views/gis/feature_class_list.html

views/gis/feature_class_list_create.html

views/gis/index.html

views/gis/legend.html

views/gis/map_service_catalogue.html

views/hms/index.html

views/importer/gettoken.html

views/importer/index.html

views/importer/spreadsheet.html

views/inventory/index.html

views/irs/index.html

views/lms/index.html

views/mobile/index.html

views/mpr/index.html

views/msg/index.html

views/org/dashboard.html

views/org/index.html

views/org/staff_create.html

views/org/staff_list_create.html

views/org/staff_popup.html

views/pr/index.html

views/rat/index.html

views/rms/index.html

views/sitrep/index.html

views/survey/index.html

views/sync/now.html

views/ticket/index.html

views/vol/index.html

views/vol/view_team_map.html

Older »