merged upstream

Author: mwallschlaeger

.devcontainer/.env

@@ -18,6 +18,8 @@ GEONODE_INSTANCE_NAME=geonode
 GEONODE_LB_HOST_IP=
 GEONODE_LB_PORT=
 
+PROXY_URL="/?url="
+
 # #################
 # backend
 # #################

entrypoint.sh

@@ -60,12 +60,6 @@ else
     fi
 
     invoke statics
-<<<<<<< HEAD
-    invoke waitforgeoserver
-    invoke geoserverfixture
-
-=======
->>>>>>> e676bc4017bbf2c1fb7cbd7f7bdca394c3f7871d
     echo "Executing UWSGI server $cmd for Production"
 fi
 

geonode/maps/migrations/0044_merge_20230823_1229.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.2.20 on 2023-08-23 12:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maps', '0043_alter_map_abstract_en'),
+        ('maps', '0043_auto_20230807_1234'),
+    ]
+
+    operations = [
+    ]