| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-03-19 | Fix bad merge | Étienne Loks | |
| 2015-02-14 | Merge branch 'master' into nef | Étienne Loks | |
| Conflicts: chimere/admin.py chimere/forms.py chimere/models.py chimere/settings.sample.py chimere/static/chimere/js/jquery.chimere-ol.js chimere/templates/chimere/base.html chimere/templates/chimere/blocks/head_chimere.html chimere/templates/chimere/blocks/map.html chimere/templates/chimere/main_map.html chimere/templatetags/chimere_tags.py chimere/tests.py chimere/urls.py chimere/views.py chimere/widgets.py | |||
| 2013-10-30 | HTML-XSLT import: manage write on the database - import tests - fix ↵ | Étienne Loks | |
| pointwidget when using a name not equal to point | |||
| 2013-10-29 | Importer HTML-XSLT: model - admin | Étienne Loks | |
| * new fields for Importer model: alt source file (2 XSLT files can be used), default location (these pages doesn't provide adresses) * adapt admin to manage 2 type of hidden OpenLayers maps on the same page | |||
| 2013-08-08 | Configure Nominatim widget for edit page | Étienne Loks | |
| 2013-08-08 | Refactoring: nominatim widget -> template | Étienne Loks | |
| 2013-07-02 | Fix point and route widget for admin pages | Étienne Loks | |
| 2013-06-18 | Default to Openlayers for edition | É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-05 | Weighted markers: model | Étienne Loks | |
| 2013-04-01 | Better management of map JS files | Étienne Loks | |
| 2013-04-01 | Change settings to allow different JS map renderer | É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-01 | Move external libs to better directory | Étienne Loks | |
| 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-22 | Admin: improve layout of markers and routes | Étienne Loks | |
| 2012-11-22 | Admin: Fix new importer form | Étienne Loks | |
| 2012-11-22 | Update french translation. | Étienne Loks | |
| 2012-11-22 | Importer admin: Improve UI - fix bad bounding box on OSM importer | Étienne Loks | |
| 2012-11-22 | Admin import: xapi specific interface (refs #449, refs #458) | Étienne Loks | |
| 2012-11-21 | Admin import: filter admin fields by type | Étienne Loks | |
| 2012-11-13 | JS: Add resolutions and zoomoffset var to map admin. | Étienne Loks | |
| 2012-10-17 | Fix admin textarea | Étienne Loks | |
| 2012-10-15 | Routing: manage warns on the itinerary | Étienne Loks | |
| 2012-10-14 | 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/models.py chimere/static/chimere/css/styles.css chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py chimere/views.py chimere/widgets.py | |||
| 2012-10-12 | JS: fix GPX upload | Étienne Loks | |
| 2012-10-07 | Forms: fix geographic init after a bad submission | Étienne Loks | |
| 2012-10-07 | Widgets: distinguish Textarea in admin and in main interface | Étienne Loks | |
| 2012-10-06 | Admin: improve widget to select an area | Étienne Loks | |
| 2012-10-03 | Add a custom layer box with ability to add some subcat as a "virtual" layer | Étienne Loks | |
| 2012-09-21 | Merge branch 'master' into saclay | Étienne Loks | |
| Conflicts: chimere/admin.py chimere/forms.py chimere/models.py chimere/static/chimere/js/jquery.chimere.js | |||
| 2012-09-19 | Admin: simplify category management | Étienne Loks | |
| 2012-09-05 | Fix tinyMCE widget | Étienne Loks | |
| 2012-09-04 | Improve tinyMCE edition for extra pages | Étienne Loks | |
| 2012-08-31 | Merge branch 'master' into saclay | Étienne Loks | |
| Conflicts: chimere/static/chimere/js/utils.js | |||
| 2012-08-31 | Widget: allow to deactivate tinyMCE on some textarea fields | Étienne Loks | |
| 2012-08-28 | TinyMCE; Leave to CSS the width and height of textarea | Étienne Loks | |
| 2012-08-27 | Improve tinyMCE management (for ajax calls) | Étienne Loks | |
| 2012-08-25 | Improvement in route display and parsing | Étienne Loks | |
| 2012-08-22 | Improve routing interface and functionalities | Étienne Loks | |
| * fix POI clicking * create a nominatim widget to get coordinates from text * create a JQuery UI button select widget * create a routing form to get itinerary from a textual form * CSS for the routing form * Reverse nominatim: when a point is get for routing on the map label for this point is get from nominatim * Add transport management by user choice * Update french translation | |||
| 2012-08-21 | Allow specific multimedia et picture formset for get_edit_page | Étienne Loks | |
| 2012-07-18 | Fix route submission | Étienne Loks | |
| 2012-07-05 | Map: manage layer order, manage default layer on a map | Étienne Loks | |
| 2012-05-24 | Fix bad JS initialisation in administration | Étienne Loks | |
| 2012-05-16 | Fix RSS feeds for django 1.4 - reintegrate them in the main application | Étienne Loks | |
