summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-24Add font-awesomeÉ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-22Delete search template (using default one)É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 suggestionsÉtienne Loks
2015-02-22Search: work on spelling suggestionÉtienne Loks
2015-02-22Add default settings to be compatible with new version of chimereÉ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
2015-02-11Merge branch 'v2.1'Étienne Loks
2015-02-11Add a sample MakefileÉtienne Loks
2015-02-11Merge branch 'v2.1' into v2.2Étienne Loks
2015-02-11New importer type XML - XSLT. Importer: add relation between category key ↵Étienne Loks
and categories * new importer type XML - XSLT * associated form and UI modification * add new model ImporterKeyCategories * associated migration * associated admin modification * longer state field for Importers * associated migration
2015-02-11Manage XML-XSLT importÉtienne Loks
2015-01-17Add boolean type for dynamic fieldsÉtienne Loks
2015-01-17Add boolean type for dynamic fieldsÉtienne Loks
2014-12-10Add french translationÉtienne Loks
2014-12-10Work on search template (previous, next button)Étienne Loks
2014-12-10Fix search resultÉtienne Loks
2014-12-10Fix search resultÉtienne Loks
2014-12-10Add icon for search resultsÉtienne Loks
2014-12-10Add icon of search resultsÉtienne Loks
2014-12-10Search: fix marker filtering - deactivate routesÉtienne Loks
2014-12-09Add missing paramaterers in settingsÉtienne Loks