summaryrefslogtreecommitdiff
path: root/chimere/admin.py
AgeCommit message (Collapse)Author
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-22Search: add keywordsÉ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-14Remove syntax warningÉ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
2013-10-27Admin: only register model if not yet registeredÉtienne Loks
This mecanism allow to specialized admin in projects
2013-08-07Admin: improve user add in groupsÉtienne Loks
2013-08-07Map: manage group permissions - fix some issues on permissions - testsÉtienne Loks
2013-06-19Fix urls for productionÉtienne Loks
2013-06-16Display/write rights management on mapsÉtienne Loks
2013-06-15Refactoring: renaming Area to MapÉtienne Loks
2013-04-23Allow generalization of CSV exportÉtienne Loks
2013-04-05Weighted markers: modelÉtienne Loks
2013-03-14Merge 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-19Admin: improve marker list with dates fieldsÉtienne Loks
2013-02-06Admin: fix route admin when a property is newly setÉtienne Loks
2013-01-30Fix modification link in adminÉtienne Loks
2012-12-13Merge 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-07Admin: improve non overloading importsÉtienne Loks
* improve non overloading import management in OSM * add a warning message to "modified" items form
2012-11-28Update documentationÉtienne Loks
2012-11-27Add not_for_osm to admin marker formÉtienne Loks
2012-11-26Merge 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-26Fix auto-recognition of multimedia filesÉtienne Loks
2012-11-26Manage 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-24Update french translationÉtienne Loks
2012-11-24Admin: 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-24Fix rapprochement - work on OSM export interfaceÉtienne Loks
2012-11-23Fix route rapprochement: prevent delete of associated markerÉtienne Loks
2012-11-23Fix category modification on amendment submission.Étienne Loks
2012-11-23OSM export: improve admin formÉtienne Loks
2012-11-22Admin: improve layout of markers and routesÉtienne Loks
2012-11-19Merge branch 'master' into saclayÉtienne Loks
2012-11-19Admin: add a disable actionÉtienne Loks
2012-11-19Merge 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-16Admin: fix area modifications (refs #411)Étienne Loks
2012-11-16Admin: Fix check problems in imports - improve area and property model list ↵Étienne Loks
(refs #413)
2012-11-16Manage route amendment in admin (refs #381)Étienne Loks
2012-11-16Manage marker amendment in admin (refs #381)Étienne Loks
2012-11-07Admin: add category filter to ImportersÉtienne Loks
2012-10-31Small admin improvmentÉtienne Loks
2012-10-14Merge 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-09Admin: fix and improve moderation groups managementÉtienne Loks
2012-10-06Import/export: KML route import - KML, CSV, ShapeFile route exportÉtienne Loks
2012-10-05Admin: sort multimedia and images by drag and dropÉtienne Loks
2012-10-02Merge 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-01OSM export: Fix modification managementÉtienne Loks
2012-09-24Map: first management of marker clusteringÉtienne Loks
2012-09-21Merge 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-20Remove another unecessary admin pageÉtienne Loks
2012-09-20Remove unecessary admin pagesÉtienne Loks