Chimère/chimere/templates, branch leaflet-permalink Application en ligne collaborative qui agrège des données géographiques http://git.iggdrasil.net/Chimère/atom?h=leaflet-permalink 2015-04-27T21:33:11+00:00 First step to implement permalink for leaflet using leaflet-plugins 2015-04-27T21:33:11+00:00 Étienne Loks etienne.loks@proxience.com 2015-04-27T21:33:11+00:00 urn:sha1:c6f7e24e373142e8618f4b6ed60df04bc0872354 Merge branch 'v2.2' 2015-02-27T00:55:08+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-27T00:55:08+00:00 urn:sha1:1da288964f2d2279339fd9224bd31831526f6e4d Conflicts: chimere/locale/fr/LC_MESSAGES/django.po chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py Revert share icons position 2015-02-25T11:20:22+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-25T11:20:22+00:00 urn:sha1:f03a559445c290960bad4ca35515a8fe7b5c546d Move share bar 2015-02-25T10:36:39+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-25T10:36:39+00:00 urn:sha1:1c0e144df5c08a274ee6b9713ff8b77886e414e1 Merge branch 'v2.2' 2015-02-25T01:40:38+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-25T01:40:38+00:00 urn:sha1:3dca534692d18ba7bfc0db6c0e2ba4aedcaef2b0 Search: don't zoom to marker extent if no result have been found 2015-02-25T01:39:13+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-25T01:39:13+00:00 urn:sha1:7c87d7ce34280965502a0c81f183ebfae7f62ebb Minor style 2015-02-25T01:27:54+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-25T01:27:54+00:00 urn:sha1:9865507a74c02e935d47b31c3b51bbe7e9c30b7f Minor label modification 2015-02-24T19:53:27+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-24T19:53:27+00:00 urn:sha1:825ad994eb056e7be67f723016e2b4cd7a41e75e Merge branch 'v2.2' 2015-02-24T19:53:20+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-24T19:53:20+00:00 urn:sha1:3c77ed9aa9b4f2c1f594f221eac9d7c03a4755be Conflicts: chimere/static/chimere/css/styles.css chimere/templates/chimere/blocks/areas.html Small fixes on teh default layout 2015-02-24T19:43:35+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-24T19:43:35+00:00 urn:sha1:4e306ce4c5686c3741ba1dcf6a0c17ad6778f084