| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-02-22 | Manage migration merge | Étienne Loks | |
| 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 | Migrations 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 | 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 | |||
| 2014-08-28 | Add category and subcategory slugs - better management of modelproperty slug | Étienne Loks | |
| 2014-07-30 | Remove auto_now_add from News model | Étienne Loks | |
| 2013-11-04 | Imports: add an automatic update option | Étienne Loks | |
| When set to True: * can be imported automatically by the chimere_import command * new items are directly available (and not at the Imported state) Admin interface and model updated. | |||
| 2013-10-29 | Importer HTML-XSLT: model - admin | Étienne Loks | |
| * new fields for Importer model: alt source file (2 XSLT files can be used), default location (these pages doesn't provide adresses) * adapt admin to manage 2 type of hidden OpenLayers maps on the same page | |||
| 2013-08-12 | Models: add a slug field for PropertyModel | Étienne Loks | |
| 2013-08-07 | Model: default fields NullBooleanField -> BooleanField | Étienne Loks | |
| 2013-08-07 | Map: manage group permissions - fix some issues on permissions - tests | Étienne Loks | |
| 2013-06-18 | Enable map clustering option - fix category when there is only one | É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-04-01 | Add aggregate SQL view | Étienne Loks | |
| 2013-03-16 | Add database migration to manage new fields from saclay branch | Étienne Loks | |
| 2013-03-16 | Re-initialize migrations | Étienne Loks | |
| 2013-01-31 | Imports: add a default description for imports. | Étienne Loks | |
| 2013-01-31 | Imports: make description import optional | Étienne Loks | |
| 2013-01-30 | Minor (remove prints) | Étienne Loks | |
| 2013-01-30 | Fix rights migration (2) | Étienne Loks | |
| 2013-01-30 | Fix rights migration | Étienne Loks | |
| 2012-12-08 | Imports: Manage overwrite optionaly | Étienne Loks | |
| 2012-11-27 | Merge Disabled and Excluded status | Étienne Loks | |
| 2012-11-26 | Fix auto-recognition of multimedia files | Étienne Loks | |
| 2012-11-22 | Fix unique area order migration | Étienne Loks | |
| 2012-11-22 | Data migration: change osm importer source to be compatible with new form | Étienne Loks | |
| 2012-11-19 | Import: manage way imports without marker associated | Étienne Loks | |
| 2012-10-12 | Administration: manage news by area | Étienne Loks | |
| 2012-10-08 | Fix area moderation | Étienne Loks | |
| 2012-10-04 | Import: add origin and license fields for import and geo-objects | Étienne Loks | |
| 2012-10-04 | Import: Allow import from uploaded files | Étienne Loks | |
| 2012-09-28 | Edit form: disable a subcat for submission only | Étienne Loks | |
| 2012-09-19 | Remove height and width not null constraint on PictureFile | Étienne Loks | |
| 2012-09-19 | Add a default name for imports | Étienne Loks | |
| 2012-09-17 | Fixes for OSM export | Étienne Loks | |
| 2012-08-24 | Manage thumbnails for picture files - display with prettyPhoto on detail desc | Étienne Loks | |
| 2012-08-20 | Merge branch 'master' into eds | Étienne Loks | |
| Conflicts: chimere/locale/fr/LC_MESSAGES/django.po chimere/templates/chimere/edit.html | |||
| 2012-08-20 | Add personal information in edit form | Étienne Loks | |
| 2012-08-20 | Model: Add mandatory field for model properties | Étienne Loks | |
| 2012-08-17 | Add conditionnal model properties dependant to subcategories | Étienne Loks | |
| 2012-08-02 | Fix migration (bis) | Étienne Loks | |
| 2012-08-02 | Fix migration script | Étienne Loks | |
| 2012-07-25 | Manage dynamic areas by areas | Étienne Loks | |
| 2012-05-16 | Fix RSS feeds for django 1.4 - reintegrate them in the main application | Étienne Loks | |
| 2012-05-08 | Fix restricted extent - Add restricted extent to area admin | Étienne Loks | |
| 2012-05-07 | Manage specific CSS for areas inside admin | Étienne Loks | |
