← Back to branch summary

~robbyoconnor/sahana-eden/gsoc2010

~robbyoconnor/sahana-eden/gsoc2010

Viewing all changes in revision 927.

Committer: rob
Date: 2010-08-18 06:21:01 UTC
Revision ID: rob@rob-vaio-20100818062101-p2hytb72gipkatvt

reverting merge -- trying to keep this branch sanitary for gsoc purposes

files added:
controllers/nim.py

cron/daemonX.py

models/nim.py

files removed:
controllers/inventory.py

controllers/supply.py

models/06_supply.py

models/inventory.py

private/import/tables/supply_item.csv

private/import/tables/supply_item_category.csv

views/cr/shelter_update.html

views/gis/feature_group_update.html

views/inventory

views/inventory/index.html

views/msg/_compose.html

views/rms/req_popup.html

views/sync/conflict.html

views/sync/now.html

views/sync/schedule.html

views/sync/schedule_create.html

views/vol/compose_group.html

views/vol/compose_person.html

views/vol/view_team_map.html

files modified:
VERSION

controllers/cr.py

controllers/default.py

controllers/doc.py

controllers/gis.py

controllers/hms.py

controllers/irs.py

controllers/msg.py

controllers/rms.py

controllers/sitrep.py

controllers/sync.py

controllers/vol.py

cron/crontab

cron/sms_handler_modem.py

languages/zh-tw.py

models/000_config.py

models/00_db.py

models/00_utils.py

models/01_menu.py

models/02_pr.py

models/03_gis.py

models/04_pr.py

models/05_org.py

models/cr.py

models/doc.py

models/dvi.py

models/hms.py

models/irs.py

models/msg.py

models/rms.py

models/sitrep.py

models/sync.py

models/vol.py

models/zzz_1st_run.py

modules/s3gis.py

modules/s3msg.py

modules/s3tools.py

modules/s3xrc.py

modules/validators.py

modules/widgets.py

static/scripts/tools/sahana.js.gis.cfg

static/scripts/tools/standalone_exe.py

static/xslt/import/ushahidi.xsl

views/auth/_register.html

views/default/index.html

views/gis/feature_group_contents_list.html

views/gis/feature_group_contents_list_create.html

views/gis/feature_group_display.html

views/gis/feature_group_list_create.html

views/irs/index.html

views/msg/compose.html

views/popup.html

views/sitrep/index.html

views/sync/history.html

views/sync/index.html

Show diffs side-by-side

added added

removed removed

controllers/cr.py

controllers/default.py

controllers/doc.py

controllers/gis.py

controllers/hms.py

controllers/inventory.py

controllers/irs.py

controllers/msg.py

controllers/nim.py

controllers/rms.py

controllers/sitrep.py

controllers/supply.py

controllers/sync.py

controllers/vol.py

cron/daemonX.py

cron/sms_handler_modem.py

languages/zh-tw.py

models/000_config.py

models/00_db.py

models/00_utils.py

models/01_menu.py

models/02_pr.py

models/03_gis.py

models/04_pr.py

models/05_org.py

models/06_supply.py

models/inventory.py

models/sitrep.py

models/zzz_1st_run.py

modules/s3gis.py

modules/s3msg.py

modules/s3tools.py

modules/s3xrc.py

modules/validators.py

modules/widgets.py

private/import/tables/supply_item.csv

private/import/tables/supply_item_category.csv

static/scripts/tools/sahana.js.gis.cfg

static/scripts/tools/standalone_exe.py

static/xslt/import/ushahidi.xsl

views/auth/_register.html

views/cr/shelter_update.html

views/default/index.html

views/gis/feature_group_contents_list.html

views/gis/feature_group_contents_list_create.html

views/gis/feature_group_display.html

views/gis/feature_group_list_create.html

views/gis/feature_group_update.html

views/inventory/

views/inventory/index.html

views/irs/index.html

views/msg/_compose.html

views/msg/compose.html

views/rms/req_popup.html

views/sitrep/index.html

views/sync/conflict.html

views/sync/history.html

views/sync/index.html

views/sync/now.html

views/sync/schedule.html

views/sync/schedule_create.html

views/vol/compose_group.html

views/vol/compose_person.html

views/vol/view_team_map.html

Older »