← Back to branch summary

~robbyoconnor/sahana-eden/sahana-eden-trunk

~robbyoconnor/sahana-eden/sahana-eden-trunk

Viewing all changes in revision 1585.

Committer: Robert O'Connor
Date: 2010-12-24 05:06:02 UTC
mfrom: (1570.1.41 eden)
Revision ID: robby.oconnor@gmail.com-20101224050602-jrw81cm7ns42pnz1

merge from trunk

files added:
views/admin/user_form.html

files removed:
views/admin/user_create_form.html

views/admin/user_update_form.html

files modified:
VERSION

controllers/admin.py

controllers/default.py

languages/en-gb.py

languages/es.py

models/00_settings.py

views/admin/user_create.html

views/admin/user_list_create.html

views/admin/user_update.html

views/assess/assess_list.html

views/default/user.html

views/org/organisation_assess_list.html

Show diffs side-by-side

added added

removed removed

controllers/admin.py

controllers/default.py

languages/en-gb.py

languages/es.py

models/00_settings.py

views/admin/user_create.html

views/admin/user_create_form.html

views/admin/user_form.html

views/admin/user_list_create.html

views/admin/user_update.html

views/admin/user_update_form.html

views/assess/assess_list.html

views/default/user.html

views/org/organisation_assess_list.html

Older »