| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2016-11-21 | Update french translation | Étienne Loks | |
| 2016-06-15 | Merge branch 'v2.2' into v3.0 | Étienne Loks | |
| Conflicts: chimere/static/chimere/js/jquery.chimere.js | |||
| 2016-05-15 | Update french translation | Étienne Loks | |
| 2016-03-25 | Update of copyright dates | Valérie-Emma Leroux | |
| 2015-04-20 | Update french translation | Étienne Loks | |
| 2015-04-19 | Update french translation | Étienne Loks | |
| 2015-03-29 | Update french translation | Étienne Loks | |
| 2015-02-26 | Update french translation | Étienne Loks | |
| 2013-04-18 | Merge branch 'v2.0' | Étienne Loks | |
| Conflicts: chimere/locale/fr/LC_MESSAGES/django.po | |||
| 2013-04-18 | Minor: more precise error message on shapefile import | É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 | Minor update on french translation | Étienne Loks | |
| 2013-02-01 | Update french translation | Étienne Loks | |
| 2013-01-31 | Imports: make description import optional | É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-08 | Minor update on french translation | Étienne Loks | |
| 2012-12-08 | Update french tranlation - minor label change | Étienne Loks | |
| 2012-12-06 | Update french translation (minor) | Étienne Loks | |
| 2012-11-27 | Add not_for_osm to admin marker form | É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-26 | Update french translation | Étienne Loks | |
| 2012-11-24 | Update french translation | Étienne Loks | |
| 2012-11-22 | Minor french translation fix | Étienne Loks | |
| 2012-11-22 | Update french translation. | Étienne Loks | |
| 2012-11-11 | Update french translation | É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-26 | Forms: fix date check on marker form | Étienne Loks | |
| * End date can't be before start date (refs #384) | |||
| 2012-10-26 | Minor update of french translation | Étienne Loks | |
| 2012-10-17 | Small french translation upgrade | É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-06 | Admin: improve widget to select an area | Étienne Loks | |
| 2012-10-04 | Update of french translation | Étienne Loks | |
| 2012-10-04 | Import: add error messages | Étienne Loks | |
| 2012-10-02 | Merge branch 'master' into saclay | Étienne Loks | |
| Conflicts: chimere/admin.py chimere/locale/fr/LC_MESSAGES/django.po chimere/models.py chimere/templates/chimere/main_map.html chimere/templatetags/chimere_tags.py chimere/views.py | |||
| 2012-10-01 | Minor: Update of locale | Étienne Loks | |
| 2012-09-28 | Add a waiting message | Étienne Loks | |
| 2012-09-28 | Edit form: disable a subcat for submission only | Étienne Loks | |
| 2012-09-05 | Update french translation | Étienne Loks | |
| 2012-09-03 | Update of french translation | Étienne Loks | |
| 2012-08-26 | Add a locale file for example project | Étienne Loks | |
| 2012-08-26 | Add the possibility to submit a modification by email | Étienne Loks | |
| 2012-08-22 | Merge branch 'saclay' of ssh://daenerys.peacefrogs.net/var/local/git/chimere ↵ | Étienne Loks | |
| into saclay Conflicts: chimere/locale/fr/LC_MESSAGES/django.po | |||
| 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 | Update french translation with routing | Étienne Loks | |
| 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-20 | Merge branch 'master' into eds | Étienne Loks | |
| Conflicts: chimere/locale/fr/LC_MESSAGES/django.po chimere/templates/chimere/edit.html | |||
| 2012-08-20 | Add personal information in edit form | Étienne Loks | |
| 2012-08-20 | Update french translation in admin for properties | Étienne Loks | |
| 2012-08-17 | 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-15 | Update french translation with routing | Étienne Loks | |
