| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
ishtar_common/data_importer.py
|
|
|
|
Conflicts:
ishtar_common/data_importer.py
|
|
|
|
|
|
associated file
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Model: a targetkey connection can now be applied to on particular import
(associated_import), one particular user (associated_user) or to all imports
(associated_import and associated_user are empty).
To be done: change import and forms to fully use this mechanism.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
archaeological_operations/models.py
|
|
|
|
|
|
Conflicts:
Makefile.example
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
