← Back to branch summary

~shikharkohli/sahana-eden/gsoc1

~shikharkohli/sahana-eden/gsoc1

Viewing all changes in revision 874.

Committer: Shikhar Kohli
Date: 2010-08-11 18:40:09 UTC
mfrom: (802.1.156 eden)
Revision ID: shikharkohli@gmail.com-20100811184009-yy8zag5dowlam0ip

Merge trunk and update (a bit) of JS

files added:
controllers/irs.py

languages/zh-tw.py

models/irs.py

static/scripts/gis/OpenStreetMap.js

views/irs

views/irs/index.html

views/irs/maps.html

files removed:
.raw

controllers/ir.py

languages/de.py

languages/fr.py

languages/ht.py

models/ir.py

views/gis/display_feature_old.html

views/gis/display_features_old.html

views/gis/feature_create_map.html

views/gis/gis_scripts_debug.html

views/gis/gis_scripts_min.html

views/gis/gis_styles_debug.html

views/gis/map_viewing_client_old.html

views/gis/ol_controls.js

views/gis/ol_controls_features.js

views/gis/ol_controls_features_geometry.js

views/gis/ol_features_popup.html

views/gis/ol_features_popup_bak.html

views/gis/ol_functions.js

views/gis/ol_js_loaders.html

views/gis/ol_layers_all.js

views/gis/ol_layers_bing.js

views/gis/ol_layers_feature.js

views/gis/ol_layers_features.js

views/gis/ol_layers_features2.py

views/gis/ol_layers_features_all.js

views/gis/ol_layers_georss.js

views/gis/ol_layers_google.js

views/gis/ol_layers_gpx.js

views/gis/ol_layers_js.js

views/gis/ol_layers_kml.js

views/gis/ol_layers_openstreetmap.js

views/gis/ol_layers_tms.js

views/gis/ol_layers_wms.js

views/gis/ol_layers_xyz.js

views/gis/ol_layers_yahoo.js

views/gis/ol_start_vars.js

views/gis/ol_status.html

views/gis/ol_vector_registerEvents.js

views/gis/toolbar.js

views/gis/unused

views/gis/unused/feature_create_unused.js

views/gis/unused/form_apikey.html

views/gis/unused/form_feature_group.html

views/gis/unused/form_subtype.html

views/gis/unused/form_type.html

views/gis/unused/ol_controls_features_unused.js

views/gis/unused/unused_add_feature_map.html

views/gis/unused/unused_add_feature_map_pieces.html

views/gis/unused/unused_mf_shortcuts.js

views/gis/unused/unused_ol_controls_switch.js

views/gis/unused/unused_ol_onload_fin.js

views/gis/unused/unused_ol_popup_ajax.js

views/gis/unused/unused_toolbar1.html

views/gis/unused/unused_toolbar2.html

views/ir

views/ir/index.html

views/ir/maps.html

files modified:
VERSION

controllers/admin.py

controllers/budget.py

controllers/default.py

controllers/gis.py

controllers/hms.py

controllers/lms.py

controllers/msg.py

controllers/nim.py

controllers/sync.py

controllers/xforms.py

cron/crontab

models/000_config.py

models/00_settings.py

models/00_utils.py

models/01_crud.py

models/01_menu.py

models/02_pr.py

models/04_pr.py

models/05_org.py

models/06_lms.py

models/budget.py

models/hms.py

models/msg.py

models/zzz_1st_run.py

modules/s3cfg.py

modules/s3gis.py

modules/s3msg.py

modules/s3tools.py

modules/s3xrc.py

static/xslt/import/odk.xsl

views/default/index.html

views/gis/test2.html

Show diffs side-by-side

added added

removed removed

controllers/admin.py

controllers/budget.py

controllers/default.py

controllers/gis.py

controllers/hms.py

controllers/ir.py

controllers/irs.py

controllers/lms.py

controllers/msg.py

controllers/nim.py

controllers/sync.py

controllers/xforms.py

languages/de.py

languages/fr.py

languages/ht.py

languages/zh-tw.py

models/000_config.py

models/00_settings.py

models/00_utils.py

models/01_crud.py

models/01_menu.py

models/02_pr.py

models/04_pr.py

models/05_org.py

models/06_lms.py

models/budget.py

models/zzz_1st_run.py

modules/s3cfg.py

modules/s3gis.py

modules/s3msg.py

modules/s3tools.py

modules/s3xrc.py

static/scripts/gis/OpenStreetMap.js

static/xslt/import/odk.xsl

views/default/index.html

views/gis/display_feature_old.html

views/gis/display_features_old.html

views/gis/feature_create_map.html

views/gis/gis_scripts_debug.html

views/gis/gis_scripts_min.html

views/gis/gis_styles_debug.html

views/gis/map_viewing_client_old.html

views/gis/ol_controls.js

views/gis/ol_controls_features.js

views/gis/ol_controls_features_geometry.js

views/gis/ol_features_popup.html

views/gis/ol_features_popup_bak.html

views/gis/ol_functions.js

views/gis/ol_js_loaders.html

views/gis/ol_layers_all.js

views/gis/ol_layers_bing.js

views/gis/ol_layers_feature.js

views/gis/ol_layers_features.js

views/gis/ol_layers_features2.py

views/gis/ol_layers_features_all.js

views/gis/ol_layers_georss.js

views/gis/ol_layers_google.js

views/gis/ol_layers_gpx.js

views/gis/ol_layers_js.js

views/gis/ol_layers_kml.js

views/gis/ol_layers_openstreetmap.js

views/gis/ol_layers_tms.js

views/gis/ol_layers_wms.js

views/gis/ol_layers_xyz.js

views/gis/ol_layers_yahoo.js

views/gis/ol_start_vars.js

views/gis/ol_status.html

views/gis/ol_vector_registerEvents.js

views/gis/test2.html

views/gis/unused/

views/gis/unused/feature_create_unused.js

views/gis/unused/form_apikey.html

views/gis/unused/form_feature_group.html

views/gis/unused/form_subtype.html

views/gis/unused/form_type.html

views/gis/unused/ol_controls_features_unused.js

views/gis/unused/unused_add_feature_map.html

views/gis/unused/unused_add_feature_map_pieces.html

views/gis/unused/unused_mf_shortcuts.js

views/gis/unused/unused_ol_controls_switch.js

views/gis/unused/unused_ol_onload_fin.js

views/gis/unused/unused_ol_popup_ajax.js

views/gis/unused/unused_toolbar1.html

views/gis/unused/unused_toolbar2.html

views/ir/index.html

views/ir/maps.html

views/irs/index.html

views/irs/maps.html

Older »