Merge branch 'dev' into fix-responsiveness

README.adoc

@@ -33,13 +33,22 @@ settings for development. Create a new file in the same directory as the setting
 file called `dev_settings.py` and make it contain the following:
 
 ```
+import os
+
 # Show debug info
 DEBUG = True
 CRISPY_FAIL_SILENTLY = False
 # "Send" email text to the terminal used to start server
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 # Upload files to the local directory
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+
+# Disable forcing SSL
+SECURE_PROXY_SSL_HEADER = None
+SECURE_SSL_REDIRECT = False
+
+# Personal / dev API keys go here
+GOOGLE_PICKER_API_KEY = 'XXX'
 ```
 
 In order to view custom error pages such as the 404 page, you need to set DEBUG to False.
@@ -74,6 +83,10 @@ Now initialize a local SQLite database:
 
     $ python manage.py migrate
 
+Create an admin user to play around with:
+
+    $ python manage.py createsuperuser
+
 And finally run the server and test:
 
     $ python manage.py runserver

package.json

@@ -43,6 +43,6 @@
     "precss": "^4.0.0",
     "sass-loader": "^8.0.2",
     "webpack-bundle-analyzer": "^3.6.1",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^4.5.0"
   }
 }