← Back to branch summary

~flavour/sahana-eden/trunk

~flavour/sahana-eden/trunk

Viewing all changes in revision 3164.

Committer: Fran Boon
Date: 2012-01-19 16:25:33 UTC
mfrom: (2124.5.58 eden)
Revision ID: fran@aidiq.com-20120119162533-qrhhj3rybexj9set

merge Graeme: Survey supports PMI & new Colours in chart

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

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

files modified:
VERSION

controllers/survey.py

models/survey.py

modules/s3/s3chart.py

modules/s3/s3survey.py

private/prepopulate/demo/ADAT/tasks.cfg

Show diffs side-by-side

added added

removed removed

controllers/survey.py

models/survey.py

modules/s3/s3chart.py

modules/s3/s3survey.py

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

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

private/prepopulate/demo/ADAT/tasks.cfg

Older »