← Back to branch summary

~flavour/sahana-eden/cert

~flavour/sahana-eden/cert

Viewing all changes in revision 3052.

Committer: Fran Boon
Date: 2011-12-21 15:14:20 UTC
mfrom: (2975.1.109 eden)
Revision ID: fran@aidiq.com-20111221151420-y8h16qnrd4e2r8qa

Merge trunk: Assets fix

files added:
models/fire.py

private/prepopulate/default/org_sector.csv

private/prepopulate/default/project_beneficiary_type.csv

static/formats/s3csv/project/activity.csv

static/formats/s3csv/project/activity.xsl

static/formats/s3csv/project/activity_type.csv

static/formats/s3csv/project/beneficiary_type.csv

static/formats/s3csv/project/beneficiary_type.xsl

static/formats/s3csv/project/hazard.csv

static/formats/s3csv/project/organisation.csv

static/formats/s3csv/project/organisation.xsl

static/formats/s3csv/project/project.csv

static/formats/s3csv/project/project.xsl

static/formats/s3csv/project/theme.csv

static/scripts/S3/i18n/jquery.ui.timepicker-de.js

static/scripts/S3/i18n/jquery.ui.timepicker-fr.js

static/scripts/S3/i18n/jquery.ui.timepicker-ja.js

views/project/comments.load

views/project/discuss.html

files removed:
static/scripts/gis/mapfish/.tests

tests/.cherrypy

views/pr/group_popup.html

views/pr/person_popup.html

files renamed:
modules/s3/s3cfg.py => modules/s3cfg.py

files modified:
VERSION

controllers/admin.py

controllers/asset.py

controllers/delphi.py

controllers/gis.py

controllers/project.py

controllers/survey.py

controllers/xforms.py

deployment-templates/models/000_config.py

languages/ar.py

languages/de.py

languages/el.py

languages/en-gb.py

languages/es.py

languages/fr.py

languages/it.py

languages/ja.py

languages/ko.py

languages/pt-br.py

languages/pt.py

languages/ru.py

languages/ur.py

languages/vi.py

languages/zh-cn.py

languages/zh-tw.py

models/000_1st_run.py

models/00_db.py

models/00_tables.py

models/00_utils.py

models/01_menu.py

models/02_pr.py

models/03_gis.py

models/04_pr.py

models/05_irs.py

models/05_org.py

models/06_hms.py

models/06_hrm.py

models/06_supply.py

models/07_cr.py

models/08_assess.py

models/08_inv.py

models/09_project.py

models/asset.py

models/budget.py

models/building.py

models/delphi.py

models/doc.py

models/dvi.py

models/event.py

models/flood.py

models/impact.py

models/importer.py

models/patient.py

models/proc.py

models/req.py

models/scenario.py

models/survey.py

models/vehicle.py

models/vol.py

models/zzz_1st_run.py

modules/s3/__init__.py

modules/s3/s3aaa.py

modules/s3/s3chart.py

modules/s3/s3cube.py

modules/s3/s3fields.py

modules/s3/s3gis.py

modules/s3/s3import.py

modules/s3/s3pdf.py

modules/s3/s3rest.py

modules/s3/s3search.py

modules/s3/s3survey.py

modules/s3/s3validators.py

modules/s3/s3widgets.py

modules/s3/s3xml.py

private/prepopulate/default/project_activity_type.csv

private/prepopulate/default/project_hazard.csv

private/prepopulate/default/project_theme.csv

private/prepopulate/default/tasks.cfg

private/prepopulate/demo/ADAT/24H_response.csv

private/prepopulate/demo/ADAT/24Hr-B.xls.Layout.csv

private/prepopulate/demo/ADAT/72H_response.csv

private/prepopulate/demo/ADAT/72Hr-B.xls.Layout.csv

private/prepopulate/demo/ADAT/layoutPMI.csv *

private/prepopulate/demo/ADAT/questionnaire24H.csv

private/prepopulate/demo/ADAT/questionnaire72H.csv *

private/prepopulate/demo/ADAT/questionnairePMI.csv

private/prepopulate/regression/organisation.csv

static/formats/rss/export.xsl

static/formats/s3csv/org/sector.csv

static/formats/s3csv/org/sector.xsl

static/formats/s3csv/project/activity_type.xsl

static/formats/s3csv/project/hazard.xsl

static/formats/s3csv/project/theme.xsl

static/formats/xml/commons.xsl

static/scripts/S3/S3.js

static/scripts/S3/S3.min.js

static/scripts/S3/jquery.ui.timepicker.js

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

static/scripts/S3/s3.gis.js

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

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

static/styles/S3/jquery.ui.timepicker.css

static/styles/S3/sahana.min.css

views/default/index.html

views/survey/index.html

views/survey/series_map.html

Show diffs side-by-side

added added

removed removed

controllers/admin.py

controllers/asset.py

controllers/delphi.py

controllers/gis.py

controllers/project.py

controllers/survey.py

controllers/xforms.py

deployment-templates/models/000_config.py

languages/ar.py

languages/de.py

languages/el.py

languages/en-gb.py

languages/es.py

languages/fr.py

languages/it.py

languages/ja.py

languages/ko.py

languages/pt-br.py

languages/pt.py

languages/ru.py

languages/ur.py

languages/vi.py

languages/zh-cn.py

languages/zh-tw.py

models/000_1st_run.py

models/00_db.py

models/00_tables.py

models/00_utils.py

models/01_menu.py

models/02_pr.py

models/03_gis.py

models/04_pr.py

models/05_irs.py

models/05_org.py

models/06_hms.py

models/06_hrm.py

models/06_supply.py

models/07_cr.py

models/08_assess.py

models/08_inv.py

models/09_project.py

models/asset.py

models/budget.py

models/building.py

models/delphi.py

models/event.py

models/flood.py

models/impact.py

models/importer.py

models/patient.py

models/scenario.py

models/survey.py

models/vehicle.py

models/zzz_1st_run.py

modules/s3/__init__.py

modules/s3/s3aaa.py

modules/s3/s3chart.py

modules/s3/s3cube.py

modules/s3/s3fields.py

modules/s3/s3gis.py

modules/s3/s3import.py

modules/s3/s3pdf.py

modules/s3/s3rest.py

modules/s3/s3search.py

modules/s3/s3survey.py

modules/s3/s3validators.py

modules/s3/s3widgets.py

modules/s3/s3xml.py

modules/s3cfg.py

private/prepopulate/default/org_sector.csv

private/prepopulate/default/project_activity_type.csv

private/prepopulate/default/project_beneficiary_type.csv

private/prepopulate/default/project_hazard.csv

private/prepopulate/default/project_theme.csv

private/prepopulate/default/tasks.cfg

private/prepopulate/demo/ADAT/24H_response.csv

private/prepopulate/demo/ADAT/24Hr-B.xls.Layout.csv

private/prepopulate/demo/ADAT/72H_response.csv

private/prepopulate/demo/ADAT/72Hr-B.xls.Layout.csv

private/prepopulate/demo/ADAT/layoutPMI.csv

private/prepopulate/demo/ADAT/questionnaire24H.csv

private/prepopulate/demo/ADAT/questionnaire72H.csv

private/prepopulate/demo/ADAT/questionnairePMI.csv

private/prepopulate/regression/organisation.csv

static/formats/rss/export.xsl

static/formats/s3csv/org/sector.csv

static/formats/s3csv/org/sector.xsl

static/formats/s3csv/project/activity.csv

static/formats/s3csv/project/activity.xsl

static/formats/s3csv/project/activity_type.csv

static/formats/s3csv/project/activity_type.xsl

static/formats/s3csv/project/beneficiary_type.csv

static/formats/s3csv/project/beneficiary_type.xsl

static/formats/s3csv/project/hazard.csv

static/formats/s3csv/project/hazard.xsl

static/formats/s3csv/project/organisation.csv

static/formats/s3csv/project/organisation.xsl

static/formats/s3csv/project/project.csv

static/formats/s3csv/project/project.xsl

static/formats/s3csv/project/theme.csv

static/formats/s3csv/project/theme.xsl

static/formats/xml/commons.xsl

static/scripts/S3/S3.js

static/scripts/S3/S3.min.js

static/scripts/S3/i18n/jquery.ui.timepicker-de.js

static/scripts/S3/i18n/jquery.ui.timepicker-fr.js

static/scripts/S3/i18n/jquery.ui.timepicker-ja.js

static/scripts/S3/jquery.ui.timepicker.js

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

static/scripts/S3/s3.gis.js

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

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

static/scripts/gis/mapfish/.tests/

static/styles/S3/jquery.ui.timepicker.css

static/styles/S3/sahana.min.css

tests/.cherrypy/

views/default/index.html

views/pr/group_popup.html

views/pr/person_popup.html

views/project/comments.load

views/project/discuss.html

views/survey/index.html

views/survey/series_map.html

Older »