lp:~merkurie/sahana-eden/potlatch

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:sahana-eden

Fran Boon: Needs Fixing on 2011-11-15

Diff: 4030 lines (+3635/-358)

3 files modified

static/potlatch2/map_features/shopping.xml (+1/-183)
static/potlatch2/map_features/tourism.xml (+1/-175)
static/potlatch2/map_features_eden.xml (+3633/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2874. By dev <dev@eden-dev> on 2011-11-14

grabbed flavour's potlatch update and cleared out some unnecessary map features.

2873. By Fran Boon on 2011-11-09

merge nursix: Move pr components out of the conditional model, encapsulate conditional definition of importer tables

2872. By Fran Boon on 2011-11-09

merge nursix: S3Cube: Represent facts as facts only of they are not aggregated, row de-duplicati Move importer table definitions into load_all_models()

2871. By Fran Boon on 2011-11-09

pre-merge commit: min'd search file

2870. By Fran Boon on 2011-11-08

merge nursix: S3CSV common templates, ReplaceOption for upload form, HR de-duplication, be able to call s3_rest_controller without arguments.

2869. By Fran Boon on 2011-11-04

bugfix

2868. By Fran Boon on 2011-11-04

merge Michael: Project module in-line with DRRPP model, Inv tweaks, Prepop tweaks

2867. By Fran Boon on 2011-11-04

merge nursix: S3Cube tweaks

2866. By Fran Boon on 2011-11-04

Map: Improved error handling for layers which fail to load

2865. By Fran Boon on 2011-11-03

merge globaliist: Fix Shelter menu