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