<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Chimère, branch v2.9</title>
<subtitle>Application en ligne collaborative qui agrège des données géographiques</subtitle>
<id>http://git.iggdrasil.net/Chimère/atom?h=v2.9</id>
<link rel='self' href='http://git.iggdrasil.net/Chimère/atom?h=v2.9'/>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/'/>
<updated>2016-11-21T11:09:16+00:00</updated>
<entry>
<title>ol3: display specific marker not present on the map (useful for permalink)</title>
<updated>2016-11-21T11:09:16+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-21T10:58:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=0dc8fec9a2cc24ad099f0d31e1464fac124dc136'/>
<id>urn:sha1:0dc8fec9a2cc24ad099f0d31e1464fac124dc136</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Remove debug</title>
<updated>2016-11-21T09:18:15+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-20T17:26:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=3ad5c69bea8e79234a32ed1532be4d43b64b7d68'/>
<id>urn:sha1:3ad5c69bea8e79234a32ed1532be4d43b64b7d68</id>
<content type='text'>
</content>
</entry>
<entry>
<title>ol3: permalink refresh</title>
<updated>2016-11-21T09:16:14+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-20T16:57:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=3a9bf04cd8696508856d6fd879249e34b978cfd1'/>
<id>urn:sha1:3a9bf04cd8696508856d6fd879249e34b978cfd1</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix search result template to manage new ids</title>
<updated>2016-11-21T09:15:45+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-20T10:46:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=ff63f61e88e50a0d1018d24d01221e0edcb693a7'/>
<id>urn:sha1:ff63f61e88e50a0d1018d24d01221e0edcb693a7</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Add upload_to to overlay field</title>
<updated>2016-11-18T11:27:23+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-18T11:27:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=b4d845042ee1b5eeb847e92505febcf3da48dea1'/>
<id>urn:sha1:b4d845042ee1b5eeb847e92505febcf3da48dea1</id>
<content type='text'>
</content>
</entry>
<entry>
<title>ol3: manage restricted extent</title>
<updated>2016-11-18T11:12:53+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-18T10:38:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=a73a78836157951c3774ea57d76b7379760a052c'/>
<id>urn:sha1:a73a78836157951c3774ea57d76b7379760a052c</id>
<content type='text'>
Conflicts:
	chimere/static/chimere/js/jquery.chimere.js
</content>
</entry>
<entry>
<title>Manage JSON overlay</title>
<updated>2016-11-18T11:11:14+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-17T18:18:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=82b264b3a0277f35bd79ca83af162cf3c08c813f'/>
<id>urn:sha1:82b264b3a0277f35bd79ca83af162cf3c08c813f</id>
<content type='text'>
Conflicts:
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templatetags/chimere_tags.py
</content>
</entry>
<entry>
<title>Fix area edition</title>
<updated>2016-11-18T11:06:25+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-18T11:06:25+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=c7c140435352532125e0488630c0ae05735019bc'/>
<id>urn:sha1:c7c140435352532125e0488630c0ae05735019bc</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update gitignore</title>
<updated>2016-11-18T11:04:49+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-17T10:18:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=0aeb821feb06145cd6877ca8213ae22ebcb40983'/>
<id>urn:sha1:0aeb821feb06145cd6877ca8213ae22ebcb40983</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Convert migration script (django 1.8 -&gt; 1.4)</title>
<updated>2016-11-18T11:03:35+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-18T11:03:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=f159ae1ae7e29b1481593c48718d0acd12631679'/>
<id>urn:sha1:f159ae1ae7e29b1481593c48718d0acd12631679</id>
<content type='text'>
</content>
</entry>
</feed>
