summaryrefslogtreecommitdiff
path: root/chimere/models.py
AgeCommit message (Collapse)Author
2012-12-08Update french tranlation - minor label changeÉtienne Loks
2012-12-08Imports: Manage overwrite optionalyÉtienne Loks
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-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-23Fix dynamic evaluation of categoriesÉtienne Loks
2012-11-22Admin: improve layout of markers and routesÉtienne Loks
2012-11-22Importer admin: Improve UI - fix bad bounding box on OSM importerÉtienne Loks
2012-11-22Admin import: xapi specific interface (refs #449, refs #458)É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-19Import: manage way imports without marker associatedÉtienne Loks
2012-11-16Manage route amendment in admin (refs #381)Étienne Loks
2012-11-16Fix starter point when a route is modifiedÉtienne Loks
2012-11-14Forms: don't allow empty area and smae order number (refs #414)Étienne Loks
2012-11-14Fix Vimeo video add (refs #439)Étienne Loks
2012-11-12Minor fix on get categoryÉtienne Loks
2012-11-07Fix bad PropertyChoice valueÉtienne Loks
2012-11-07Improve CSV export and import - more tolerant add of choice valuesÉtienne Loks
2012-10-31JS: preload icon imagesÉ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-27Fix dynamic evaluation of categories (refs #379)Étienne Loks
2012-10-17Admin: improvment on category display - Remove unecessary fieldÉtienne Loks
2012-10-15Routing: manage warns on the itineraryÉ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-12Administration: manage news by areaÉtienne Loks
2012-10-09Admin: fix and improve moderation groups managementÉtienne Loks
2012-10-08Fix area moderationÉtienne Loks
2012-10-06Export: add a command to launch export with the CLIÉtienne Loks
2012-10-06Import: import CSV filesÉtienne Loks
2012-10-06Import/export: KML route import - KML, CSV, ShapeFile route exportÉtienne Loks
2012-10-06Import: add GeoRSS importÉtienne Loks
2012-10-05Import: add a command to launch import with the CLIÉtienne Loks
2012-10-04Import: add origin and license fields for import and geo-objectsÉtienne Loks
2012-10-04Import: Allow import from uploaded filesÉtienne Loks
2012-10-03Add a custom layer box with ability to add some subcat as a "virtual" layerÉ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-28Edit form: disable a subcat for submission onlyÉtienne Loks
2012-09-25Map: manage hover for markers - work on clusteringÉtienne Loks
* add the possibility to add an alternate icon when the category is hovered * management of click *and* hover for cluster layer * make clustering of marker not mandatory * manage icon hover in JS: change icon + category label display on top of the marker
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-20Fix category sortÉtienne Loks
2012-09-19Fix bad number formatingÉtienne Loks
2012-09-19Fix automatic marker creationÉtienne Loks
2012-09-19Improve route save: manage with signals the affectation of a reference markerÉtienne Loks
2012-09-19Remove height and width not null constraint on PictureFileÉtienne Loks