Chimère/example_project, branch master-install Application en ligne collaborative qui agrège des données géographiques http://git.iggdrasil.net/Chimère/atom?h=master-install 2013-03-16T11:07:28+00:00 Add database migration to manage new fields from saclay branch 2013-03-16T11:07:28+00:00 Étienne Loks etienne.loks@peacefrogs.net 2013-03-16T11:07:28+00:00 urn:sha1:bd5bfca50ee1b670a877cca6ef93ea30fdb61463 Merge branch 'master' into saclay 2013-03-14T17:48:00+00:00 Étienne Loks etienne.loks@peacefrogs.net 2013-03-14T17:48:00+00:00 urn:sha1:054fdbdf7a1e5106725b8b5a36db99242cfa65c1 Conflicts: chimere/locale/fr/LC_MESSAGES/django.po chimere/static/chimere/css/styles.css chimere/static/chimere/js/jquery.chimere.js chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py chimere/utils.py chimere/views.py example_project/settings.py Extract example_project to a new repository - update doc about this change 2013-02-01T18:15:32+00:00 Étienne Loks etienne.loks@peacefrogs.net 2013-02-01T18:15:32+00:00 urn:sha1:f0f5980a289351f026539043084a2e9fb350ff7f Adapt example_project to avoid unicode characters. 2013-02-01T16:57:20+00:00 Étienne Loks etienne.loks@peacefrogs.net 2013-02-01T16:57:20+00:00 urn:sha1:f07b25fd08431f529b17567ff40a52c1ebbcd71d Temporary fix to prevent a Django bug. cf. https://code.djangoproject.com/ticket/18091 Fix database initialisation for upgrade. 2013-01-24T22:33:54+00:00 Étienne Loks etienne.loks@peacefrogs.net 2013-01-24T22:33:54+00:00 urn:sha1:80f9f6f67531314f870cb4ad034918f99cd2f1de Merge branch 'master' into saclay 2012-11-26T18:50:43+00:00 Étienne Loks etienne.loks@peacefrogs.net 2012-11-26T18:50:43+00:00 urn:sha1:43b0c50accfa1017ee323ba121ac53920d1cdbf5 Conflicts: chimere/admin.py chimere/fixtures/initial_data.json chimere/forms.py chimere/locale/fr/LC_MESSAGES/django.po chimere/static/chimere/css/styles.css chimere/templates/chimere/blocks/alternate_multimedia.html chimere/templates/chimere/blocks/categories.html chimere/widgets.py Admin: improve property model management 2012-11-24T14:36:43+00:00 Étienne Loks etienne.loks@peacefrogs.net 2012-11-24T14:36:43+00:00 urn:sha1:1ac9350e74bce36eb8f64d8564a3c44e6072600e * Add the ability to hide property model from the admin * Add a warning to the admin that it should reload the webserver Fail properly when the routing engine don't find a route - JS: manage routing messages 2012-11-13T21:01:39+00:00 Étienne Loks etienne.loks@peacefrogs.net 2012-11-13T21:01:39+00:00 urn:sha1:40d7d3b373a392b68b43524a4049216b1223c81c Merge branch 'master' into saclay 2012-10-14T14:55:22+00:00 Étienne Loks etienne.loks@peacefrogs.net 2012-10-14T14:55:22+00:00 urn:sha1:ea65e5512c236b81e7f4b8757521facadae4b3b8 Conflicts: chimere/admin.py chimere/fixtures/initial_data.json chimere/forms.py chimere/locale/fr/LC_MESSAGES/django.po chimere/models.py chimere/static/chimere/css/styles.css chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py chimere/views.py chimere/widgets.py Integration of Alban Tiberghien <alban.tiberghien@gmail.com> changes to make the application more 'pip' and 'virtualenv' friendly 2012-10-09T15:47:02+00:00 Étienne Loks etienne.loks@peacefrogs.net 2012-10-09T15:47:02+00:00 urn:sha1:57af459400d9160f413f384d140f80e9e2329b61 Changes has been integrated in alternate files 'local_settings.py.pip.sample' and 'apache-wsgi-pip.conf' in order to not conflict with installation not using 'pip'. The changes are: - Add django-extensions - Install tinymce as 3rd app - Minor fix in jquery path - Fix shabang in order to work with virtual environment As I want to minimise the size of the tracked files in the Git repository jQuery-UI files were not included (as a small fix Google CDN is set by default for jquery-UI).