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 | Search: add keywords | É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 | |||
2015-02-14 | Remove syntax warning | Étienne Loks | |
2015-02-11 | New 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 | |||
2013-10-27 | Admin: only register model if not yet registered | Étienne Loks | |
This mecanism allow to specialized admin in projects | |||
2013-08-07 | Admin: improve user add in groups | Étienne Loks | |
2013-08-07 | Map: manage group permissions - fix some issues on permissions - tests | Étienne Loks | |
2013-06-19 | Fix urls for production | É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 generalization of CSV export | Étienne Loks | |
2013-04-05 | Weighted markers: model | É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-19 | Admin: improve marker list with dates fields | Étienne Loks | |
2013-02-06 | Admin: fix route admin when a property is newly set | Étienne Loks | |
2013-01-30 | Fix modification link in admin | É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-07 | Admin: improve non overloading imports | Étienne Loks | |
* improve non overloading import management in OSM * add a warning message to "modified" items form | |||
2012-11-28 | Update documentation | É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 | Fix auto-recognition of multimedia files | Étienne Loks | |
2012-11-26 | Manage auto-detection of multimedia type by extension - improvement on ↵ | Étienne Loks | |
alternate multimedia widget Conflicts: chimere/admin.py chimere/forms.py chimere/models.py chimere/templates/chimere/blocks/alternate_multimedia.html chimere/templatetags/chimere_tags.py | |||
2012-11-24 | Update french translation | Étienne Loks | |
2012-11-24 | Admin: improve property model management | Étienne Loks | |
* Add the ability to hide property model from the admin * Add a warning to the admin that it should reload the webserver | |||
2012-11-24 | Fix rapprochement - work on OSM export interface | Étienne Loks | |
2012-11-23 | Fix route rapprochement: prevent delete of associated marker | Étienne Loks | |
2012-11-23 | Fix category modification on amendment submission. | Étienne Loks | |
2012-11-23 | OSM export: improve admin form | Étienne Loks | |
2012-11-22 | Admin: improve layout of markers and routes | Étienne Loks | |
2012-11-19 | Merge branch 'master' into saclay | Étienne Loks | |
2012-11-19 | Admin: add a disable action | É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 | Admin: fix area modifications (refs #411) | Étienne Loks | |
2012-11-16 | Admin: Fix check problems in imports - improve area and property model list ↵ | Étienne Loks | |
(refs #413) | |||
2012-11-16 | Manage route amendment in admin (refs #381) | Étienne Loks | |
2012-11-16 | Manage marker amendment in admin (refs #381) | Étienne Loks | |
2012-11-07 | Admin: add category filter to Importers | Étienne Loks | |
2012-10-31 | Small admin improvment | É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-09 | Admin: fix and improve moderation groups management | Étienne Loks | |
2012-10-06 | Import/export: KML route import - KML, CSV, ShapeFile route export | Étienne Loks | |
2012-10-05 | Admin: sort multimedia and images by drag and drop | É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 | OSM export: Fix modification management | Étienne Loks | |
2012-09-24 | Map: first management of marker clustering | Étienne Loks | |
2012-09-21 | Merge branch 'master' into saclay | Étienne Loks | |
Conflicts: chimere/admin.py chimere/forms.py chimere/models.py chimere/static/chimere/js/jquery.chimere.js | |||
2012-09-20 | Remove another unecessary admin page | Étienne Loks | |
2012-09-20 | Remove unecessary admin pages | Étienne Loks | |