summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-28Fix conditionnal parameters for routingÉtienne Loks
2013-03-26Merge branch 'v2.0'Étienne Loks
2013-03-26Merge branch 'v2.0' of ssh://daenerys.peacefrogs.net/var/local/git/chimere ↵Étienne Loks
into v2.0
2013-03-26Improve regexp for Youtube linksÉtienne Loks
2013-03-18Update copyright notice on the mapÉtienne Loks
2013-03-18Fix image height in popupÉtienne Loks
2013-03-18JS: better parse of network linksÉtienne Loks
2013-03-18Fix link redirectionÉtienne Loks
2013-03-17Merge branch 'v2.0'Étienne Loks
2013-03-17Fix documentation syntaxÉtienne Loks
2013-03-16Update documentationÉtienne Loks
2013-03-16Update documentationÉtienne Loks
2013-03-16Add database migration to manage new fields from saclay branchÉtienne Loks
2013-03-16Merge branch 'saclay'Étienne Loks
Conflicts: chimere/migrations/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py chimere/migrations/0029_auto__add_propertymodelchoice.py chimere/migrations/0030_auto__add_field_importer_default_name.py chimere/migrations/0031_auto__add_field_subcategory_dated.py chimere/migrations/0031_auto__chg_field_picturefile_width__chg_field_picturefile_height.py chimere/migrations/0032_auto__add_field_subcategory_submission.py chimere/migrations/0033_auto__add_field_importer_source_file.py chimere/migrations/0034_auto__add_field_importer_origin__add_field_importer_license__add_field.py chimere/migrations/0035_area_permissions.py chimere/migrations/0035_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py chimere/migrations/0036_auto.py chimere/migrations/0036_auto__add_field_importer_default_name.py chimere/migrations/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py chimere/migrations/0038_auto__chg_field_picturefile_width__chg_field_picturefile_height.py chimere/migrations/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py chimere/migrations/0040_remove_excluded_status.py chimere/migrations/0041_auto__add_field_importer_overwrite.py chimere/migrations/0041_auto__add_field_importer_source_file.py chimere/migrations/0042_auto__add_field_importer_origin__add_field_importer_license__add_field.py chimere/migrations/0042_fix_rights.py chimere/migrations/0043_area_permissions.py chimere/migrations/0043_auto__add_field_importer_get_description.py chimere/migrations/0044_auto.py chimere/migrations/0044_auto__add_field_importer_default_description.py chimere/migrations/0046_auto__del_field_subcategory_routing_available.py chimere/migrations/0047_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py chimere/migrations/0049_auto__chg_field_multimediafile_multimedia_type.py chimere/migrations/0050_remove_excluded_status.py chimere/migrations/0051_auto__add_field_importer_overwrite.py chimere/migrations/0054_fix_rights.py chimere/old_migrations/v2.0/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py chimere/old_migrations/v2.0/0030_auto__add_field_importer_default_name.py chimere/old_migrations/v2.0/0031_auto__chg_field_picturefile_width__chg_field_picturefile_height.py chimere/old_migrations/v2.0/0032_auto__add_field_subcategory_submission.py chimere/old_migrations/v2.0/0033_auto__add_field_importer_source_file.py chimere/old_migrations/v2.0/0034_auto__add_field_importer_origin__add_field_importer_license__add_field.py chimere/old_migrations/v2.0/0035_area_permissions.py chimere/old_migrations/v2.0/0036_auto.py chimere/old_migrations/v2.0/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py chimere/old_migrations/v2.0/0038_osm_import_filtr.py chimere/old_migrations/v2.0/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py chimere/old_migrations/v2.0/0040_remove_excluded_status.py chimere/old_migrations/v2.0/0041_auto__add_field_importer_overwrite.py chimere/old_migrations/v2.0/0042_fix_rights.py chimere/old_migrations/v2.0/0043_auto__add_field_importer_get_description.py chimere/old_migrations/v2.0/0044_auto__add_field_importer_default_description.py
2013-03-16Re-initialize migrationsÉtienne Loks
2013-03-14Fix migrations after mergeÉ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-03-04Force JPG thumbnail to prevent resizing errorsÉtienne Loks
2013-02-20Merge branch 'master' into v2.0Étienne Loks
2013-02-20Fixtures: add geobretagne and opencyclemap layersÉtienne Loks
2013-02-19Debian: update changelogÉtienne Loks
2013-02-19v2.0.2 descriptionv2.0.2Étienne Loks
2013-02-19Admin: improve marker list with dates fieldsÉtienne Loks
2013-02-19Better sorting of newsÉtienne Loks
2013-02-19Merge branch 'master' into v2.0Étienne Loks
2013-02-19Merge branch 'master' of ↵Étienne Loks
ssh://etienne@daenerys.peacefrogs.net/var/local/git/chimere
2013-02-19Be tolerent to markers with not category associatedÉtienne Loks
2013-02-19Fix permalink (refs #479)Étienne Loks
2013-02-18Allow to easily specify the log fileÉtienne Loks
2013-02-18Debian: remove django-extensions dependencyÉtienne Loks
2013-02-15Debian: fix dependenciesÉtienne Loks
2013-02-12Debian: add missing dependencyÉtienne Loks
2013-02-10Update Debian changelogÉtienne Loks
2013-02-10v2.0.1 descriptionv2.0.1Étienne Loks
2013-02-06Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimereÉtienne Loks
2013-02-06Admin: fix route admin when a property is newly setÉtienne Loks
2013-02-05Doc: Fix gitorious urlÉtienne Loks
2013-02-05Minor: add attribution of map layerÉtienne Loks
2013-02-04Fixes for debian packagingv2.0.0Étienne Loks
2013-02-03First work on Debian packaging.Étienne Loks
* first version of debian specific files to build the package * fix requirements * precise licence of external library
2013-02-02Update changesÉtienne Loks
2013-02-02JS: when the marker selected is associated to a route zoom to its extentv2.0-RC6Étienne Loks
2013-02-01Fix path according to Chimère reorganizationÉtienne Loks
2013-02-01Move external libs to better directoryÉtienne Loks
2013-02-01Extract example_project to a new repository - update doc about this changeÉtienne Loks
2013-02-01Changes to reflect move from example_project to chimere_example_projectÉ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-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-02-01Minor update on french translationÉtienne Loks
2013-02-01Update french translationÉtienne Loks
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-22 17:49:43 +0000