lp:~keitheis/sahana-eden/edentrunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:sahana-eden at revision 1065

Fran Boon: Pending requested 2010-08-22

Diff: 100 lines (+22/-9)

5 files modified

controllers/irs.py (+1/-1)
models/00_settings.py (+1/-0)
models/00_utils.py (+10/-8)
models/01_crud.py (+7/-0)
modules/s3xrc.py (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1073. By Keith Yang on 2010-08-24

Try the way of redifined minimal incident categories

1072. By Fran Boon on 2010-08-24

Merge michael: many tweaks :)

1071. By Fran Boon on 2010-08-24

More work on Locations Selector - can now add new records, still much to be done though

1070. By Fran Boon on 2010-08-23

Location AutoComplete progress (not complete, so not being pulled to live yet)
Moved Ext JS/CSS to load for all pages (gray theme live throughout)

1069. By Fran Boon on 2010-08-23

Locations now have a Simple Search form

1068. By Fran Boon on 2010-08-22

Correct Locations security

1067. By Fran Boon on 2010-08-22

merge nursix: RAT section 3

1066. By Fran Boon on 2010-08-22

per-merge commit: Protect the default Map settings, whilst still allowing personalisable settings. Start preparing for GeoServer/GeoSpatial DB integration (Healthscapes merge)

1065. By Fran Boon on 2010-08-22

Merge keitheis: Copy function added to shn_action_buttons in IRS
Added the same to KML layers, more KML tweaks

1064. By Fran Boon on 2010-08-22

Move locations hierarchy to deployment_settings
Enhanced KML overlay support