Merge 0275122 into 718ac3d

dbca-wa · May 10, 2018 · 0990005 · 0990005
2 parents 718ac3d + 0275122
commit 0990005
Show file tree

Hide file tree

Showing 183 changed files with 135 additions and 12,774 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: python
 cache: pip
 dist: trusty
 python:
-    - 2.7
     - 3.5
 services:
     - postgresql

diff --git a/README.md b/README.md
@@ -1,6 +1,3 @@
-[![Build
-status](https://travis-ci.org/parksandwildlife/oim-cms.svg?branch=master)](https://travis-ci.org/parksandwildlife/oim-cms/builds) [![Coverage Status](https://coveralls.io/repos/github/parksandwildlife/oim-cms/badge.svg?branch=master)](https://coveralls.io/github/parksandwildlife/oim-cms?branch=master)
-
 OIM Extranet
 ============
 
@@ -14,12 +11,6 @@ Install required libraries using `pip`:
 
     pip install -r requirements.txt
 
-Notes
------
-
-This project is focused on Parks and Wildlife use cases at this point in time,
-for more information please contact asi@dbca.wa.gov.au.
-
 Development
 -----------
 
@@ -29,9 +20,5 @@ For local development, minimum required settings are as follows:
     DEBUG=True
     DATABASE_URL="postgis://USER:PASSWORD@HOST:PORT/DATABASE_NAME"
     SECRET_KEY="ThisIsASecretKey"
-    BASE_URL="HOST:PORT"
-    FRESHDESK_ENDPOINT="https://dpaw.freshdesk.com/api/v2"
-    FRESHDESK_KEY="SecretAPIKeyValue"
-    PDQ_INV_PATH="/path/to/pdq_inventory/mount"
-    AZUREAD_AUTHORITY="https://login.microsoftonline.com/thisisnotarealazureaudauthorityurl"
-    ALLOWED_DOMAINS=".dpaw.wa.gov.au,.dbca.wa.gov.au,.der.wa.gov.au"
+    BASE_URL="HOST<:PORT>"
+    ALLOWED_DOMAINS=".dbca.wa.gov.au"
diff --git a/approvals/__init__.py b/approvals/__init__.py
diff --git a/approvals/admin.py b/approvals/admin.py
diff --git a/approvals/api.py b/approvals/api.py
diff --git a/approvals/forms.py b/approvals/forms.py
diff --git a/approvals/migrations/0001_initial.py b/approvals/migrations/0001_initial.py
diff --git a/approvals/migrations/__init__.py b/approvals/migrations/__init__.py
diff --git a/approvals/models.py b/approvals/models.py
diff --git a/approvals/templates/approvals/approval_detail.html b/approvals/templates/approvals/approval_detail.html
diff --git a/approvals/templates/approvals/approval_form.html b/approvals/templates/approvals/approval_form.html
diff --git a/approvals/test_views.py b/approvals/test_views.py
diff --git a/approvals/urls.py b/approvals/urls.py