| Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/tests.py
chimere/utils.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* improve non overloading import management in OSM
* add a warning message to "modified" items form
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
docs/fr/upgrade.rst
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* First version of french version of "administration" file.
* Minor change on english "administration" file.
|
|
|
|
|
|
|
|
|
|
Conflicts:
docs/_build/html/administration.html
docs/_build/html/customisation.html
docs/_build/html/import_export.html
docs/_build/html/searchindex.js
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|