Merge branch 'release/5.2'

OGKevin · May 28, 2017 · fcc51af · fcc51af
2 parents 2515d0b + 3c5d0e8
commit fcc51af
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 7,302 deletions.
diff --git a/.gitignore b/.gitignore
@@ -159,6 +159,7 @@ celerybeat-schedule
 .venv
 venv/
 ENV/
+venvv/
 
 # Spyder project settings
 .spyderproject

diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 dist: trusty
 python:
 - 3.5.1
+- 3.6.1
 addons:
   postgresql: '9.6'
 before_install:

diff --git a/BunqWebApp/settings.py b/BunqWebApp/settings.py
@@ -49,7 +49,8 @@
 DEBUG = False
 SECURE_SSL_REDIRECT = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
-ALLOWED_HOSTS = ['.combunqweb.herokuapp.com', '.127.0.0.1']
+ALLOWED_HOSTS = ['.beta-combunqweb.herokuapp.com',
+                 '.combunqweb.herokuapp.com', '.127.0.0.1']
 LOGIN_URL = 'two_factor:login'
 SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 SESSION_COOKIE_SECURE = True

diff --git a/Wiki b/Wiki
diff --git a/apiwrapper/clients/api_client.py b/apiwrapper/clients/api_client.py
@@ -29,7 +29,7 @@ class ApiClient:
     __variables = ['installation_id', 'installation_token', 'api_key',
                    'server_token', 'server_pubkey', 'session_token']
 
-    def __init__(self, privkey, use_sandbox=True, **kwargs):
+    def __init__(self, privkey, use_sandbox=False, **kwargs):
         self.privkey = privkey
         self._uri = self._uri_sandbox if use_sandbox else self._uri_production
         self._handle_kwargs(kwargs)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "communitybunqweb",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Bunq web interface made by bunqers",
   "main": "./manage.py",
   "scripts": {

diff --git a/requirements.txt b/requirements.txt
@@ -35,7 +35,7 @@ pytz==2017.2
 PyYAML==3.12
 qrcode==5.3
 raven==6.1.0
-requests==2.16.3
+requests==2.16.5
 requests-mock==1.3.0
 shellescape==3.4.1
 six==1.10.0

diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-python-3.5.1
+python-3.6.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,6 +159,7 @@ celerybeat-schedule @@
     .venv
     venv/
     ENV/
+    venvv/
     # Spyder project settings
     .spyderproject
@@ Expand Down @@