summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-27Add leaflet-pluginsleaflet-permalinkÉtienne Loks
2015-04-27First step to implement permalink for leaflet using leaflet-pluginsÉtienne Loks
2015-03-19Fix bad mergeÉtienne Loks
2015-02-27Merge branch 'v2.2'Étienne Loks
2015-02-27Fix category listing orderÉtienne Loks
2015-02-27Merge branch 'v2.2'Étienne Loks
Conflicts: chimere/locale/fr/LC_MESSAGES/django.po chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py
2015-02-27Merge branch 'v2.1' into v2.2Étienne Loks
2015-02-27JS: manage the saving of route with many stepsÉtienne Loks
2015-02-26Update french translationÉtienne Loks
2015-02-25Extend news to the default area if non is provided.Étienne Loks
2015-02-25Change default pan for openlayersÉtienne Loks
2015-02-25Revert share icons positionÉtienne Loks
2015-02-25Move share barÉtienne Loks
2015-02-25Merge branch 'v2.2'Étienne Loks
2015-02-25Search: don't zoom to marker extent if no result have been foundÉtienne Loks
2015-02-25Minor styleÉtienne Loks
2015-02-24Minor label modificationÉtienne Loks
2015-02-24Merge branch 'v2.2'Étienne Loks
Conflicts: chimere/static/chimere/css/styles.css chimere/templates/chimere/blocks/areas.html
2015-02-24Small fixes on teh default layoutÉtienne Loks
2015-02-22Manage migration mergeÉtienne Loks
2015-02-22Merge 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-22Disable permalink when not revelantÉtienne Loks
2015-02-22Cleaner (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-22Clean search results when selection a categoryÉtienne Loks
2015-02-22Search templates refactoringÉtienne Loks
2015-02-22Few style and layout fixÉtienne Loks
2015-02-22Search: add keywordsÉtienne Loks
2015-02-22Search: work on spelling suggestionÉtienne Loks
2015-02-21Search: add sample solr configuration filesÉtienne Loks
2015-02-21Search: display nothing in place of "No result" messageÉtienne Loks
2015-02-20Merge branch 'v2.1' into v2.2Étienne Loks
2015-02-20Merge branch 'v2.1'Étienne Loks
2015-02-20Routing: prevent incoherent transport and speedÉtienne Loks
2015-02-20Fix bad typo in JS...Étienne Loks
2015-02-20Merge branch 'v2.1' into v2.2Étienne Loks
2015-02-20Merge branch 'v2.1'Étienne Loks
Conflicts: chimere/templates/chimere/blocks/map.html chimere/templatetags/chimere_tags.py
2015-02-20Change JS transport and route management to be available on startupÉtienne Loks
2015-02-18Add the ability to display an extra json layer by defaultÉtienne Loks
2015-02-15Update copyrightÉtienne Loks
2015-02-15Fix bad mergeÉtienne Loks
2015-02-15Migrations mergeÉtienne Loks
2015-02-14Merge 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
2015-02-14Merge branch 'v2.1'Étienne Loks
2015-02-14Remove syntax warningÉtienne Loks
2015-02-14Merge branch 'v2.1'Étienne Loks
2015-02-14XSLT imports: better date management - refactoring - manage date ISO formatÉtienne Loks
2015-02-14Add missing files for testsÉtienne Loks
2015-02-14Refactoring XSLT imports - fix testsÉtienne Loks
2015-02-11Merge branch 'v2.1'Étienne Loks
2015-02-11Makefile sample: add collecstatic to updateÉtienne Loks