| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-06-18 | Enable map clustering option - fix category when there is only one | Étienne Loks | |
| 2013-06-16 | Display/write rights management on maps | Étienne Loks | |
| 2013-06-15 | Refactoring: renaming Area to Map | Étienne Loks | |
| 2013-05-29 | Merge branch 'master' into nef | Étienne Loks | |
| 2013-05-29 | Merge branch 'v2.0' | Étienne Loks | |
| Conflicts: chimere/widgets.py | |||
| 2013-05-29 | Simplify live_lonlat template | Étienne Loks | |
| 2013-05-29 | Ability to set coordinates from live_lonlat (refs #335) | Étienne Loks | |
| Integration of Raphaël Droz's work. | |||
| 2013-05-29 | Use a template to render PointChooser widget. | Étienne Loks | |
| Integration of Raphaël Droz's work. | |||
| 2013-04-22 | Manage many layers with Leaflet | Étienne Loks | |
| 2013-04-05 | Leaflet: work on clustering | Étienne Loks | |
| 2013-04-05 | Manage conditionnal CSS (better to come...) | Étienne Loks | |
| 2013-04-03 | First work on Leaflet script | Étienne Loks | |
| * manage markers from a GeoJson source with custom icon | |||
| 2013-04-01 | Better management of map JS files | Étienne Loks | |
| 2013-04-01 | Merge branch 'master' into nef2 | Étienne Loks | |
| Conflicts: chimere/settings.sample.py | |||
| 2013-04-01 | Fix templates and disable by default clustering | Étienne Loks | |
| 2013-04-01 | Fix routing templatetags | Étienne Loks | |
| 2013-04-01 | Change settings to allow different JS map renderer | Étienne Loks | |
| 2013-03-18 | Update copyright notice on the map | Étienne Loks | |
| 2013-03-14 | Merge branch 'master' into saclay | Étienne Loks | |
| Conflicts: chimere/locale/fr/LC_MESSAGES/django.po chimere/static/chimere/css/styles.css chimere/static/chimere/js/jquery.chimere.js chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py chimere/utils.py chimere/views.py example_project/settings.py | |||
| 2013-02-02 | JS: when the marker selected is associated to a route zoom to its extentv2.0-RC6 | Étienne Loks | |
| 2013-02-01 | Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimere | Étienne Loks | |
| 2013-02-01 | Templates: more explicit messages on edition pages. | Étienne Loks | |
| 2013-02-01 | Improve template when no default area is defined | Étienne Loks | |
| 2013-01-30 | Fix modification link in admin | Étienne Loks | |
| 2013-01-30 | Fix bad detextion of modification in admin | Étienne Loks | |
| 2012-12-13 | Merge branch 'master' into saclay | Étienne Loks | |
| Conflicts: chimere/admin.py chimere/locale/fr/LC_MESSAGES/django.po chimere/tests.py chimere/utils.py | |||
| 2012-12-07 | Admin: improve non overloading imports | Étienne Loks | |
| * improve non overloading import management in OSM * add a warning message to "modified" items form | |||
| 2012-11-26 | Merge branch 'master' into saclay | Étienne Loks | |
| Conflicts: chimere/admin.py chimere/fixtures/initial_data.json chimere/forms.py chimere/locale/fr/LC_MESSAGES/django.po chimere/static/chimere/css/styles.css chimere/templates/chimere/blocks/alternate_multimedia.html chimere/templates/chimere/blocks/categories.html chimere/widgets.py | |||
| 2012-11-26 | Manage auto-detection of multimedia type by extension - improvement on ↵ | Étienne Loks | |
| alternate multimedia widget Conflicts: chimere/admin.py chimere/forms.py chimere/models.py chimere/templates/chimere/blocks/alternate_multimedia.html chimere/templatetags/chimere_tags.py | |||
| 2012-11-24 | Minor UI change on feeds | Étienne Loks | |
| 2012-11-24 | Add simple map link on main template | Étienne Loks | |
| 2012-11-24 | Admin: improve property model management | Étienne Loks | |
| * Add the ability to hide property model from the admin * Add a warning to the admin that it should reload the webserver | |||
| 2012-11-24 | Fix rapprochement - work on OSM export interface | Étienne Loks | |
| 2012-11-23 | Fix get_categories empty response | Étienne Loks | |
| 2012-11-23 | OSM export: improve admin form | Étienne Loks | |
| 2012-11-22 | Inline formset: manage addition of new lines in JS | Étienne Loks | |
| 2012-11-19 | Change page title to project name | Étienne Loks | |
| 2012-11-19 | Merge branch 'master' into saclay | Étienne Loks | |
| Conflicts: chimere/admin.py chimere/models.py chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py chimere/tests.py | |||
| 2012-11-16 | Manage route amendment in admin (refs #381) | Étienne Loks | |
| 2012-11-16 | Manage marker amendment in admin (refs #381) | Étienne Loks | |
| 2012-11-15 | Add a template tags for a small OpenLayers map | Étienne Loks | |
| 2012-11-13 | Fail properly when the routing engine don't find a route - JS: manage ↵ | Étienne Loks | |
| routing messages | |||
| 2012-11-12 | HTML validation (alt attribute) | Étienne Loks | |
| 2012-11-12 | HTML validation | Étienne Loks | |
| 2012-11-11 | JS: Fix clustering redraw and layer z-index after category check | Étienne Loks | |
| 2012-10-31 | JS: improve category check | Étienne Loks | |
| 2012-10-31 | Merge branch 'master' into saclay | Étienne Loks | |
| Conflicts: chimere/locale/fr/LC_MESSAGES/django.po chimere/templates/chimere/blocks/multimedia_file.html chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py chimere/views.py | |||
| 2012-10-29 | Add a legend on multimedia items (refs #395) | Étienne Loks | |
| 2012-10-28 | Better no-JS message | Étienne Loks | |
| 2012-10-28 | Minor terminology fix | Étienne Loks | |
