Remaining parts of link table deletion fix: unit test, fix precedence (don't try to attach components if alias matches linked table)
s3.popup.js to support S3HierarchyWidget updates
Restore datatable permalinks.
CRMT: Hierarchical org_service
Merge branch 'master' of git://github.com/nursix/eden
Minify
Custom markers for CAP based on priority of alert
- changed marker to grey
-solved s3_unicode issue
Extending POI functionality
-Select resource from popup functionality
IFRC: revert accidental change in organisation custom form, consistency for options.json, unit tests
OCHAROCCA
* Added Ukraine
* Removed Faciilities
* made fields for Lat?lon Soruce/Date visible
* Fixed Representation of GIS Levels
* Styling of Buttons
* Allows mulitple Column headers in event_event.xsl for Name/Reference and demographic_data.xsl for Date/Year
Trailing comma, possibly preventing minification.
HRM: Optionally link Courses to Sectors
IFRC: Use the linkage, move courses prepop to Train
CRMT: Include some Services in the dummy prepop
Minify
hierarchicalopts: close menu automatically on mouseleave after first click
Fix bootstrap CSS for datatable permalinks
Fix Hierarchical Service import
Minify
IFRC/RDRT member profile: split skills into Computer/Language and hide all others (create-popup still needs fixing => to follow)
Hierarchicalopts: with multiple=False, close menu immediately after a node has been selected
Project: Optionally link Beneficiaries to Activity Types
IFRC: Make use of this (not 100% complete)
GIS: Catch bad Paths in Location Represents
IFRC: Ensure that activity_types propagate to the Location
Merge branch 'master' of git://github.com/nursix/eden
CRMT: Allow free-form phone numbers & show these for Orgs