summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-06-10Fix migration after mergeÉtienne Loks
2015-06-10Merge branch 'stable'Étienne Loks
Conflicts: archaeological_operations/models.py
2015-06-10Test on import that no operation with same OA code can be importedÉtienne Loks
2015-06-10Code patriarche is unique - adjustment on operation fieldsÉtienne Loks
2015-06-10Merge branch 'stable'Étienne Loks
Conflicts: Makefile.example
2015-06-10Tests: new import mechanism - test MCC operation importerÉtienne Loks
2015-06-09Update Makefile sample with updated fixturesÉtienne Loks
2015-06-05Merge branch 'stable'Étienne Loks
2015-06-05Documentation: add model imagesÉtienne Loks
2015-06-05Add CSV sample for testing importsÉtienne Loks
2015-06-04Merge migrationsÉtienne Loks
2015-06-04Merge branch 'stable'Étienne Loks
2015-06-04Import: add description for columns - update import fixtureÉtienne Loks
2015-06-03Merge branch 'stable'Étienne Loks
2015-06-03Admin: add raw_name in Person columnsÉtienne Loks
2015-06-03Merge branch 'stable'Étienne Loks
2015-06-03Fix menu for new importsÉtienne Loks
2015-06-03Merge branch 'stable'Étienne Loks
2015-06-03More explicit url for new importsÉtienne Loks
2015-06-03Merge branch 'stable'Étienne Loks
2015-06-03Fix imports urlsÉtienne Loks
2015-06-02Update fixture town with states and departmentsÉtienne Loks
2015-06-02Merge branch 'stable'Étienne Loks
Conflicts: ishtar_common/locale/fr/LC_MESSAGES/django.po
2015-06-02Update french translationÉtienne Loks
2015-06-02Merge branch 'stable'Étienne Loks
2015-06-02Admin: better admin for target keysÉtienne Loks
2015-06-02Merge branch 'stable'Étienne Loks
2015-06-02Add target keys to adminÉtienne Loks
2015-06-02Merge branch 'stable'Étienne Loks
2015-06-02Remove error file when no error is reported on re-importÉtienne Loks
2015-06-02Merge branch 'stable'Étienne Loks
2015-06-02Imports: add re-analysed to already imported filesÉtienne Loks
2015-06-02Merge branch 'stable'Étienne Loks
2015-06-01Add import actions (re-import and unarchive)Étienne Loks
2015-06-01Merge branch 'stable'Étienne Loks
2015-06-01Fix targetkey formset by allowing only some associationÉtienne Loks
2015-05-20Install: put ODT_TEMPLATE in local_settingsÉtienne Loks
2015-05-20Merge branch 'stable'Étienne Loks
Conflicts: ishtar_common/locale/fr/LC_MESSAGES/django.po
2015-05-20Minir label fixÉtienne Loks
2015-05-20Merge branch 'stable'Étienne Loks
Conflicts: ishtar_common/locale/fr/LC_MESSAGES/django.po
2015-05-20Update french translationÉtienne Loks
2015-05-19Merge branch 'stable'Étienne Loks
2015-05-19Minor label fixÉtienne Loks
2015-05-19Merge branch 'stable'Étienne Loks
2015-05-19Fixtures: update importtypes-frÉtienne Loks
2015-05-19Merge branch 'stable'Étienne Loks
Conflicts: ishtar_common/data_importer.py
2015-05-19Imports: fix many to many association and treatmentÉtienne Loks
2015-05-13Merge branch 'stable'Étienne Loks
2015-05-13Fixtures: add regexp to import fixtureÉtienne Loks
2015-05-13Merge branch 'stable'Étienne Loks