| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-02-27 | Merge branch 'v2.2' | Étienne Loks | |
| 2015-02-27 | Fix category listing order | Étienne Loks | |
| 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-22 | Search: work on spelling suggestion | Étienne Loks | |
| 2015-02-20 | Merge branch 'v2.1' into v2.2 | Étienne Loks | |
| 2015-02-20 | Merge branch 'v2.1' | Étienne Loks | |
| 2015-02-20 | Routing: prevent incoherent transport and speed | Étienne Loks | |
| 2015-02-15 | 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 | |||
| 2014-12-10 | Search: fix marker filtering - deactivate routes | Étienne Loks | |
| 2014-12-09 | Work on autocomplete | Étienne Loks | |
| 2014-09-22 | Work on search engine | Étienne Loks | |
| * templates * styles * search index definition | |||
| 2014-07-29 | Add contact email to submited | Étienne Loks | |
| 2014-07-29 | Detail: add routing_enabled to the context | Étienne Loks | |
| 2014-06-14 | Fix bad json export | Étienne Loks | |
| 2014-06-05 | Improve performance of getGeoObjects for large request | Étienne Loks | |
| One supplementary request was done for each marker! To be done: check and improve routes. | |||
| 2014-04-10 | Add 'simple' to context of templates | Étienne Loks | |
| 2013-10-27 | Edpoit page: don't display dated fields when no categories has date | Étienne Loks | |
| 2013-10-25 | Mobile adaptation | Étienne Loks | |
| * manage specific domains for mobile * add Openlayers mobile library * put sample (empty) file for specific JS and specific CSS * add a new MOBILE context variable | |||
| 2013-09-23 | Manage extra urls | Étienne Loks | |
| 2013-08-19 | Fix modification right for non superuser user with right permissions | Étienne Loks | |
| 2013-08-08 | Configure Nominatim widget for edit page | Étienne Loks | |
| 2013-08-07 | Better management of map rights | Étienne Loks | |
| 2013-08-07 | Map: manage group permissions - fix some issues on permissions - tests | Étienne Loks | |
| 2013-07-01 | Manage automatic submission when authenticated and have the right. | Étienne Loks | |
| 2013-06-18 | Manage edition rights | Étienne Loks | |
| 2013-06-18 | Make conditon on actions - simplify map rigth management | É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-04-11 | Manage object with not category in getGeoObjects | Étienne Loks | |
| 2013-04-09 | Improve JSON generation performance | Étienne Loks | |
| 2013-04-01 | Be more flexible on settings configuration | Étienne Loks | |
| 2013-03-28 | Fix conditionnal parameters for routing | É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 | Remove outdated markers from news | Étienne Loks | |
| 2012-12-16 | Improve (greatly) performance for route display on the map | É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-23 | Fix route rapprochement: prevent delete of associated marker | Étienne Loks | |
| 2012-11-23 | Fix get_categories empty response | Étienne Loks | |
| 2012-11-19 | Change page title to project name | Étienne Loks | |
| 2012-11-19 | Change modification email (fix) | Étienne Loks | |
| 2012-11-19 | Change modification email | É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 | Redirect to the main page when area is not available (refs #412) | Étienne Loks | |
