| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/widgets.py
|
|
|
|
|
|
|
|
|
|
Integration of Raphaël Droz's work.
|
|
Integration of Raphaël Droz's work.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into nef
|
|
|
|
|
|
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* manage markers from a GeoJson source with custom icon
|
|
|
|
|
|
Conflicts:
chimere/settings.sample.py
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/templatetags/chimere_tags.py
|
|
|
|
|
|
|
|
|
|
|
|
into v2.0
|
|
|
|
|