← Back to branch summary

~michael-howden/sahana-eden/eden

~michael-howden/sahana-eden/eden

Viewing all changes in revision 2732.

Committer: Michael Howden
Date: 2012-01-18 02:46:12 UTC
mfrom: (2653.1.486 eden)
Revision ID: michael@sahanafoundation.org-20120118024612-70bahuqx9rezd8w7

Merge Trunk

files added:
private/prepopulate/demo/ADAT/72H-Test-Data.csv

static/img/silk/email.png

static/scripts/S3/s3.msg.js

files removed:
views/event/compose.html

views/hrm/compose.html

files modified:
VERSION

controllers/event.py

controllers/hrm.py

controllers/inv.py

controllers/msg.py

models/08_inv.py

models/req.py

modules/eden/irs.py

modules/eden/msg.py

modules/eden/org.py

modules/s3/s3msg.py

modules/s3/s3navigation.py

modules/s3/s3test.py

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

private/prepopulate/demo/ADAT/tasks.cfg

static/scripts/S3/S3.min.js

static/scripts/S3/s3.dataTables.js

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

static/scripts/tools/sahana.js.cfg

views/_search.html

views/dataTables.html

views/msg/_compose.html

Show diffs side-by-side

added added

removed removed

controllers/event.py

controllers/hrm.py

controllers/inv.py

controllers/msg.py

models/08_inv.py

modules/eden/irs.py

modules/eden/msg.py

modules/eden/org.py

modules/s3/s3msg.py

modules/s3/s3navigation.py

modules/s3/s3test.py

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

private/prepopulate/demo/ADAT/72H-Test-Data.csv

private/prepopulate/demo/ADAT/tasks.cfg

static/img/silk/email.png

static/scripts/S3/S3.min.js

static/scripts/S3/s3.dataTables.js

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

static/scripts/S3/s3.msg.js

static/scripts/tools/sahana.js.cfg

views/_search.html

views/dataTables.html

views/event/compose.html

views/hrm/compose.html

views/msg/_compose.html

Older »