summaryrefslogtreecommitdiff
path: root/chimere/forms.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-15Fix bad 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-11Merge branch 'v2.1' into v2.2Étienne Loks
2015-02-11Manage XML-XSLT importÉtienne Loks
2014-09-22Work on search engineÉtienne Loks
* templates * styles * search index definition
2013-10-30HTML-XSLT import: manage write on the database - import tests - fix ↵Étienne Loks
pointwidget when using a name not equal to point
2013-07-01Manage automatic submission when authenticated and have the right.Étienne Loks
2013-06-16Display/write rights management on mapsÉtienne Loks
2013-06-15Refactoring: renaming Area to MapÉtienne Loks
2013-04-05Weighted markers: modelÉtienne Loks
2013-03-28Fix conditionnal parameters for routingÉ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-01-31Imports: add a default description for imports.É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-08Imports: Manage overwrite optionalyÉtienne Loks
2012-11-26Add missing importÉ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-24OSM export: fix username/password encoding from form - allow non-email usernameÉtienne Loks
2012-11-24Associate a marker by default for a new submisssionÉtienne Loks
2012-11-24Fix rapprochement - work on OSM export interfaceÉtienne Loks
2012-11-23OSM export: improve admin formÉtienne Loks
2012-11-22Fix modification of route when no marker is associatedÉtienne Loks
2012-11-22Admin import: xapi specific interface (refs #449, refs #458)Étienne Loks
2012-11-21Admin import: filter admin fields by typeÉtienne Loks
2012-11-19Merge branch 'master' into saclayÉtienne Loks
2012-11-19Fix area modification (forgot to exclude current item to order check)É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-19Admin: Fix "order" check for areasÉtienne Loks
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-14Forms: prevent bad initialization of areas (refs #411, refs #414)Étienne Loks
2012-11-14Forms: don't allow empty area and smae order number (refs #414)Étienne Loks
2012-11-14Fix file form checkÉtienne Loks
2012-11-01Minor UI adaptationÉtienne Loks
2012-10-31Merge branch 'master' into saclayÉtienne Loks
Conflicts: chimere/locale/fr/LC_MESSAGES/django.po chimere/templates/chimere/blocks/multimedia_file.html chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py chimere/views.py
2012-10-26Forms: fix date check on marker formÉtienne Loks
* End date can't be before start date (refs #384)
2012-10-17Admin: improvment on category display - Remove unecessary fieldÉ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-07Widgets: distinguish Textarea in admin and in main interfaceÉtienne Loks
2012-10-05Import: fix OSM import formÉtienne Loks
2012-10-05Admin: sort multimedia and images by drag and dropÉtienne Loks
2012-10-04Import: Allow import from uploaded filesÉ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