← Back to branch summary

~michael-howden/sahana-eden/ifrc

~michael-howden/sahana-eden/ifrc

Viewing all changes in revision 2157.

Committer: Fran Boon
Date: 2012-01-18 21:59:54 UTC
mfrom: (1875.1.1275 eden)
Revision ID: fran@aidiq.com-20120118215954-lly1db1r3hfzdb4i

merge trunk

files added:
static/scripts/S3/s3.timeline.js

files modified:
VERSION

controllers/project.py

controllers/survey.py

languages/en-gb.py

models/01_menu.py

models/asset.py

modules/eden/irs.py

modules/eden/org.py

modules/eden/project.py

modules/s3/s3gis.py

modules/s3/s3msg.py

requirements.txt

static/scripts/S3/S3.js

static/scripts/S3/S3.min.js

static/scripts/tools/noop.py

static/scripts/tools/sahana.js.cfg

static/styles/S3/sahana.css

views/_search.html

Show diffs side-by-side

added added

removed removed

controllers/project.py

controllers/survey.py

languages/en-gb.py

models/01_menu.py

models/asset.py

modules/eden/irs.py

modules/eden/org.py

modules/eden/project.py

modules/s3/s3gis.py

modules/s3/s3msg.py

requirements.txt

static/scripts/S3/S3.js

static/scripts/S3/S3.min.js

static/scripts/S3/s3.timeline.js

static/scripts/tools/noop.py

static/scripts/tools/sahana.js.cfg

static/styles/S3/sahana.css

views/_search.html

Older »