← Back to branch summary

~lifeeth/sahana-eden/ifrc

~lifeeth/sahana-eden/ifrc

Viewing all changes in revision 2131.

Committer: Fran Boon
Date: 2011-12-19 12:19:53 UTC
mfrom: (1875.1.1203 eden)
Revision ID: fran@aidiq.com-20111219121953-9w0m9akc3rnkukgo

merge trunk: Survey fixes, Move org_sector zzz_1st_run => prepopulate

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

private/prepopulate/demo/IFRC/org_sector.csv

files modified:
VERSION

controllers/survey.py

languages/en-gb.py

models/05_org.py

models/06_supply.py

models/09_project.py

models/survey.py

models/zzz_1st_run.py

modules/s3/s3chart.py

modules/s3/s3search.py

modules/s3/s3survey.py

private/prepopulate/default/tasks.cfg

private/prepopulate/demo/IFRC/tasks.cfg

private/prepopulate/regression/organisation.csv

static/formats/s3csv/org/sector.csv

static/formats/s3csv/org/sector.xsl

Show diffs side-by-side

added added

removed removed

controllers/survey.py

languages/en-gb.py

models/05_org.py

models/06_supply.py

models/09_project.py

models/survey.py

models/zzz_1st_run.py

modules/s3/s3chart.py

modules/s3/s3search.py

modules/s3/s3survey.py

private/prepopulate/default/org_sector.csv

private/prepopulate/default/tasks.cfg

private/prepopulate/demo/IFRC/org_sector.csv

private/prepopulate/demo/IFRC/tasks.cfg

private/prepopulate/regression/organisation.csv

static/formats/s3csv/org/sector.csv

static/formats/s3csv/org/sector.xsl

Older »