Ishtar/ishtar_common/model_merging.py, branch develop-42-2026-02-gisfix Logiciel de gestion et d'inventaire en archéologie http://git.iggdrasil.net/Ishtar/atom?h=develop-42-2026-02-gisfix 2024-09-10T13:40:21+00:00 🐛 merge: do not merge import association 2024-09-10T13:40:21+00:00 Étienne Loks etienne.loks@iggdrasil.net 2024-09-08T09:43:36+00:00 urn:sha1:9c677ef564ecb3f5990c129975978eccd49c2b20 Otherwise, this may result in unwanted deletion when deleting an import Format - black: ishtar_common 2021-03-19T10:05:22+00:00 Étienne Loks etienne.loks@iggdrasil.net 2021-03-19T10:05:22+00:00 urn:sha1:3039fae5124c00a67283c9b707e4a411149d93b1 Fix container merge 2021-02-28T11:15:20+00:00 Étienne Loks etienne.loks@iggdrasil.net 2020-06-09T10:05:37+00:00 urn:sha1:cbe8d22ccecad9e09dd70f5fdbbd78bf497671a9 Migrate to python 3 - Clean old migrations and some old scripts 2019-06-17T11:21:27+00:00 Étienne Loks etienne.loks@iggdrasil.net 2019-02-27T19:44:52+00:00 urn:sha1:0f3229a119e53054d98c5e878a9581403628cd08 Merge: generic function for main items - adpat for containers 2019-04-05T13:45:26+00:00 Étienne Loks etienne.loks@iggdrasil.net 2019-04-05T13:45:26+00:00 urn:sha1:d9f08efb2e5cd65e50bcb10c2863a4e445f17e2c Merge: variable name dysambiguation 2017-09-26T08:42:41+00:00 Étienne Loks etienne.loks@iggdrasil.net 2017-09-26T08:42:41+00:00 urn:sha1:0319fd95c37ed8b72aaac78c5a5edeaa31605db5 Merge: fix one to one field merge (such as person for ishtaruser) 2017-09-25T14:31:20+00:00 Étienne Loks etienne.loks@iggdrasil.net 2017-09-25T14:31:20+00:00 urn:sha1:c51fe37c9fa264a81ea890877871b5a5bbced14f Django 1.11: adapt all get_field_* to match the current Options API 2017-08-21T20:49:29+00:00 Étienne Loks etienne.loks@iggdrasil.net 2017-08-21T20:49:29+00:00 urn:sha1:cca497f2b81fa6d7d7797953afda2bcffea8e066 Django 1.8: fix get_models deprecation 2017-04-20T10:00:00+00:00 Étienne Loks etienne.loks@iggdrasil.net 2017-04-20T10:00:00+00:00 urn:sha1:b8c71bb519ce212ba6e5d33666bf1330cda1b744 Django 1.8: fix import errors, deprecation warnings and models warnings 2017-04-14T17:37:35+00:00 Étienne Loks etienne.loks@iggdrasil.net 2017-04-14T17:37:35+00:00 urn:sha1:75eba6fe02babf4a4e86997578e2caf9f7ba828e