Chimère/chimere/migrations, 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-02-22T20:06:37+00:00 Manage migration merge 2015-02-22T20:06:37+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-22T20:06:37+00:00 urn:sha1:5c29b59c93c73497af08ab96c1c356d54fd9d807 Merge branch 'v2.2' 2015-02-22T20:04:43+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-22T20:04:43+00:00 urn:sha1:906a299b4c07d4e6f0a31cd6504926cf7ff7cc66 Conflicts: chimere/admin.py chimere/models.py chimere/static/chimere/css/styles.css chimere/urls.py chimere/views.py Search: add keywords 2015-02-22T16:01:26+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-22T16:01:26+00:00 urn:sha1:ac85de348c85f36a0d00ebb1526fa9c0a4396cf7 Migrations merge 2015-02-15T12:22:07+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-15T12:22:07+00:00 urn:sha1:d5b62b9f44d78dcee6b7c8a4c7f88fbb930e42f2 Merge branch 'master' into nef 2015-02-14T20:42:27+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-14T20:42:27+00:00 urn:sha1:660ce29ac2cf781c8e9607a837b9832e1692e156 Conflicts: chimere/admin.py chimere/forms.py chimere/models.py chimere/settings.sample.py chimere/static/chimere/js/jquery.chimere-ol.js chimere/templates/chimere/base.html chimere/templates/chimere/blocks/head_chimere.html chimere/templates/chimere/blocks/map.html chimere/templates/chimere/main_map.html chimere/templatetags/chimere_tags.py chimere/tests.py chimere/urls.py chimere/views.py chimere/widgets.py New importer type XML - XSLT. Importer: add relation between category key and categories 2015-02-11T17:02:42+00:00 Étienne Loks etienne.loks@proxience.com 2015-02-11T17:02:42+00:00 urn:sha1:ec824db12597389c87184497796e8d0763c80b51 * new importer type XML - XSLT * associated form and UI modification * add new model ImporterKeyCategories * associated migration * associated admin modification * longer state field for Importers * associated migration Add category and subcategory slugs - better management of modelproperty slug 2014-08-28T10:23:07+00:00 Étienne Loks etienne.loks@proxience.com 2014-08-28T10:23:07+00:00 urn:sha1:b29e9b60e276a0417aefaa8a3f5024d06936bccf Remove auto_now_add from News model 2014-07-30T07:42:00+00:00 Étienne Loks etienne.loks@proxience.com 2014-07-30T07:42:00+00:00 urn:sha1:be8a87d53f6fe8102f50364b896c2ebfb0159bb4 Imports: add an automatic update option 2013-11-04T14:06:24+00:00 Étienne Loks etienne.loks@peacefrogs.net 2013-11-04T14:02:46+00:00 urn:sha1:ad5de5b2fb255e84e2e6be7250aebc756faae734 When set to True: * can be imported automatically by the chimere_import command * new items are directly available (and not at the Imported state) Admin interface and model updated. Importer HTML-XSLT: model - admin 2013-10-29T19:12:36+00:00 Étienne Loks etienne.loks@peacefrogs.net 2013-10-29T19:06:11+00:00 urn:sha1:07eff011922affd5733814c13236fe149cd64fd1 * new fields for Importer model: alt source file (2 XSLT files can be used), default location (these pages doesn't provide adresses) * adapt admin to manage 2 type of hidden OpenLayers maps on the same page