| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-02-22 | Merge branch 'v2.2' | Étienne Loks | |
| Conflicts: chimere/admin.py chimere/models.py chimere/static/chimere/css/styles.css chimere/urls.py chimere/views.py | |||
| 2015-02-22 | Cleaner (and safer) way to generate JSON - add a get-marker view - allow to ↵ | Étienne Loks | |
| display only one marker (and no category) with permalinks | |||
| 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 | |||
| 2014-12-09 | Work on autocomplete | Étienne Loks | |
| 2014-09-22 | Work on search engine | Étienne Loks | |
| * templates * styles * search index definition | |||
| 2014-08-26 | Haystack parameters | Étienne Loks | |
| 2013-06-16 | Display/write rights management on maps | Étienne Loks | |
| 2013-06-15 | Refactoring: renaming Area to Map | Étienne Loks | |
| 2013-04-23 | Allow to load static JSON overlay layers | Étienne Loks | |
| 2013-03-28 | Fix conditionnal parameters for routing | É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-24 | Add simple map link on main template | Étienne Loks | |
| 2012-10-31 | JS: preload icon images | Étienne Loks | |
| 2012-09-10 | Manage share toolbar inside a template tag | Étienne Loks | |
| 2012-09-07 | Manage subcategory description | Étienne Loks | |
| 2012-09-07 | Manage a category description | Étienne Loks | |
| 2012-09-04 | Add a new Page model to add simple pages as "actions"- Improve actions ↵ | Étienne Loks | |
| management | |||
| 2012-08-31 | Routing: manage speed in (forms, views, helpers) | É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-22 | Improve routing: manage steps | Étienne Loks | |
| * Manage steps in routing core * Add extra parameters for steps in urls.py * Modify the view to parse steps and send them to the routing core * Manage steps in JS (add many step flags and send a correct request to the view) * Manage a clear itinerary action in JS * Add a new flag image for steps * CSS improvement | |||
| 2012-08-22 | First working version of routing. | Étienne Loks | |
| * add an utilitary Routing class to manage different routing system * implement the routing with routino * add a view to manage routes * itinerary panel template * JS management of routing: * manage flag markers on the map * request the route when start and finish flag are set * display the route and the itinerary description * add of two flags images * itinerary panel CSS * french translation update | |||
| 2012-08-02 | Fix url of tinyurl when no area name is provided | Étienne Loks | |
| 2012-07-24 | Urls: manage areas with "-" and "_" | Étienne Loks | |
| 2012-07-05 | Simplify zoom area management | Étienne Loks | |
| 2012-07-03 | Fix feeds - remove BASE_URL ref | Étienne Loks | |
| * fix area feeds * fix url feeds * temporary fix: pass Marker from BaseGeoManager to GeoManager to fix a strange error in area feeds using contained filter | |||
| 2012-07-02 | Fix access to RSS feeds (refs #367) - Improve URLs | Étienne Loks | |
| 2012-06-28 | Fix *simple page* access (closes #363) | Étienne Loks | |
| 2012-05-16 | Fix RSS feeds for django 1.4 - reintegrate them in the main application | Étienne Loks | |
| 2012-05-06 | Improve area management | Étienne Loks | |
| 2012-02-28 | Move the submit message to the edit page | Étienne Loks | |
| 2012-02-28 | Allow modification of routes on the main interface | Étienne Loks | |
| 2012-02-28 | Allow modification of markers on the main interface | Étienne Loks | |
| 2012-02-27 | Correct gpx import | Étienne Loks | |
| 2012-02-25 | Fix: duplicate JS include - dynamic loading of categories | Étienne Loks | |
| 2012-02-19 | Many fixes on template and static vars | Nim | |
| 2012-02-16 | Refactoring: change paths, move files, renaming, re-adapt templates + use ↵ | Étienne Loks | |
| context template (refs #316) | |||
| 2012-02-15 | Large reorganization (refs #316), south migration script to new model names ↵ | Étienne Loks | |
| (refs #319) | |||
| 2011-09-14 | Allow route submission from a simple page (closes #303) | Étienne Loks | |
| 2011-09-09 | Association of a GPX (or KML) file to a route (refs #302) | Étienne Loks | |
| - new table in the model - new form in route edition - uploaded gpx file simplification - automatic route creation from the GPX file | |||
| 2010-11-20 | Merge branch 'master' into carte-ouverte | Étienne Loks | |
| Conflicts: chimere/urls.py | |||
| 2010-11-20 | Correct i18n if the calendar (fixes #277) | Étienne Loks | |
| 2010-11-20 | Merge branch 'master' into carte-ouverte | Étienne Loks | |
| Conflicts: .gitignore chimere/main/actions.py chimere/urls.py | |||
| 2010-11-20 | Make the feeds work (refs #65) | Étienne Loks | |
| 2010-11-19 | Syntax correction (refs #65) | Étienne Loks | |
| 2010-11-19 | Add a new application "rss". Add urls to manage RSS. | Étienne Loks | |
| Rough integration of work of Pierre Clarenc and Samuel Renard (refs #65) | |||
| 2010-11-18 | Changements spécifiques carte OuVerte | root | |
| 2010-11-16 | Simplify the management of tiny urls | Étienne Loks | |
| Don't save the current window and avoid the opening of a window considered has a popup | |||
| 2010-11-13 | Manage an application with no email server setv1.0.0 | Étienne Loks | |
| 2010-04-27 | Correct url | etienne | |
| git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@82 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864 | |||
| 2010-04-25 | Correct url resolution - #97 | etienne | |
| git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@81 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864 | |||
