Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/admin.py
chimere/forms.py
example_project/settings.py
|
|
|
|
|
|
|
|
|
|
and add a specific page for news)
|
|
management
|
|
|
|
|
|
Conflicts:
chimere/static/chimere/js/utils.js
|
|
|
|
|
|
alternate multimedia widget
|
|
dynamic (finaly!)
|
|
|
|
* add a short_description property to marker which cut desc
* add options in jquery.chimere.js to customize popup display
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/edit.html
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* fix area feeds
* fix url feeds
* temporary fix: pass Marker from BaseGeoManager to GeoManager to fix a strange
error in area feeds using contained filter
|
|
* new templatetag: get_tinyfied_url
* remove an old reference to BASE_URL
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|