summaryrefslogtreecommitdiff
path: root/example_project
AgeCommit message (Collapse)Author
2013-03-16Add database migration to manage new fields from saclay branchÉtienne Loks
2013-03-14Merge branch 'master' into saclayÉtienne Loks
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
2013-02-01Extract example_project to a new repository - update doc about this changeÉtienne Loks
2013-02-01Adapt example_project to avoid unicode characters.Étienne Loks
Temporary fix to prevent a Django bug. cf. https://code.djangoproject.com/ticket/18091
2013-01-24Fix database initialisation for upgrade.É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-24Admin: improve property model managementÉtienne Loks
* Add the ability to hide property model from the admin * Add a warning to the admin that it should reload the webserver
2012-11-13Fail properly when the routing engine don't find a route - JS: manage ↵Étienne Loks
routing messages
2012-10-14Merge 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/models.py chimere/static/chimere/css/styles.css chimere/templates/chimere/detail.html chimere/templatetags/chimere_tags.py chimere/views.py chimere/widgets.py
2012-10-09Integration of Alban Tiberghien <alban.tiberghien@gmail.com> changes to make ↵Étienne Loks
the application more 'pip' and 'virtualenv' friendly Changes has been integrated in alternate files 'local_settings.py.pip.sample' and 'apache-wsgi-pip.conf' in order to not conflict with installation not using 'pip'. The changes are: - Add django-extensions - Install tinymce as 3rd app - Minor fix in jquery path - Fix shabang in order to work with virtual environment As I want to minimise the size of the tracked files in the Git repository jQuery-UI files were not included (as a small fix Google CDN is set by default for jquery-UI).
2012-10-09Update documentationÉtienne Loks
2012-10-07Documentation/configuration: fix path, add dependanciesÉtienne Loks
2012-09-18Merge branch 'master' into saclayÉtienne Loks
Conflicts: chimere/admin.py chimere/forms.py example_project/settings.py
2012-09-18Work on CSV exportÉtienne Loks
2012-09-05Add contact email var to main templateÉtienne Loks
2012-08-26Add a locale file for example projectÉtienne Loks
2012-08-26Add the possibility to submit a modification by emailÉtienne Loks
2012-08-26Improve detail displayÉtienne Loks
* add a short_description property to marker which cut desc * add options in jquery.chimere.js to customize popup display
2012-08-24Merge branch 'master' into saclayÉtienne Loks
Conflicts: example_project/settings.py
2012-08-24Manage thumbnails for picture files - display with prettyPhoto on detail descÉtienne Loks
2012-08-24Fix default Openlayers path when static path is not the defaultÉtienne Loks
2012-08-22Improve routing interface and functionalitiesÉtienne Loks
* fix POI clicking * create a nominatim widget to get coordinates from text * create a JQuery UI button select widget * create a routing form to get itinerary from a textual form * CSS for the routing form * Reverse nominatim: when a point is get for routing on the map label for this point is get from nominatim * Add transport management by user choice * Update french translation
2012-08-22First working version of routing.Étienne Loks
* add an utilitary Routing class to manage different routing system * implement the routing with routino * add a view to manage routes * itinerary panel template * JS management of routing: * manage flag markers on the map * request the route when start and finish flag are set * display the route and the itinerary description * add of two flags images * itinerary panel CSS * french translation update
2012-08-22Routing & UI improvment: first work on map menuÉtienne Loks
* add a map menu on the main interface * add a new templatetag: map_menu * add CHIMERE_ENABLE_ROUTING to settings * add a routing settings (boolean) in jquery.chimere.js * manage zoomin, zoomout, center in jquery.chimere.js
2012-08-21Map: change the pan to a cleaner one (thanks to OpenStreetMap website)Étienne Loks
2012-08-02Fix import test for celeryÉtienne Loks
2012-08-02Move locale to applicationÉtienne Loks
2012-08-02Fix migration scriptÉtienne Loks
2012-08-02Rechange wording: from theme to categoriesÉtienne Loks
2012-08-02Make Celery and Kombu optional (but the import is not available)Étienne Loks
2012-07-25Manage dynamic areas by areasÉtienne Loks
2012-07-24Update translationÉtienne Loks
2012-07-18Minor fix in translationÉtienne Loks
2012-07-18Improve user submissions (routes and markers)Étienne Loks
2012-07-12Settings: Fix default settingsÉtienne Loks
2012-07-11Update doc - minor fix on description where no area is providedÉtienne Loks
2012-07-05Fix bad share networks linksÉtienne Loks
2012-07-03Remove old reference to EXTRA_URLÉtienne Loks
2012-07-03Fix feeds - remove BASE_URL refÉtienne Loks
* 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
2012-05-22Create dirs to overload templates in example_projectÉtienne Loks
2012-05-17Minor translationÉtienne Loks
2012-05-17Update translationÉtienne Loks
2012-05-16Fix RSS feeds for django 1.4 - reintegrate them in the main applicationÉtienne Loks
2012-05-09Update french translationÉtienne Loks
2012-05-08Fix restricted extent - Add restricted extent to area adminÉtienne Loks
2012-05-08Fix share iconsÉtienne Loks
2012-05-07Manage specific CSS for areas inside adminÉtienne Loks
2012-05-07Manage default categories inside adminÉtienne Loks
2012-05-05Manage different and multiple layers in areas (including default)Étienne Loks
2012-05-04Shapefile importÉtienne Loks
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-19 06:02:31 +0000