| Age | Commit message (Collapse) | Author |
|
Conflicts:
chimere/static/chimere/js/jquery.chimere.js
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
|
|
|
|
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
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/blocks/multimedia_file.html
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/views.py
|
|
* End date can't be before start date (refs #384)
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/templates/chimere/main_map.html
chimere/templatetags/chimere_tags.py
chimere/views.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
|
|
* 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
|
|
|
|
* 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
|
|
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/edit.html
|
|
|
|
|
|
* 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
|
|
|
|
* 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
|