Merge 34bb64f into 296885e

liqd · Apr 9, 2020 · c5c85bf · c5c85bf
2 parents 296885e + 34bb64f
commit c5c85bf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 49 deletions.
diff --git a/euth/maps/fields.py b/euth/maps/fields.py
diff --git a/euth/maps/migrations/0001_initial.py b/euth/maps/migrations/0001_initial.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import euth.maps.fields
+import adhocracy4.maps.fields
 
 
 class Migration(migrations.Migration):
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
             name='AreaSettings',
             fields=[
                 ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')),
-                ('polygon', euth.maps.fields.MultiPolygonField()),
+                ('polygon', adhocracy4.maps.fields.MultiPolygonField()),
                 ('module', models.OneToOneField(to='a4modules.Module', related_name='areasettings_settings', on_delete=models.CASCADE)),
             ],
             options={
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
             name='MapIdea',
             fields=[
                 ('idea_ptr', models.OneToOneField(serialize=False, auto_created=True, primary_key=True, parent_link=True, to='euth_ideas.Idea', on_delete=models.CASCADE)),
-                ('point', euth.maps.fields.PointField()),
+                ('point', adhocracy4.maps.fields.PointField()),
             ],
             options={
                 'abstract': False,

diff --git a/euth/maps/migrations/0002_add_helptexts.py b/euth/maps/migrations/0002_add_helptexts.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import euth.maps.fields
+import adhocracy4.maps.fields
 
 
 class Migration(migrations.Migration):
@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='mapidea',
             name='point',
-            field=euth.maps.fields.PointField(verbose_name='Where can your idea be located on a map?', help_text='Click inside marked area to set a marker. Drag and drop marker to change place.'),
+            field=adhocracy4.maps.fields.PointField(verbose_name='Where can your idea be located on a map?', help_text='Click inside marked area to set a marker. Drag and drop marker to change place.'),
         ),
     ]
diff --git a/package.json b/package.json
@@ -10,8 +10,9 @@
     "@babel/preset-react": "7.9.4",
     "@babel/runtime": "7.9.2",
     "@fortawesome/fontawesome-free": "5.13.0",
-    "adhocracy4": "github:liqd/adhocracy4#ddea876093be5d7faea7474b05a90b1e10903121",
+    "adhocracy4": "github:liqd/adhocracy4#ebc21b9ef72eff5f7a355711f8b34560e4a3a30e",
     "autoprefixer": "9.7.6",
+    "axios": "0.19.2",
     "babel-loader": "8.1.0",
     "bootstrap-sass": "3.4.1",
     "classnames": "2.2.6",

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,5 +1,5 @@
 # A4
-git+git://github.com/liqd/adhocracy4.git@ddea876093be5d7faea7474b05a90b1e10903121#egg=adhocracy4
+git+git://github.com/liqd/adhocracy4.git@ebc21b9ef72eff5f7a355711f8b34560e4a3a30e#egg=adhocracy4
 
 # Additional requirements
 bcrypt==3.1.7
@@ -28,7 +28,7 @@ django-widget-tweaks==1.4.8
 djangorestframework==3.11.0
 easy-thumbnails==2.7
 html5lib==1.0.1
-jsonfield==2.0.2
+jsonfield==3.1.0
 psycopg2-binary==2.8.5
 python-dateutil==2.8.1
 python-magic==0.4.15