summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-13Merge branch 'master' into saclayÉtienne Loks
Conflicts: chimere/admin.py chimere/locale/fr/LC_MESSAGES/django.po chimere/tests.py chimere/utils.py
2012-12-11Documentation: minorÉtienne Loks
2012-12-10Documentation: add icon generator websiteÉtienne Loks
2012-12-10Documentation: fix bad linksÉtienne Loks
2012-12-10Documentation: french doc correctionsÉtienne Loks
2012-12-08Documentation: update import with overwrite optionÉtienne Loks
2012-12-08Import: display overwrite option in OSM importÉtienne Loks
2012-12-08Minor update on french translationÉtienne Loks
2012-12-08Update french tranlation - minor label changeÉtienne Loks
2012-12-08Imports: Manage overwrite optionalyÉtienne Loks
2012-12-07Admin: improve non overloading importsÉtienne Loks
* improve non overloading import management in OSM * add a warning message to "modified" items form
2012-12-06Documentation: syntax fixÉtienne Loks
2012-12-06Documentation: syntax fix and config for french documentationÉtienne Loks
2012-12-06Documentation: screenshots for french documentationÉtienne Loks
2012-12-06Update french translation (minor)Étienne Loks
2012-12-05Documentation: reorganization to generate multi-languages docsÉtienne Loks
2012-12-02Documentation: french translation of import_exportÉtienne Loks
2012-12-01Documentation: french translation of indexÉtienne Loks
2012-12-01Documentation: french translation of configurationÉtienne Loks
2012-12-01Documentation: remove generated HTML from GitÉtienne Loks
2012-11-30Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimereNawa
Conflicts: docs/fr/upgrade.rst
2012-11-30Documentation: new corrections, mainly on the french pagesNawa
2012-11-30Documentation: french translation of upgrade documentationÉtienne Loks
2012-11-30Documentation: minor changes - first work on french version of upgradeÉtienne Loks
2012-11-30Documentation: add missing imageÉtienne Loks
2012-11-30Documentation: new corrections, mainly on the configuration part.Nawa
2012-11-30Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimereNawa
2012-11-30Documentation: new corrections, mainly in the upgrade partNawa
2012-11-30Documentation: integration of Nawa's remarksÉtienne Loks
2012-11-29Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimereNawa
2012-11-29Documentation: new corrections, mainly on the administration partNawa
2012-11-29Documentation: french translation of customisation section.Étienne Loks
2012-11-29Documentation: add CLI explanation in import/exportÉtienne Loks
2012-11-29Documentation: french translation of "administration".Étienne Loks
* First version of french version of "administration" file. * Minor change on english "administration" file.
2012-11-29Documentation: small corrections on upgrade.rstNawa
2012-11-29Documentation: new correctionsNawa
2012-11-29Begin french translation of documentationÉtienne Loks
2012-11-29MergeÉtienne Loks
2012-11-29Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimereNawa
Conflicts: docs/_build/html/administration.html docs/_build/html/customisation.html docs/_build/html/import_export.html docs/_build/html/searchindex.js
2012-11-28Update documentationÉtienne Loks
2012-11-28Premières corrections, essentiellement sur install.rstNawa
2012-11-28Update documentationÉtienne Loks
2012-11-27Merge Disabled and Excluded statusÉtienne Loks
2012-11-27Add not_for_osm to admin marker formÉtienne Loks
2012-11-26Add missing importÉtienne Loks
2012-11-26Allow nullify of multimediaextensionÉtienne Loks
2012-11-26Try to clean south mess-up...Étienne Loks
2012-11-26Merge branch 'master' into saclayÉtienne Loks
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
2012-11-26Update french translationÉtienne Loks
2012-11-26Fix default typesÉtienne Loks