Chimère/chimere, branch v2.3Application en ligne collaborative qui agrège des données géographiqueshttp://git.iggdrasil.net/Chimère/atom?h=v2.32016-11-07T11:24:33+00:00Copy OpenStreetMap.js from openstreetmap2016-11-07T11:24:33+00:00Étienne Loksetienne.loks@iggdrasil.net2016-11-07T11:24:33+00:00urn:sha1:1dcf7ca038bc4c989b0b3fab121c5281ee23688bAdd tile.stamen.js to repository (https issue: only available from http)2016-08-02T12:47:08+00:00Étienne Loksetienne.loks@iggdrasil.net2016-08-02T12:47:08+00:00urn:sha1:d5312427df0030cdc02387ee06f1c6fb835c4de3Prevent crash when inconsistant data is put on choice property model2015-11-24T12:36:24+00:00Étienne Loksetienne.loks@proxience.com2015-11-24T12:36:24+00:00urn:sha1:c2ce4dd7f38478681f9b9aef2f8119dadb5f45f5Fix bad merge2015-03-19T16:05:07+00:00Étienne Loksetienne.loks@proxience.com2015-03-19T16:05:07+00:00urn:sha1:4a7a4a28e9907fe85fd7af37466e817dca6db6b9Merge branch 'v2.2'2015-02-27T11:39:03+00:00Étienne Loksetienne.loks@proxience.com2015-02-27T11:39:03+00:00urn:sha1:2ca084384e6bf0596822938a607a189b507f60edFix category listing order2015-02-27T11:37:59+00:00Étienne Loksetienne.loks@proxience.com2015-02-27T11:37:59+00:00urn:sha1:eff2dd6938980317015bfba3e34a31aa8139e335Merge branch 'v2.2'2015-02-27T00:55:08+00:00Étienne Loksetienne.loks@proxience.com2015-02-27T00:55:08+00:00urn:sha1:1da288964f2d2279339fd9224bd31831526f6e4d
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
Merge branch 'v2.1' into v2.22015-02-27T00:47:59+00:00Étienne Loksetienne.loks@proxience.com2015-02-27T00:47:59+00:00urn:sha1:403bb16d02db6aca31e63d1be147594dda28d703JS: manage the saving of route with many steps2015-02-27T00:46:40+00:00Étienne Loksetienne.loks@proxience.com2015-02-27T00:46:40+00:00urn:sha1:1242868c7eb1cd9da6f4001e2e98d4369d24ba15Update french translation2015-02-26T00:37:13+00:00Étienne Loksetienne.loks@proxience.com2015-02-26T00:37:13+00:00urn:sha1:cfea28d371c6dd46f59f8a73d1b56ac6ffe12cb8