← Back to branch summary

~sahanapy-haiti/sahana-eden/haiti-release

~sahanapy-haiti/sahana-eden/haiti-release

Viewing all changes in revision 606.

Committer: Fran Boon
Date: 2010-01-25 15:44:37 UTC
mfrom: (434.1.94 sahana)
Revision ID: flavour@partyvibe.com-20100125154437-4mv7b2q1k6d3ksxt

Merge Trunk: Import Jobs from mattb, Bulk GIS from tcarobruce, OR Bugfix from sunneach, HMS bugfix from nursix
Remove old deprecated views

files added:
controllers/bulk_gis.py

cron/import_job_do_import.py

cron/import_job_do_processing.py

static/styles/admin

static/styles/admin/import_job.css

views/admin/_import_job_reload_status.html

views/admin/_import_job_status_failed.html

views/admin/_import_job_status_import.html

views/admin/_import_job_status_imported.html

views/admin/_import_job_status_new.html

views/admin/_import_job_status_processed.html

views/admin/_import_job_status_processing.html

views/admin/import_job_list.html

views/admin/import_job_update.html

files removed:
views/or/activity_popup.html

views/rms/sms_request_display.html

views/rms/tweet_request_display.html

files modified:
VERSION

controllers/admin.py

cron/crontab

models/00_settings.py

models/01_menu.py

models/admin.py

models/hms.py

modules/sahana.py

views/admin/import_data.html

views/footer.html

views/layout.html

views/or/dashboard.html

views/pr/person_create.html

views/pr/person_popup.html

Show diffs side-by-side

added added

removed removed

controllers/admin.py

controllers/bulk_gis.py

cron/import_job_do_import.py

cron/import_job_do_processing.py

models/00_settings.py

models/01_menu.py

models/admin.py

modules/sahana.py

static/styles/admin/

static/styles/admin/import_job.css

views/admin/_import_job_reload_status.html

views/admin/_import_job_status_failed.html

views/admin/_import_job_status_import.html

views/admin/_import_job_status_imported.html

views/admin/_import_job_status_new.html

views/admin/_import_job_status_processed.html

views/admin/_import_job_status_processing.html

views/admin/import_data.html

views/admin/import_job_list.html

views/admin/import_job_update.html

views/layout.html

views/or/activity_popup.html

views/or/dashboard.html

views/pr/person_create.html

views/pr/person_popup.html

views/rms/sms_request_display.html

views/rms/tweet_request_display.html

Older »