<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Chimère/chimere/static, 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>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>Manage inconsistent data</title>
<updated>2016-11-18T10:58:32+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-16T19:04:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=1613a568856c02b481cd96e46c5bd294fbebe36e'/>
<id>urn:sha1:1613a568856c02b481cd96e46c5bd294fbebe36e</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix update share link management</title>
<updated>2016-11-18T10:57:17+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-14T15:11:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=8b8dac7ba6343107791cdd9062b3037f8c957e73'/>
<id>urn:sha1:8b8dac7ba6343107791cdd9062b3037f8c957e73</id>
<content type='text'>
Conflicts:
	chimere/templates/chimere/blocks/share_bar.html
</content>
</entry>
<entry>
<title>OL3: manage permalink loading</title>
<updated>2016-11-18T10:55:49+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-14T11:02:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=8fd5f6c5ba4e8e40bfa652af79018efcc88556ba'/>
<id>urn:sha1:8fd5f6c5ba4e8e40bfa652af79018efcc88556ba</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Adapt permalink loading</title>
<updated>2016-11-18T10:54:46+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-09T20:49:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=6250f2fbc643c4970771c13fffe9907e55c3b6fc'/>
<id>urn:sha1:6250f2fbc643c4970771c13fffe9907e55c3b6fc</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix interface layout (panel and detail localisation)</title>
<updated>2016-11-18T10:53:44+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-09T10:51:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=c7fa87627b33b1ebc843c8601456cca08fe6e2d5'/>
<id>urn:sha1:c7fa87627b33b1ebc843c8601456cca08fe6e2d5</id>
<content type='text'>
Conflicts:
	.gitignore
</content>
</entry>
</feed>
