🗃️ imports: merge migrations

8 files changed, 19 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index 49299d597..361eb79bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ example_project/local_settings.py.old
 scripts
 .project
 .pydevproject
+.ycm_extra_conf.py
 .settings
 src/
 coverage/
diff --git a/archaeological_context_records/migrations/0113_contextrecord_imports_updated.py b/archaeological_context_records/migrations/0114_contextrecord_imports_updated.py
index b68f81937..a5081ba19 100644
--- a/archaeological_context_records/migrations/0113_contextrecord_imports_updated.py
+++ b/archaeological_context_records/migrations/0114_contextrecord_imports_updated.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-10-24 10:45
+# Generated by Django 2.2.24 on 2023-11-15 16:16
 
 from django.db import migrations, models
 
@@ -6,8 +6,8 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0230_auto_20231024_1045'),
-        ('archaeological_context_records', '0112_migrate_created'),
+        ('ishtar_common', '0231_auto_20231115_1616'),
+        ('archaeological_context_records', '0113_auto_20231113_1610'),
     ]
 
     operations = [
diff --git a/archaeological_files/migrations/0112_file_imports_updated.py b/archaeological_files/migrations/0113_file_imports_updated.py
index bde441df4..b59e8bd01 100644
--- a/archaeological_files/migrations/0112_file_imports_updated.py
+++ b/archaeological_files/migrations/0113_file_imports_updated.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-10-24 10:50
+# Generated by Django 2.2.24 on 2023-11-15 16:17
 
 from django.db import migrations, models
 
@@ -6,8 +6,8 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0230_auto_20231024_1045'),
-        ('archaeological_files', '0111_migrate_created'),
+        ('ishtar_common', '0231_auto_20231115_1616'),
+        ('archaeological_files', '0112_auto_20231113_1610'),
     ]
 
     operations = [
diff --git a/archaeological_finds/migrations/0113_auto_20231024_1050.py b/archaeological_finds/migrations/0114_auto_20231115_1617.py
index bf174540a..de4d76a71 100644
--- a/archaeological_finds/migrations/0113_auto_20231024_1050.py
+++ b/archaeological_finds/migrations/0114_auto_20231115_1617.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-10-24 10:50
+# Generated by Django 2.2.24 on 2023-11-15 16:17
 
 from django.db import migrations, models
 
@@ -6,8 +6,8 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0230_auto_20231024_1045'),
-        ('archaeological_finds', '0112_migrate_created'),
+        ('ishtar_common', '0231_auto_20231115_1616'),
+        ('archaeological_finds', '0113_auto_20231113_1610'),
     ]
 
     operations = [
diff --git a/archaeological_operations/migrations/0113_auto_20231024_1045.py b/archaeological_operations/migrations/0114_auto_20231115_1616.py
index bb0b8ac0e..845ff9b52 100644
--- a/archaeological_operations/migrations/0113_auto_20231024_1045.py
+++ b/archaeological_operations/migrations/0114_auto_20231115_1616.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-10-24 10:45
+# Generated by Django 2.2.24 on 2023-11-15 16:16
 
 from django.db import migrations, models
 
@@ -6,8 +6,8 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0230_auto_20231024_1045'),
-        ('archaeological_operations', '0112_migrate_created'),
+        ('ishtar_common', '0231_auto_20231115_1616'),
+        ('archaeological_operations', '0113_auto_20231114_1058'),
     ]
 
     operations = [
diff --git a/archaeological_warehouse/migrations/0119_auto_20231024_1050.py b/archaeological_warehouse/migrations/0120_auto_20231115_1617.py
index 7e9811d3b..25bb63576 100644
--- a/archaeological_warehouse/migrations/0119_auto_20231024_1050.py
+++ b/archaeological_warehouse/migrations/0120_auto_20231115_1617.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-10-24 10:50
+# Generated by Django 2.2.24 on 2023-11-15 16:17
 
 from django.db import migrations, models
 
@@ -6,8 +6,8 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0230_auto_20231024_1045'),
-        ('archaeological_warehouse', '0118_auto_20230807_1106'),
+        ('ishtar_common', '0231_auto_20231115_1616'),
+        ('archaeological_warehouse', '0119_auto_20231113_1611'),
     ]
 
     operations = [
diff --git a/ishtar_common/migrations/0230_auto_20231024_1045.py b/ishtar_common/migrations/0231_auto_20231115_1616.py
index f9715bd65..0f692d5d2 100644
--- a/ishtar_common/migrations/0230_auto_20231024_1045.py
+++ b/ishtar_common/migrations/0231_auto_20231115_1616.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-10-24 10:45
+# Generated by Django 2.2.24 on 2023-11-15 16:16
 
 import django.core.validators
 from django.db import migrations, models
@@ -9,7 +9,7 @@ import ishtar_common.utils
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0229_auto_20230608_1303'),
+        ('ishtar_common', '0230_auto_20231114_1334'),
     ]
 
     operations = [
@@ -117,11 +117,6 @@ class Migration(migrations.Migration):
             name='target',
             field=models.CharField(help_text='The target of the default values. Can be set to empty with "-". Use the "__" notation to pass between models.', max_length=500, verbose_name='Target'),
         ),
-        migrations.AlterField(
-            model_name='ishtarsiteprofile',
-            name='account_naming_style',
-            field=models.CharField(choices=[('NF', 'name.firstname'), ('FN', 'firstname.name')], default='FN', max_length=2, verbose_name='Naming style for accounts'),
-        ),
         migrations.CreateModel(
             name='ImportGroup',
             fields=[
diff --git a/ishtar_common/migrations/0231_default_mandatory_keys_import_permissions.py b/ishtar_common/migrations/0232_default_mandatory_keys_import_permissions.py
index 120711f09..a465ad9a4 100644
--- a/ishtar_common/migrations/0231_default_mandatory_keys_import_permissions.py
+++ b/ishtar_common/migrations/0232_default_mandatory_keys_import_permissions.py
@@ -108,7 +108,7 @@ def migrate(apps, __):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0230_auto_20231024_1045'),
+        ('ishtar_common', '0231_auto_20231115_1616'),
     ]
 
     operations = [