| Age | Commit message (Collapse) | Author |
|
Integration of Raphaël Droz's work.
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
* first version of debian specific files to build the package
* fix requirements
* precise licence of external library
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/tests.py
chimere/utils.py
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
routing messages
|
|
|
|
|
|
|
|
|
|
|
|
|
|
problematic)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|