| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-03-26 | Merge branch 'v2.0' | Étienne Loks | |
| 2013-03-26 | Improve regexp for Youtube links | É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-03-04 | Force JPG thumbnail to prevent resizing errors | Étienne Loks | |
| 2013-02-19 | Better sorting of news | Étienne Loks | |
| 2013-02-19 | Be tolerent to markers with not category associated | É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 | Fix modification link in admin | Étienne Loks | |
| 2013-01-29 | Better management of missing content type (upgrade issue) | Étienne Loks | |
| 2013-01-29 | Update migration errors | Étienne Loks | |
| 2013-01-24 | Fix database initialisation for upgrade. | Étienne Loks | |
| 2012-12-16 | Improve (greatly) performance for route display on the map | É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 | Update french tranlation - minor label change | Étienne Loks | |
| 2012-12-08 | Imports: Manage overwrite optionaly | Étienne Loks | |
| 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 | 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 | Fix dynamic evaluation of categories | Étienne Loks | |
| 2012-11-22 | Admin: improve layout of markers and routes | Étienne Loks | |
| 2012-11-22 | Importer admin: Improve UI - fix bad bounding box on OSM importer | Étienne Loks | |
| 2012-11-22 | Admin import: xapi specific interface (refs #449, refs #458) | É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 | Import: manage way imports without marker associated | Étienne Loks | |
| 2012-11-16 | Manage route amendment in admin (refs #381) | Étienne Loks | |
| 2012-11-16 | Fix starter point when a route is modified | Étienne Loks | |
| 2012-11-14 | Forms: don't allow empty area and smae order number (refs #414) | Étienne Loks | |
| 2012-11-14 | Fix Vimeo video add (refs #439) | Étienne Loks | |
| 2012-11-12 | Minor fix on get category | Étienne Loks | |
| 2012-11-07 | Fix bad PropertyChoice value | Étienne Loks | |
| 2012-11-07 | Improve CSV export and import - more tolerant add of choice values | Étienne Loks | |
| 2012-10-31 | JS: preload icon images | É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-27 | Fix dynamic evaluation of categories (refs #379) | Étienne Loks | |
| 2012-10-17 | Admin: improvment on category display - Remove unecessary field | Étienne Loks | |
| 2012-10-15 | Routing: manage warns on the itinerary | É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-12 | Administration: manage news by area | Étienne Loks | |
| 2012-10-09 | Admin: fix and improve moderation groups management | Étienne Loks | |
| 2012-10-08 | Fix area moderation | Étienne Loks | |
| 2012-10-06 | Export: add a command to launch export with the CLI | Étienne Loks | |
| 2012-10-06 | Import: import CSV files | Étienne Loks | |
| 2012-10-06 | Import/export: KML route import - KML, CSV, ShapeFile route export | Étienne Loks | |
| 2012-10-06 | Import: add GeoRSS import | Étienne Loks | |
