From 6e2ecc4be9124a8752cd5d2f6192ef5cd2727d14 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Tue, 10 Sep 2024 10:46:13 -0700 Subject: [PATCH 1/4] chore(ci): deploy database --- .github/workflows/.deploy.yml | 34 +- .github/workflows/pr-open.yml | 21 +- database/Dockerfile | 9 - .../ocp4 => database}/postgresql.dc.yml | 0 ...relevant context. List dependency changes. | 57799 ---------------- 5 files changed, 35 insertions(+), 57828 deletions(-) delete mode 100644 database/Dockerfile rename {gwells/openshift/ocp4 => database}/postgresql.dc.yml (100%) delete mode 100644 e provide a summary of the change and the issue fixed. Please include relevant context. List dependency changes. diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml index 4d713259f..f768a2fda 100644 --- a/.github/workflows/.deploy.yml +++ b/.github/workflows/.deploy.yml @@ -19,19 +19,39 @@ on: type: string jobs: - frontend: - name: Frontend - # needs: [backend] - environment: ${{ inputs.environment }} + database: + name: Database + # environment: ${{ inputs.environment }} runs-on: ubuntu-22.04 steps: - - name: Deploy Frontend + # - name: Deploy Frontend + # uses: bcgov-nr/action-deployer-openshift@v3.0.0 + # with: + # oc_namespace: ${{ vars.OC_NAMESPACE }} + # oc_server: ${{ vars.OC_SERVER }} + # oc_token: ${{ secrets.OC_TOKEN }} + # file: frontend/openshift.deploy.yml + # overwrite: true + # parameters: + # -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }} + + - name: Database uses: bcgov-nr/action-deployer-openshift@v3.0.0 with: oc_namespace: ${{ vars.OC_NAMESPACE }} oc_server: ${{ vars.OC_SERVER }} oc_token: ${{ secrets.OC_TOKEN }} - file: frontend/openshift.deploy.yml + file: database/postgresql.dc.yml overwrite: true parameters: - -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }} \ No newline at end of file + -p DATABASE_SERVICE_NAME=gwells-pg12-dev-${{ github.event.number }} + -p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }} + -p IMAGE_STREAM_NAME=crunchy-postgres-gis + -p NAME_SUFFIX=-dev-${{ github.event.number }} + -p POSTGRESQL_DATABASE=gwells + -p VOLUME_CAPACITY=1Gi + -p STORAGE_CLASS=netapp-file-standard + -p REQUEST_CPU=200m + -p REQUEST_MEMORY=512Mi + -p LIMIT_CPU=500m + -p LIMIT_MEMORY=1Gi diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 6f745f632..9cc79c3c3 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -26,19 +26,6 @@ jobs: tag_fallback: latest triggers: ('${{ matrix.package }}/') - # # https://github.com/bcgov/quickstart-openshift-helpers - # deploys: - # name: Deploys - # needs: [builds] - # uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.6.1 - # secrets: - # oc_namespace: ${{ secrets.OC_NAMESPACE }} - # oc_token: ${{ secrets.OC_TOKEN }} - # with: - # triggers: ('frontend/') - # params: - # --set global.secrets.persist=false - deploy: name: Deploy needs: [builds] @@ -60,3 +47,11 @@ jobs: runs-on: ubuntu-22.04 steps: - run: echo "Success!" + + dump: + name: Dump Context + runs-on: ubuntu-22.04 + env: + CONTEXT: ${{ toJson(github) }} + steps: + - run: echo "${{ env.CONTEXT }}" diff --git a/database/Dockerfile b/database/Dockerfile deleted file mode 100644 index ef8ece592..000000000 --- a/database/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM crunchydata/crunchy-postgres-gis:centos7-12.2-4.2.2 - -# Copy startup scripts -COPY /* /docker-entrypoint-initdb.d/ - -# User, port and Healthcheck -USER postgres -EXPOSE 5432 -HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "pg_isready", "-U", "postgres"] \ No newline at end of file diff --git a/gwells/openshift/ocp4/postgresql.dc.yml b/database/postgresql.dc.yml similarity index 100% rename from gwells/openshift/ocp4/postgresql.dc.yml rename to database/postgresql.dc.yml diff --git a/e provide a summary of the change and the issue fixed. Please include relevant context. List dependency changes. b/e provide a summary of the change and the issue fixed. Please include relevant context. List dependency changes. deleted file mode 100644 index 1acef188d..000000000 --- a/e provide a summary of the change and the issue fixed. Please include relevant context. List dependency changes. +++ /dev/null @@ -1,57799 +0,0 @@ -commit 42a3ab2c628ae3c6794e3630ad7abb3b78e2db60 (HEAD -> chore/ci/compose, origin/chore/ci/compose) -Author: Derek Roberts -Date: Tue Aug 13 11:41:36 2024 -0700 - - Move pgadmin into separate profile - -commit d9d55de8c9999c0d90b9b7dc959a0e79aa56ab32 -Author: Derek Roberts -Date: Tue Aug 13 11:39:20 2024 -0700 - - Simplify pgdata volume - -commit 5a5d3084a0a149c589d4e0b3c9b37a38d039b9d9 -Author: Derek Roberts -Date: Tue Aug 13 11:38:49 2024 -0700 - - Use default networking - -commit 86b888ad3ed2964deb735d92822cd681733a3d16 -Author: Derek Roberts -Date: Tue Aug 13 11:36:49 2024 -0700 - - Remove bind mounts - -commit 92db08099ab86e1660900b2cba2fe40527a09d54 -Author: Derek Roberts -Date: Tue Aug 13 11:29:44 2024 -0700 - - Swap some booleans for strings - -commit df184311dfbcfbefdd015cd929046fc99081210b -Author: Derek Roberts -Date: Tue Aug 13 11:26:00 2024 -0700 - - Comment out envar requirement - -commit be73dbd964851f2a1c0db3de04f2dc121c271f0c (origin/main, origin/HEAD, main) -Author: Fergus MacConnell -Date: Tue Aug 13 11:20:53 2024 -0700 - - chore: docker compose volumes (#38) - -commit bc31a55606d3c4c720f2c792e00415b29acd13d9 -Author: Fergus MacConnell -Date: Tue Aug 13 11:02:36 2024 -0700 - - chore: add frontend back to GitHub build step (#35) - -commit 600ae1b407ce0c9f900622d02c2b8e21f88eb0e9 -Author: Fergus MacConnell -Date: Tue Aug 13 10:31:46 2024 -0700 - - chore: Add Dockerfile for frontend. Update docker compose frontend service. (#32) - -commit 135f4b37a1d23b5af8b9135ea933da37258e206e -Author: Fergus MacConnell -Date: Fri Aug 9 15:48:51 2024 -0700 - - chore: Update docker compose file. (#31) - -commit 6043c2c80a132b46f7165669574a8a28c337dfb9 -Author: Fergus MacConnell -Date: Thu Aug 8 10:29:29 2024 -0700 - - chore: Uncomment backend build job (#30) - -commit 63120c215f6ff368a16703aa93c38988c858811c -Author: Fergus MacConnell -Date: Wed Aug 7 15:42:54 2024 -0700 - - chore: Move gwells backend and fronted to root folder. Dockerfile's moved to related app root folder. (#29) - -commit 8f1b060d599e5f5ffc87198b96bb7086b0364da4 -Author: Fergus MacConnell -Date: Wed Aug 7 14:32:34 2024 -0700 - - chore: import gwells, maintain history (from gwells release branch) (#25) - - Co-authored-by: Derek Roberts - -commit 2fa898afb1ffa2c85be3e45ad471c9af9b0ac996 -Merge: 6bc2ae3a4 475dfa64c -Author: Derek Roberts -Date: Tue Aug 6 09:57:38 2024 -0400 - - Merge pull request #4 from bcgov/combine - - chore: import gwells, maintain history (try 2) - -commit 475dfa64cb2475be3dd19ad9b6058fa9b9afc48c -Author: Derek Roberts -Date: Tue Aug 6 06:54:16 2024 -0700 - - Comment out PR jobs until ready - -commit 6bc2ae3a44e65336339eff18420338bea190e4d1 -Author: Derek Roberts -Date: Tue Aug 6 09:53:14 2024 -0400 - - fix: revert "chore: import gwells, maintain history" (#3) - -commit 7649b63b1ab4b2d7e20c6f37c5d273633866eec0 -Author: Derek Roberts -Date: Tue Aug 6 09:42:07 2024 -0400 - - feat(ci): prepare TEST env (#2) - -commit 2e35250b03df1a0e185ec1b54b75bff6653b0576 -Author: Derek Roberts -Date: Tue Aug 6 09:21:20 2024 -0400 - - chore: import gwells, maintain history (#1) - - Co-authored-by: Dan - Co-authored-by: Steve Hillier - Co-authored-by: Daine Trinidad - Co-authored-by: snyk-bot - Co-authored-by: Dan <78053857+danbigthink@users.noreply.github.com> - Co-authored-by: Daine Rose Trinidad - Co-authored-by: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> - -commit 5bc7a03fbfe444d032663900ada1e651686776a7 -Author: Derek Roberts -Date: Tue Aug 6 06:19:23 2024 -0700 - - Start restoring root files - -commit 51b55726d4b123d00f87b68254be80bd6793f308 -Author: Derek Roberts -Date: Tue Aug 6 06:05:11 2024 -0700 - - Readme repo name - -commit 0a931e8b2aa2b4f67e3efcc86be7d65c51b35ae1 -Merge: 50ffad85e 742459c6d -Author: Derek Roberts -Date: Tue Aug 6 05:46:38 2024 -0700 - - Merge remote-tracking branch 'upstream/export' into import - -commit 742459c6d03c3aa50b6a8213a7d7ff2775bec06f -Author: Derek Roberts -Date: Tue Aug 6 05:38:44 2024 -0700 - - Prep for repo merge - -commit 50ffad85ee61967b39e68e9fdeab1e8896a75415 -Author: Derek Roberts -Date: Tue Aug 6 08:21:33 2024 -0400 - - Initial commit - -commit fb1ee8cb0d43f1728490feb47dae44c35e592578 -Merge: a189d0c47 599a8860a -Author: Steve Hillier -Date: Tue Jul 13 11:04:10 2021 -0700 - - Merge pull request #1711 from bcgov/release - - Release - -commit 599a8860a0ad1411a37754c923880aa2a5f0bbf5 -Merge: 8c2ba85a9 1dd283368 -Author: Daine Rose Trinidad -Date: Tue Jul 6 11:38:41 2021 -0700 - - Merge pull request #1798 from bcgov/daine/matomo - - Track gwells staging on matomo - -commit 1dd283368c533611c037ec24a7dd450f16009b98 -Author: Daine Trinidad -Date: Tue Jul 6 10:46:16 2021 -0700 - - Track gwells staging on matomo - -commit 8c2ba85a9b50213cec08a9e5734b87e7660d6d1f -Merge: 973cba930 aa00cca41 -Author: Daine Rose Trinidad -Date: Mon Jul 5 15:38:12 2021 -0700 - - Merge pull request #1797 from bcgov/daine/matomo - - Add VueMatomo analytics - -commit aa00cca4187c5c640ab20e60b2e42fbd12bafd34 -Merge: f06c30cb2 ed87c99e7 -Author: Daine Trinidad -Date: Mon Jul 5 14:49:45 2021 -0700 - - Merge branch 'release' into daine/matomo - -commit f06c30cb2a9052fe3d2eb5bf03a5fad19f2a9052 -Author: Daine Trinidad -Date: Mon Jul 5 13:22:14 2021 -0700 - - Lock psycopg2 to <2.9, as it doesn't play well with Django 2.2 - -commit 114aef2bcb84245bd04d0089f0279b677deb2e6a -Author: Daine Trinidad -Date: Mon Jul 5 11:02:06 2021 -0700 - - Adding vue-matomo package and updating domain for vue-matomo - -commit d324be7b3de9175d3120699224358246b2cf261d -Author: Daine Trinidad -Date: Mon Jul 5 10:18:59 2021 -0700 - - Add VueMatomo analytics - -commit 973cba930643005acff55c97dbe677d88f667b02 -Merge: ed87c99e7 43383bce2 -Author: Daine Rose Trinidad -Date: Mon May 10 15:58:03 2021 -0700 - - Merge pull request #1793 from bcgov/daine/fix-minio - - Update minio backup script build config directory - -commit 43383bce2797a983405fbadbe95a34b68a760da6 -Author: Daine Trinidad -Date: Mon May 10 14:16:02 2021 -0700 - - Update minio backup script build config directory - -commit ed87c99e728ff19ce53d682e6a677b1149ff6c65 -Merge: 7c888882e 5c3868425 -Author: Steve Hillier -Date: Mon May 10 11:44:24 2021 -0700 - - Merge pull request #1790 from bcgov/cvarjao-ocp4-jenkins - - Update Jenkins for OCP4 - -commit 5c3868425547602aa2f8e4ccf261d2693fd24340 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Mon May 10 10:21:43 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 2afbf91e20ff8594336c0973c94fc582cf271e19 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 17:37:41 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit b6011d52bea6b83660438db72dc8e6be26a36046 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 17:13:15 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 61c951e36f9ee4230b62ddf9a2cbc4aa33049ae0 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 16:59:46 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 54b885b0f0d7308c28a1b9bf3c2df7398b9b7d17 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 15:03:35 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit fa8a5e30f366fcb2c83926b9fe747686ce8e8260 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 14:50:16 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 040c5b6ffe14cd0201116a087e3c17144152c384 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 14:01:52 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit ab7c8a57397e270d624fa6d857975e7fa63424df -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 13:32:50 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 282e397fe55f74dab887e4acb48a1315aeb940d0 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 13:27:13 2021 -0700 - - Remove build triggers - - A new build is always started with startBuild() - -commit a1d7e070812394cf26820194e342c15843d87ed9 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 13:24:17 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 6fd3cd8abb12b2986a891fc7bc9f731a5b245f1b -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 13:17:22 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 3d2ea2194dafc04c208146184c485ebeca0ed5cd -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 13:10:22 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 907df50e2f1e94a8383e963844628563ab910b93 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 13:07:04 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit 4ab88444dceda5c92038ef219f29f86017fea5da -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 12:56:12 2021 -0700 - - Updating namespaces - -commit 4b4d14e6997c4c9d103fc36b8010091f21ddcb8e -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 12:51:57 2021 -0700 - - Update Jenkinsfile.ocp4 - -commit b386c89cdedb0608175a2a3fb7dba0cbe783b061 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 12:48:03 2021 -0700 - - Fix input step - -commit 7fbbeede852ce1705d18112ae75641f90b08d723 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 12:43:23 2021 -0700 - - adding "-controller" to the name - -commit 8aa5ea9edf3ba4fd2f7950197c8a88438cd0249e -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 12:42:33 2021 -0700 - - Explicitly define agent/node used by each stage - -commit aa3f8e9a6bf9c55d299555ebeca6b66a21f093cd -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 6 09:29:33 2021 -0700 - - handle github pull request closed event - -commit 7c888882eec383a78711778ef360d8151e7fbfed -Merge: 355d82bfd c694af3c2 -Author: Steve Hillier -Date: Thu May 6 08:25:03 2021 -0700 - - Merge pull request #1792 from bcgov/steve/miniofix - - increase minio capacity - -commit c694af3c271b7d2c558fbf7f97cab9fb7c25c44f -Author: Steve Hillier -Date: Wed May 5 10:02:40 2021 -0700 - - increase minio capacity - -commit 5dca5a208370557c4ec4653a3fae939cb812ecf0 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Mon May 3 11:08:03 2021 -0700 - - Enable partial PVC persistence - -commit 39725557af7049264b1f344347294b51cba1ca33 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Mon May 3 11:07:41 2021 -0700 - - Configure Jenkins tunnel for cloud nodes - -commit a914b6d6099cbfa19a2df4f37452115357a7696a -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Fri Apr 30 12:42:32 2021 -0700 - - Enable github deployment integration - -commit cd8ac693bc7525eb60b84d8d1878c35bef2f2e7b -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu Apr 29 13:38:39 2021 -0700 - - Job configuration and Dockerfile - -commit 355d82bfd036d662ae334797be92f19d0a5a50e8 -Merge: 008a011d1 73e239afb -Author: Steve Hillier -Date: Thu Apr 29 15:02:24 2021 -0700 - - Merge pull request #1789 from bcgov/steve/minio-test-fix - - increase backup size on staging - -commit 73e239afb6b771399fe7d3b23a24a2d760cea8a3 -Author: Steve Hillier -Date: Thu Apr 29 14:17:00 2021 -0700 - - increase backup size - -commit 008a011d1a74bef8652db52b7acf42580b6de483 -Merge: fd121b104 58b7d8128 -Author: Daine Rose Trinidad -Date: Thu Apr 22 08:59:31 2021 -0700 - - Merge pull request #1788 from bcgov/daine/minio-backups - - Removing extra backup scripts - -commit 58b7d81289e14e08bb7028825efbf9d82f0edadf -Author: Daine Trinidad -Date: Wed Apr 21 14:32:57 2021 -0700 - - Remove unused variables - -commit 1727c502ab3bdafaf670c48e798085226aec3494 -Author: Daine Trinidad -Date: Wed Apr 21 14:04:00 2021 -0700 - - Removing extra backup scripts - -commit fd121b10443daa8b082fbbd2531b7dbf93e955b0 -Merge: 880214001 46a8f3451 -Author: Daine Rose Trinidad -Date: Wed Apr 21 14:03:50 2021 -0700 - - Merge pull request #1785 from bcgov/daine/delete-maintenance - - Cleaning up old devops scripts - -commit 8802140014b8f57bb773f7aef955cc4a45443006 -Merge: fd32a137b c51d7de23 -Author: Daine Rose Trinidad -Date: Wed Apr 21 11:44:40 2021 -0700 - - Merge pull request #1787 from bcgov/dan/WATER-1775 - - changed well search/export limits to 999999 from 5000, this needs to … - -commit c51d7de23ede17581519a94d0d6d7cdedb7e8425 -Author: Dan -Date: Wed Apr 21 10:52:50 2021 -0700 - - changed well search/export limits to 999999 from 5000, this needs to be tested with more data. introduced constants mechanisms - -commit fd32a137b444fa621949b142acbd224cc7f6fc32 -Merge: 7b2fafb81 97d8a5739 -Author: Daine Rose Trinidad -Date: Tue Apr 20 10:03:30 2021 -0700 - - Merge pull request #1786 from bcgov/dan/WATER-1778 - - licence_status is not a related, it's a property on the well model, t… - -commit 7b2fafb81ce79fda18616d3dee54ea14605efd80 -Merge: e33b0e485 2a4b4054f -Author: Daine Rose Trinidad -Date: Mon Apr 19 17:07:58 2021 -0700 - - Merge pull request #1784 from bcgov/dan/WATER-1545-v2 - - added column styling to export, so we can control the column width of… - -commit 97d8a5739e62c2cdbad5852ddf78a669a900a9d8 -Author: Dan -Date: Mon Apr 19 11:05:09 2021 -0700 - - licence_status is not a related, it's a property on the well model, this means it should not be in this list of relateds - -commit 2a4b4054fc19c526c82f91e69f13bfaea375751f -Author: Dan -Date: Fri Apr 16 09:35:21 2021 -0700 - - added column styling to export, so we can control the column width of predefined columns; removed a column from the wells export view - -commit 46a8f34519c0d84857648f3b1e344f721aa84db7 -Author: Daine Trinidad -Date: Thu Apr 15 15:09:39 2021 -0700 - - Cleaning up old devops scripts - -commit e33b0e485b5cee56c9d6c7073481014c08804701 -Merge: 4503cb71c bbad154c0 -Author: Daine Rose Trinidad -Date: Tue Apr 13 11:58:01 2021 -0700 - - Merge pull request #1783 from bcgov/daine/WATER-1688-minio-fix - - Change deployment config for minio on ocp4 - -commit 4503cb71cba175bcda096f68e4803a039e6692bd -Merge: ae8565683 cecc7da9c -Author: Steve Hillier -Date: Tue Apr 13 11:46:23 2021 -0700 - - Merge pull request #1776 from bcgov/snyk-fix-6d946da4b583e0e929c6c86eda858931 - - [Snyk] Security upgrade djangorestframework from 3.9.4 to 3.11.2 - -commit ae856568365f9d8dc816e1119ed12c87043fbc40 -Merge: 081f97acf 1ffd512a1 -Author: Daine Rose Trinidad -Date: Tue Apr 13 11:39:05 2021 -0700 - - Merge pull request #1781 from bcgov/dan/WATER-1754 - - Remove DEFAULT_COLUMNS in the store - -commit 081f97acf20c801fef0972a9943bf253288b35c5 -Merge: c762fc24f 9f18eac8e -Author: Daine Rose Trinidad -Date: Tue Apr 13 11:35:41 2021 -0700 - - Merge pull request #1782 from bcgov/dan/WATER-1769 - - will show staging message in header when url contains testapps.nrs.go… - -commit bbad154c06067f81799153a22012d1dd36381e88 -Author: Daine Trinidad -Date: Tue Apr 13 11:25:50 2021 -0700 - - Change deployment config for minio on ocp4 - -commit 9f18eac8e6b34cc020cf50760592469fa59eb312 -Author: Dan -Date: Tue Apr 13 11:08:04 2021 -0700 - - will show staging message in header when url contains testapps.nrs.gov.bc.ca or gwells-staging. creating backend merge migration - -commit c762fc24ff220952ae03cc27725220598aa2a357 -Merge: 43acce0fc d4af500c4 -Author: Daine Rose Trinidad -Date: Tue Apr 13 08:23:37 2021 -0700 - - Merge pull request #1777 from bcgov/dan/WATER-1308 - - modified activity_submission fields for well_orientation, well_disinf… - -commit 43acce0fc368205c9eb3c5e9475f4c2472b9e0a1 -Merge: e5d7579a6 d0f78095a -Author: Daine Rose Trinidad -Date: Mon Apr 12 15:25:32 2021 -0700 - - Merge pull request #1780 from bcgov/daine/WATER-1688-minio-fix - - Minio not rolling out - -commit d4af500c44dda552d6b6cc8f7f00019581362a0e -Author: Steve Hillier -Date: Mon Apr 12 15:07:54 2021 -0700 - - update tests to use well_orientation_status - -commit d0f78095aa1f22b5a69dfbf7427c085bcd9aa827 -Author: Daine Trinidad -Date: Mon Apr 12 14:57:56 2021 -0700 - - Cleanup - -commit cecc7da9c3b0134fe3ea1389f6a2d511dd9a3160 -Merge: 2bc7055f0 28d755e1a -Author: Steve Hillier -Date: Mon Apr 12 14:18:31 2021 -0700 - - Merge branch 'snyk-fix-6d946da4b583e0e929c6c86eda858931' of github.com:bcgov/gwells into snyk-fix-6d946da4b583e0e929c6c86eda858931 - -commit 2bc7055f03a15219472cdbd6a8da5ba88dae3130 -Author: Steve Hillier -Date: Mon Apr 12 14:18:19 2021 -0700 - - upgrade drf-yasg - -commit 1ffd512a18df935060510dab9e4def2bef300ef1 -Author: Dan -Date: Mon Apr 12 13:34:05 2021 -0700 - - this was a tough bug to resolve, somehow it's possible to modify the value of the const DEFAULT_COLUMNS in the store, super weird, this is why I removed the [...DEFAULT_COLUMNS]. tested and seems ok now - -commit 28d755e1ac552401bbf953de95117ce919e96245 -Author: Daine Rose Trinidad -Date: Mon Apr 12 13:24:29 2021 -0700 - - Update app/backend/requirements.txt - - Co-authored-by: Steve Hillier - -commit fe9d4f3c48cb0f46998a8b2758b789c637fbf021 -Author: Daine Trinidad -Date: Mon Apr 12 13:18:04 2021 -0700 - - Remove image change trigger for deployment of minio - -commit ffd0e546588242b27affc36c6e199cdb998528ae -Author: Daine Trinidad -Date: Mon Apr 12 13:17:06 2021 -0700 - - Revert debugging changes - -commit ac388ec717b6ee0054b6d5cfc0f00e99b11a34d7 -Author: Daine Trinidad -Date: Fri Apr 9 17:46:40 2021 -0700 - - More debugging - -commit 49a4f154b59073c0a6248f1ae42e78f3b5401800 -Author: Daine Trinidad -Date: Fri Apr 9 17:32:42 2021 -0700 - - Debugging for Jenkinsfile minio - -commit e5d7579a63dfbdce17eb86bcad519896ceabd3de -Merge: f341f1022 8de300100 -Author: Daine Rose Trinidad -Date: Fri Apr 9 15:27:57 2021 -0700 - - Merge pull request #1769 from bcgov/dan/WATER-1704 - - simple fix, change feet to feet bgl on well related data for field to… - -commit f341f10226c5b9da11766064361fe9ae0aa0bdab -Merge: d56bd2754 c2cef156f -Author: Daine Rose Trinidad -Date: Fri Apr 9 11:52:31 2021 -0700 - - Merge pull request #1779 from bcgov/dan/WATER-1753 - - fixed bug, was using field artesian_flow instead of artesian_conditio… - -commit c2cef156fb4e3bc6fd0766f385b663643d4daf84 -Author: Dan -Date: Thu Apr 8 11:47:22 2021 -0700 - - fixed bug, was using field artesian_flow instead of artesian_conditions in a few places. Also did a bit of refactoring to follow PEP's such as two spaces after comment, unused import and too many lines between - -commit d56bd2754a9fb1d464b19a3f3cfcc911240d9e94 -Merge: 4c3aff581 0850b52c9 -Author: Daine Rose Trinidad -Date: Thu Apr 8 10:06:51 2021 -0700 - - Merge pull request #1778 from bcgov/dan/WATER-1069 - - added leave unsaved page confirmation - -commit 0850b52c9066b06e772d5987436a291e716fc85f -Author: Dan -Date: Wed Apr 7 11:04:19 2021 -0700 - - added leave unsaved page confirmation - -commit 338e3a01a8f871f5774ecdadbe16bf21839b5331 -Author: Dan -Date: Tue Apr 6 11:43:11 2021 -0700 - - modified activity_submission fields for well_orientation, well_disinfected, well_activity_type, well_publication_status to support nullable - -commit 00e50641356a0de05ebceb78108949217cfb739f -Author: snyk-bot -Date: Sun Apr 4 23:52:13 2021 +0000 - - fix: app/backend/requirements.txt to reduce vulnerabilities - - - The following vulnerabilities are fixed by pinning transitive dependencies: - - https://snyk.io/vuln/SNYK-PYTHON-DJANGORESTFRAMEWORK-1090569 - -commit 4c3aff581fb9cdd338b532475115bd85397a7a05 -Merge: d8eb6968d 0c1f480f1 -Author: Daine Rose Trinidad -Date: Thu Apr 1 16:29:25 2021 -0700 - - Merge pull request #1775 from bcgov/dan/WATER-1734 - - added alternative specs submitted to the well search results and well… - -commit 0c1f480f114a2932f9b434d44bbc6dc03ceab198 -Author: Dan -Date: Wed Mar 31 14:18:17 2021 -0700 - - added alternative specs submitted to the well search results and well search results export by added the field to the serializer and renderer - -commit d8eb6968d9ccf9acabe78a51ed75c1ab434e41ad -Merge: ba86ecd5e 5af577848 -Author: Daine Rose Trinidad -Date: Wed Mar 31 13:57:52 2021 -0700 - - Merge pull request #1774 from bcgov/dan/WATER-1687 - - removed old well detail django html template, cleaned up views, filte… - -commit 5af577848f708e988882d016270f1e692bdc5eee -Author: Dan <78053857+danbigthink@users.noreply.github.com> -Date: Wed Mar 31 13:42:01 2021 -0700 - - Update app/backend/aquifers/fixtures/aquifers.json - - agree, accidental duplicate - - Co-authored-by: Daine Rose Trinidad - -commit f15d730782b0e66dcdcd9a147c111637e9b7b347 -Author: Dan -Date: Wed Mar 31 09:48:58 2021 -0700 - - missed passing in the version number to the generate_wells method for databc export, fixed - -commit 7e050a1debbd831f10997c667d7c9442caeba968 -Author: Dan -Date: Wed Mar 31 09:42:52 2021 -0700 - - removed old well detail django html template, cleaned up views, filters, renderers, models, serializers for the removal of the well.surface_seal_length field. Added 3 migrations, 1 for altering the well export views, 1 for updating the data as per the ticket specs and 1 for removal of the actual column - -commit ba86ecd5e149ef5e136799f3cdd6a867c888a9d8 -Merge: 89bf63f74 a7e7073ae -Author: Daine Rose Trinidad -Date: Tue Mar 30 11:11:34 2021 -0700 - - Merge pull request #1773 from bcgov/dan/WATER-1400 - - added column intended_water_use to COLUMN_LABELS in the renderers, te… - -commit a7e7073ae2687b68ade6108facb7affedd12f4b4 -Author: Dan -Date: Tue Mar 30 10:40:43 2021 -0700 - - added column intended_water_use to COLUMN_LABELS in the renderers, tested that frontend shows column in download - -commit 89bf63f7422f3c3d8653f56ff010d791d78c5753 -Merge: cac34ecb6 6061b96e1 -Author: Daine Trinidad -Date: Tue Mar 30 10:08:15 2021 -0700 - - Merge pull request #1771 from bcgov/dan/WATER-946 - - added in message in page header to denote staging environment if url … - -commit cac34ecb6017e83707d426091e5f7acc48290ccb -Merge: 6b7c91168 1018e7967 -Author: Daine Trinidad -Date: Tue Mar 30 10:08:03 2021 -0700 - - Merge pull request #1770 from bcgov/dan/WATER-1653 - - added ref_name field and value to WellDetailSerializer v1 and v2. tes… - -commit 6b7c91168a34051d92cd1a1ba53f00d71a3a170e -Merge: 79e420876 d6d823bfb -Author: Daine Trinidad -Date: Tue Mar 30 10:07:50 2021 -0700 - - Merge pull request #1768 from bcgov/dan/WATER-1702 - - fixed issue. an activity submission create user/date should be used f… - -commit 79e4208763af76f2f94a5e50efa3f9f5d05a7a6b -Merge: 6302df6ab 255a13475 -Author: Steve Hillier -Date: Mon Mar 29 17:14:30 2021 -0700 - - Merge pull request #1766 from bcgov/dan/WATER-1634 - - created migration to remove duplicate invalid well subclasses - -commit 6302df6abb60dac64f6e25544356afddb893c365 -Merge: 8e5126fbd 19ec7aacb -Author: Daine Rose Trinidad -Date: Mon Mar 29 16:41:28 2021 -0700 - - Merge pull request #1765 from bcgov/dan/WATER-1660 - - fixed outputs of boolean values on ui, sometimes this was true/false … - -commit 8e5126fbd9819364fdcc9621209f72c68636520d -Merge: 6b1e650ad 6ad6da3b6 -Author: Daine Rose Trinidad -Date: Mon Mar 29 16:15:02 2021 -0700 - - Merge pull request #1772 from bcgov/dan/WATER-1444 - - updated column and migration types to NUMERIC (30,10) - -commit 6ad6da3b6233dd816a66f3ad9fa4da80501380c9 -Author: Dan -Date: Mon Mar 29 15:41:07 2021 -0700 - - updated column and migration types to NUMERIC (30,10) - -commit 19ec7aacb7e0218505fbdfc2292127a6c9f7383a -Merge: 34286aec6 6b1e650ad -Author: Dan <78053857+danbigthink@users.noreply.github.com> -Date: Mon Mar 29 15:01:59 2021 -0700 - - Merge branch 'release' into dan/WATER-1660 - -commit 6061b96e15a7c3c33c67bc023fe1c537afbbf594 -Author: Dan -Date: Mon Mar 29 10:37:34 2021 -0700 - - added in message in page header to denote staging environment if url has gwells-staging in it - -commit 1018e796716f38ab77704e8ccfef018a7705f043 -Author: Dan -Date: Fri Mar 26 16:00:30 2021 -0700 - - added ref_name field and value to WellDetailSerializer v1 and v2. tested that redoc works as expected, it's good now. tested that the fix didn't break the frontend, seems to work fine too - -commit 8de300100d11f254a176f2ef211240a109638c4f -Author: Dan -Date: Fri Mar 26 13:46:26 2021 -0700 - - simple fix, change feet to feet bgl on well related data for field total depth drilled - -commit d6d823bfb19bfa93a8fd486b78ddb60028ed124e -Author: Dan -Date: Fri Mar 26 13:17:56 2021 -0700 - - fixed issue. an activity submission create user/date should be used for displaying history as these records are not updated by the users. - -commit 6b1e650ad70c17dff4dd6541fd01d54dbbe1d74b -Merge: 1f4927236 ce99f40c2 -Author: Daine Trinidad -Date: Thu Mar 25 22:25:41 2021 -0700 - - Merge pull request #1767 from bcgov/dan/WATER-MERGE-1444-1545 - - created django merge migration for tickets 1444, 1545 - -commit ce99f40c2c4f3e147207813283bd6b7f6c0ef1ec -Author: Dan -Date: Thu Mar 25 15:30:08 2021 -0700 - - created django merge migration for tickets 1444, 1545 - -commit 255a13475867218885a7d7a4049de949255a3e6f -Author: Dan -Date: Thu Mar 25 13:50:53 2021 -0700 - - created migration to remove duplicate invalid well subclasses - -commit 1f4927236126d604023d2e200d136840408a83c5 -Merge: b8c04b2a3 d35a26368 -Author: Daine Rose Trinidad -Date: Thu Mar 25 12:01:12 2021 -0700 - - Merge pull request #1762 from bcgov/dan/WATER-1545 - - Dan/water 1545 - -commit 34286aec659863ddd470ce8c1c88e26763e72222 -Author: Dan -Date: Thu Mar 25 11:00:58 2021 -0700 - - fixed outputs of boolean values on ui, sometimes this was true/false when it should have been Yes/No. - -commit b8c04b2a3b97f61c91cabf45919677e7d6412ac9 -Merge: 5084a92f0 7708c658a -Author: Steve Hillier -Date: Thu Mar 25 09:36:33 2021 -0700 - - Merge pull request #1763 from bcgov/dan/WATER-1701 - - updated Alternative specs submitted in Comments section on Well Summa… - -commit 5084a92f0f8598aeff53cdc7125ac5236904d20d -Merge: 3ba30a16d d583eb766 -Author: Steve Hillier -Date: Thu Mar 25 09:35:51 2021 -0700 - - Merge pull request #1764 from bcgov/dan/WATER-1444 - - altered column transmissitivity on 3 tables, so now numeric(8,6) so w… - -commit d583eb7662a0c315303dbec77dc4b7b08c36eaeb -Author: Dan -Date: Wed Mar 24 14:36:16 2021 -0700 - - altered column transmissitivity on 3 tables, so now numeric(8,6) so we can store decimal place values now. modified the models and tested on frontend, entering the field with decimal place values now works. example: 12.123456 works, meanwhile 123.123123 does NOT, neither does 12.1231231 - -commit 3ba30a16d90326ac320df7927e3d0adc95d0b1e8 -Merge: 7999a973a c3c91304f -Author: Daine Rose Trinidad -Date: Wed Mar 24 13:22:04 2021 -0700 - - Merge pull request #1760 from bcgov/dan/WATER-1658 - - altered schema and models to support alternative_specs_submitted, hyd… - -commit 7999a973a4f97a1a6ae0086c49a20d7ae39142e7 -Merge: 9d42d03bc c13f5346d -Author: Daine Rose Trinidad -Date: Wed Mar 24 13:21:28 2021 -0700 - - Merge pull request #1758 from bcgov/dan/WATER-1049 - - Dan/water 1049 - -commit 7708c658a51f5ebba62bebeeca51e91d2e3b102f -Author: Dan -Date: Wed Mar 24 11:40:24 2021 -0700 - - updated Alternative specs submitted in Comments section on Well Summary, it was using incorrect display logic - -commit 9d42d03bc79fd1bd58197d7fbbd5d36bb19ff1d7 -Merge: 3f30bed37 95ecf974d -Author: Daine Rose Trinidad -Date: Wed Mar 24 08:43:24 2021 -0700 - - Merge pull request #1736 from bcgov/daine/ocp4 - - OCP4 migration - -commit 95ecf974dee9843711a3465ac169c726f6d67e29 -Merge: 24d17cc32 3f30bed37 -Author: Steve Hillier -Date: Tue Mar 23 16:46:17 2021 -0700 - - Merge branch 'release' into daine/ocp4 - -commit 24d17cc32ee205ee49962624ddb8bda1e7e574d6 -Merge: af3c85ae4 250c39d64 -Author: Steve Hillier -Date: Tue Mar 23 16:44:52 2021 -0700 - - Merge branch 'daine/ocp4' of github.com:bcgov/gwells into daine/ocp4 - -commit 3f30bed37c7580ba9ceb56d83d16117a45c60f18 -Merge: 782ed3a6a b0bfbf937 -Author: Steve Hillier -Date: Tue Mar 23 16:34:53 2021 -0700 - - Merge pull request #1761 from bcgov/snyk-fix-56a2be17f3983584848df916d74d9d59 - - [Snyk] Security upgrade lxml from 4.6.2 to 4.6.3 - -commit c13f5346d43785fd2200bc7f30a61da23578e274 -Merge: 25c0a5321 782ed3a6a -Author: Dan <78053857+danbigthink@users.noreply.github.com> -Date: Tue Mar 23 15:46:27 2021 -0700 - - Merge branch 'release' into dan/WATER-1049 - -commit d35a263684a666120e635d2fc16199d21b4b914a -Author: Dan -Date: Tue Mar 23 09:24:35 2021 -0700 - - altered the url used by the frontend to obtain the wells data - -commit b0bfbf937dcb1e9edb980ee6a8e303b85246d4bf -Author: snyk-bot -Date: Mon Mar 22 23:51:58 2021 +0000 - - fix: app/backend/requirements.txt to reduce vulnerabilities - - - The following vulnerabilities are fixed by pinning transitive dependencies: - - https://snyk.io/vuln/SNYK-PYTHON-LXML-1088006 - -commit d43a1c0a947f815154a4ecaa6707de7b0c74528a -Author: Dan -Date: Mon Mar 22 15:41:21 2021 -0700 - - first pass of the v2 well export; includes refactored sql (into views), outputs to "" and v2 - -commit 782ed3a6ad15b7f18491aa8ef1e60272b09c060d -Merge: e3b38f008 02ae7a627 -Author: Daine Trinidad -Date: Fri Mar 19 09:16:31 2021 -0700 - - Merge pull request #1759 from bcgov/dan/WATER-833 - - Dan/water 833 - -commit c3c91304fdb4c1ca652c823f016fb0c630a7a42e -Author: Dan -Date: Thu Mar 18 13:10:08 2021 -0700 - - altered schema and models to support alternative_specs_submitted, hydro_fracturing_performed to allow nullable on fields provided and activity submissions - -commit 02ae7a6272cad5b7433416c5a84842153384df8f -Author: Dan -Date: Tue Mar 16 15:45:08 2021 -0700 - - just about completed, reviewing databc standards and running a few more tests - -commit ec8648e10e9e6dd8c6820c7f36f6514425898fae -Author: Dan -Date: Tue Mar 16 13:55:14 2021 -0700 - - first final version, as per specs - -commit ea885f69e03fba24beeceef4580ee78387d8fb41 -Author: Dan -Date: Tue Mar 16 12:40:31 2021 -0700 - - first pass of databc export update for wells completed, leaving out the column for water_quality_characteristics - -commit e3b38f008980b4f79270bac8eb90279c418f400f -Merge: 57074a153 db19f92aa -Author: Steve Hillier -Date: Tue Mar 16 11:28:10 2021 -0700 - - Merge pull request #1755 from bcgov/dan/WATER-639 - - Dan/water 639 - -commit 57074a15347e4a7fd412a44b04bb52a5b51260e6 -Merge: 5800d3df8 db405f77f -Author: Steve Hillier -Date: Tue Mar 16 11:27:36 2021 -0700 - - Merge pull request #1757 from bcgov/WATER-1651 - - created export django command export_welltags_documents_csv. tested l… - -commit 19c29746ff2d145bc49a583df11288a79c39a4ee -Author: Dan -Date: Tue Mar 16 11:10:09 2021 -0700 - - checkpoint - -commit 25c0a5321545c31c8174611cbadd93468ce3e0a3 -Author: Dan -Date: Mon Mar 15 16:15:02 2021 -0700 - - removed columns that were originally added for a different ticket - -commit bdb5ad66107de882621ca384b3911c6464d92605 -Author: Dan -Date: Mon Mar 15 16:09:15 2021 -0700 - - keeping changes - -commit db405f77fa5e475bf782b6551c18a511af0aa414 -Author: Dan -Date: Mon Mar 15 14:26:58 2021 -0700 - - removed uses of well_tag and replaced with wtn instead (well tag number), now all verbiage will be the same - -commit 973ec3ffab28a9afd522b159501cc355eb45195f -Author: Dan -Date: Mon Mar 15 14:08:41 2021 -0700 - - added more documentation to make this command more understandable in the future, now we can see the environment variable requirements, how to run it and what it's for - -commit a33f9aefe8ea6ce4babf38ff49441d5247864e70 -Author: Dan -Date: Mon Mar 15 13:43:54 2021 -0700 - - first pass of adding in new fields to export - -commit 5f8a1635ce7108b65d5c6ab7ba7b2bcdd66bdcd4 -Author: Dan -Date: Fri Mar 12 15:20:53 2021 -0800 - - added in version feature to databc upload for v1 and v2 - -commit 974bd1dc2175458b905bd2f0c1ed2c00af50c826 -Author: Dan -Date: Fri Mar 12 14:50:04 2021 -0800 - - added in aquifer lithology code, construction start date and owner full name to databc well export - -commit e2964cd97ea0b52047b0b8c3ed2f80ea8cb247e7 -Author: Dan -Date: Thu Mar 11 14:16:18 2021 -0800 - - updated exception due to code smell, we simply want to ignore the exception - -commit 9019bcdbd105a33410e3baaf5843daa3bc4372f7 -Author: Dan -Date: Thu Mar 11 13:47:28 2021 -0800 - - created export django command export_welltags_documents_csv. tested locally - -commit db19f92aa1021568150e884b9980083cb6214ebb -Merge: 281768afd 5800d3df8 -Author: Steve Hillier -Date: Wed Mar 10 16:31:56 2021 -0800 - - Merge branch 'release' into dan/WATER-639 - -commit 5800d3df8932d7ecea43f1269bd6e1bdb58262df -Merge: 5aef9b879 a3e7e5e8d -Author: Steve Hillier -Date: Wed Mar 10 16:31:17 2021 -0800 - - Merge pull request #1756 from bcgov/steve/ocp4fix-mar9 - - fix for Minio dev hosts - -commit a3e7e5e8d84f661f3c51246d89664eedd04d5553 -Author: Steve Hillier -Date: Wed Mar 10 16:18:36 2021 -0800 - - change minio tag for dev environments - * includes a bucket for testing public docs (for use in DEV) - -commit 0e9b9a439d942ecb450e167b2649960b3cc8c391 -Author: Steve Hillier -Date: Wed Mar 10 16:11:10 2021 -0800 - - add base doc dir for use in dev envs - -commit 0a5fc45740f6bb9e097cdf72464fef808ecc6db8 -Author: Steve Hillier -Date: Wed Mar 10 13:36:04 2021 -0800 - - create map before adding properties - -commit ffed68ba6b34ece0173362e700ef61ad7364a34a -Author: Steve Hillier -Date: Wed Mar 10 13:06:02 2021 -0800 - - different method for getting data into Secret - -commit 120517beef94da3bda8698b282b2aab6e75922c9 -Author: Steve Hillier -Date: Wed Mar 10 12:02:20 2021 -0800 - - base64 encode string for copying into Secret - -commit 38e37f3ff261877ad3a2a92c4607241eae50fb48 -Author: Steve Hillier -Date: Wed Mar 10 11:49:27 2021 -0800 - - fix for Minio dev host - -commit 281768afd0f4031228d9bfb97c0ba4a242eea2e0 -Author: Dan -Date: Wed Mar 10 09:35:19 2021 -0800 - - mistake on assignment = rather than == found in calculate methods, code smell fixed - -commit 44abf8c87047f19802e0624ddf84f8108687812f -Author: Dan -Date: Wed Mar 10 09:21:42 2021 -0800 - - added in a missing feature, artesian pressure psi and head should calculate the other field value upon change and load. - -commit b5e62069ddb8eed75a1e195bee1f25a22486e165 -Author: Dan -Date: Mon Mar 8 12:41:28 2021 -0800 - - finished testing, found a few missings and added them - -commit 5aef9b8794d2dea6dda8619cbd9a03c8c463bb2d -Merge: 523db4464 86094d9d1 -Author: Steve Hillier -Date: Mon Mar 8 11:06:51 2021 -0800 - - Merge pull request #1754 from bcgov/steve/ocp4-mar4 - - remove staging/prod deployments from ocp3 pipeline - -commit 86094d9d17f772b705bdba13ef9a1eed7082d370 -Author: Steve Hillier -Date: Fri Mar 5 17:02:53 2021 -0800 - - add comment - -commit 903575f1edd5e3561d7a46565968b42447d4c599 -Author: Dan -Date: Fri Mar 5 16:11:02 2021 -0800 - - updated the fixtures to create scenario of dummy artesian flow, added migration sql to update all artesian_flow to null where value = 0.01 for well and activity submission - -commit 69638464712a2d5645827025252468bb6c520721 -Author: Steve Hillier -Date: Fri Mar 5 16:01:19 2021 -0800 - - stop creating deployment statuses - -commit ebda2331b3014dcfd818c8f2a60022744eb3d59c -Author: Steve Hillier -Date: Fri Mar 5 15:41:56 2021 -0800 - - update Jenkinsfile - -commit ced9102824c123fb0a8b11c400df7f3a1454d27f -Author: Dan -Date: Fri Mar 5 15:41:46 2021 -0800 - - added refresh snapshots to package.json scripts and ran unit tests, updated snapshot - -commit 7ac82f497a745bd951c1784896c62a2ba2ff871a -Author: Dan -Date: Fri Mar 5 15:04:04 2021 -0800 - - fixed up the fields provided model, it did not require null, default to false is ok - -commit 61070c44e2deefe6ee04de6c080a799ae12646d8 -Author: Dan -Date: Fri Mar 5 14:41:34 2021 -0800 - - features except for validation on client for artesian condition are done - -commit 27ec8743e95cd5496caeb45d5170c26a91a28766 -Author: Steve Hillier -Date: Fri Mar 5 13:48:14 2021 -0800 - - re-enable more features for OCP4 - -commit 250c39d649c08eb51379f833a37ab9a9754aea0e -Author: Daine Trinidad -Date: Thu Mar 4 17:22:55 2021 -0800 - - Update next steps & add documentation on minio - -commit bc2883ff9471dfd65ad7ba2a8e46a275aa5d80cb -Author: Dan -Date: Thu Mar 4 16:29:45 2021 -0800 - - finishing up testing, found a couple of strange behaviours - -commit 39456c31bc48e2dd87a81fb28ab801e36cdbc8a9 -Author: Steve Hillier -Date: Thu Mar 4 16:19:12 2021 -0800 - - remove staging/prod deployments from ocp3 pipeline - -commit 7a4eb855fd1f82e89b6bd9a9916ee9baff395453 -Author: Dan -Date: Thu Mar 4 13:20:30 2021 -0800 - - got features all in, starting testing - -commit 523db4464b4c1a91aebc178330cda85b356ae9d5 -Merge: e0902f450 410951758 -Author: Steve Hillier -Date: Thu Mar 4 10:35:27 2021 -0800 - - Merge pull request #1753 from bcgov/steve/ocp4-mar3 - - adjust backup pvc sizes (OCP4) - -commit 410951758b150166b8c7f40a88ed8f729a2f8acc -Author: Steve Hillier -Date: Wed Mar 3 16:09:27 2021 -0800 - - adjust backup pvc sizes - -commit e0902f45077fc2c9943e2492a9dadaf01e541436 -Merge: 5db763dd5 3679294aa -Author: Steve Hillier -Date: Wed Mar 3 15:47:59 2021 -0800 - - Merge pull request #1746 from bcgov/steve/ocp4-feb19 - - fixes for OCP4 - -commit 5db763dd574f34a483c681c08771b47380b3dbc7 -Merge: 92b54765d fcef65183 -Author: Steve Hillier -Date: Wed Mar 3 15:47:25 2021 -0800 - - Merge pull request #1750 from bcgov/steve/ocp4-feb24 - - API tests for OCP4 - -commit 92b54765d9a9751d93998c982d00009c6f0adb14 -Merge: 31cfdfb04 5aad2e3a9 -Author: Steve Hillier -Date: Wed Mar 3 15:33:16 2021 -0800 - - Merge pull request #1752 from bcgov/dan/WATER-1647 - - needed to call the get_current_year fn rather than pass get_current_y… - -commit 3679294aa8240d7512ac27188e891b3ea1244fd2 -Author: Steve Hillier -Date: Wed Mar 3 15:19:08 2021 -0800 - - fix typos - -commit a9e6251d13e45f1ca564ba7f358f1918157c1f28 -Author: Steve Hillier -Date: Wed Mar 3 15:09:38 2021 -0800 - - remove references to /app/backend - -commit 045e77a96104491ab00185cc510917d229e9f093 -Author: Dan -Date: Wed Mar 3 14:57:21 2021 -0800 - - got the well detail screen working correctly and the filters for search - -commit 7c2b37f25555bcc15dc833f5e0c49ca81c21777a -Author: Steve Hillier -Date: Wed Mar 3 14:34:35 2021 -0800 - - remove WORKDIR's from Dockerfile - -commit 1306b38dfd4926866a6e4ec659fd9c8df7761d9f -Author: Steve Hillier -Date: Wed Mar 3 14:24:08 2021 -0800 - - add networkpolicy config - -commit e3513656d496586feffd8adcc4bd1048572ced35 -Author: Steve Hillier -Date: Wed Mar 3 14:23:59 2021 -0800 - - change app dir - -commit 9524035dad5a55e83acf686e57543ef5963beafc -Author: Dan -Date: Wed Mar 3 12:08:33 2021 -0800 - - still working on this, just leaving a checkpoint; advanced search now working - -commit 4fc1bfd28cf049d2532d1a2c7726b8e57cb385ac -Author: Steve Hillier -Date: Wed Mar 3 09:45:21 2021 -0800 - - add write permission to user - -commit fcef65183451530dd4c7551f5a114ac7dba8744a -Author: Steve Hillier -Date: Tue Mar 2 16:21:06 2021 -0800 - - revert to v2 - -commit 5aad2e3a95ff131f648e58ea2aec794156726719 -Author: Dan -Date: Tue Mar 2 11:13:02 2021 -0800 - - needed to call the get_current_year fn rather than pass get_current_year fn reference into model - -commit 0a8fa9b5f85ab093d5918fdd4e5c2bee08a3461c -Author: Dan -Date: Tue Mar 2 10:51:26 2021 -0800 - - latest, not working, just keeping changes - -commit 31cfdfb04151d0676d5d35f7d9a5c038e4c85433 -Merge: b4ebd7267 0080dc774 -Author: Steve Hillier -Date: Mon Mar 1 16:56:01 2021 -0800 - - Merge pull request #1751 from bcgov/dan/WATER-1232 - - Dan/water 1232 - -commit 42b1f6f6602f7ebccf777824f66dbcaef815ce0b -Author: Steve Hillier -Date: Mon Mar 1 16:08:24 2021 -0800 - - revert to python 36 - -commit 6023779ab377f5ddb2cf1b9e6fcce402031e61c1 -Author: Dan -Date: Mon Mar 1 15:17:35 2021 -0800 - - got databc export updated and tested, along with other serializers, starting on frontend updates now - -commit 8178a2a275d13e08c1cb2d0a9c4c8c8e01e04797 -Author: Steve Hillier -Date: Mon Mar 1 13:41:48 2021 -0800 - - fix image reference - -commit 0080dc7748013a45be3d431f44f793d10d50f84f -Author: Dan -Date: Mon Mar 1 13:39:20 2021 -0800 - - fixed grammar on unpublished notification, added a period to both sentences - -commit 6fe68709d8f83298e43d74c92af4246b6cfac23c -Author: Steve Hillier -Date: Mon Mar 1 13:25:39 2021 -0800 - - update base image for ocp4 - -commit 1d20ddca066063a0ecfb662303074cb7ba0db6e4 -Author: Dan -Date: Mon Mar 1 12:38:40 2021 -0800 - - first pass, created new column in models (activitysubmission, well and fieldsprovided), created amigration to update existing database data; need to complete api changes for post/put/get and ui changes/validation - -commit a19f718b94b05616506e21a1139bcd5e49a16837 -Author: Steve Hillier -Date: Mon Mar 1 12:06:31 2021 -0800 - - bump base image version (to new build) - -commit 6d5ff7f5ae860f2ce1ecbb506a939d645015ca96 -Merge: 9d629c510 cefee8514 -Author: Steve Hillier -Date: Mon Mar 1 12:06:52 2021 -0800 - - Merge branch 'steve/ocp4-feb24' of github.com:bcgov/gwells into steve/ocp4-feb24 - -commit 9d629c5108af8a2f2c6121e93fee04f59c41392c -Author: Steve Hillier -Date: Mon Mar 1 12:06:31 2021 -0800 - - bump base image version (to new build) - -commit 16f3ff49509fd1fec9009056bd9b94a8b9c6f899 -Author: Dan -Date: Fri Feb 26 10:51:31 2021 -0800 - - added is_published serializer method fields to WellDetailAdminSerializer and WellDetailSerializer, which results in is_published flag being available, created 2 computed methods for isUnpublished to control the logic to show the well not published notification, created a new property in SubmissionsHome to pass along this value to the ActivitySubmissionForm - -commit b4ebd7267db460fbce470cfc5010c7bbec6e4d2e -Merge: e6f0e6140 e7b941fd7 -Author: Steve Hillier -Date: Thu Feb 25 15:35:16 2021 -0800 - - Merge pull request #1749 from bcgov/steve/config-fixes - - Config fixes - -commit cefee851420ee022aa5d73b883780c2432896a9b -Author: Steve Hillier -Date: Thu Feb 25 14:57:29 2021 -0800 - - add if stmt for minio host (dev environments) - -commit e276eb00d0819b4872ff1c1c80b171eb730c4be7 -Author: Dan -Date: Thu Feb 25 12:04:50 2021 -0800 - - finished up running tests, there are no direct tests for bootstrap notification in the app for aquifers or wells for unpublished - -commit 8835895b4c4b492d24f0630629a07600c96dc795 -Author: Dan -Date: Thu Feb 25 11:49:32 2021 -0800 - - notification messages for unpublished wells on logged in users is now working, moving onto tests now - -commit e6f0e61409996ae5db6901798c7aa629b596400f -Merge: 64268ea83 2ea238b8c -Author: Steve Hillier -Date: Wed Feb 24 16:27:59 2021 -0800 - - Merge pull request #1747 from bcgov/dan/WATER-1590 - - Dan/water 1590 - -commit 413d31a15140573096a54a7c5a2d3ac5176b1f2e -Author: Steve Hillier -Date: Wed Feb 24 16:16:39 2021 -0800 - - re-enable API tests - -commit e7b941fd7dd30f57fd7081395fa32a3450af4524 -Author: Steve Hillier -Date: Wed Feb 24 16:02:24 2021 -0800 - - always import debug urls - - DEBUG_TOOLBAR_CONFIG controls whether urls are accessible. - -commit a469802f4eab9dbc14ad939c73f10d305a850e5b -Author: Dan -Date: Wed Feb 24 15:49:16 2021 -0800 - - end of day push, got the alerts showing up, no logic to show or hide and incorrect color/border on submission - -commit f8cae0ed3076323610b2d73e3158cd300ad047e4 -Author: Steve Hillier -Date: Wed Feb 24 15:44:38 2021 -0800 - - migration for custom validator - -commit 64268ea836615e5c49f8084f295d9dd92b7b59f2 -Merge: afb801d22 5e6f32d96 -Author: Steve Hillier -Date: Wed Feb 24 15:15:43 2021 -0800 - - Merge pull request #1744 from bcgov/dan/WATER-1589 - - Dan/water 1589 - -commit 5e6f32d968f9f200716298d473b18dc8f3cf4464 -Author: Steve Hillier -Date: Wed Feb 24 14:18:08 2021 -0800 - - update tests - -commit afb801d223a82bc31b235f4d73ceb6eb7a5e9179 -Merge: 3ad241a90 3ff6930e4 -Author: Steve Hillier -Date: Wed Feb 24 14:14:04 2021 -0800 - - Merge pull request #1748 from bcgov/dan/WATER-1621 - - cleaned up some unused tests and wrote a new django model validator (… - -commit be510cb158fd9c251651183afc5211164f2337d0 -Author: Steve Hillier -Date: Wed Feb 24 13:40:10 2021 -0800 - - update test for retired subclass - -commit 3ff6930e429f58809b4127b95eb71ac452931624 -Author: Dan -Date: Wed Feb 24 13:38:26 2021 -0800 - - removed unused pass statement in test - -commit 0c6be0b97b3e6ab3b82dd321fc05e731d3bed20a -Author: Dan -Date: Wed Feb 24 13:32:56 2021 -0800 - - cleaned up some unused tests and wrote a new django model validator (DynamicMaxValueValidator) that can use a function to determine the current year rather than a constant, altered the Aquifer model mapping_year field to use this DynamicMaxValueValidator rather than MaxValueValidator (fn based rather than constant). wrote a test in aquifers/tests.py named TestAquiferMappingYearDynamicMaxValueValidator that proves this validator works as expected, not allowed future years to be placed into the mapping_year field - -commit 911b76e2415f2217f17088e59a9e3cf3fd622311 -Author: Steve Hillier -Date: Tue Feb 23 14:15:04 2021 -0800 - - don't use /tmp dir - -commit 2ea238b8cfbd1fb22590b1fe7d46ddca0babbff3 -Author: Dan -Date: Tue Feb 23 10:11:29 2021 -0800 - - regenerated the aquifer component view snapshot - -commit a090c364a954c0b7f58dbca96306b123127e0017 -Author: Dan -Date: Tue Feb 23 10:09:26 2021 -0800 - - removed geo simplification of 1km radius - -commit 3e5d34b50b860dc5d1c3c81212555cc8f7622d32 -Author: Dan -Date: Mon Feb 22 16:55:07 2021 -0800 - - altered the label text and info question mark text - -commit 9b0e07c268bb9c8e489d36920ff008b1454a66f2 -Author: Daine Trinidad -Date: Mon Feb 22 16:51:15 2021 -0800 - - Updated pg_restore script - -commit a9fbc81083bd7c98915d7bd7d4820514815e6d5d -Author: Dan -Date: Mon Feb 22 10:18:52 2021 -0800 - - fixed test by removing old codes, also had removed code I shouldn't have on the intended water use options computed, put this back in - -commit d400e818db6a5a943456dc712c46ee1984a342dd -Author: Dan -Date: Fri Feb 19 15:34:53 2021 -0800 - - we now default class of well Water Supply or Closed Loop Geo well subclass to Not Applicable (and grey out the dropdown). - -commit 3e725ae47704ec4d2c59254d824c7dd77b4ca9f4 -Author: Daine Trinidad -Date: Fri Feb 19 14:44:56 2021 -0800 - - Scale down silver pods to sever db connections, and updated README with db - issues you may encounter - -commit 7f874e6cde26f4cbb6dc434b6538973ea3512503 -Author: Steve Hillier -Date: Fri Feb 19 14:43:25 2021 -0800 - - use tmp dirs for writing files - -commit 361279047249b3f06c2d00c571805bcf8aeeefd8 -Author: Steve Hillier -Date: Fri Feb 19 13:23:22 2021 -0800 - - alter import script test fixture file - -commit a5e16a8643ed38f39352b373b096526a61898757 -Author: Daine Trinidad -Date: Fri Feb 19 12:52:44 2021 -0800 - - Add option to do a test run - -commit 78cdae6b53a4bb226a34ac32e87c8ecd31c3c28b -Author: Steve Hillier -Date: Fri Feb 19 12:04:44 2021 -0800 - - check that well was updated before calling save - -commit 3ad241a90b025d4e52c7e488fb172c3f65a56a8c -Merge: f434d11df d00422b64 -Author: Steve Hillier -Date: Fri Feb 19 11:43:30 2021 -0800 - - Merge pull request #1745 from bcgov/steve/ocp4-feb18 - - update ocp4 Jenkinsfile, enable more nightly jobs - -commit c1bd686db58d0269cd18076cd40dd706385685b8 -Author: Dan -Date: Fri Feb 19 10:33:58 2021 -0800 - - found the fixtures (aquifers) that were adding well subclass guids for newly retired well subclasses - -commit d00422b6425dbdb6255874fa563cbe2a33e06297 -Author: Steve Hillier -Date: Thu Feb 18 17:06:38 2021 -0800 - - fixes for minio backup cj - -commit 63cf705a327348da5670f497a77ceb9c68a4a3db -Author: Steve Hillier -Date: Thu Feb 18 16:35:22 2021 -0800 - - change staging minio PVC size - -commit 73a7d8c789b117b3077a76ed465c7e67a5103537 -Author: Steve Hillier -Date: Thu Feb 18 15:55:40 2021 -0800 - - fix brackets - -commit 4f03b4f7110b3b9dd0dbb94f1de3d866a432c069 -Author: Steve Hillier -Date: Thu Feb 18 15:54:30 2021 -0800 - - split out dev deployment - -commit db4cf7855a68397c967d04fd763b3653fef2dddf -Author: Steve Hillier -Date: Thu Feb 18 15:49:59 2021 -0800 - - split out some code into a method - -commit 139d47f929a56aaeabdaa8610c35df8068edcffd -Author: Steve Hillier -Date: Thu Feb 18 15:44:57 2021 -0800 - - remove more comments/whitespace - -commit ff1ba2e315b044ccae2a29be9df3b8e447e6ff5b -Author: Steve Hillier -Date: Thu Feb 18 15:41:27 2021 -0800 - - delete whitespace - -commit f7ebe11ee5c4d91b1826f4b31d6adce74f5211a1 -Author: Steve Hillier -Date: Thu Feb 18 15:29:37 2021 -0800 - - update ocp4 jenkinsfile - -commit 4b96fe473b9cbc7e3cc7b7cb2fb1d72d87e08d61 -Author: Dan -Date: Thu Feb 18 15:26:30 2021 -0800 - - made a mistake, removed the update of wells/activity_submission where geotech/special was being changed to cls_lp_geo/na - -commit af3c85ae4d6a9a24565b2d7336fb7446fd32fc86 -Author: Steve Hillier -Date: Thu Feb 18 15:20:46 2021 -0800 - - update jenkinsfile.ocp4 - -commit 54a2d1631cc801868854b6c12acd4adf63de54e6 -Author: Steve Hillier -Date: Thu Feb 18 15:20:14 2021 -0800 - - updates to scripts - -commit 93d3c7b6e40654eff11784d7651edffd5ba9ef01 -Author: Dan -Date: Thu Feb 18 14:33:14 2021 -0800 - - ports section in db section in docker-compose had a merge conflict, just fixed by outdenting ports - -commit 712fb4c72faa12aae0aaeb316d084f437ca37f30 -Author: Dan -Date: Thu Feb 18 14:25:37 2021 -0800 - - finished the migration inspection instructions and manually tested - -commit 94243386d9b5085188fea0cc142afc67befb314c -Author: Dan -Date: Thu Feb 18 11:16:09 2021 -0800 - - updated well search codetables so our new code table changes aren't stomped on. Unfortunately there are more issues around this migration and the current state of the fixtures, the fixtures run after the migration, causing issues with allowing wells and activity submissions with retired codes to remain. I'm planning to manually alter the wells subclass code that are to be expired - -commit 7b7342fe62c7b3d028cbd62927645a8d35c626e0 -Author: Dan -Date: Thu Feb 18 10:38:49 2021 -0800 - - finished code, testing now - -commit f434d11df2069f14368fc85dcea5dc272072b094 -Merge: d74af5f2d 1bcf08ac7 -Author: Steve Hillier -Date: Thu Feb 18 09:44:03 2021 -0800 - - Merge pull request #1743 from bcgov/steve/ocp4-feb16 - - fix postgres startup script for ocp4 - -commit 45793065b2556fbe59a56a4380ed47c240790dc6 -Author: Dan -Date: Wed Feb 17 17:55:26 2021 -0800 - - most of the migration is done, still beefing up the missing well subclass codes, once that's completed this migration should be perfect - -commit 1bcf08ac7ea7e2de35f781d234a3817988b4d648 -Author: Steve Hillier -Date: Wed Feb 17 16:40:18 2021 -0800 - - fix postgres startup script for ocp4 - -commit d74af5f2d9fd246b3501bcca4990470b68492e66 -Merge: 7d209297d d9c251ee4 -Author: Steve Hillier -Date: Wed Feb 17 15:20:33 2021 -0800 - - Merge pull request #1742 from bcgov/steve/ocp4-feb11-2 - - (Openshift 4) fix schedules - -commit d9c251ee4fccfd589b731a42ffca831fc260136d -Author: Steve Hillier -Date: Wed Feb 17 13:50:39 2021 -0800 - - update snapshot - -commit f4183b67d244d161bde55544b39a6f42d62d388e -Merge: 6f3a08594 7d209297d -Author: Steve Hillier -Date: Wed Feb 17 13:49:42 2021 -0800 - - Merge branch 'release' into steve/ocp4-feb11-2 - -commit 6f3a08594471c00f9b4bb23baef07087f1049ed9 -Author: Steve Hillier -Date: Wed Feb 17 13:35:29 2021 -0800 - - fix secret ref - -commit 3ae4513229bd74e9e31ab3880aeb7885f751ff8e -Author: Dan -Date: Tue Feb 16 17:23:35 2021 -0800 - - removed unused from djano.utils import timezone that I added earlier - -commit b1ce60d8d8db3bc4f7605791dfd72a89951151e4 -Author: Dan -Date: Tue Feb 16 17:20:27 2021 -0800 - - changed well class code serializer and submissions options view get to support expired well subclass codes - -commit 7d209297d286511034c288727f5fcd72ae4f6343 -Merge: 855ed007b 736900083 -Author: Steve Hillier -Date: Tue Feb 16 13:26:35 2021 -0800 - - Merge pull request #1739 from bcgov/origin/dan/WATER-1445 - - Origin/dan/water 1445 - -commit 4f2b86d91f6aa0cfe656a17d925a45473f8a6475 -Author: Daine Trinidad -Date: Thu Feb 11 17:33:30 2021 -0800 - - Update instructions/readme and cleaned up minio script - -commit 855ed007b7058134c919daab3b7c801ff93e3b27 -Merge: f1d6ed32f 365bb5540 -Author: Steve Hillier -Date: Thu Feb 11 16:49:18 2021 -0800 - - Merge pull request #1740 from bcgov/dan/WATER-1608 - - changed the a href for Liner Details from perforations_fieldset to li… - -commit 7520b870521ac864395af177a18c8650b3474771 -Merge: 3fbcbf47c f1d6ed32f -Author: Daine Trinidad -Date: Thu Feb 11 16:47:17 2021 -0800 - - Merge remote-tracking branch 'origin/release' into daine/ocp4 - -commit 3fbcbf47c4f197a85d8c9a88698aaf763e6efd28 -Merge: 73ce8ac0e a189d0c47 -Author: Daine Trinidad -Date: Thu Feb 11 16:44:06 2021 -0800 - - Merge remote-tracking branch 'origin/master' into daine/ocp4 - -commit 73ce8ac0e72c4d15d153577ad069e1f700391beb -Author: Daine Trinidad -Date: Thu Feb 11 16:42:02 2021 -0800 - - Added tips, tricks, and issues - -commit d5f78b731b0c0af892619863d833c0a21889119b -Author: Steve Hillier -Date: Thu Feb 11 16:33:15 2021 -0800 - - fix schedules - -commit f1d6ed32f577ae0e599ff59d59dba2a227dba017 -Merge: 6f3401a4b b6847b8d5 -Author: Steve Hillier -Date: Thu Feb 11 16:09:09 2021 -0800 - - Merge pull request #1741 from bcgov/steve/ocp4-feb11 - - OpenShift 4 fixes - -commit b6847b8d5c111ce31c6a09a8e5997ecdb026f4da -Author: Steve Hillier -Date: Thu Feb 11 15:29:17 2021 -0800 - - fix file path - -commit ec49a9193a4a9694c952c635b7489a75a8f1d654 -Author: Steve Hillier -Date: Thu Feb 11 15:03:02 2021 -0800 - - change startup script - -commit 1df558324537d1c29c540bb77604d6f50e3c3f60 -Author: Steve Hillier -Date: Thu Feb 11 15:01:37 2021 -0800 - - include export script - -commit 7369000834fdf67ddfee4f1ed9cb75393bbd53a5 -Author: Dan -Date: Thu Feb 11 13:09:06 2021 -0800 - - missed a few codes, messed up a few codes. compared SubmissionForm components again - -commit 77cea923ae46e3ec216a806bfd8a001feab359d2 -Merge: 1f770c3f5 62809797a -Author: Dan -Date: Thu Feb 11 12:16:11 2021 -0800 - - Merge branch 'origin/dan/WATER-1445' of https://github.com/bcgov/gwells into origin/dan/WATER-1445 - -commit 1646613cda8313f0b9f59d9193a0189ba703206b -Author: Dan -Date: Thu Feb 11 12:15:04 2021 -0800 - - updated docker-compose.yml to expose postgres port to local - -commit 6f3401a4bf7969e49a4ddb3bae57d84fc0485b34 -Merge: 168dc5641 766bd4510 -Author: Steve Hillier -Date: Thu Feb 11 11:09:04 2021 -0800 - - Merge pull request #1734 from bcgov/steve/ocp4-feb5 - - add migrator-cli template - -commit ef9c9a529583a3ee2f9c870487846d4d987958b8 -Author: Daine Trinidad -Date: Wed Feb 10 16:59:48 2021 -0800 - - Reset some parts of the migration - -commit 5f3e87753253d2c139ac8cddee4352697923e37c -Author: Daine Trinidad -Date: Wed Feb 10 16:45:36 2021 -0800 - - Fix some variables on some scripts, updated readme with migration checklist - And a couple of other minor fixes - -commit 766bd45102eb4ce6dbadcb11bcf8a8c7e4ccbfb1 -Author: Steve Hillier -Date: Wed Feb 10 16:30:31 2021 -0800 - - remove scripts - -commit 168dc56419849b9fc0a50ddd1ec4f8471c710c41 -Merge: ef51bdba3 e6c4e09bb -Author: Steve Hillier -Date: Wed Feb 10 16:10:25 2021 -0800 - - Merge pull request #1737 from bcgov/snyk-fix-9cd55b29804008ce9ddff69427ef680f - - [Snyk] Security upgrade cryptography from 3.2 to 3.3.2 - -commit 32587de72efd266aaf991fdf4299811b5595fe40 -Author: Daine Trinidad -Date: Wed Feb 10 15:56:43 2021 -0800 - - Add quick way to rsh to migrator pod - -commit dab1a04f1e6143d79b2171faedc80606fc6ef3b9 -Author: Daine Trinidad -Date: Wed Feb 10 15:55:53 2021 -0800 - - Merged scripts and cleanup of vars and params - -commit 62809797ace2b4eba0b5cacdd72c37fdf4246a7b -Author: Dan <78053857+danbigthink@users.noreply.github.com> -Date: Wed Feb 10 15:34:18 2021 -0800 - - Delete .python-version - -commit c15f17e0cd742a7da9a1fb85399acf90d8f9cd21 -Author: Daine Trinidad -Date: Wed Feb 10 14:59:38 2021 -0800 - - @stephenhillier's revert options code - -commit 7c1bf672beb6ae0c8de787b20d2bdd91d2ef4c34 -Merge: 52d7b6963 4d5b343ee -Author: Daine Trinidad -Date: Wed Feb 10 14:57:49 2021 -0800 - - Merge remote-tracking branch 'origin/steve/ocp4-feb5' into daine/ocp4 - -commit 52d7b6963115a63df8852303e056d2dee1c86af1 -Author: Daine Trinidad -Date: Wed Feb 10 14:55:07 2021 -0800 - - Add quick script to rsh into migrator cli - -commit a50eeb633c1a07cd535eb3e391d03a80538d9137 -Author: Daine Trinidad -Date: Wed Feb 10 14:54:40 2021 -0800 - - Make scripts re-runnable - -commit 4d5b343ee933b2888a65aa8041f686153e50d668 -Author: Steve Hillier -Date: Wed Feb 10 14:52:09 2021 -0800 - - rename files - -commit b417a37ba05a8529a0af25d7cc6b3aa6b777d30d -Author: Steve Hillier -Date: Wed Feb 10 14:49:12 2021 -0800 - - add revert options - -commit 365bb554079aa19e7a03deb5b0ef5715d9e16baf -Author: Dan -Date: Wed Feb 10 13:47:17 2021 -0800 - - changed the a href for Liner Details from perforations_fieldset to liner_details_fieldset and tested, link now works - -commit 1f770c3f553202cc98cf55c43b4af1979e3a3c8e -Merge: 60cfd8c43 ef51bdba3 -Author: Dan -Date: Wed Feb 10 13:35:45 2021 -0800 - - Merge branch 'release' of https://github.com/bcgov/gwells into origin/dan/WATER-1445 - -commit 60cfd8c433bb11fe6716620a80c87dd6699076be -Author: Dan -Date: Wed Feb 10 13:18:49 2021 -0800 - - finished reviewing and comparing submission form components with well detail to ensure we have correct units for all (well completion, liner details, well yield and others), updated unit test snap to newest - -commit 0dfda8f5ba7d3ec89f44f6cc62f909c7009b141c -Author: Daine Trinidad -Date: Wed Feb 10 12:21:42 2021 -0800 - - File naming consistency - -commit d8fc865fc5f13725063995a09b4890d4b3be1773 -Merge: 756d354b1 d7ab0904f -Author: Daine Trinidad -Date: Wed Feb 10 12:21:04 2021 -0800 - - Merge remote-tracking branch 'origin/steve/ocp4-feb5' into daine/ocp4 - -commit 756d354b12eaecd03bf0bdb9371ed95bc0f2aa22 -Author: Daine Trinidad -Date: Wed Feb 10 12:18:57 2021 -0800 - - Update migration scripts - add do_migration.sh - -commit d7ab0904fb8ce5d4ec64321901dde03e937f4468 -Author: Steve Hillier -Date: Wed Feb 10 10:41:45 2021 -0800 - - add tile server to list of routes to patch - -commit 483177d93bfe256ef48ff755c5a192a96cab57a0 -Author: Steve Hillier -Date: Wed Feb 10 10:38:04 2021 -0800 - - add usage - -commit 62f73a1c5feedf8b439b31622af20dcd14a30725 -Author: Steve Hillier -Date: Wed Feb 10 10:36:39 2021 -0800 - - script to put proxy in place - -commit a35c2d588f2798a9c383c56359158c7f00a178ce -Author: Steve Hillier -Date: Wed Feb 10 10:36:28 2021 -0800 - - move scripts into scripts folder - -commit fa46722d250fa7c1a7b08a6b1a9b921b02cc964d -Author: Dan -Date: Tue Feb 9 16:56:55 2021 -0800 - - altered filter to ensure its safe, created tests for well detail and filters - -commit bf24f50cacdeafdcd85f12002e0d7baf9f72cb9d -Author: dainetrinidad -Date: Tue Feb 9 16:29:06 2021 -0800 - - Change names from OCP3 -> Pathfinder, OCP4 -> Silver for less confusion. - Also added @stephenhillier's scaledown scripts which will be used later - -commit 8a85609b9ef95cb2cb93d16bd9a9b3df56feaa50 -Merge: f70498eaf a50b22f92 -Author: dainetrinidad -Date: Tue Feb 9 16:27:32 2021 -0800 - - Merge remote-tracking branch 'origin/steve/ocp4-feb5' into daine/ocp4 - -commit f70498eafe6dbc99ab144b6c38341f438c2322fe -Author: dainetrinidad -Date: Tue Feb 9 16:07:19 2021 -0800 - - Change pod name to '-production' instead of '-prod' - -commit a50b22f92c7e8d73309f42b5d37c24cd0fb15217 -Author: Steve Hillier -Date: Tue Feb 9 16:02:51 2021 -0800 - - fix env name - -commit 5bcb0286f675a86729c674f140715e88ad35e95c -Author: Steve Hillier -Date: Tue Feb 9 16:00:50 2021 -0800 - - add scale up and scale down scripts - -commit 3c90808f285928f5a7bd52f37b89531f94845275 -Author: dainetrinidad -Date: Tue Feb 9 14:37:36 2021 -0800 - - Update instructions and added more comments to scripts - -commit 89d7a1ffe2c0716e333bcf6d9eb75dec85b81355 -Author: Steve Hillier -Date: Tue Feb 9 11:10:26 2021 -0800 - - specify 1Gi for staging doc backup pvc - -commit b589765c89bf16118ed203ec1c19c4fce52574d6 -Author: Steve Hillier -Date: Tue Feb 9 11:08:21 2021 -0800 - - add pvc to backup - -commit a2aebd8933c5abfc5f4c04da8eb10a582c6978ce -Author: dainetrinidad -Date: Tue Feb 9 10:17:17 2021 -0800 - - Update instructions - -commit e7817533e2718d3f14a7b9577054621ecc9e561d -Author: dainetrinidad -Date: Tue Feb 9 09:39:34 2021 -0800 - - Updated migration checklist - -commit 2adbb93ca2370dbb8a2a1167139351c68c0eaedb -Author: dainetrinidad -Date: Mon Feb 8 16:54:54 2021 -0800 - - Remove unused script - -commit 6e07941b9234ca31a83dc1669cd0e2bca74e4113 -Author: dainetrinidad -Date: Mon Feb 8 16:43:04 2021 -0800 - - Change variable name - -commit 7f6c3185f82f556f0269585ab812b676a6c78530 -Author: Dan -Date: Mon Feb 8 16:37:18 2021 -0800 - - vue filters are now built into common, finished WellDetail.vue with a few exceptions, Well Completion, Liner Details and Well Yield can yield different unit types, have to finish comparing to submissions, then write unit test spec for WellDetail - -commit 670bf8daca5baf3bec21000e1ce0590853e7b277 -Author: dainetrinidad -Date: Mon Feb 8 16:37:13 2021 -0800 - - Updated dc file and migration scripts - -commit 5ac372e9adbb09cdaeac7ee16acc53933dd5a2d8 -Author: dainetrinidad -Date: Mon Feb 8 16:17:00 2021 -0800 - - DB migration scripts - -commit 96c3871346b09448b4c5673f84400a3ff1af9391 -Author: Steve Hillier -Date: Mon Feb 8 11:21:39 2021 -0800 - - change to recreate mode - -commit e6c4e09bb6a828dd969f605b5ae5d070af13d272 -Author: snyk-bot -Date: Mon Feb 8 23:54:46 2021 +0000 - - fix: app/backend/requirements.txt to reduce vulnerabilities - - - The following vulnerabilities are fixed by pinning transitive dependencies: - - https://snyk.io/vuln/SNYK-PYTHON-CRYPTOGRAPHY-1070544 - -commit fc5afb4b2b7f6f5bc0825e3d502237052c0fc8b7 -Author: Steve Hillier -Date: Mon Feb 8 15:14:56 2021 -0800 - - fix comment line - -commit ef51bdba381fcdcc323ce3daeeb67f038d8ed5dd -Merge: 82ffbc8f1 eb745aa1b -Author: Steve Hillier -Date: Mon Feb 8 14:51:04 2021 -0800 - - Merge pull request #1731 from bcgov/origin/dan/WATER-674 - - Update GroundwaterInformation.vue - -commit 4f9e02948487500bb70641c17f25a5401b756322 -Author: Steve Hillier -Date: Mon Feb 8 11:21:39 2021 -0800 - - change to recreate mode - -commit 6363683040cc452f20cd842454b372cc96243d47 -Author: dainetrinidad -Date: Fri Feb 5 18:06:51 2021 -0800 - - Some scripts to run to migrate db from ocp3 to ocp4 - -commit 7d7b69f6ca6b5d9d8ee746363da7ae829de1e7dd -Author: Dan -Date: Fri Feb 5 16:32:41 2021 -0800 - - checking in changes before weekend, most of the views/WellDetail.vue changes are done for units, still haven't got dynamic units in nor excludeZeroDecimals filter across all necessary places - -commit 70df80ebd81a518369b0751dd4ef523b9810a0f9 -Author: Steve Hillier -Date: Fri Feb 5 15:36:44 2021 -0800 - - turn on some cronjobs for ocp4 - -commit 23b515d89e0130a2bef761d1f990addd546728b4 -Author: Steve Hillier -Date: Fri Feb 5 15:02:54 2021 -0800 - - update cleanup script - -commit 10a38e6d656723bf49382d072bd0aab0795f223c -Author: Steve Hillier -Date: Fri Feb 5 11:46:37 2021 -0800 - - fix volume reference - -commit bbf26067d9f6b59ac22b107c455fac1ca1674aa8 -Author: Steve Hillier -Date: Fri Feb 5 11:44:32 2021 -0800 - - add migrator-cli template - -commit 82ffbc8f11445f58611cde8566e2800fc335e4e1 -Merge: 38218309c dd999a55f -Author: Steve Hillier -Date: Thu Feb 4 16:46:18 2021 -0800 - - Merge pull request #1732 from bcgov/steve/minio-pvc - - (OCP4) increase file storage and backup pvc sizes - -commit dd999a55f4a3fc87e4317620ef6e0b1b11e26c22 -Author: Steve Hillier -Date: Thu Feb 4 16:14:43 2021 -0800 - - change back to ReadWriteOnce - -commit e040a2cf78d737339923f680d23558364aa98a9a -Author: Steve Hillier -Date: Thu Feb 4 15:40:33 2021 -0800 - - increase file storage and backup pvc sizes - -commit 38218309cfa82aaca62d7ac172d473cacf28afb6 -Merge: 8a010b19f d98a770c1 -Author: Steve Hillier -Date: Wed Feb 3 14:23:44 2021 -0800 - - Merge pull request #1730 from bcgov/steve/licence-search-fix - - update licence status filter (well search page) - -commit eb745aa1b6d5eb5a59d67580f5eaf3afef5c1943 -Author: Dan -Date: Wed Feb 3 13:27:38 2021 -0800 - - Update GroundwaterInformation.vue - - Changed href - -commit 8a010b19f73e3f9a22dce5c4f048497b0ad92d1c -Merge: ddb3fa5d7 d72a8be7b -Author: Steve Hillier -Date: Tue Feb 2 16:11:11 2021 -0800 - - Merge pull request #1728 from bcgov/alex/minio-pvc-access - - updated pvc access mode - -commit d98a770c17f074b1f75fb72498a881e0a9c4c6a1 -Author: Steve Hillier -Date: Tue Feb 2 15:21:21 2021 -0800 - - fix use of code / description - -commit 233f5ed01bb557b88aee7e446344bbd91643c7bd -Author: Steve Hillier -Date: Tue Feb 2 13:50:59 2021 -0800 - - remove licenced_status from well model - - and convert to a property derived from the `well_licences` table - -commit 8e9fa02489fee573e081111d1b2325bb1f83ea11 -Author: Steve Hillier -Date: Tue Feb 2 13:49:57 2021 -0800 - - automated migration to increase max year - -commit 7ec0abe9a4d8945046cb08c1946a34a7e11f852e -Author: Steve Hillier -Date: Mon Feb 1 17:11:41 2021 -0800 - - fix test - -commit ddb3fa5d730adc249fb3587723b2a18a3fa59ff9 -Merge: f61beb3a6 6a820a41f -Author: Steve Hillier -Date: Mon Feb 1 16:38:04 2021 -0800 - - Merge pull request #1729 from bcgov/steve/ocp4proxy - - Add proxy for OCP3/OCP4 - -commit edac2e17352276e1a6d5dc47222232797b7fa9e3 -Author: Steve Hillier -Date: Mon Feb 1 15:23:47 2021 -0800 - - fix var reference - -commit e91613222d64f1f05fb9c56298e723998a410a83 -Author: Steve Hillier -Date: Mon Feb 1 14:52:03 2021 -0800 - - import json module - -commit 9cc2da8f03f382e4529ddbfa4e8ded8326de0eb7 -Author: Steve Hillier -Date: Mon Feb 1 14:51:49 2021 -0800 - - try loading data from json for test - -commit 6a820a41faf74879e73c80a3914ca83920218c92 -Author: Steve Hillier -Date: Mon Feb 1 14:21:58 2021 -0800 - - revert to proxy - -commit 2e203ec379d367f65d293373899369f839a316ea -Author: Steve Hillier -Date: Mon Feb 1 14:15:51 2021 -0800 - - fix list comp with wrong variable name - -commit 34c925b23c092600459c017f43795494c1c4ce8d -Author: Steve Hillier -Date: Mon Feb 1 13:36:17 2021 -0800 - - remove old comment - -commit 0095dd8fc1e55607ec829f78385bac658415022d -Author: Steve Hillier -Date: Mon Feb 1 13:36:01 2021 -0800 - - change assertions - -commit 1c03f1efefdac6b248e6293d5320e0f029267fa7 -Author: Steve Hillier -Date: Mon Feb 1 11:54:59 2021 -0800 - - lint aquifer fixtures - -commit afdd2002a0ac2ad4a2184a5bf1c940bf8eddaeb2 -Merge: c1eb920dd 33e88eea8 -Author: Steve Hillier -Date: Thu Jan 28 16:33:20 2021 -0800 - - Merge branch 'steve/ocp4proxy' of github.com:bcgov/gwells into steve/ocp4proxy - -commit c1eb920dd178514b7a6b91c393bb62b8eea17293 -Author: Steve Hillier -Date: Thu Jan 28 16:33:06 2021 -0800 - - switch to redirect - -commit 2f1afae32d261834e321351c389c52cafbf59e7a -Author: Steve Hillier -Date: Thu Jan 28 10:25:39 2021 -0800 - - add an error if an unexpected status is used - -commit 110b93b39565e86f0b86423c101e5bc6e6d07132 -Author: Steve Hillier -Date: Thu Jan 28 10:18:09 2021 -0800 - - fix licence search fixture test - -commit 1ab3c5dddbe60ed2b4326b0db2b0dec5bf08e09a -Author: Steve Hillier -Date: Wed Jan 27 16:52:30 2021 -0800 - - add test for filtering - -commit f11f3b2086439f63ea1e36dbc512cc3850124402 -Author: Steve Hillier -Date: Wed Jan 27 13:54:59 2021 -0800 - - update licence status filter - -commit 33e88eea889a05f255210ca6332378607b090cba -Author: Steve Hillier -Date: Wed Jan 27 13:13:57 2021 -0800 - - add staging and prod deployments - -commit 31b21aa64f78f39a7962746cc501d925cd639009 -Author: Steve Hillier -Date: Tue Jan 26 16:55:42 2021 -0800 - - fix replica number - -commit 590c5137c5b018d22cce79f956ce06e194718650 -Author: Steve Hillier -Date: Tue Jan 26 16:29:19 2021 -0800 - - fix image reference - -commit 50de72c0d136ab6ea96920c7e3044163d424e413 -Author: Steve Hillier -Date: Tue Jan 26 16:26:14 2021 -0800 - - add proxy to Jenkinsfile - -commit 35f6ffd18fac8ad96619f371228fc1200340a287 -Author: Steve Hillier -Date: Tue Jan 26 16:14:04 2021 -0800 - - add back host header - -commit cd7544ec1042c9139a825560583420ec8039762d -Author: Steve Hillier -Date: Tue Jan 26 15:52:58 2021 -0800 - - update image - -commit f61beb3a60e1c2d286e48d056ef9da4d62645310 -Merge: 00f74e7ea 15fd7652f -Author: Steve Hillier -Date: Tue Jan 26 15:51:28 2021 -0800 - - Merge pull request #1727 from bcgov/steve/licence-import-tests - - add tests to licence import - -commit 0795ad1cd299c9ada0bb0c382858feb0c98c7e02 -Author: Steve Hillier -Date: Tue Jan 26 15:23:14 2021 -0800 - - remove extra port - -commit 5b8c16b6286ccee49a65424212309113f64f897b -Author: Steve Hillier -Date: Tue Jan 26 14:32:03 2021 -0800 - - maintenance deployment with config - -commit d27d9eed30b5579e3dc9f106c18695d00c1f5172 -Author: Steve Hillier -Date: Tue Jan 26 13:26:06 2021 -0800 - - create maintenance template - -commit d72a8be7b0d971c43b3909efc8fdda588845967d -Author: AlexZorkin -Date: Mon Jan 25 13:39:27 2021 -0800 - - updated pvc access code - -commit 15fd7652f87e22d784887324d8129896a77a7260 -Author: Steve Hillier -Date: Fri Jan 22 15:40:51 2021 -0800 - - try f string - -commit ff75126db4e7f18db72720e2a723193ff80c57ff -Author: Steve Hillier -Date: Fri Jan 22 15:13:58 2021 -0800 - - use stdout for success msg - -commit 81b527d1e17a15dee193d7f82aa7a79f58fa2ee1 -Author: Steve Hillier -Date: Fri Jan 22 14:33:44 2021 -0800 - - try some logging - -commit e2cc73927276b8ff847577173f6356aef0001141 -Author: Steve Hillier -Date: Fri Jan 22 14:16:34 2021 -0800 - - add fixtures to ensure there are wells for test - -commit f9476fb94a1a00a54e3109737e380bd0e7b949dd -Author: Steve Hillier -Date: Fri Jan 22 13:31:14 2021 -0800 - - fixes for test - -commit 11ab638e74a8098d0c0718b8c9d4ad126960be86 -Author: Steve Hillier -Date: Wed Jan 20 15:05:11 2021 -0800 - - add tests to licence import - -commit 00f74e7ea8c4400e4c3c2cbcd88998b9afaf4a73 -Merge: eabaf832c e569daf6f -Author: Steve Hillier -Date: Tue Jan 19 09:06:45 2021 -0800 - - Merge pull request #1726 from bcgov/steve/well-licences-3 - - (Licence import) check for well before adding aquifer to well - -commit eabaf832ce846adedac3a23162f2ec983b54a9f0 -Merge: 2098bdaf9 a428587d9 -Author: Steve Hillier -Date: Tue Jan 19 09:06:16 2021 -0800 - - Merge pull request #1725 from bcgov/steve/updateimg - - update ubi8/python-38 image tag - -commit e569daf6f831c1852fe752105e6cd5325b06ff3d -Author: Steve Hillier -Date: Mon Jan 18 16:20:10 2021 -0800 - - check for well before adding aquifer to well - -commit 2098bdaf92159f13f6e49b671e260c57738ce5bb -Merge: b15f14e5a d5509a9e3 -Author: Steve Hillier -Date: Mon Jan 18 15:46:57 2021 -0800 - - Merge pull request #1724 from bcgov/steve/well-licences-2 - - better handling of non-aquifer sources - -commit d5509a9e3f0dceefd38de0f4dc3fbcd81e9f2230 -Author: Steve Hillier -Date: Mon Jan 18 15:23:24 2021 -0800 - - replace random with mod - - leave every other dev fixture unassociated - -commit b15f14e5a34b73f86fbb2207ea1dd5b1a5dd426b -Merge: c78eebf55 7af36d041 -Author: Steve Hillier -Date: Thu Jan 14 16:51:23 2021 -0800 - - Merge pull request #1722 from bcgov/dependabot/npm_and_yarn/app/frontend/axios-0.21.1 - - Bump axios from 0.19.1 to 0.21.1 in /app/frontend - -commit d9e74273154642749ad2453fefbbd144b2ffd193 -Author: Steve Hillier -Date: Wed Jan 13 15:33:55 2021 -0800 - - licence: random aquifer association for testing - -commit a428587d9a2ba832a6b7aacfe949c35bab4f0621 -Author: Steve Hillier -Date: Wed Jan 13 14:00:23 2021 -0800 - - update image tag - -commit 388916aeb617213be45487e6236bf9611ab26f97 -Author: Steve Hillier -Date: Wed Jan 13 13:56:39 2021 -0800 - - more robust handling of non-aquifer sources - -commit c78eebf55750f961a670cc0ced9528af87c6404a -Merge: 29191c5c0 e6f30c8e3 -Author: Steve Hillier -Date: Tue Jan 12 13:08:11 2021 -0800 - - Merge pull request #1720 from bcgov/steve/well-licences - - Ensure all licences for wells are imported - -commit e6f30c8e332a80cd4bd637ba0dd11a1893b9af95 -Author: Steve Hillier -Date: Thu Jan 7 14:58:14 2021 -0800 - - clean up comments - -commit 29191c5c04e85c8766ffbc1c519cd3d80e87f268 -Merge: 96f6166f1 7bb6caf1c -Author: Steve Hillier -Date: Thu Jan 7 14:42:01 2021 -0800 - - Merge pull request #1723 from bcgov/stephenhillier-patch-2 - - add project lifecycle badge (stable badge) - -commit 7bb6caf1ca52f560533dcc8d931480ac056effb1 -Author: Steve Hillier -Date: Thu Jan 7 14:14:27 2021 -0800 - - add project lifecycle badge - -commit 7af36d041fbc8cc5014781dc2c58fd9c18508e27 -Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -Date: Tue Jan 5 01:25:55 2021 +0000 - - Bump axios from 0.19.1 to 0.21.1 in /app/frontend - - Bumps [axios](https://github.com/axios/axios) from 0.19.1 to 0.21.1. - - [Release notes](https://github.com/axios/axios/releases) - - [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md) - - [Commits](https://github.com/axios/axios/compare/0.19.1...v0.21.1) - - Signed-off-by: dependabot[bot] - -commit d9a60fd052661f664afd1ca3fb402681914d7e48 -Merge: 99bd43b12 d89a23a34 -Author: Steve Hillier -Date: Mon Jan 4 14:31:06 2021 -0800 - - Merge branch 'steve/well-licences' of github.com:bcgov/gwells into steve/well-licences - -commit 99bd43b1281bc4e579e31a0e1a73667d6943810e -Author: Steve Hillier -Date: Mon Jan 4 14:30:57 2021 -0800 - - fix db credentials for dev - -commit d89a23a34fa25b74d24c37c9e769757bd8023e8a -Author: Steve Hillier -Date: Wed Dec 23 13:02:09 2020 -0800 - - get licensed status from imported licences - -commit 32979a099e55db43965d6ed841451c32b6d01aee -Author: Steve Hillier -Date: Tue Dec 22 13:46:58 2020 -0800 - - import all licences with a well tag - - script previously only imported licences if it had an aquifer ID - -commit 1b66539d6e655763ecaf0c1536b659689a34379a -Author: Steve Hillier -Date: Tue Dec 22 11:44:44 2020 -0800 - - (wip) start adjusting import script - - ensure licences are up to date for wells - -commit 96f6166f138bf4eaed9c65419b878a3efab89730 -Merge: eea2ffdbf e763a99c4 -Author: Steve Hillier -Date: Thu Dec 10 13:45:25 2020 -0800 - - Merge pull request #1718 from bcgov/steve/ocp4-fixes6 - - fix another missing comma - -commit e763a99c4101a19751f4d7066f7672899b76056d -Author: Steve Hillier -Date: Thu Dec 10 11:42:13 2020 -0800 - - fix another missing comma - -commit eea2ffdbf4ae4cb6fe493f351471c310f1b20e5d -Merge: ead6819b1 03acfa74c -Author: Steve Hillier -Date: Thu Dec 10 09:51:07 2020 -0800 - - Merge pull request #1717 from bcgov/steve/ocp4-fixes5 - - fix missing comma - -commit 03acfa74c1e3a4ee3398234a119ea9c56fd2ff96 -Author: Steve Hillier -Date: Wed Dec 9 14:20:34 2020 -0800 - - fix missing comma - -commit ead6819b1467db8f55181440b72cf6646e8db60f -Merge: 796e9f697 0f03d78ed -Author: Steve Hillier -Date: Wed Dec 9 14:11:49 2020 -0800 - - Merge pull request #1716 from bcgov/steve/ocp4-fixes4 - - fixes for OCP4 (config references) - -commit 0f03d78ed5d9ab5545db2dc9cce60a0283a91178 -Author: Steve Hillier -Date: Wed Dec 9 09:08:01 2020 -0800 - - fix secret references - -commit 765cf77609da24ebfb93ed1077c5eea66a6cfd59 -Author: Steve Hillier -Date: Tue Dec 8 11:27:12 2020 -0800 - - fix image ref for documents backup - -commit 796e9f697ac990beb1cc9822d5b85bc09d84e88f -Merge: 0649aa23f 0b8d33673 -Author: Steve Hillier -Date: Mon Dec 7 14:12:35 2020 -0800 - - Merge pull request #1715 from bcgov/steve/ocp4-fixes3 - - add minio routes - -commit 0b8d33673b91ce0ffdc25e4d2380a86808e14c70 -Author: Steve Hillier -Date: Mon Dec 7 13:41:48 2020 -0800 - - fix labels - -commit a8c13e93c85f11e54302765f77213bdb48c95b1d -Author: Steve Hillier -Date: Mon Dec 7 13:40:32 2020 -0800 - - fix namespace reference - -commit fa97ef5e471141f006f7f43b818551f0ea3256a9 -Author: Steve Hillier -Date: Mon Dec 7 13:25:05 2020 -0800 - - add selector to minio service - -commit 0b3dd267b1a3d014096cafafe30041ab61848fbf -Author: Steve Hillier -Date: Fri Dec 4 16:35:19 2020 -0800 - - add https redirect - -commit 8116ec883250df55429301c84d775f453faa27a0 -Author: Steve Hillier -Date: Fri Dec 4 16:33:21 2020 -0800 - - delete generated route - -commit 6fc866dcf71a01ae7540937b605e334b8dbccc8c -Author: Steve Hillier -Date: Fri Dec 4 16:32:07 2020 -0800 - - add minio routes - -commit 0649aa23f282e186474ea55b9ac48167def21243 -Merge: 66cb12d2f 155b6ca4c -Author: Steve Hillier -Date: Fri Dec 4 14:33:57 2020 -0800 - - Merge pull request #1714 from bcgov/steve/ocp4-fixes2 - - more fixes for OCP4 (cron jobs) - -commit 66cb12d2fa127828fc5de18737f86d02299f0757 -Merge: ceefc3f48 da71100e6 -Author: Steve Hillier -Date: Fri Dec 4 13:32:50 2020 -0800 - - Merge pull request #1712 from bcgov/snyk-fix-e3702b2bfc47d15cee19461cf71363b4 - - [Snyk] Security upgrade lxml from 4.2.5 to 4.6.2 - -commit 155b6ca4c88cdd38dce17e20c690bddc2deaf037 -Author: Steve Hillier -Date: Fri Dec 4 10:51:10 2020 -0800 - - more fixes for OCP4 (cron jobs) - -commit ceefc3f48d8922233e16dd8f7386eefa38321fb3 -Merge: b5f6739d6 00fcf13f7 -Author: Steve Hillier -Date: Wed Dec 2 16:36:30 2020 -0800 - - Merge pull request #1713 from bcgov/steve/ocp4-fixes - - Fixes for staging OCP4 - -commit 00fcf13f7bad548e5a92169eb6a7b01ffda2ad2c -Author: Steve Hillier -Date: Wed Dec 2 16:01:27 2020 -0800 - - update minio backup container image - -commit c7e0ebabe5ca83873c74dc372f0b01c851107389 -Author: Steve Hillier -Date: Wed Dec 2 15:56:10 2020 -0800 - - changes for GWELLS ocp4 staging - -commit bddaa64f793538670131bf3cf211d182bca239ac -Author: Steve Hillier -Date: Tue Dec 1 17:11:00 2020 -0800 - - fixes for staging deployment - -commit da71100e615792e43da989f56ed1a721ac8d348e -Author: snyk-bot -Date: Tue Dec 1 23:52:12 2020 +0000 - - fix: app/backend/requirements.txt to reduce vulnerabilities - - - The following vulnerabilities are fixed by pinning transitive dependencies: - - https://snyk.io/vuln/SNYK-PYTHON-LXML-1047473 - - https://snyk.io/vuln/SNYK-PYTHON-LXML-1047474 - -commit b5f6739d6ca953bd453899bb26d3748e94c83966 -Merge: 914efe0f5 b44c5b926 -Author: Steve Hillier -Date: Tue Dec 1 14:49:28 2020 -0800 - - Merge pull request #1710 from bcgov/oc4 - - Openshift 4 config changes - -commit b44c5b926311684b291ee00b49a235dda94d930f -Author: Steve Hillier -Date: Tue Dec 1 14:27:29 2020 -0800 - - delete extra docs file - -commit 57886f326c7edee7e876d2555cb2ebb4b192559d -Author: Steve Hillier -Date: Tue Dec 1 14:23:38 2020 -0800 - - add comment to gunicorn cfg - -commit 13790d75ae85c1521ae490727b5a4008e7421055 -Author: Steve Hillier -Date: Mon Nov 30 16:01:58 2020 -0800 - - update README - -commit f43c087d3d048a62ae8be8d8c3aaa24c4c268d18 -Author: Steve Hillier -Date: Mon Nov 30 15:24:20 2020 -0800 - - get started on backup config - -commit d84a24e4de0da3e19cfbad5948519f460f80e264 -Author: Steve Hillier -Date: Thu Nov 26 14:06:00 2020 -0800 - - updates for staging/prod minio - -commit 1ecf1899e52fe766d0ea4a678cc6a9fc815b4ece -Author: Steve Hillier -Date: Thu Nov 26 10:32:10 2020 -0800 - - split up ocp4 and ocp3 gunicorn configs - -commit 346743e3ddef292cf782bca536c569ba81e73544 -Author: Steve Hillier -Date: Thu Nov 26 10:26:12 2020 -0800 - - revert changes for oc3 postgres template - -commit b627b7ae0b3a0d487f4cbec278079f628b41c583 -Author: Steve Hillier -Date: Thu Nov 26 10:24:54 2020 -0800 - - revert changes for oc 3 template - -commit 4d16fc4261318f20f68c6af1ca1dbeef145a987f -Author: Steve Hillier -Date: Wed Nov 25 16:03:46 2020 -0800 - - update minio manifest (command and args) - -commit d3d02015d6a3bbb2e3a36bd7d598c21c69caeba0 -Author: Steve Hillier -Date: Wed Nov 25 15:53:10 2020 -0800 - - fix minio dockerfile - -commit ee93bd2465ee8d37f7ae319ca802706929d32ded -Author: Steve Hillier -Date: Wed Nov 25 14:08:06 2020 -0800 - - fix minio mount path - -commit 30680aa7a7e34d9748489be0f789e611376b1a38 -Author: Steve Hillier -Date: Wed Nov 25 13:56:52 2020 -0800 - - update minio config - -commit 2b3f82989d1276355eb4aef9a810e8e168214b3c -Author: Steve Hillier -Date: Wed Nov 25 12:57:04 2020 -0800 - - fix namespace ref - -commit 75c33ebd4e181d5fe6056637ece3e3041ec924f0 -Author: Steve Hillier -Date: Wed Nov 25 12:55:59 2020 -0800 - - fix image namespace - -commit 5d80cfeb0741dccda6f13b1583f19c9011aab19b -Author: Steve Hillier -Date: Wed Nov 25 11:52:16 2020 -0800 - - fix minio template - -commit a9d14e6480479c48d51d42cbb4bb80a2c18c4789 -Author: Steve Hillier -Date: Wed Nov 25 09:33:00 2020 -0800 - - fix minio names - -commit d950fba33ee05600a691b37cf6aa3302b4805931 -Author: Steve Hillier -Date: Tue Nov 24 17:31:23 2020 -0800 - - fix minio deployment name - -commit 98f79bc0c89e67427ab92eca4db7ce39af8ac4ad -Author: Steve Hillier -Date: Tue Nov 24 17:21:13 2020 -0800 - - add minio deployment to right ocp4 jenkinsfile - -commit 39a5490048c41238bca3c89e7d4c211771f63a66 -Author: Steve Hillier -Date: Tue Nov 24 17:00:20 2020 -0800 - - add Minio to dev - -commit b419e8db9c50555aa8a62339d032ec335a9fd95c -Author: Steve Hillier -Date: Tue Nov 24 16:36:40 2020 -0800 - - update to minio buildconfig - -commit a30de5539e5d9a7c56f1e489e54608b84bb30647 -Author: Steve Hillier -Date: Tue Nov 24 15:40:00 2020 -0800 - - split Jenkinsfiles - -commit 8a472d1b02028eeb3eb4373080cd96156f5588af -Author: Steve Hillier -Date: Tue Nov 24 14:54:39 2020 -0800 - - add noinput to django test cmd - -commit 50be0daef309a0a3c545411529fc543cb9a1637c -Author: Steve Hillier -Date: Tue Nov 24 14:43:01 2020 -0800 - - temporarily skip backup for ocp4 - -commit f29074ba5a2c6f77a50bd73ccb8a93272b9de258 -Author: Steve Hillier -Date: Tue Nov 24 14:38:56 2020 -0800 - - skip api tests on ocp4 - -commit a4b3bbe392bcd437248bd40e778cbb1f54762237 -Author: Steve Hillier -Date: Tue Nov 24 14:20:05 2020 -0800 - - fix env var ref - -commit 024d821e27d68f42f77a8d7e0ec5ee9f6c420369 -Author: Steve Hillier -Date: Tue Nov 24 14:16:44 2020 -0800 - - fix APP_ROOT references - -commit 874bc80fd9ee4c967b64af474844f76147e14fb5 -Author: Steve Hillier -Date: Tue Nov 24 14:06:54 2020 -0800 - - rework manage.py command - -commit 6c45efb2db0181f36097504a8b88ddc7e111ddef -Author: Steve Hillier -Date: Tue Nov 24 13:55:24 2020 -0800 - - try using oc cmd instead of openshift.exec - -commit 6a88baf0f6e7858a7c5d2c9356aad8eec2f7cae6 -Author: Steve Hillier -Date: Tue Nov 24 12:54:15 2020 -0800 - - try to move pipeline along - -commit 76a08122baa467fb52d94633f573b134cbc19b09 -Author: Steve Hillier -Date: Mon Nov 23 16:25:28 2020 -0800 - - update tileserv env vars - -commit 2ed92670a2fa1cf61f8dff3dcc4c5c7daf2e3851 -Author: Steve Hillier -Date: Mon Nov 23 16:07:02 2020 -0800 - - try without chdir - -commit c32f0aebf31d18af25cf65adc7bfb6178970a6a5 -Author: Steve Hillier -Date: Mon Nov 23 15:54:27 2020 -0800 - - fix backend dir - -commit 3a5f843037c525f3a8083f8821d2f3b811619299 -Author: Steve Hillier -Date: Mon Nov 23 15:43:01 2020 -0800 - - use new domain - -commit 06fea67cdf45c89fd52122649d335d8758c0b6c7 -Author: Steve Hillier -Date: Mon Nov 23 15:26:18 2020 -0800 - - fix substitution - -commit 47bca730a62b64598c1c6cc940162092a8b22226 -Author: Steve Hillier -Date: Mon Nov 23 15:16:51 2020 -0800 - - fix dir - -commit d488e78cc712ce7ce94e4a4aab06a12064b6bb5b -Author: Steve Hillier -Date: Mon Nov 23 15:06:16 2020 -0800 - - use app root - -commit bb8a75fa14d5ecc47edd3309322366f5d499fb49 -Author: Steve Hillier -Date: Mon Nov 23 15:05:27 2020 -0800 - - changes to script dirs - -commit 955ad26f8ccb87cd566e90d8aba9e42c4e7bc581 -Author: Steve Hillier -Date: Mon Nov 23 14:58:21 2020 -0800 - - add debug msgs - -commit e4ded768a2bbba651d3ec75c5ccb59c3d0a938c6 -Author: Steve Hillier -Date: Mon Nov 23 14:41:57 2020 -0800 - - update other script for APP_ROOT - -commit e69139dccb5b29d148e6e8cbcb7044455a57b335 -Author: Steve Hillier -Date: Mon Nov 23 14:41:28 2020 -0800 - - test using APP_ROOT again - -commit 7f51b28f24b443b41079644d5650bbf2a0281a76 -Author: Steve Hillier -Date: Mon Nov 23 14:36:18 2020 -0800 - - changes to deploy script - -commit 6c8d85861bd15e37817c8b996ce013c45e504834 -Author: Steve Hillier -Date: Mon Nov 23 14:25:33 2020 -0800 - - test changes to deploy script - -commit 3772b8777c906d989643edd48b1bced82945ee69 -Author: Steve Hillier -Date: Mon Nov 23 13:36:49 2020 -0800 - - try referring to app dir directly - -commit b95b16147b537007d7da8245ad3334b5519ea39d -Author: Steve Hillier -Date: Mon Nov 23 13:06:57 2020 -0800 - - fix secret ref - -commit fb0e38d147590b036e0abd7490749b380dacea53 -Author: Steve Hillier -Date: Mon Nov 23 12:57:40 2020 -0800 - - update postgres dc to use new credentials - -commit d4f2f6724014d882c49ce9c2e9128063574f0724 -Author: Steve Hillier -Date: Mon Nov 23 12:05:04 2020 -0800 - - further increase limits - -commit ae6931ea170f25629de3ad93e3e54994c2481b18 -Author: Steve Hillier -Date: Mon Nov 23 11:49:20 2020 -0800 - - increase resources for build pod - -commit c2e50f3f20159df462288d0898d0be491d268ae9 -Author: Steve Hillier -Date: Mon Nov 23 11:47:21 2020 -0800 - - add documentation - -commit c2cd4f83e68b145239a1f136e9155ab5a2de5a87 -Author: Steve Hillier -Date: Mon Nov 23 11:35:06 2020 -0800 - - update bc - -commit ad4157fa89e79995ffb55e725e05b1dc223cd7d7 -Author: Steve Hillier -Date: Mon Nov 23 11:29:11 2020 -0800 - - try home instead of app root - -commit a38965674d14ea9595edcebf484ce9ba3e4b1e26 -Author: Steve Hillier -Date: Mon Nov 23 11:24:50 2020 -0800 - - change base image version - -commit 051d0cba4d62907aee79c2a787ab37b5f45225f0 -Author: Steve Hillier -Date: Mon Nov 23 09:58:36 2020 -0800 - - update pg references - -commit cf7f00f5bbeece8c1843c6021994375a3e35430c -Author: Steve Hillier -Date: Mon Nov 23 09:19:17 2020 -0800 - - remove outdated reference - -commit 98c8d60980d8ce775f9f9e74e9f79df226d042ec -Author: Steve Hillier -Date: Mon Nov 23 08:55:33 2020 -0800 - - fix ref to imagestream - -commit 392ddc911741abc5c178374092f516894479b482 -Author: Steve Hillier -Date: Thu Nov 19 17:16:14 2020 -0800 - - switch env var check to str - -commit c8b1fdecc3eb0eff29f894380cc96d5cc413450d -Author: Steve Hillier -Date: Thu Nov 19 16:58:11 2020 -0800 - - updates to template (app root folders) - -commit 6ef6944c9579e6c08b4523eaca189e73a848fc2d -Author: Steve Hillier -Date: Thu Nov 19 16:39:53 2020 -0800 - - add debug text - -commit 042ee696ef9732e0183c709163fa1a3a03894ed4 -Author: Steve Hillier -Date: Thu Nov 19 16:07:31 2020 -0800 - - add debug text - -commit 3bd19ce2b41c72b4eb8a2c8e618181630732454a -Author: Steve Hillier -Date: Thu Nov 19 15:58:50 2020 -0800 - - fix ref - -commit e4c93582970dbb4751234d1b6fd5275cc16069fd -Author: Steve Hillier -Date: Thu Nov 19 15:23:28 2020 -0800 - - add OCP_PLATFORM env var - -commit ceb40ca5c3548b149a2320ad0a1960b0d90aed6d -Author: Steve Hillier -Date: Thu Nov 19 15:09:31 2020 -0800 - - start splitting up templates - -commit a8c9dc11b5e562e0b516278ece00c2acf178d60d -Author: Steve Hillier -Date: Thu Nov 19 09:21:14 2020 -0800 - - use different db image for db check - -commit 8ac7b97ec75fda14869a0b161a845fcc11bac35e -Author: Steve Hillier -Date: Wed Nov 18 17:03:16 2020 -0800 - - try removing map keys - -commit 375df8070d425cac8fec5c59f83959d4f0f74923 -Author: Steve Hillier -Date: Wed Nov 18 16:54:12 2020 -0800 - - try different time format - -commit 807293ac4441c44d3666d8ffccf309e2b18693b6 -Author: Steve Hillier -Date: Wed Nov 18 16:45:23 2020 -0800 - - try different time zero value - -commit 4af6056696d388d7f03d045622b7fb5727e7f04f -Author: Steve Hillier -Date: Wed Nov 18 16:40:01 2020 -0800 - - try leaving annotations in place - -commit 18f48b72f4b1df0b0fc0b29551356b2ecb3bdc1d -Author: Steve Hillier -Date: Wed Nov 18 16:33:21 2020 -0800 - - try different nil value - -commit ae1dd3b57759576807eeec5ee02e85866764216b -Author: Steve Hillier -Date: Wed Nov 18 16:26:28 2020 -0800 - - try removing metadata manually - -commit 88850e8a68f610fce012b9d80ae342d39b3bf7bf -Author: Steve Hillier -Date: Wed Nov 18 13:58:18 2020 -0800 - - try without unused secret - -commit 6ebaf6a7d7eaacba220303e4315302ee297d856a -Author: Steve Hillier -Date: Wed Nov 18 13:27:55 2020 -0800 - - updates for running on ocp4 - -commit dca04ed7b80935e7a0654ef8815f9cb5285c784f -Author: Steve Hillier -Date: Tue Nov 17 12:53:40 2020 -0800 - - updates to Jenkins for ocp4 - -commit 0b8f4e7dde5a5953c55a7f78a5b17c44b1001d5e -Author: Steve Hillier -Date: Fri Nov 13 10:18:46 2020 -0800 - - try accessing url - -commit ae416f297c4a4bc3496bb37ddb31d2e46d7f114e -Author: Steve Hillier -Date: Fri Nov 13 10:06:44 2020 -0800 - - try without new keyword - -commit 21c9e44156a73bf54c44483def16acbc2c88bf65 -Author: Steve Hillier -Date: Thu Nov 5 13:52:42 2020 -0800 - - update minio and jenkins manifests - -commit 914efe0f574699cc301aa3fa8b5f3773de61514b -Merge: 41c446a45 501871897 -Author: Daine Trinidad -Date: Thu Oct 29 11:31:35 2020 -0700 - - Merge pull request #1707 from bcgov/dependabot/pip/app/cryptography-3.2 - - Bump cryptography from 2.3.1 to 3.2 in /app - -commit 501871897a3cb3dd9f884307ec6e1516883d4577 -Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -Date: Tue Oct 27 21:14:34 2020 +0000 - - Bump cryptography from 2.3.1 to 3.2 in /app - - Bumps [cryptography](https://github.com/pyca/cryptography) from 2.3.1 to 3.2. - - [Release notes](https://github.com/pyca/cryptography/releases) - - [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst) - - [Commits](https://github.com/pyca/cryptography/compare/2.3.1...3.2) - - Signed-off-by: dependabot[bot] - -commit a189d0c47da9815bee52f9c9a9e28961323f0e9a -Merge: 3dc9772aa 41c446a45 -Author: Daine Trinidad -Date: Tue Oct 27 13:15:32 2020 -0700 - - Merge pull request #1703 from bcgov/release - - Release - -commit 41c446a4587e282c842ed7282d65a605afbe5187 -Merge: cd2ccf68b 03ae5d445 -Author: Daine Trinidad -Date: Mon Oct 26 19:19:18 2020 -0700 - - Merge pull request #1705 from bcgov/daine/updatedockerimage - - Update pgtileserve image - -commit cd2ccf68b783672b19d8a69fcc21dafd120a8cef -Merge: 020aff3b1 8b7488778 -Author: Daine Trinidad -Date: Mon Oct 26 19:18:57 2020 -0700 - - Merge pull request #1706 from bcgov/daine/fix-development-methods - - Fix Development methods - -commit 8b74887789ffe6625745cdd049a634a62eea2aa5 -Author: daine -Date: Mon Oct 26 15:44:17 2020 -0700 - - Remove some code duplication for the serializer - -commit 76534dc0765662fe0f312302a70078e355d5c8d7 -Author: daine -Date: Mon Oct 26 15:03:01 2020 -0700 - - Also fixed Yield Estimation Method - display proper description - -commit 395107b2bd767cd0e288bbfb90c816a7eff65190 -Author: daine -Date: Mon Oct 26 14:56:26 2020 -0700 - - Added new serializer to handle multiple values for development methods - -commit 416548aad98864754c2e358fe268ed56792b1af6 -Author: daine -Date: Mon Oct 26 12:59:46 2020 -0700 - - Change SSO for tests and dev - -commit 03ae5d445aabda8bebd542d54c14e7c96553a9c1 -Author: daine -Date: Mon Oct 26 11:15:48 2020 -0700 - - Update docker image for pgtileserve to latest - -commit 020aff3b13bea4fc518c3646557765108c2a1873 -Merge: fd44264f5 e12e4d356 -Author: Steve Hillier -Date: Tue Oct 20 08:00:03 2020 -0700 - - Merge pull request #1704 from bcgov/snyk-fix-c876e05d67d919ac55e49b452ad795a9 - - [Snyk] Security upgrade chart.js from 2.8.0 to 2.9.4 - -commit e12e4d356b8168982d9bcdeb991cc958a0baea08 -Author: snyk-bot -Date: Tue Oct 20 05:45:06 2020 +0000 - - fix: app/frontend/package.json & app/frontend/package-lock.json to reduce vulnerabilities - - The following vulnerabilities are fixed with an upgrade: - - https://snyk.io/vuln/SNYK-JS-CHARTJS-1018716 - -commit fd44264f594bc4754b3ffcbc908bb3ecbdda7123 -Merge: b144d2aaf c748b3dd0 -Author: Steve Hillier -Date: Tue Oct 6 12:49:53 2020 -0700 - - Merge pull request #1701 from bcgov/steve/swl_before_test - - fix SWL before test display - -commit c748b3dd01f488d4fbaaeb451af962dd6fd74429 -Author: Steve Hillier -Date: Thu Sep 24 11:14:57 2020 -0700 - - fix SWL before test display - -commit 3dc9772aa6b1522ffea79cdc9a040ed366c69c04 -Merge: a1b69b527 b144d2aaf -Author: Steve Hillier -Date: Thu Sep 24 11:13:07 2020 -0700 - - Merge pull request #1698 from bcgov/release - - Release - -commit b144d2aaf6b841dec2e397dcf092dfbf43aa9678 -Merge: e36eec202 8b88179aa -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Sep 15 09:01:06 2020 -0700 - - Merge pull request #1699 from bcgov/alex/intendedwateruse - - intended water use updates migration - -commit 8b88179aa9c3761161fb3358db5fd7a2679cfb40 -Author: AlexZorkin -Date: Fri Sep 11 13:06:50 2020 -0700 - - intended water updates migration - -commit e36eec2021139d739a497b03f7c0af6ae3f69574 -Merge: 52495bfda 8740b4543 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Sep 9 16:38:38 2020 -0700 - - Merge pull request #1696 from bcgov/alex/watersupplycodeupdate - - NA to UNK Intended Water Use on Water Supply Wells Migration - -commit 52495bfda67e471d2da134d60e2e413dd04ee435 -Merge: dcc435fb7 d4086b3e1 -Author: Steve Hillier -Date: Wed Sep 9 10:43:15 2020 -0700 - - Merge pull request #1697 from bcgov/steve/aquifer-intersect-null-geom - - well/aquifer intersect: handle case when aquifer has null geom - -commit d4086b3e1dc14bad9d5b9349b52b3599e602c2b7 -Author: Steve Hillier -Date: Tue Sep 8 17:11:04 2020 -0700 - - well/aquifer intersect: handle null geom - -commit 8740b45432a8cedda31e821d9380fd6b2a893777 -Author: AlexZorkin -Date: Thu Aug 27 09:40:29 2020 -0700 - - added migration to update wells with water supply and NA intended use to Unknown - -commit a1b69b52709a09b4e1e01d7077d23e8e81696dcf -Merge: bcabc6831 dcc435fb7 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Aug 18 14:45:02 2020 -0700 - - Merge pull request #1695 from bcgov/release - - Releasing Drainage/Dewatering changes, and Well Summary Back Fix - -commit dcc435fb78675a070d6f10e2ad894d966a3c7f1b -Merge: 37d5bb804 34ad3c112 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Aug 18 13:15:34 2020 -0700 - - Merge pull request #1694 from bcgov/alex/welleditback - - Fix on Well Edit Back - -commit 34ad3c11224086bb0a54e907eb9bfb160f3a33f1 -Author: AlexZorkin -Date: Mon Aug 17 13:35:29 2020 -0700 - - fixture change - -commit 2f03df64350e57a05c54c73a7a0549df92c4e23c -Author: AlexZorkin -Date: Mon Aug 17 12:24:24 2020 -0700 - - reset well info on successful well edit - -commit 37d5bb804f373e3cea5feb115cd66e894fdfa164 -Merge: 1004f52cd 0e8ab3e55 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Aug 5 11:50:00 2020 -0700 - - Merge pull request #1692 from bcgov/alex/drainagewells - - migrations to update well class code - -commit 0e8ab3e55b99a4183ad6ff608dfa46e7dfc6f7e0 -Author: AlexZorkin -Date: Thu Jul 30 18:07:29 2020 -0700 - - date fix - -commit e51df126277ef18a7a49ac8d1d20137455ac00f0 -Author: AlexZorkin -Date: Thu Jul 30 17:57:02 2020 -0700 - - code table update - -commit c82d73a150a131338e14e48bb0eb8d568b90853f -Author: AlexZorkin -Date: Wed Jul 29 23:03:49 2020 -0700 - - migrations to update well class code - -commit bcabc68318f95f0d7e183b0f03b8bbca8f3dd89c -Merge: 3fec8e79b 1004f52cd -Author: Steve Hillier -Date: Wed Jul 22 16:48:49 2020 -0700 - - Merge pull request #1690 from bcgov/release - - Release - -commit 1004f52cdc98a2fc63dc7e01ae078686dc21d01d -Merge: 75cbb0efa 8e955b989 -Author: Séamus O'Connor -Date: Fri Jul 3 14:48:55 2020 -0700 - - Merge pull request #1691 from bcgov/313-show-casing-drive-shoe-status-on-preview - - Shows drive shoe status on submission preview - -commit 8e955b989f012c720bb4396afd8064060480dd0c -Author: Séamus O'Connor -Date: Fri Jul 3 13:46:02 2020 -0700 - - Shows drive shoe status on submission preview - -commit 75cbb0efa143082e1017ec9959d9a803c39c01cf -Merge: 9d08cd6a8 d75cd5059 -Author: Séamus O'Connor -Date: Fri Jul 3 10:26:04 2020 -0700 - - Merge pull request #1688 from bcgov/507-consolidate-aquifer-material-categories-in-geojson - - Consolidates aquifer material categories in GeoJSON - -commit 9d08cd6a820c0e0dacdc4660f3fd73351d876627 -Merge: 2a5a80efc 76681cef8 -Author: Séamus O'Connor -Date: Fri Jul 3 09:45:00 2020 -0700 - - Merge pull request #1689 from bcgov/20-fix-intended-water-use-dropdown - - Fix intended water use dropdown - -commit 76681cef8b075dded85752e7bb7285b7bd7a4a7d -Author: Séamus O'Connor -Date: Fri Jul 3 08:43:30 2020 -0700 - - Fixes tests by using await instead of nextTick callback - -commit b968160fceffb57997b78a6e26f29dc3457c32b5 -Author: Séamus O'Connor -Date: Fri Jul 3 07:50:50 2020 -0700 - - Allows user to change conflicting intended water use in dropdown - -commit 3fec8e79b4afab9a9722081105c54c4a5cf194b1 -Merge: 9b92cbd05 2a5a80efc -Author: Steve Hillier -Date: Thu Jul 2 15:31:53 2020 -0700 - - Merge pull request #1685 from bcgov/release - - Release - -commit d75cd50594de90288567fb4368301bb1fa5f7280 -Author: Séamus O'Connor -Date: Thu Jul 2 09:42:50 2020 -0700 - - Consolidates aquifer material categories only in GeoJSON - -commit 2a5a80efc549a1a301c9314ab275d9b66b580010 -Merge: 78b16c251 2c1c110b3 -Author: Séamus O'Connor -Date: Tue Jun 30 13:25:14 2020 -0700 - - Merge pull request #1686 from bcgov/1285-remove-default-h-coordinate-acquisition-code - - Removes default 'H' from ActivitySubmission's coordinate_acquisition_code - -commit 78b16c251df5338b3c4e0dd7984898f831441a43 -Merge: a26e292e4 6c21d30ab -Author: Séamus O'Connor -Date: Tue Jun 30 11:24:21 2020 -0700 - - Merge pull request #1687 from bcgov/20-fix-migrations - - Fixes migration order - -commit 2c1c110b32ab1859d36b0e5fadca94f281269e66 -Author: Séamus O'Connor -Date: Tue Jun 30 11:13:43 2020 -0700 - - Fixes migrations - -commit b26636c09ee6505c5cd85554025540e7378999ce -Merge: a8ba7349f 6c21d30ab -Author: Séamus O'Connor -Date: Tue Jun 30 09:42:54 2020 -0700 - - Merge branch '20-fix-migrations' into 1285-remove-default-h-coordinate-acquisition-code - -commit 6c21d30ab4035798f778d7f01aa7fa2061a36f1d -Author: Séamus O'Connor -Date: Tue Jun 30 09:37:17 2020 -0700 - - Fixes migration order - -commit a26e292e4e36a2161e80f19773535129a5063bf1 -Merge: acdc3d121 2d2b65ee2 -Author: Séamus O'Connor -Date: Tue Jun 30 09:10:37 2020 -0700 - - Merge pull request #1684 from bcgov/20-migrate-well-class-nulls - - Cleanup well_class_code and intended_water_use_code - -commit a8ba7349f8d7f28939ab6edb284de280fdeed288 -Author: Séamus O'Connor -Date: Tue Jun 30 08:12:42 2020 -0700 - - Removes default 'H' for ActivitySubmission's coordinate_acquisition_code - -commit 2d2b65ee280e06582ec9b806ac128edc27b7f2fe -Author: Séamus O'Connor -Date: Thu Jun 25 14:59:23 2020 -0700 - - Updates well_class migration to update fields_provided too - -commit 6dd55f5caaaa35593dce585c0a62616f02524ffa -Author: Séamus O'Connor -Date: Thu Jun 25 07:54:28 2020 -0700 - - Corrects well_class and intended_water_use validation for new (no well tag number entered) ALT or DEC submissions - -commit 517dd02b34af58fff5dae18c0cc45ea23f5c2e0e -Author: Séamus O'Connor -Date: Wed Jun 17 13:13:21 2020 -0700 - - Migrates well_class_code to WATR_SPPLY. Adds 'Not Applicable' to intended water use. - -commit acdc3d121864e24c2ce7f80291314b4175e2cdaf -Merge: 4222e029b 733510bc1 -Author: Steve Hillier -Date: Wed Jun 24 10:11:14 2020 -0700 - - Merge pull request #1683 from bcgov/steve/profanitysearch - - add profanity script - -commit 9b92cbd0518c2552ea0a969159166019e7a6c06f -Merge: 00466a15d 4222e029b -Author: Steve Hillier -Date: Tue Jun 23 14:05:02 2020 -0700 - - Merge pull request #1682 from bcgov/release - - Release - -commit 733510bc1295c9c6a33f07ae2c14e07c24f44e60 -Author: Steve Hillier -Date: Tue Jun 23 12:52:25 2020 -0700 - - add profanity script - -commit 4222e029b907f9792ddd18c0944fa44157a16b66 -Merge: d6d5044f9 723888de6 -Author: Séamus O'Connor -Date: Tue Jun 23 12:14:05 2020 -0700 - - Merge pull request #1681 from bcgov/1243-obs-wells-vector-layer - - Convert observation wells raster layer to vector layer - -commit 723888de607fad98e077659b91d6bd9e52b72755 -Author: Séamus O'Connor -Date: Fri Jun 19 15:44:04 2020 -0700 - - Updates to obs well layer styles and order. - -commit 00466a15d2103e89b500cad67ebf27fbf57d23f8 -Merge: 59b869e59 d6d5044f9 -Author: Steve Hillier -Date: Mon Jun 22 12:48:46 2020 -0700 - - Merge pull request #1675 from bcgov/release - - Release - -commit 07c80e060c5580f8ab357ed707cb80fe20506d2e -Merge: ed79bfcf1 d6d5044f9 -Author: Séamus O'Connor -Date: Fri Jun 19 15:08:35 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1243-obs-wells-vector-layer - -commit d6d5044f980add8f498eb59d200c3768f27c2df3 -Merge: 6ef94610d f406fa082 -Author: Séamus O'Connor -Date: Fri Jun 19 11:01:56 2020 -0700 - - Merge pull request #1676 from bcgov/1237-vectorize-gw-sw-layer - - Groundwater / surface water vector layers - -commit f406fa08256df1cce0dbdcbad41d6c77cc88d7bd -Author: Séamus O'Connor -Date: Fri Jun 19 10:20:44 2020 -0700 - - Only shows active licences - -commit ed79bfcf110262880c85cb32ba2bedd2c5a3e5ac -Author: Séamus O'Connor -Date: Fri Jun 19 09:51:58 2020 -0700 - - Adds observation well data to wells vector tile view. Uses that observation well data for 'Observation wells' layer. - -commit 6ef94610d274b4b8e1954375dfac7e46421154ac -Merge: bcefe631c ca64dbba8 -Author: Séamus O'Connor -Date: Thu Jun 18 13:20:46 2020 -0700 - - Merge pull request #1679 from bcgov/1185-fix-map-zoom-ctrl-bug - - Fix map zoom bug - -commit 405739ff602aeac5ee85f01091fede3d5048d229 -Merge: ab884c3b7 bcefe631c -Author: Séamus O'Connor -Date: Thu Jun 18 11:54:25 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1237-vectorize-gw-sw-layer - -commit ca64dbba8581ee68537d34cce1bb1e647b8464ba -Author: Séamus O'Connor -Date: Thu Jun 18 10:53:28 2020 -0700 - - Updates to a newer version of mbgl-gesture-handling with a bug fix for ctrl+zoom not working bug. - -commit bcefe631c2cf259edd8aacec396535ff7050f29b -Merge: b1064107d 5291d7297 -Author: Séamus O'Connor -Date: Thu Jun 18 10:50:32 2020 -0700 - - Merge pull request #1678 from bcgov/1236-gw-ecocat - - Splits EcoCat into GW and everything else layers. - -commit 5291d7297223aca477c4ed06976efafd8966c377 -Author: Séamus O'Connor -Date: Thu Jun 18 10:00:02 2020 -0700 - - Splits EcoCat into GW and everything else layers. - -commit ab884c3b7e154f1959e0c22852040f2bd1d72dba -Author: Séamus O'Connor -Date: Tue Jun 16 13:20:43 2020 -0700 - - Keep zero quantities in GW/SW popups - -commit ff23bb07a81a7b828ef0ab65ac756261ec97e1e8 -Merge: a904e935e b1064107d -Author: Séamus O'Connor -Date: Mon Jun 15 16:34:41 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1237-vectorize-gw-sw-layer - -commit b1064107dce39047774690fde99abb8873d2c85e -Merge: af26bfe6e 620c531a9 -Author: Séamus O'Connor -Date: Mon Jun 15 16:34:16 2020 -0700 - - Merge pull request #1673 from bcgov/1236-ecocat-vector-layer - - Changes EcCcat to vector layer and adds map EcoCat tooltips - -commit a904e935eb24653a87ed9574b7d410b419a77d0a -Merge: cf6342c3f af26bfe6e -Author: Séamus O'Connor -Date: Mon Jun 15 09:55:04 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1237-vectorize-gw-sw-layer - -commit cf6342c3f19fb7feb6848f4dd93c821556baef92 -Author: Séamus O'Connor -Date: Thu Jun 11 14:44:48 2020 -0700 - - Uses vector tiles for GW and SW licence layers. - -commit 620c531a916e03b869ca6218986e9e91b981919b -Merge: a84108caf af26bfe6e -Author: Séamus O'Connor -Date: Thu Jun 11 14:45:24 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1236-ecocat-vector-layer - -commit af26bfe6e26c92ddd00bb091dccca5dd3bf6cd68 -Merge: 87dca1615 05556cad8 -Author: Séamus O'Connor -Date: Thu Jun 11 14:45:13 2020 -0700 - - Merge pull request #1674 from bcgov/steve/tileservimages - - update pg_tileserv image - -commit 05556cad828f3c301969ef7741fd117767a13413 -Author: Steve Hillier -Date: Thu Jun 11 14:18:31 2020 -0700 - - fix image ref - -commit 82cfab4e23c379e55d3b571b15bd70429388ad67 -Author: Steve Hillier -Date: Thu Jun 11 14:01:27 2020 -0700 - - update pg_tileserv images - -commit a84108cafc885908f7ca6f513603567ae3d99fee -Author: Séamus O'Connor -Date: Thu Jun 11 10:21:35 2020 -0700 - - Removes innerHTML from popup code to prevent possible XSS attack vector - -commit f1212b38f70816d328651d2ec6f2699ffe9f0d4c -Author: Séamus O'Connor -Date: Thu Jun 11 08:32:19 2020 -0700 - - Changes ecocat to vector layer and adds map ecocat tooltips - -commit 59b869e59c668fe5052707b75dcc9e6e2940b954 -Merge: 69af7988c 87dca1615 -Author: Steve Hillier -Date: Wed Jun 10 09:07:55 2020 -0700 - - Merge pull request #1671 from bcgov/release - - Release - -commit 87dca1615ab454c047884cf521340448faf75d65 -Merge: 794cb6a12 f9a262e46 -Author: Séamus O'Connor -Date: Wed Jun 10 07:51:29 2020 -0700 - - Merge pull request #1672 from bcgov/daine/wells_aquifer_api - - Add aquifer lithology to subsurface end point - -commit f9a262e4650a7f57832cb46853126ea946f4d8cb -Author: daine -Date: Tue Jun 9 16:26:50 2020 -0700 - - Add aquifer lithology to subsurface end point - -commit 794cb6a12e44c4320e9d7689183d2a2604de2445 -Merge: c999be62d e5b458bb9 -Author: Séamus O'Connor -Date: Tue Jun 9 10:44:44 2020 -0700 - - Merge pull request #1667 from bcgov/1201-bulk-well-aquifer-correlation-warnings - - Returns warning if a well is outside aquifer on bulk well aquifer correlation upload - -commit e5b458bb911df12bb87a8582a786df1444bc91b2 -Author: Séamus O'Connor -Date: Tue Jun 9 09:56:02 2020 -0700 - - Updates wording of non-aquifer 1143 warning - -commit 69af7988ca082130c8107c4b431445376c372722 -Merge: 9523a70c8 c999be62d -Author: Steve Hillier -Date: Tue Jun 9 09:44:05 2020 -0700 - - Merge pull request #1660 from bcgov/release - - Release - -commit c999be62d8e2b7d755a4541515f263d3d0927603 -Merge: 60c513fd4 06bc64873 -Author: Daine Trinidad -Date: Mon Jun 8 16:00:00 2020 -0700 - - Merge pull request #1658 from bcgov/daine/wells_aquifer_api - - Wells Subsurface API endpoint - -commit 60c513fd4a79eed4c4c078d90ca0e37067edb462 -Merge: 423df7fa2 3833642c3 -Author: Séamus O'Connor -Date: Mon Jun 8 15:32:27 2020 -0700 - - Merge pull request #1670 from bcgov/547-filter-registry-export - - Uses filter_backends for ListAPIView for csv/xlsx registries export - -commit 06bc64873da09c3414aa0380a8a1cdecd0fa443b -Author: daine -Date: Mon Jun 8 15:31:31 2020 -0700 - - Optimize query (reduce calls to the db) - -commit 24b55f55527ed840c646241b0613d1124e507afd -Author: daine -Date: Mon Jun 8 14:26:02 2020 -0700 - - Move aquifer info into child node - -commit 3833642c359d5004ffce505dd875b112bb8dffbe -Author: Séamus O'Connor -Date: Mon Jun 8 11:57:39 2020 -0700 - - Uses filter_backends for ListAPIView for csv/xlsx registries export - -commit 423df7fa284da375edaeadaa54cbdf554d7f0ae7 -Merge: 9b36d0143 da3aba8ad -Author: Séamus O'Connor -Date: Mon Jun 8 11:36:30 2020 -0700 - - Merge pull request #1669 from bcgov/1258-unused-file-cleanup - - Removes unused files from the front-end - -commit 9b36d0143be14edff21f632b3020142cd59141f3 -Merge: 6699d17c5 900e9b996 -Author: Séamus O'Connor -Date: Mon Jun 8 11:35:50 2020 -0700 - - Merge pull request #1668 from bcgov/1257-fixing-sentry-errors - - Fixes a bunch of Sentry JS errors. - -commit c0289b8a143d0c5b42205bc1e3c91704085fe13a -Author: Séamus O'Connor -Date: Mon Jun 8 10:58:47 2020 -0700 - - Update constants.py - - Added comment about aquifer 1143 and JIRA task WATER-999 - -commit da3aba8ad3faafc5e8564fd5c519a13b0e6b8ef8 -Author: Séamus O'Connor -Date: Mon Jun 8 10:51:46 2020 -0700 - - Removes unused files from the front-end - -commit 900e9b996bc2151a0919e2d85830ef7d747fdbac -Author: Séamus O'Connor -Date: Mon Jun 8 10:36:09 2020 -0700 - - Fixes a bunch of Sentry JS errors. Silences errors from IE 11. - -commit 6699d17c5904acc8cae23721dc8bcf8687f1a664 -Merge: accd6c6c1 b3eb68bb8 -Author: Séamus O'Connor -Date: Mon Jun 8 09:12:30 2020 -0700 - - Merge pull request #1666 from bcgov/547-fix-registry-export-bug - - Reorders the columns in the xlsx/csv export - -commit 06c86efe59bbfca5d4925a87ac0f417424b255a4 -Author: Séamus O'Connor -Date: Fri Jun 5 14:06:08 2020 -0700 - - Returns warning if a well is outside aquifer on bulk well aquifer correlation upload - -commit b3eb68bb820aebe4cc21532d9c92b27f57649709 -Author: Séamus O'Connor -Date: Fri Jun 5 13:51:22 2020 -0700 - - Reorders the columns in the xlsx/csv export - -commit accd6c6c17d6cbaebf1fd5d81a6d09413ecdd234 -Merge: 5ad6e0366 af4773670 -Author: Séamus O'Connor -Date: Fri Jun 5 07:41:18 2020 -0700 - - Merge pull request #1663 from bcgov/547-export-registry - - Adds link to XLSX/CSV export of all registry drillers - -commit 9a928fa3382234f234d191e3af5bee7c5553b3c8 -Author: daine -Date: Thu Jun 4 14:10:29 2020 -0700 - - Return a list of wells with corresponding aquifer information - -commit 5ad6e0366b27fb808a0336ea4f0f1349a51098fa -Merge: 6fe16b14d e0cabe55a -Author: Séamus O'Connor -Date: Thu Jun 4 09:11:32 2020 -0700 - - Merge pull request #1665 from bcgov/748-update-demand-tooltip-text - - Updates calculated well density tooltip text - -commit e0cabe55adf0ca4cc6c6b8e21d997782701c0963 -Author: Séamus O'Connor -Date: Thu Jun 4 07:14:37 2020 -0700 - - Updates calculated well density tooltip text - -commit af477367066f22c8a8fa1aa1d608916673ba5ad6 -Author: Séamus O'Connor -Date: Mon Jun 1 11:11:57 2020 -0700 - - Adds link to XLSX/CSV export of all registry drillers - -commit 6fe16b14d39be8029d15372d9af569730ee0d680 -Merge: 062a05a0d b95f73fc9 -Author: Séamus O'Connor -Date: Wed Jun 3 12:09:55 2020 -0700 - - Merge pull request #1662 from bcgov/748-fix-update-demand-command - - Handles divide by zero possibility in update_demand command - -commit b95f73fc93b884c4276e8e3808fc0e6eb4680761 -Author: Séamus O'Connor -Date: Wed Jun 3 11:46:54 2020 -0700 - - Handles divide by zero possibility in update_demand command - -commit 062a05a0d161d50dd772cf43c70ec5e02241f18a -Merge: 01b360533 f5be5556f -Author: Séamus O'Connor -Date: Wed Jun 3 10:17:46 2020 -0700 - - Merge pull request #1655 from bcgov/748-calc-aquifer-demand-command - - Updates aquifer demand calculation nightly - -commit 9523a70c88914bdd3a07fa2316b8c17f03661145 -Merge: 44ee3e13c 01b360533 -Author: Steve Hillier -Date: Wed Jun 3 10:16:50 2020 -0700 - - Merge pull request #1648 from bcgov/release - - Release - -commit 01b3605338964f3626413f4b4e7786c701d9d30e -Merge: 449132fd1 82d9493b1 -Author: Séamus O'Connor -Date: Tue Jun 2 16:20:12 2020 -0700 - - Merge pull request #1659 from bcgov/594-show-retired-checkbox - - Adds a 'Show X retired aquifers' checkbox to aquifer search - -commit 82d9493b1fcb36ae202da6321a9282fb4dc7929c -Author: Séamus O'Connor -Date: Tue Jun 2 13:22:13 2020 -0700 - - Adds a 'Show X retired aquifers' checkbox to aquifer search - -commit f5be5556f52620b4f268363a2b92b7e14a2139a3 -Author: Séamus O'Connor -Date: Tue Jun 2 14:52:42 2020 -0700 - - Adds info popup to Calculated well density - -commit bc9dcb88e2a891b97388e3fb107d2b0a271d3a2b -Author: daine -Date: Tue Jun 2 12:32:37 2020 -0700 - - Added new endpoint for wells/aquifer - -commit 449132fd138ba5ffe32894944f0a3e23fe7de97c -Merge: 8545e0cdc e67b0e782 -Author: Séamus O'Connor -Date: Mon Jun 1 16:00:57 2020 -0700 - - Merge pull request #1656 from bcgov/594-fix-aquifer-csv-export - - Fixes aquifer CSV export bug - -commit e67b0e7827b8ba4485b9ec54cc056160c7657128 -Author: Séamus O'Connor -Date: Mon Jun 1 11:27:18 2020 -0700 - - Fixes aquifer CSV export bug - -commit 392af72e4ec66d6a573424ffae8ebf4fd62e3a2f -Author: Séamus O'Connor -Date: Mon Jun 1 09:12:18 2020 -0700 - - Updates aquifer demand calculation nightly. Removes demand dropdown from Aquifer edit screen. - -commit 8545e0cdc793d763b3d186b415266511556191b3 -Merge: 306091c56 31539be31 -Author: Séamus O'Connor -Date: Fri May 29 15:20:38 2020 -0700 - - Merge pull request #1653 from bcgov/1181-bulk-upload-filename-fix - - Bulk Well and Aquifer screen now strips IDs from file name before upload - -commit 306091c56a533819a78bb04073d11bcb7cfaf738 -Merge: 3dcb0ebc8 2706c3e42 -Author: Séamus O'Connor -Date: Fri May 29 14:57:16 2020 -0700 - - Merge pull request #1654 from bcgov/594-retired-aquifer-fixes - - Updates messaging for unpubished aquifers - -commit 31539be31b3fd6939eec258125bc7964f3b2e724 -Author: Séamus O'Connor -Date: Fri May 29 13:02:06 2020 -0700 - - Bulk Well and Aquifer screen now strips IDs from file name before upload. Bulk well document upload now warns that files could be overridden. - -commit 2706c3e42570fa40de70f87ead2c81076ac49ec0 -Author: Séamus O'Connor -Date: Fri May 29 13:11:58 2020 -0700 - - Updates messaging for unpubished aquifers - -commit 3dcb0ebc8c9969855789547e5164a89a822753bb -Merge: e7f319ea9 f78426d55 -Author: Séamus O'Connor -Date: Thu May 28 15:16:08 2020 -0700 - - Merge pull request #1652 from bcgov/594-fix-tileserver-view-migration - - Fix well & aquifer view migration to grant SELECT perms to ftw_reader - -commit f78426d558a424b2b0d00285649ea97ea36d3006 -Author: Séamus O'Connor -Date: Thu May 28 14:51:00 2020 -0700 - - Fix well & aquifer view migration to grant SELECT perms to ftw_reader - -commit e7f319ea9684ae9f1e3e395f44b28ed20e611484 -Merge: d1025101e f63729c23 -Author: Séamus O'Connor -Date: Thu May 28 09:58:30 2020 -0700 - - Merge pull request #1650 from bcgov/594-aquifer-status - - Ability to unpublish and retire aquifers - -commit f63729c23f4f23cc665ac2c87afbf81b6125c123 -Author: Séamus O'Connor -Date: Wed May 27 14:51:56 2020 -0700 - - Hides unpublished wells and aquifers from vector tile views. - -commit d1025101ef0c2fc62efd6f31697aa952f3d0c3e7 -Merge: 357e7f302 2a30f2569 -Author: Séamus O'Connor -Date: Thu May 28 08:24:28 2020 -0700 - - Merge pull request #1651 from bcgov/1181-serial-file-upload - - Uploads documents in serial to avoid presigned URL timeouts - -commit 2a30f2569ad89f4ec02b6d6aa116efb1dc43d934 -Author: Séamus O'Connor -Date: Wed May 27 15:40:54 2020 -0700 - - Uploads documents in serial to avoid presigned URL timeouts - -commit 023627773e8e4f0c82b6c01f9548c136562ecceb -Author: Séamus O'Connor -Date: Mon May 25 12:21:21 2020 -0700 - - Adds effective_date, expiry_date, and retire_date to aquifer table. - -commit 357e7f3024eb2c400f4b0212d369b464ef180575 -Merge: 58413855a 39f3aef94 -Author: Séamus O'Connor -Date: Mon May 25 11:00:09 2020 -0700 - - Merge pull request #1645 from bcgov/1181-bulk-well-docs - - Bulk well documents upload - -commit 58413855a18fd84529ac50f578294ef2024898ca -Merge: 271a51139 58a68e4d1 -Author: Séamus O'Connor -Date: Mon May 25 10:27:54 2020 -0700 - - Merge pull request #1647 from bcgov/1194-hide-v2-in-swagger-docs - - Removes V2 API docs from auto-gen swagger - -commit 39f3aef949bf641e3c91d263e45754baea4f7e1d -Author: Séamus O'Connor -Date: Fri May 22 10:26:32 2020 -0700 - - Updates how wellTagNumber is parsed from uploaded filename - -commit 271a51139383d392fe2cd1ad3ed8d4458eaeada9 -Merge: ac092f302 ddcb602fd -Author: Séamus O'Connor -Date: Thu May 21 14:24:04 2020 -0700 - - Merge pull request #1646 from bcgov/1183-fix-blurry-map-road-tiles - - Fix blurry DataBC road tiles when switching environments - -commit 58a68e4d1a48f783e891bbfc470ccb8772cf4b6e -Author: Séamus O'Connor -Date: Thu May 21 14:16:18 2020 -0700 - - Removes V2 API docs from auto-gen swagger - -commit ddcb602fd61c1a7a2a15a8ed39ec005cbb47b8aa -Author: Séamus O'Connor -Date: Thu May 21 13:49:59 2020 -0700 - - Adds ?env= param to roads tile for CORS bug WATER-1183 - -commit 96fe24c6dc64e4dccc738d54bfacebaf9558320a -Author: Séamus O'Connor -Date: Thu May 21 11:21:05 2020 -0700 - - Adds bulk well document upload screen - -commit 44ee3e13cb97271fddd612a79fa85650027004ab -Merge: a45715e80 ac092f302 -Author: Steve Hillier -Date: Wed May 20 12:17:22 2020 -0700 - - Merge pull request #1635 from bcgov/release - - Release - -commit ac092f3028c9f70c653bd421216e14a08438e51a -Merge: ae692d585 baff42eb8 -Author: Séamus O'Connor -Date: Wed May 20 10:27:56 2020 -0700 - - Merge pull request #1636 from bcgov/1160-mapbox-submissions-coords-map - - Convert Leaflet to Mapbox on submissions coords map - -commit ae692d58551f9dea6cf22440f570742a6a3c93f0 -Merge: 2234bfc00 46ad007fe -Author: Séamus O'Connor -Date: Wed May 20 09:45:43 2020 -0700 - - Merge pull request #1644 from bcgov/1115-fix-import-licences - - Makes import_licences more robust when parsing CSV - -commit 2234bfc00b7e793aafd8c7ee9ef00014ce7414a8 -Merge: a5cbbb363 86ecf953c -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed May 20 09:23:35 2020 -0700 - - Merge pull request #1643 from bcgov/alex/aquiferview - - aquifer view for wally vector tiles - -commit 46ad007fe5ec9f2c486567439657e4ff524ec6ca -Author: Séamus O'Connor -Date: Wed May 20 08:14:08 2020 -0700 - - Makes import_licences more robust when parsing CSV - -commit 86ecf953c1f537b27263b5166cdf4df452e837ea -Author: AlexZorkin -Date: Tue May 19 22:15:30 2020 -0700 - - aquifer view for wally vector tiles - -commit a5cbbb363b560f0ed9a389736236c8d69afb1420 -Merge: 0acfc9ce5 4bf982782 -Author: Séamus O'Connor -Date: Tue May 19 15:33:44 2020 -0700 - - Merge pull request #1640 from bcgov/1115-clean-water-licences-import - - Deletes all existing water licences on import - -commit 4bf9827825e449863ec099e375f07ae7ea0a83b4 -Merge: 39476cc6a 0acfc9ce5 -Author: Séamus O'Connor -Date: Tue May 19 15:10:44 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1115-clean-water-licences-import - -commit 0acfc9ce5feeda010f71e3b8c7dc612c2fafb8ad -Merge: 9a8df26c2 db7058357 -Author: Steve Hillier -Date: Tue May 19 15:05:50 2020 -0700 - - Merge pull request #1642 from bcgov/steve/20200519-fixes2 - - remove extra stages in Jenkinsfile - -commit 39476cc6a831f092c3b8cacfa66e36d336fc2775 -Author: Séamus O'Connor -Date: Tue May 19 14:50:39 2020 -0700 - - Fix typo - - Co-authored-by: Steve Hillier - -commit 9a8df26c297455a2632c9e5aabc3b0a4e46d098a -Merge: c57121f30 108211ddb -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue May 19 14:36:28 2020 -0700 - - Merge pull request #1641 from bcgov/alex/wallyview - - Wally Well View Added - -commit db7058357c00203c641657170da82439c170aebc -Author: Steve Hillier -Date: Tue May 19 14:31:15 2020 -0700 - - fix echo - -commit acebeb9d7d96050e0749ed4a2309dcd662e2eaa9 -Author: Steve Hillier -Date: Tue May 19 14:30:27 2020 -0700 - - remove demo env deployment - -commit 108211ddb9dd562b14931a15a3a0e85c89af7f5e -Author: AlexZorkin -Date: Tue May 19 13:10:14 2020 -0700 - - wally well view added - -commit a40d886204a03fadf4289df880ae5842d19be392 -Author: Séamus O'Connor -Date: Tue May 19 10:33:58 2020 -0700 - - Deletes all existing water licences on import - -commit c57121f30ced762a055bddcba74632f547c097eb -Merge: 88ea7fc9e dce1d10b3 -Author: Séamus O'Connor -Date: Tue May 19 11:15:34 2020 -0700 - - Merge pull request #1639 from bcgov/1107-well-search-map-tweaks - - Tweaks for well search map - -commit baff42eb80adcb94adfc053fc323c8cdcc48f8cc -Merge: 6731759f5 88ea7fc9e -Author: Séamus O'Connor -Date: Tue May 19 11:09:56 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1160-mapbox-submissions-coords-map - -commit 88ea7fc9e34acd1a88679936bf66245c5ed9f6b6 -Merge: dab1bf309 8190e125a -Author: Séamus O'Connor -Date: Tue May 19 10:58:05 2020 -0700 - - Merge pull request #1634 from bcgov/1159-mapbox-well-summary-map - - Replace Leaftlet with Mapbox GL on Well Summary screen - -commit dce1d10b3b31f3f968c9042e146f1fbedf5f4e6f -Author: Séamus O'Connor -Date: Tue May 19 10:48:31 2020 -0700 - - Removes the search results icons from legend. Hides popups when map is reset. Fixes grammar of off-current-view message. - -commit dab1bf309a29a7d23b64f55e75407d970dab245d -Merge: 39747463f b17e32cc7 -Author: Steve Hillier -Date: Tue May 19 10:18:27 2020 -0700 - - Merge pull request #1638 from bcgov/steve/20200519-fixes - - fix postgres backup container db name - -commit b17e32cc7b07895e961d6cf3c408d8d9753ea726 -Author: Steve Hillier -Date: Tue May 19 09:10:41 2020 -0700 - - fix postgres backup container db name - -commit 39747463f973cc5ee88b9b7337b04050607cdd2e -Merge: 9a94a713e 18d038917 -Author: Séamus O'Connor -Date: Fri May 15 09:11:25 2020 -0700 - - Merge pull request #1637 from bcgov/1170-fix-map-well-popup - - Removes hyperlink from Well Tag Number in well popups - -commit 18d038917771f8c18997e84c4248d7f783fe88fc -Author: Séamus O'Connor -Date: Fri May 15 08:37:05 2020 -0700 - - Removes hyperlink from Well Tag Number in well popups. - -commit 6731759f54324d94c98fce4f22a0a6d4055a6232 -Merge: 647f1ac6c 9a94a713e -Author: Séamus O'Connor -Date: Thu May 14 14:58:50 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1160-mapbox-submissions-coords-map - -commit 647f1ac6c3e35f714dbc0c2998287208b27c5e33 -Author: Séamus O'Connor -Date: Thu May 14 14:54:57 2020 -0700 - - Replaces Leaflet with MapBox GL JS on submission coordinates map - -commit 8190e125a0c552d8aa9ad53fbb1982fe5cda4781 -Merge: dfa67b282 9a94a713e -Author: Séamus O'Connor -Date: Wed May 13 13:11:26 2020 -0700 - - Merge branch 'release' into 1159-mapbox-well-summary-map - -commit 9a94a713e936423b7d92b92daeeee0aa69462738 -Merge: bd51934b2 6aeb05699 -Author: Séamus O'Connor -Date: Wed May 13 12:02:17 2020 -0700 - - Merge pull request #1623 from bcgov/1107-mapbox-well-search-map - - Replaces Leaflet with Mapbox GL JS on Well Search map - -commit a45715e80d9d8f28fe7cba3533444319b855d35c -Merge: 662dc3045 bd51934b2 -Author: Daine Trinidad -Date: Wed May 13 11:53:11 2020 -0700 - - Merge pull request #1633 from bcgov/release - - Release - -commit bd51934b2ac2d6e0b1fb4deb9c6bb62a21264de1 -Merge: 5d8c71604 d94602644 -Author: Séamus O'Connor -Date: Wed May 13 10:34:59 2020 -0700 - - Merge pull request #1632 from bcgov/1166-fix-ie11-aquifer-map-js-error - - Fixes vector tile server URL syntax - -commit d946026446d839bd6f95ca46a810bfb6a8cdaaab -Author: Séamus O'Connor -Date: Wed May 13 09:09:04 2020 -0700 - - Fixes VECTOR_TILE_SERVER url syntax - -commit 662dc3045b71d12d135d7d6f2a92d889a1dddefb -Merge: 9d2cc74dc 5d8c71604 -Author: Steve Hillier -Date: Wed May 13 08:26:47 2020 -0700 - - Merge pull request #1609 from bcgov/release - - Release - -commit 5d8c716040a0d6e5f2282040a6d690538c9303ce -Merge: e458d3849 3e4c59d6b -Author: Séamus O'Connor -Date: Tue May 12 18:50:29 2020 -0700 - - Merge pull request #1631 from bcgov/fix-ie11-es6-syntax-error - - Transpiles ES6 mbgl-gesture-handling to ES5 for IE 11 - -commit 3e4c59d6b5b432c0ce4d496dd12d88e4325492fa -Author: Séamus O'Connor -Date: Tue May 12 16:35:46 2020 -0700 - - Transpiles ES6 mbgl-gesture-handling to ES5 for IE 11 - -commit dfa67b282ce2927ea0692619c38979dc20613c04 -Author: Séamus O'Connor -Date: Tue May 12 16:12:50 2020 -0700 - - Replaces Leaflet with Mapbox GL JS Well Summary screen - -commit e458d3849625497965de1bf2b3ebb53b8640ec59 -Merge: 034c0dc85 7991da01e -Author: Steve Hillier -Date: Tue May 12 15:52:34 2020 -0700 - - Merge pull request #1630 from bcgov/steve/20200512-fixes4 - - fixes for pre-deploy backup step - -commit 7991da01e363090fb3c2c66fd117adf0b82d5696 -Author: Steve Hillier -Date: Tue May 12 13:53:49 2020 -0700 - - change backup dir - -commit cd4977596eddd980f1e14d0278dfe8b74ce8ecb8 -Author: Steve Hillier -Date: Tue May 12 13:52:36 2020 -0700 - - comment out defunct verification - -commit 034c0dc85b3c65d264766c1edd6267752af021a4 -Merge: fa397fcc3 6ca5e1a05 -Author: Steve Hillier -Date: Tue May 12 13:33:16 2020 -0700 - - Merge pull request #1629 from bcgov/steve/20200512-fixes3 - - fixes to pg_restore verification - -commit 6ca5e1a056490fa7e872525662e04b9e66cd000e -Author: Steve Hillier -Date: Tue May 12 12:38:55 2020 -0700 - - fixes to pg_restore verification - -commit fa397fcc3a50ec2da7f657581547ba06b13c68c6 -Merge: 5485205ef 10e75dba8 -Author: Steve Hillier -Date: Tue May 12 12:25:19 2020 -0700 - - Merge pull request #1628 from bcgov/steve/20200512-fixes2 - - fix database user for backups - -commit 10e75dba8a4914644d3355b7db442c2ad254c2ed -Author: Steve Hillier -Date: Tue May 12 11:11:38 2020 -0700 - - change cron schedules to PST - -commit 33a644edc2586b8a0a00a7de8c07724e7803b5ea -Merge: 6aeb05699 5485205ef -Author: Séamus O'Connor -Date: Tue May 12 10:50:54 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1107-mapbox-well-search-map - -commit 511409d33ecbb1a4ae51060b75326d2faebdadfb -Author: Steve Hillier -Date: Tue May 12 10:37:40 2020 -0700 - - remove unused env variables - -commit 24bf25b57977c1e8be24190d97652b892d8916dd -Author: Steve Hillier -Date: Tue May 12 10:36:33 2020 -0700 - - fix database user - -commit 5485205ef9b6b8622f8fcd2b78814730af522461 -Merge: 3dac11767 d363d756e -Author: Steve Hillier -Date: Tue May 12 10:35:28 2020 -0700 - - Merge pull request #1627 from bcgov/steve/20200512-fixes - - jenkinsfile changes - -commit d363d756eed2c127ea208a45ec89d96225e42576 -Author: Steve Hillier -Date: Tue May 12 10:08:41 2020 -0700 - - jenkinsfile changes - -commit 3dac11767ff1b01f3f6a61cb87b2498a358742c9 -Merge: 82ab06054 a1d05417a -Author: Steve Hillier -Date: Tue May 12 09:05:42 2020 -0700 - - Merge pull request #1626 from bcgov/steve/pg12-db-fixes - - fix storage class and remove upgrade step - -commit 82ab0605456cce83eef865410928a19e4933b009 -Merge: 31353a968 f26fa6e1a -Author: Séamus O'Connor -Date: Tue May 12 07:23:18 2020 -0700 - - Merge pull request #1625 from bcgov/1103-fix-css-checkbox-bug - - Fixes CSS bug with aquifer search checkboxes - -commit a1d05417a4577430b9148f5b54e0de7770d09021 -Author: Steve Hillier -Date: Mon May 11 17:59:51 2020 -0700 - - re-enable predeploy staging backup - -commit 4c5e2b4adc43203bd914bc450a9bc8331e6f49ec -Author: Steve Hillier -Date: Mon May 11 17:56:41 2020 -0700 - - fix storage class - -commit f26fa6e1ac9e95a20d28f4f573c81270f2db3646 -Author: Séamus O'Connor -Date: Mon May 11 16:06:57 2020 -0700 - - Fixes CSS bug with aquifer search checkboxes - -commit 6aeb0569999bb2ddbb9a4c10e948b9c2c523f1f3 -Author: Séamus O'Connor -Date: Mon May 11 15:46:16 2020 -0700 - - Handles zero wells found in BC case on Well Search map - -commit 31353a968f5d1c846056648b5a7ff5be0042a3e2 -Merge: 1aa9ea1fb 212722bc3 -Author: Steve Hillier -Date: Mon May 11 15:22:14 2020 -0700 - - Merge pull request #1624 from bcgov/steve/backup-credentials - - use postgres user for backups - -commit 212722bc3c85f126705c6650128f0d1bb48c46eb -Author: Steve Hillier -Date: Mon May 11 14:28:50 2020 -0700 - - use postgres user for backups - -commit aac5bab76a1c90a8b3c5bd07821240234f5947b7 -Author: Séamus O'Connor -Date: Mon May 11 11:37:31 2020 -0700 - - Shows focused wells as pulsing dots on Well Search map - -commit 221cf84beb9f24ed78aea39032627c65f2976fb9 -Author: Séamus O'Connor -Date: Fri May 8 13:55:14 2020 -0700 - - Replaces Leaflet with Mapbox GL JS on Well Search map - -commit 1aa9ea1fb4865036a7fa863cd81d99e086349322 -Merge: 136627074 72807b510 -Author: Séamus O'Connor -Date: Thu May 7 16:08:55 2020 -0700 - - Merge pull request #1622 from bcgov/fix-aquifer-map-popup - - Another aquifer popup fix - -commit 72807b51065f69aaa132e762d423b1022abdfa33 -Author: Séamus O'Connor -Date: Thu May 7 15:28:01 2020 -0700 - - Fixes aquifer map well popup not sticking when EMS / Uncorrelated well layer enabled - -commit 1366270745afc077cc19bf1f5c1b63b5031e79d6 -Merge: c1b3df11b 97c315c6d -Author: Séamus O'Connor -Date: Thu May 7 14:53:35 2020 -0700 - - Merge pull request #1621 from bcgov/mapbox-aquifer-map-fixes - - Mapbox aquifer map fixes - -commit 97c315c6dad8db3b67993e066608dee995058e90 -Author: Séamus O'Connor -Date: Thu May 7 14:04:39 2020 -0700 - - Fixes bug where clicking on a EMS or uncorrelated well would not make a popup. Aquifer map uses the ctrl modifier key for mouse wheel zooming. - -commit c1b3df11b44c8743fae9c2939b7ed73a3fe9c6ab -Merge: c63321ce4 775fa12d4 -Author: Steve Hillier -Date: Wed May 6 16:56:28 2020 -0700 - - Merge pull request #1620 from bcgov/steve/tilecachefix - - prevent cacheing 500 errors - -commit c63321ce415f8b782f0e5c95ff35a3cec2512f1e -Merge: 7556062fc 7526b5216 -Author: Séamus O'Connor -Date: Wed May 6 16:37:09 2020 -0700 - - Merge pull request #1611 from bcgov/1103-mapbox-aquifer-search-map - - Replaces Leaflet with Mapbox GL JS on aquifer search map - -commit 7526b52168a02e2bb5781ba92f5facf470dff409 -Author: Séamus O'Connor -Date: Wed May 6 15:53:19 2020 -0700 - - Fixes typo - -commit 81a6fb7e717d8e38538df999141f4efb6b5e47a0 -Author: Séamus O'Connor -Date: Wed May 6 15:47:20 2020 -0700 - - Jumps to aquifer on Aquifer Details map instead of flying - -commit 775fa12d47c7cda3852627bf660b78a6f8ca3792 -Author: Steve Hillier -Date: Wed May 6 14:06:45 2020 -0700 - - update nginx conf - -commit fe65a37a6df4d8a791885f48c887bc3ccef323df -Merge: 217012b4f 7556062fc -Author: Séamus O'Connor -Date: Wed May 6 14:01:10 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1103-mapbox-aquifer-search-map - -commit 7556062fcb0ce8de40b344662461ca099e27ff8f -Merge: ec844dee2 1fdabc030 -Author: Séamus O'Connor -Date: Wed May 6 12:39:21 2020 -0700 - - Merge pull request #1618 from bcgov/1091-mapbox-aquifer-details-map-fixes - - Mapbox aquifer details map fixes - -commit ec844dee2f280b6063b17a84707b168fb5d94104 -Merge: 9420ca931 1b4bee260 -Author: Steve Hillier -Date: Wed May 6 11:45:32 2020 -0700 - - Merge pull request #1617 from bcgov/steve/tilecache - - test tile cache - -commit 9420ca9310d61aa99404ccf0a168e2287f4d6f30 -Merge: 3a038d018 38359b197 -Author: Steve Hillier -Date: Wed May 6 11:45:14 2020 -0700 - - Merge pull request #1619 from bcgov/steve/backupfix - - update backup cronjob - -commit 1b4bee260232576a6b8016b9e5b8460d968ecac5 -Author: Steve Hillier -Date: Wed May 6 11:19:59 2020 -0700 - - adjust proxy_cache_valid - -commit 38359b19719c3c5b8da7d12f0751bc1a53cfcfbf -Author: Steve Hillier -Date: Wed May 6 11:17:46 2020 -0700 - - update backup cronjob env - -commit 1fdabc030ea6b5ca98db260419b6a190d561992c -Author: Séamus O'Connor -Date: Wed May 6 10:07:33 2020 -0700 - - Uses fork of mbgl-gesture-handling to use ctrl key instead of alt. Updates well popup to only surround WTN with a link. - -commit d21bf064ca7530e5b0a98f2095797d7a05740664 -Author: Steve Hillier -Date: Tue May 5 16:12:54 2020 -0700 - - fix nginx conf route prefix - -commit cf14d0cafe1c2edad184735a7c50ddfd3fafb96b -Author: Steve Hillier -Date: Tue May 5 16:11:22 2020 -0700 - - fix service port - -commit cf7c6633ce63f3e3a9c0d954bc16c98993bca51d -Author: Steve Hillier -Date: Tue May 5 14:47:12 2020 -0700 - - add a readme - -commit 27d9e8c73ea10fc9dd0469e96bb90bf69502457c -Author: Steve Hillier -Date: Tue May 5 14:38:34 2020 -0700 - - add health endpoint - -commit d3b7766abd3c1498cbd199a32f3f13c5a6b31a4d -Author: Steve Hillier -Date: Tue May 5 14:31:47 2020 -0700 - - change version - -commit a60b5b4e4a12031cc6d43fd1e7c244c9a9b09ffc -Author: Steve Hillier -Date: Tue May 5 14:29:09 2020 -0700 - - add nginx conf - -commit 3a038d018509ac447c1ecc58b998efbde57af251 -Merge: 3f81e5018 f7bf96ab1 -Author: Steve Hillier -Date: Tue May 5 09:36:31 2020 -0700 - - Merge pull request #1616 from bcgov/steve/pg12backup - - use new, larger pvc for staging backups - -commit f7bf96ab1a28a93c5905efb6b838f4d11d7dc78d -Author: Steve Hillier -Date: Mon May 4 15:32:01 2020 -0700 - - adjust readiness and liveness probes - -commit 566a473fa8b6a5ee1e37cea0620517d01ef53bba -Author: Steve Hillier -Date: Mon May 4 14:57:54 2020 -0700 - - use new, larger pvc for staging backups - -commit 3f81e501812d11b964324940bb42b956d3091600 -Merge: ae326edce 478b89eb6 -Author: Steve Hillier -Date: Mon May 4 12:28:05 2020 -0700 - - Merge pull request #1615 from bcgov/snyk-fix-4dc77e5ef7a2d557fb0530829603fd88 - - [Snyk] Security upgrade mapbox-gl from 1.9.1 to 1.10.0 - -commit 478b89eb6f8cccefe4e8ed4ecbd8b417d846be9a -Author: snyk-bot -Date: Mon May 4 11:15:53 2020 -0700 - - fix: app/frontend/package.json & app/frontend/package-lock.json to reduce vulnerabilities - - The following vulnerabilities are fixed with an upgrade: - - https://snyk.io/vuln/SNYK-JS-MINIMIST-559764 - -commit c6ecc615867e9fd83659ce09d5222e3da59a53df -Author: snyk-bot -Date: Mon May 4 11:15:52 2020 -0700 - - fix: app/frontend/package.json & app/frontend/package-lock.json to reduce vulnerabilities - - The following vulnerabilities are fixed with an upgrade: - - https://snyk.io/vuln/SNYK-JS-MINIMIST-559764 - -commit ae326edce971a1b4d724c82d023836f50b2511f9 -Merge: 8e72898c6 6305107ce -Author: Séamus O'Connor -Date: Mon May 4 11:15:19 2020 -0700 - - Merge pull request #1607 from bcgov/1091-mapbox-powered-aquifer-detail-map - - Replaces Leaflet with Mapbox to power the Aquifer Details map. - -commit 217012b4fd848c8d7fdef62dc0f09008e75c58e4 -Author: Séamus O'Connor -Date: Mon May 4 09:52:00 2020 -0700 - - Fixes Django unit tests - -commit 32668d6edfd3fdf345cf8970f55197afdebbe730 -Author: Séamus O'Connor -Date: Sat May 2 14:12:23 2020 -0700 - - Fixes unit tests - -commit d6f1d54e4ece26f240aae2d690d15889101cafbe -Merge: 0d00bbfbd 6305107ce -Author: Séamus O'Connor -Date: Sat May 2 10:27:50 2020 -0700 - - Merge branch '1091-mapbox-powered-aquifer-detail-map' into 1103-mapbox-aquifer-search-map - -commit 6305107ceac880826362624354709c86dfa8fa7d -Merge: d217bc714 1ea1479d7 -Author: Séamus O'Connor -Date: Fri May 1 16:02:06 2020 -0700 - - Merge remote-tracking branch 'origin/steve/stagingfixes' into 1091-mapbox-powered-aquifer-detail-map - -commit 1ea1479d7922929491cadcd92c0d6305ca3c31f9 -Author: Steve Hillier -Date: Fri May 1 15:56:48 2020 -0700 - - clean up unused code - -commit fbf947ecd1a709681c7f8a98dc0b49cc7fabcc64 -Author: Steve Hillier -Date: Fri May 1 15:55:56 2020 -0700 - - clean up jenkinsfile - -commit d217bc714244a106a443bf0cd5cc0da9ec8272cd -Author: Séamus O'Connor -Date: Fri May 1 15:30:03 2020 -0700 - - Fix Django unit tests by creating postgis_ftw schema in a migration - -commit fdd694f82236b20d596b69bbdaca34b5a92f9fd3 -Author: Steve Hillier -Date: Fri May 1 13:40:45 2020 -0700 - - change order that routes are created - -commit ddc97bc8f0fea5c5d1c654b5cc06db1d77f8c720 -Merge: 426661f88 8e72898c6 -Author: Séamus O'Connor -Date: Fri May 1 13:15:26 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1091-mapbox-powered-aquifer-detail-map - -commit e63ea976d99861adcdb76d64d33bff7f1667740b -Author: Steve Hillier -Date: Fri May 1 12:48:50 2020 -0700 - - temporarily stop staging backup - -commit 8e72898c6f4bfb832afbc5be8deb6c8464509c30 -Merge: 3dac9e9a8 299d7316d -Author: Steve Hillier -Date: Fri May 1 12:24:05 2020 -0700 - - Merge pull request #1612 from bcgov/steve/pgtileserv - - pg_tileserv deployment - -commit 3dac9e9a8b629d32a093625d23932e338661b88a -Merge: fd0167a66 0b9d1ed63 -Author: Séamus O'Connor -Date: Fri May 1 12:23:41 2020 -0700 - - Merge pull request #1613 from bcgov/1116-fix-well-search-smooth-scroll-error - - Fix map id for smooth scrolling selector - -commit 299d7316d166985cdf54fe249dfdc71d346e2542 -Author: Steve Hillier -Date: Fri May 1 11:47:01 2020 -0700 - - add route - -commit 9f3a8cfef069d45ae9975945df178fb8d4c406e2 -Author: Steve Hillier -Date: Fri May 1 10:55:26 2020 -0700 - - fix uri prefix in Caddyfile config - -commit 5a272b4d639e9b1fed8c41843bf4a64c6123b3f8 -Author: Steve Hillier -Date: Fri May 1 10:25:30 2020 -0700 - - remove imagestream from deployment - -commit 635483020acce563e04e338716f5d952774e7622 -Author: Steve Hillier -Date: Fri May 1 10:16:31 2020 -0700 - - add staging and prod checks for tile server - -commit c2a7844a1322a958a78f2240b3dcb7c48ab7b225 -Author: Steve Hillier -Date: Fri May 1 10:14:38 2020 -0700 - - add a check for pgtileserv readiness - -commit 818100cfc2a6e35c060ede3ad75f16423570fae1 -Author: Steve Hillier -Date: Fri May 1 10:10:24 2020 -0700 - - fix username - -commit 0b9d1ed63eb0974a4cfdd2006f2789c9b8f1f8d4 -Author: Séamus O'Connor -Date: Fri May 1 09:53:37 2020 -0700 - - Fix map id for smooth scrolling selector - -commit e78d370cc29f87ae9caa2d9e819a6b944f866ef1 -Author: Steve Hillier -Date: Fri May 1 09:36:33 2020 -0700 - - adjust configmap volume config - -commit 3f2a8d35d5f986eb20e1aa95966906e4c094e395 -Author: Steve Hillier -Date: Thu Apr 30 21:21:54 2020 -0700 - - change listen address - -commit 789f2bc5fd3d85261d27cce55803a07ae2da7d6a -Author: Steve Hillier -Date: Thu Apr 30 17:30:40 2020 -0700 - - put setup script into db container - -commit 894b25ce7533903b1af21483fbfabc15d9ffce65 -Author: Steve Hillier -Date: Thu Apr 30 17:30:11 2020 -0700 - - fix for backups - -commit a236de987257e93de194aa465270b03b163e4106 -Author: Steve Hillier -Date: Thu Apr 30 14:54:45 2020 -0700 - - fix encode directive - -commit d34dcc7e5975ab110fec4d96e3eda0f146fe65f6 -Author: Steve Hillier -Date: Thu Apr 30 14:54:16 2020 -0700 - - update config - -commit c76a8d3e5a628699e232b11faf4b7472d4e3dfec -Author: Steve Hillier -Date: Thu Apr 30 14:33:34 2020 -0700 - - update service port - -commit ad69e2888336825bb2fdf4f90f30fadf0f750c4c -Merge: 9e9bbc98d fd0167a66 -Author: Steve Hillier -Date: Thu Apr 30 14:28:46 2020 -0700 - - Merge branch 'release' into steve/pgtileserv - -commit 9e9bbc98d492a07d6eec8aa4bd399f2ba9576cfe -Author: Steve Hillier -Date: Thu Apr 30 14:28:24 2020 -0700 - - update caddyfile config - -commit b953fe6b69be50a4f7ad55f721d63dcff818356e -Author: Steve Hillier -Date: Thu Apr 30 14:26:43 2020 -0700 - - fix path to template - -commit 426661f885567fbb0a7ed787183a5be3c571c6fe -Merge: c419fa022 fd0167a66 -Author: Séamus O'Connor -Date: Thu Apr 30 14:23:50 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1091-mapbox-powered-aquifer-detail-map - -commit fd0167a6680e8e1bb753b4585f653774b048adae -Merge: ee671f1d5 e9e0184a5 -Author: Steve Hillier -Date: Thu Apr 30 14:13:40 2020 -0700 - - Merge pull request #1610 from bcgov/steve/db_readiness - - Fixes for DB deployment - -commit effa613a2cfa0d86f4262cbea090cb9755564724 -Author: Steve Hillier -Date: Thu Apr 30 13:55:31 2020 -0700 - - fix image reference - -commit f51e2f8d15492e33bd94c06865928440b8fa7907 -Merge: fd9871134 ee671f1d5 -Author: Steve Hillier -Date: Thu Apr 30 13:53:39 2020 -0700 - - Merge branch 'release' into steve/pgtileserv - -commit c419fa022f9881e664c80d18bc9d74b9afc8b553 -Author: Séamus O'Connor -Date: Thu Apr 30 13:51:55 2020 -0700 - - Removes vue-smoothscroll from main.js - -commit fd9871134e4500a6eef8d8d36c3b7bca3dc1d63e -Author: Steve Hillier -Date: Thu Apr 30 13:51:49 2020 -0700 - - test tileserv deployment - -commit 15346dcf2c2f5138a14f06814589ec9f65fd16bf -Merge: a6d71dffb ee671f1d5 -Author: Séamus O'Connor -Date: Thu Apr 30 13:32:32 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1091-mapbox-powered-aquifer-detail-map - -commit a6d71dffb9b3e7a35fdf1392628db45247d90d9b -Author: Séamus O'Connor -Date: Thu Apr 30 13:16:01 2020 -0700 - - Replaces vue-smoothscroll npm module with simplier smoothscroll - -commit 8d91d497672f3aa373f95d4d8dd75550e41f933f -Author: Séamus O'Connor -Date: Thu Apr 30 13:02:27 2020 -0700 - - Adds migrations to create new views for tile server - -commit 0d00bbfbd6125008bc2560345eadf54d5f676f38 -Author: Séamus O'Connor -Date: Thu Apr 30 11:56:13 2020 -0700 - - Replaces Leaflet with Mapbox GL JS on Aquifer Search map - -commit 9525707533fb925c4cc3e3c853929265c473a4ca -Author: Séamus O'Connor -Date: Thu Apr 30 11:50:16 2020 -0700 - - Changes vector tile server URL path to be /tiles/ - -commit e9e0184a5c004eb29e43c459734902d53758db29 -Author: Steve Hillier -Date: Tue Apr 28 20:33:22 2020 -0700 - - apply object copies after DC - -commit 59dc5e01646d260e67ee8cc653718c7640c561b5 -Author: Steve Hillier -Date: Tue Apr 28 16:40:23 2020 -0700 - - higher delay on readiness probe - -commit ee671f1d5d652e3781bcb95e5d49a8c5ba7bf29e -Merge: b36b5af16 dd988d9f9 -Author: Steve Hillier -Date: Tue Apr 28 16:21:13 2020 -0700 - - Merge pull request #1600 from bcgov/steve/protobuf - - Upgrade database image - -commit 40d1dce54d10beb89a71e77c2ef8640899ae4a36 -Merge: 048e08db9 dd988d9f9 -Author: Steve Hillier -Date: Tue Apr 28 11:03:32 2020 -0700 - - Merge branch 'steve/protobuf' into steve/pgtileserv - -commit b36b5af167bf82ad7a973b67a4fd082e7a8d1eec -Merge: ff168c1ac 0ea262866 -Author: Séamus O'Connor -Date: Tue Apr 28 10:28:38 2020 -0700 - - Merge pull request #1605 from bcgov/785-fix-back-button-on-submissions - - Browser back goes back in multi-step well submission form - -commit 9d2cc74dc038edb8858c07b5a6b3b4074dd9c953 -Merge: 28980d645 ff168c1ac -Author: Daine Trinidad -Date: Tue Apr 28 10:14:33 2020 -0700 - - Merge pull request #1606 from bcgov/release - - Release - -commit dd988d9f9bab5055ece82cdd15c6567c5c9e7b6b -Author: Steve Hillier -Date: Mon Apr 27 18:11:56 2020 -0700 - - add new db name to cleanup script - -commit 154202ef444b977c7ece3d55f1c170ec809703c3 -Author: Steve Hillier -Date: Mon Apr 27 18:08:51 2020 -0700 - - remove test scale - -commit 09ff61fc8e775102ad7449caa7a67fd13398f93a -Author: Steve Hillier -Date: Mon Apr 27 17:55:51 2020 -0700 - - add namespace to scale command - -commit 33931d0dc98947dd9e38aa436cb6312119cc31a0 -Author: Steve Hillier -Date: Mon Apr 27 16:43:28 2020 -0700 - - fix typo - -commit 7d4b76c5db6beee9af7e711d3abc43f5ade3be36 -Author: Steve Hillier -Date: Mon Apr 27 16:41:58 2020 -0700 - - test scale down/up - -commit f4f0354f92d29db8e0590944ec07b9c452e0c41a -Author: Steve Hillier -Date: Mon Apr 27 16:09:02 2020 -0700 - - revert pg_dump option - -commit abc997dc2f2f150ca05c5f2d1d7e3c4bea656538 -Author: Steve Hillier -Date: Mon Apr 27 16:06:55 2020 -0700 - - make sure dbBackup uses old db - -commit 0458f40aba34c890d2d6f9dbde804c0f4efd4c42 -Author: Steve Hillier -Date: Mon Apr 27 14:26:19 2020 -0700 - - update backend template - -commit fefd8738c4495d0574ba8b281af82ebd09119c7f -Author: Steve Hillier -Date: Mon Apr 27 12:05:58 2020 -0700 - - remove extra echo - -commit 9f0c6a9fe156c9b9053a070bb8a3b269ad176998 -Merge: 65a181fcf ff168c1ac -Author: Séamus O'Connor -Date: Mon Apr 27 11:58:37 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1091-mapbox-powered-aquifer-detail-map - -commit 65a181fcf96bc75ba2ead6439a87c921c036e6a0 -Author: Séamus O'Connor -Date: Mon Apr 27 10:15:49 2020 -0700 - - Replaces Leaflet with Mapbox to power the Aquifer Details map. Uses aquifer and wells vector tiles. - -commit d828dd6cdcde46ba27b22684317a7514f8da5ac9 -Author: Steve Hillier -Date: Mon Apr 27 11:46:09 2020 -0700 - - add some echos for debugging - -commit ff168c1acd231f0cea02954de662a0ec3de526b5 -Merge: 01234875a 559d3e451 -Author: Séamus O'Connor -Date: Mon Apr 27 10:52:11 2020 -0700 - - Merge pull request #1608 from bcgov/1056-add-wtn-label-to-aquifer-detail-map-popup - - Adds 'Well Tag Number' to aquifer details map popup - -commit 559d3e4510d5d244c91c4f254a468090c0ea8250 -Author: Séamus O'Connor -Date: Mon Apr 27 10:18:27 2020 -0700 - - Adds 'Well Tag Number' to aquifer details map popup - -commit 4330df76ca423faaa6d5fc1053d6c374b8c232a8 -Author: Steve Hillier -Date: Thu Apr 23 16:57:27 2020 -0700 - - temporarily add upgrade step to staging and prod - -commit 0fcc105cd2d50038d39ae4f1854be855d1b0856a -Author: Steve Hillier -Date: Thu Apr 23 16:30:42 2020 -0700 - - fix storage space - -commit 6b75f9b2c6f215fc06484479e53de9fdea888e6a -Author: Steve Hillier -Date: Thu Apr 23 16:27:22 2020 -0700 - - fix db requests - -commit 52cf938a15160b4ab6c3f299ae75336e126a48c1 -Author: Steve Hillier -Date: Thu Apr 23 16:17:55 2020 -0700 - - adjust health check - -commit 3e8dc9455a7d7f03ba2c9bbfe1f5f1df3d39bc23 -Author: Steve Hillier -Date: Thu Apr 23 16:12:29 2020 -0700 - - changes to readiness and liveness chekcs - -commit 7e1e1bb90d69b20baf2901cd36648b7a18cb480f -Author: Steve Hillier -Date: Thu Apr 23 15:57:44 2020 -0700 - - fix oc volume command - -commit 5733073a85b2228fe37e9ec15e8cd708312ed68a -Author: Steve Hillier -Date: Thu Apr 23 15:56:07 2020 -0700 - - fix path - -commit efcfbe229fe2caef052e7155531f1395a96cce4d -Author: Steve Hillier -Date: Thu Apr 23 15:53:37 2020 -0700 - - change env variables - -commit 6fc05039a16e2ff313cbf0f4cbaad117b15cbc1a -Author: Steve Hillier -Date: Thu Apr 23 14:55:04 2020 -0700 - - type in mkdir script - -commit 40f79c65061fc5f51c141106650e1b95109b8171 -Author: Steve Hillier -Date: Thu Apr 23 14:47:11 2020 -0700 - - fix path for backup folder being created - -commit f68ea0b1f3d7ef9b6290de91b935c21322ff2eb2 -Author: Steve Hillier -Date: Thu Apr 23 14:32:44 2020 -0700 - - typo in waiting for pod - -commit e4021d06520c3c3f2a3e7698b0596b0669550c5b -Author: Steve Hillier -Date: Thu Apr 23 14:22:44 2020 -0700 - - fix jenkinsfile (still testing) - -commit 0bf04989aae870e4350627227a8e7ec87d998a0a -Author: Steve Hillier -Date: Thu Apr 23 13:46:28 2020 -0700 - - fix stage condition - -commit 7a2aecc142dc925d8541cf1eb50bd3803e25c86a -Author: Steve Hillier -Date: Wed Apr 22 12:17:29 2020 -0700 - - testing automated upgrade - -commit 01234875a0bd203a083a8444fb78eb631c9997cb -Merge: 19ccf885c e27cee479 -Author: Séamus O'Connor -Date: Tue Apr 21 12:57:25 2020 -0700 - - Merge pull request #1601 from bcgov/1056-aquifer-polygons-on-details-map - - Use simplified aquifer poly on details map - -commit a8bed63379d13080609b402420eac2b4a20abafa -Author: Steve Hillier -Date: Tue Apr 21 11:56:10 2020 -0700 - - increase health check timeout - -commit e27cee4793ec2ba887c159763b7f8fe1a9b88aed -Merge: 64a3a5ce4 19ccf885c -Author: Séamus O'Connor -Date: Tue Apr 21 11:30:56 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 1056-aquifer-polygons-on-details-map - -commit 19ccf885c088417107afe58c30a5b5eb600d7acf -Merge: 12fd9722d a7e0289fb -Author: Séamus O'Connor -Date: Tue Apr 21 11:27:02 2020 -0700 - - Merge pull request #1604 from bcgov/838-obs-well-xhr-error-retry - - Adds error icon to water level analysis if XHR fails - -commit 12fd9722db3ac9e9eeeedb2124b22b0c894e9c9b -Merge: 8da58bf3b 15633f7c6 -Author: Séamus O'Connor -Date: Tue Apr 21 11:23:09 2020 -0700 - - Merge pull request #1597 from bcgov/983-aquifer-search-in-map-button - - Search within aquifer map button - -commit 10aa83db11ba593bc9c112e45e8342b38ec35a70 -Author: Steve Hillier -Date: Tue Apr 21 09:21:50 2020 -0700 - - set requests/limits for dev environments - -commit 28980d645dc41005cb95a5779f54eab77bab9a73 -Merge: d6aa547c5 8da58bf3b -Author: Steve Hillier -Date: Tue Apr 21 09:12:35 2020 -0700 - - Merge pull request #1593 from bcgov/release - - Release - -commit be6f38e7e45df100c300ca7e0936323a8aaaf533 -Author: Steve Hillier -Date: Mon Apr 20 16:56:03 2020 -0700 - - fix typo - -commit 76d61cf6d39bf66fc8308c818251b7c530f279fa -Author: Steve Hillier -Date: Mon Apr 20 16:34:25 2020 -0700 - - fix dumpName variable - -commit 0630f7dab7fa56f5b088c496a50380779adf28ec -Author: Steve Hillier -Date: Mon Apr 20 16:12:01 2020 -0700 - - prepare pipeline files for db upgrade - -commit 5cbcea1676bcfb1b6fc9c038d31cdec4d7e7ce59 -Author: Steve Hillier -Date: Mon Apr 20 10:44:38 2020 -0700 - - stop ignoring sql files - -commit 0ea26286604dc94f0c2cf6c4edb8ae379e23708d -Author: Séamus O'Connor -Date: Mon Apr 20 10:47:01 2020 -0700 - - Browser back navigates back in multi-step well submission form - -commit 048e08db93551f75849a1f5acac3b6a4c660315b -Author: Steve Hillier -Date: Mon Apr 20 10:44:38 2020 -0700 - - stop ignoring sql files - -commit a977225bdee660e1b8aa24ac25d3dd79dedda039 -Author: Steve Hillier -Date: Mon Apr 20 10:43:29 2020 -0700 - - add tileserv to docker-compose - -commit edd93736f50adbe67a55f2cbc8e748f6c3cc9f87 -Author: Steve Hillier -Date: Sat Apr 18 14:19:01 2020 -0700 - - remove unused files - -commit 3ba9a82f4327ecf7e80f145b254b5462134c0519 -Author: Steve Hillier -Date: Fri Apr 17 17:11:36 2020 -0700 - - set up for upgrade - -commit 661220dc74872fc3fe2bc502de163c47c1aa2080 -Author: Steve Hillier -Date: Fri Apr 17 15:17:49 2020 -0700 - - change host name - -commit 5d05395387702f6c10fb4d4a3986552f88e474c7 -Author: Steve Hillier -Date: Fri Apr 17 14:48:59 2020 -0700 - - set path override again - -commit 347887aa651567311b2e2fdee5dc667a7f0f9834 -Author: Steve Hillier -Date: Fri Apr 17 14:42:37 2020 -0700 - - use /tmp for pghost (required by readiness probe) - -commit 7e0de5cb9204ce365423d7c87b769601c374ca07 -Author: Steve Hillier -Date: Fri Apr 17 14:32:50 2020 -0700 - - temporarily disable build for testing - -commit 2ba542026e8be6c26383a4a1876919da45fb9ca8 -Author: Steve Hillier -Date: Fri Apr 17 14:31:38 2020 -0700 - - try different config - -commit aff36ff9e16642ad5119abe9a4f7f0d5b14db4a1 -Author: Steve Hillier -Date: Fri Apr 17 14:09:43 2020 -0700 - - fix pgdata path - -commit a7e0289fbbc7d8ac2b250c171503eac004232d1a -Author: Séamus O'Connor -Date: Fri Apr 17 13:55:49 2020 -0700 - - Adds error icon to water level analysis if xhr fails - -commit 61cf7725d447221aa9faa9e2bb2064eae114dec3 -Author: Steve Hillier -Date: Fri Apr 17 13:50:34 2020 -0700 - - add PGDATA - -commit b21834687622312f29359ef5a63f54367276cc4d -Author: Steve Hillier -Date: Fri Apr 17 13:18:47 2020 -0700 - - fix data dir - -commit 9c1b162f08f7e1264ede3e6ed1a6fb073f125d8e -Author: Steve Hillier -Date: Fri Apr 17 13:08:52 2020 -0700 - - update data path - -commit e66f7bca090e74215968a873d38b4821c2f2b9c0 -Author: Steve Hillier -Date: Fri Apr 17 12:47:34 2020 -0700 - - fix image ref - -commit 1d7598602660789e6abe3060c79b2961aa12962d -Author: Steve Hillier -Date: Fri Apr 17 12:24:34 2020 -0700 - - fix db user name - -commit 08aec8082c68b058f9e188ea0a10593bdbaa864e -Author: Steve Hillier -Date: Fri Apr 17 11:51:29 2020 -0700 - - remove outdated params - -commit 3ce137402c032afab7508d512eb8fc92de0d8ec9 -Author: Steve Hillier -Date: Fri Apr 17 11:25:11 2020 -0700 - - update postgres deployment - -commit 8da58bf3b3a2f789e39acb733c9a3411bda5d0c9 -Merge: f4dd2f448 7b72fb686 -Author: Séamus O'Connor -Date: Fri Apr 17 09:59:45 2020 -0700 - - Merge pull request #1602 from bcgov/1063-outdated-browser-updates - - Tweaking CSS & wording of outdated browser message - -commit 7b72fb6866c17709c87da4b9572055423ef6ede9 -Author: Séamus O'Connor -Date: Fri Apr 17 08:30:00 2020 -0700 - - Tweaking CSS & wording of outdated browser message - -commit 64a3a5ce452f81967d0bdce012dd439fa0b92f44 -Author: Séamus O'Connor -Date: Fri Apr 17 07:29:01 2020 -0700 - - Aquifer details map replaces DataBC raster aquifer layer with simplified aquifers polygons. - -commit 37042587718fa4a02e9103a876370218c2f521a2 -Author: Steve Hillier -Date: Thu Apr 16 21:59:30 2020 -0700 - - test debian image - -commit 2bfedc7f708c15b237804cba97ccb603ffe0b785 -Author: Steve Hillier -Date: Thu Apr 16 21:38:58 2020 -0700 - - test images - -commit f4dd2f448861a7233a185fd9a0c9d9dcc9a7a251 -Merge: 0284ad60c da4cd87f0 -Author: Séamus O'Connor -Date: Wed Apr 15 08:40:02 2020 -0700 - - Merge pull request #1599 from bcgov/970-screen-toggle-save-stays-disabled - - Well edit save button stays disabled when dropdown changed - -commit 15633f7c6c4a3ea2077c2fb8af7f6606e83163fc -Author: Séamus O'Connor -Date: Tue Apr 14 15:39:32 2020 -0700 - - Updates style of aquifer search in map button - -commit da4cd87f0c30c9d9093b828d897d34ff86ef2f9d -Author: Séamus O'Connor -Date: Tue Apr 14 15:18:26 2020 -0700 - - Fixed tests - -commit 8147f1af53d6436b7111dccf9f030a2147205f5c -Author: Séamus O'Connor -Date: Tue Apr 14 14:52:32 2020 -0700 - - Enable search in map feature when qs feature flag present - -commit c29beb85a4078ee3823f85bf10aefa63d331b313 -Author: Séamus O'Connor -Date: Tue Apr 14 12:59:04 2020 -0700 - - Well edit save button stays disabled when dropdown changed back to original value - -commit 0284ad60c3ae248f15354a0b5f41c8ed802abc43 -Merge: 13634ff5c e18910f7c -Author: Séamus O'Connor -Date: Tue Apr 14 10:11:32 2020 -0700 - - Merge pull request #1598 from bcgov/981-more-fuchia - - Enhances the fuchia outline around artesian wells - -commit e18910f7c30e631a103f4b99b25c42716d3562c0 -Author: Séamus O'Connor -Date: Thu Apr 9 15:01:45 2020 -0700 - - Enhances the fuchia outline around artesian wells - -commit 9e815344d3f0032ec2cc1ea32d60e79c1e655b62 -Merge: aa42a77ee 13634ff5c -Author: Séamus O'Connor -Date: Thu Apr 9 14:26:01 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 983-aquifer-search-in-map-button - -commit aa42a77ee1ce7f45986c19e675edd195cae8d883 -Author: Séamus O'Connor -Date: Thu Apr 9 13:47:10 2020 -0700 - - Adds buttons to search all aquifers or only those visible on map - -commit 13634ff5c5581924d2d311c4bd5bb5c62fb662ec -Merge: e28949576 8ceaeb328 -Author: Séamus O'Connor -Date: Thu Apr 9 13:43:55 2020 -0700 - - Merge pull request #1596 from bcgov/891-fix-aquifer-history-bug - - Returns None when 'geom' is missing from reversion fields - -commit 8ceaeb328d122d1bf4055ff79c7279578aca6484 -Author: Séamus O'Connor -Date: Thu Apr 9 13:11:00 2020 -0700 - - Returns None when 'geom' is missing from reversion fields - -commit e28949576a465648d2eda8c320d25ccd10af46e3 -Merge: 60d7030fd 1ec8ba729 -Author: Séamus O'Connor -Date: Thu Apr 9 12:02:37 2020 -0700 - - Merge pull request #1594 from bcgov/891-multi-polygon-aquifers - - Upgrades aquifer geom from Polygon to MultiPolygon - -commit 1ec8ba729ea3fd82dabf4260dabe1057a3b8fdf5 -Author: Séamus O'Connor -Date: Thu Apr 9 11:21:05 2020 -0700 - - Fixed error loading Swagger docs - -commit b539f1d1188a1c1bc2bf611aa74f85bfed346563 -Author: Séamus O'Connor -Date: Wed Apr 8 13:33:59 2020 -0700 - - Adds shapefile.zip for API tests - -commit 74af1d4ee48663be9d12f82077e29bae5c0e79de -Author: Séamus O'Connor -Date: Wed Apr 8 12:46:02 2020 -0700 - - Pin newman to v4.6.1 in Jenkins as newman@v5 requires Node v10 - -commit bf29600641de9bc3ccf25aec5c65ce4e3098e51b -Author: Séamus O'Connor -Date: Wed Apr 8 12:00:26 2020 -0700 - - Updates V1 APIs to only return Polygon GeoJSON. - -commit 60d7030fda7d109c269a5397c3ca3780fecbf39e -Merge: 5ec01aeb4 d176a5451 -Author: Séamus O'Connor -Date: Tue Apr 7 17:13:56 2020 -0700 - - Merge pull request #1591 from bcgov/948-stacked-aquifers-map-click - - Lists all aquifers underneath map click in popup - -commit 5ec01aeb4972262721e85a17461d6f58df228ce0 -Merge: 3a2a4a6e9 c6f8f6e02 -Author: Séamus O'Connor -Date: Tue Apr 7 14:41:39 2020 -0700 - - Merge pull request #1595 from bcgov/981-fix-aquifer-wells-toggle - - Toggles aquifer wells and raster wells layers together - -commit c6f8f6e02afe22912e49aae4c75d71f5ed0d009e -Author: Séamus O'Connor -Date: Tue Apr 7 14:17:19 2020 -0700 - - Toggles aquifer wells and raster wells layers together - -commit d176a54514de4fe5f50c31cec362b32ed7f29933 -Merge: 33d2d4f0d 3a2a4a6e9 -Author: Séamus O'Connor -Date: Tue Apr 7 14:12:50 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 948-stacked-aquifers-map-click - -commit 1f9a13da7f93548f65063338b491066f9080b197 -Author: Séamus O'Connor -Date: Tue Apr 7 14:03:37 2020 -0700 - - Upgrades aquifer geom from Polygon to MultiPolygon - -commit 3a2a4a6e971ecb632a53e5f7d692e79aa75545e6 -Merge: 10201c62a cbc33641f -Author: Séamus O'Connor -Date: Mon Apr 6 11:27:20 2020 -0700 - - Merge pull request #1588 from bcgov/981-remove-artesian-raster-layer - - Remove artesian layer from layers control - -commit d6aa547c530aa38d155738774b2b7a2f859542a2 -Merge: 24837fe2c 10201c62a -Author: Steve Hillier -Date: Mon Apr 6 11:26:05 2020 -0700 - - Merge pull request #1587 from bcgov/release - - Release - -commit 10201c62acd42fc99fb0046d96e8f8738f71d0e3 -Merge: c63d60a02 17d6fd939 -Author: Séamus O'Connor -Date: Mon Apr 6 10:21:45 2020 -0700 - - Merge pull request #1585 from bcgov/891-more-decommission-info - - Adds decomission sealant & backfill material to well summary - -commit c63d60a02ca93f08895404081db6f6fffd074086 -Merge: 0b18d5a2f 692689395 -Author: Séamus O'Connor -Date: Mon Apr 6 07:45:01 2020 -0700 - - Merge pull request #1590 from bcgov/1012-actually-delete-dupes - - Fix dupe removal migration - -commit 0b18d5a2f3f4a3e7bad2f33db470235af3147a64 -Merge: 45a02e20d db80ee9c6 -Author: Séamus O'Connor -Date: Sat Apr 4 07:27:42 2020 -0700 - - Merge pull request #1592 from bcgov/steve/netapp-staging - - Update staging deployment config in pipeline to use netapp - -commit db80ee9c6c213df99076dd6f34b3ee0823777b32 -Author: Steve Hillier -Date: Fri Apr 3 17:48:21 2020 -0700 - - add missing comma - -commit 5c95154a4a1988ae3b85334e4e86a4a16dd619f3 -Author: Steve Hillier -Date: Fri Apr 3 16:51:42 2020 -0700 - - switch staging deployment to netapp - -commit 33d2d4f0d43a93c60225a0857291573249ab88d9 -Author: Séamus O'Connor -Date: Fri Apr 3 11:02:08 2020 -0700 - - Lists all aquifers underneath map click in popup - -commit 692689395d7a11bdd61080bb8220090bfb813486 -Author: Séamus O'Connor -Date: Fri Apr 3 11:04:08 2020 -0700 - - Fixes dupe removal migration to delete associated table data for that LEGACY activity submission - -commit 45a02e20d49716e830524fd76c11b5467ea52832 -Merge: a024ef6ae 8db4ead15 -Author: Séamus O'Connor -Date: Fri Apr 3 07:54:21 2020 -0700 - - Merge pull request #1589 from bcgov/snyk-fix-a96908024e60e04e39f65c79d24d73f9 - - [Snyk] Security upgrade papaparse from 5.1.1 to 5.2.0 - -commit 8db4ead15b534504cad7af17700033a2d6c7d672 -Author: snyk-bot -Date: Fri Apr 3 05:45:17 2020 +0000 - - fix: app/frontend/package.json & app/frontend/package-lock.json to reduce vulnerabilities - - The following vulnerabilities are fixed with an upgrade: - - https://snyk.io/vuln/SNYK-JS-PAPAPARSE-564258 - -commit cbc33641f0cba3c04f66127fb6e54a505df060da -Author: Séamus O'Connor -Date: Thu Apr 2 14:47:40 2020 -0700 - - Adds artesian flag to wells/locations api. Adds legend to well search map. Shows artesian wells outlined in fuchsia. - -commit a024ef6ae4ca62a5d6262bed43106eae47d24598 -Merge: 9199bdf3c 40e3d2690 -Author: Séamus O'Connor -Date: Thu Apr 2 14:02:46 2020 -0700 - - Merge pull request #1586 from bcgov/1012-delete-duplicate-legacy-records - - Migration to delete all duplicate LEGACY submissions - -commit accde7556d3e41744abb9d0a57751d564acc572d -Author: Séamus O'Connor -Date: Thu Apr 2 12:21:09 2020 -0700 - - Updates aquifer map raster layers and updates dot styles - -commit 40e3d2690061bd09dcb30db4c4844e8bd2fca556 -Author: Séamus O'Connor -Date: Thu Apr 2 11:22:28 2020 -0700 - - Migration to delete all duplicate LEGACY submissions - -commit 17d6fd93919b626605d616099ebff8c58efb1c7e -Author: Séamus O'Connor -Date: Wed Apr 1 13:11:09 2020 -0700 - - Adds decomission sealant & backfill material to well summary - -commit 24837fe2ce232ad4cc0c975dc58c954f43ff8aa1 -Merge: daa4d4650 9199bdf3c -Author: Steve Hillier -Date: Thu Mar 19 11:23:34 2020 -0700 - - Merge pull request #1584 from bcgov/release - - Release - -commit 9199bdf3cc8b940af3176fef059d108961bd7da4 -Merge: 6cfc750c7 e8bf144c0 -Author: Séamus O'Connor -Date: Wed Mar 18 07:53:09 2020 -0700 - - Merge pull request #1583 from bcgov/942-improve-well-plate-taken-error-message - - Better error message for in-use plate numbers - -commit 6cfc750c755088c686a107f98861cdd6253eb1d7 -Merge: d60e06030 999e749e7 -Author: Séamus O'Connor -Date: Tue Mar 17 16:30:59 2020 -0700 - - Merge pull request #1577 from bcgov/533-aquifer-map-non-correlated-wells - - Aquifer map shows all wells that intersect geom - -commit d60e0603002f676512f6441497d37edc70bea84e -Merge: 1ee1c5474 57f53506d -Author: Séamus O'Connor -Date: Tue Mar 17 16:13:46 2020 -0700 - - Merge pull request #1581 from bcgov/947-fix-company-guid-search - - Shows expired person & company names in well search results - -commit daa4d46507b918071b5f911d1a24bccc0dc2cc4e -Merge: d27d9365f 1ee1c5474 -Author: Daine Trinidad -Date: Tue Mar 17 16:12:37 2020 -0700 - - Merge pull request #1567 from bcgov/release - - Release - -commit 1ee1c5474334098518afc5931af783ccd34a302e -Merge: 3bbae7fd7 d9df8fa54 -Author: Séamus O'Connor -Date: Tue Mar 17 12:58:49 2020 -0700 - - Merge pull request #1575 from bcgov/870-fix-well-history - - Shows all well changes in well history - -commit e8bf144c02ebe328704a8945abf56b7c37101a84 -Author: Séamus O'Connor -Date: Tue Mar 17 12:04:14 2020 -0700 - - Adds verbose_name to well for identification_plate_number in use error message - -commit 3bbae7fd7a4d2a8fd3200dfa376f1dcc7b8f49ba -Merge: f972919b7 6a72a2159 -Author: Séamus O'Connor -Date: Tue Mar 17 11:49:14 2020 -0700 - - Merge pull request #1582 from bcgov/816-really-expire-old-drilling-companies - - Really expire old drilling companies - -commit 6a72a2159a925bd85babe8dfea7527e89bd4b030 -Author: Séamus O'Connor -Date: Tue Mar 17 11:09:36 2020 -0700 - - Migration to set expiry_date for all drilling_companies previously moved into registries_organization - -commit a41cbd9eb83b39e353a3198a1bf0bbbc6f17670f -Author: Séamus O'Connor -Date: Tue Mar 17 10:44:30 2020 -0700 - - Revert "Updates migration to expire all copied drilling_company records" - - This reverts commit 48b9a794e0c29943e3b82fc9d3246e5009d11744. - -commit 999e749e716c31e7d8f00845a9b34ce75e6a7c27 -Author: Séamus O'Connor -Date: Tue Mar 17 08:46:08 2020 -0700 - - Combines wells-all layer and API wells on SingleAquiferMap.vue - -commit f972919b77bb639c6affeed13809e98cac135876 -Merge: ca04d7c40 c6a19c2d4 -Author: Séamus O'Connor -Date: Mon Mar 16 15:51:20 2020 -0700 - - Merge pull request #1578 from bcgov/958-fix-wellsubclass-export - - Fixes well_subclass in export - -commit 57f53506dd65b6ec6996b8c23b131a5652eca932 -Author: Séamus O'Connor -Date: Mon Mar 16 15:43:10 2020 -0700 - - Updates API tests - -commit ca04d7c4078005b6e3a58e326d81eea4948c97fb -Merge: e44b3cea9 d2e9b711c -Author: Séamus O'Connor -Date: Mon Mar 16 15:14:12 2020 -0700 - - Merge pull request #1580 from bcgov/537-fix-pie-chart-labels - - Removes MCM from pie chart labels - -commit c0abe11b9b588357cd35b9927733b01f2de188c3 -Author: Séamus O'Connor -Date: Mon Mar 16 13:42:52 2020 -0700 - - Show expired companies and people in well search table - -commit d2e9b711c8816754ea024cfad25d26c1d5c1e648 -Author: Séamus O'Connor -Date: Mon Mar 16 13:46:01 2020 -0700 - - Removes MCM from pie chart labels - -commit c6a19c2d46f32e179c63614881492beeb2b55e81 -Author: Séamus O'Connor -Date: Fri Mar 13 15:24:47 2020 -0700 - - Fixes well_subclass in export - -commit 9318274438f49a150c95d88202eb9971c5b5e67e -Author: Séamus O'Connor -Date: Fri Mar 13 14:28:45 2020 -0700 - - Aquifer map shows all wells that intersect geom - -commit e44b3cea96dec4274949e84a9a278d1cada716b9 -Merge: 1b6e992da dcbf7512f -Author: Séamus O'Connor -Date: Fri Mar 13 13:14:16 2020 -0700 - - Merge pull request #1574 from bcgov/938-saves-screen-information-on-con-submission - - Adds screen_information to construction submission serializer - -commit 1b6e992da9e1f66673166c1723c8c4fcd5269498 -Merge: facc02d89 8323fbcba -Author: Séamus O'Connor -Date: Fri Mar 13 11:51:42 2020 -0700 - - Merge pull request #1576 from bcgov/537-revert-aquifer-bar-to-pie-charts - - Changes bar chart back to a pie chart on aquifer detail view - -commit d9df8fa549a32481fc72bae4c5b4e2964a7aedf4 -Author: Séamus O'Connor -Date: Thu Mar 12 13:28:44 2020 -0700 - - Include legacy records in well history - -commit 8323fbcba1cc6e64eab8c143b69e2fabdf71f139 -Author: Séamus O'Connor -Date: Thu Mar 12 12:51:26 2020 -0700 - - Changes bar chart back to a pie chart on aquifer detail view - -commit 7b2e25c0acc37ae13f8e02767ccbca7cabf86b06 -Author: Séamus O'Connor -Date: Thu Mar 12 11:27:13 2020 -0700 - - Updates well history to use ALT submissions and to show all changes - -commit facc02d892c79b616c2f8b420b29fcc92a93a261 -Merge: 6b6aa309f 20dc9a410 -Author: Séamus O'Connor -Date: Wed Mar 11 08:34:45 2020 -0700 - - Merge pull request #1572 from bcgov/884-well-edit-screen-aquifer-detail-units - - Adds units to inputs on well edit's aquifer details section - -commit 6b6aa309fb6c71b65ae891b132f48e36226ebcd7 -Merge: 3a9fd2245 ebd105ea7 -Author: Séamus O'Connor -Date: Wed Mar 11 08:34:22 2020 -0700 - - Merge pull request #1570 from bcgov/34-fix-back-to-top-bug - - Fixes submission reload bug when url fragment changes - -commit 3a9fd2245febde5e9f53b16f87378d2d6c9a9dad -Merge: 93fca20b2 c20e52504 -Author: Séamus O'Connor -Date: Wed Mar 11 08:33:03 2020 -0700 - - Merge pull request #1554 from bcgov/924-fix-driller_name-overwrite - - Only overwrites driller_name when drillerSameAsPersonResponsible is true - -commit dcbf7512f8d28ef9dba7c3fa281e12c954f237c5 -Author: Séamus O'Connor -Date: Tue Mar 10 14:53:17 2020 -0700 - - Adds screen_information to construction submission serializer - -commit 93fca20b2581b9413bcb30c33516cc74dcc20d35 -Merge: 201a7180e 32bd9a88e -Author: Séamus O'Connor -Date: Tue Mar 10 12:30:26 2020 -0700 - - Merge pull request #1573 from bcgov/537-fix-cut-off-text-on-bar-charts - - Fixes cut off text on x-axis labels on bar charts - -commit 201a7180e4bf8e96f34dc962664e0b15847d3f42 -Merge: 7e47b1f2f 7736a7504 -Author: Séamus O'Connor -Date: Tue Mar 10 11:56:35 2020 -0700 - - Merge pull request #1558 from bcgov/675-fix-api-well-fields - - Adds person_responsible and driller_name to well search API fields - -commit 32bd9a88e41f77b85e5afc120d652b247344f9bd -Author: Séamus O'Connor -Date: Tue Mar 10 11:51:43 2020 -0700 - - Fixes cut off text on x-axis labels on bar charts - -commit 7736a750400d505678250c7bf7d6e994b9569ef7 -Merge: f20c5d367 7e47b1f2f -Author: Séamus O'Connor -Date: Tue Mar 10 11:14:31 2020 -0700 - - Merge remote-tracking branch 'origin/release' into 675-fix-api-well-fields - -commit ebd105ea7d3af02ebd59ff694bf0636f64e8de2b -Author: Séamus O'Connor -Date: Tue Mar 10 10:37:10 2020 -0700 - - Fixes typo - -commit 7e47b1f2f804a46f6557d7b965c6e58a3f447b22 -Merge: 8f211be78 f4a05965b -Author: Séamus O'Connor -Date: Tue Mar 10 10:33:59 2020 -0700 - - Merge pull request #1569 from bcgov/537-aquifer-bar-charts - - Changes pie charts to bar charts on aquifer details screen - -commit f20c5d367d2e6da8b605846959207ae3b112a527 -Author: Séamus O'Connor -Date: Tue Mar 10 10:32:49 2020 -0700 - - Changes well advanced search Additional Fields dropdown label - -commit 20dc9a410bd2eff49cc543a2f0c23e2d8eda7842 -Author: Séamus O'Connor -Date: Tue Mar 10 10:00:31 2020 -0700 - - Adds units to inputs on well edit's aquifer details section - -commit 8f211be78ae5aaf1052520073fcb35c64ae8aab2 -Merge: 0c3c5a240 bdebb83a9 -Author: Séamus O'Connor -Date: Tue Mar 10 09:55:36 2020 -0700 - - Merge pull request #1571 from bcgov/856-fix-infinity-to-depth-bug - - Converts infinite to_depth to None for VerticalAquiferExtent model - -commit bdebb83a93c7e215eb9c8f1bf17ff70747337bfd -Author: Séamus O'Connor -Date: Tue Mar 10 08:53:43 2020 -0700 - - Converts infinite to_depth to None for VerticalAquiferExtent model - -commit 72d0d8a6f066932e9b0264773e50f80fa2fcfa57 -Author: Séamus O'Connor -Date: Mon Mar 9 17:03:10 2020 -0700 - - Fixes submission reload bug when url fragment changes - -commit 0c3c5a240820fd5e911c374fb1f21f74174a5752 -Merge: 705193c71 12cb0d1cb -Author: Séamus O'Connor -Date: Mon Mar 9 13:04:19 2020 -0700 - - Merge pull request #1564 from bcgov/906-advanced-mapping-info-tooltip - - Adds tooltip to Aquifer advanced mapping knowledge indicators - -commit 705193c713e1fa66eef44a2db6a34e021d7e6ca6 -Merge: 402e05bc5 65ec21196 -Author: Séamus O'Connor -Date: Mon Mar 9 13:01:41 2020 -0700 - - Merge pull request #1568 from bcgov/872-remove-wtn-from-construction-submissions - - Hides well tag number dropdown for construction reports - -commit 12cb0d1cb297984d1e78de763067a873624631a2 -Author: Séamus O'Connor -Date: Mon Mar 9 12:11:42 2020 -0700 - - Updated advanced mapping tooltip copy - -commit f4a05965b54717f64bfebc6a2ab9894257fc565d -Author: Séamus O'Connor -Date: Mon Mar 9 11:54:52 2020 -0700 - - Adds padding to bar-chart left side so labels are not cutoff - -commit e7e735df4bccb4ded7d2a32607234383d584a27c -Author: Séamus O'Connor -Date: Fri Mar 6 16:45:53 2020 -0800 - - Shows '<0.01' instead of '0' when aquifer licence volume is less then 0.01 - -commit 3743762a39dea389c6f5e1808cb7a50d9593e2a0 -Author: Séamus O'Connor -Date: Fri Mar 6 13:56:05 2020 -0800 - - Changes pie charts to bar charts on aquifer details screen - -commit 402e05bc58fb5bd4fa227fa943bc11e1212913f1 -Merge: 0d5aee1c8 cc79a48ac -Author: Séamus O'Connor -Date: Fri Mar 6 13:55:06 2020 -0800 - - Merge pull request #1566 from bcgov/525-tooltips-fo-map-tools - - Adds title tooltips to Aquifer search map tools - -commit 0d5aee1c823c0d7ebc6bb1e4e8234311d605a9e3 -Merge: ec42e88b7 585ce1e06 -Author: Séamus O'Connor -Date: Fri Mar 6 13:54:14 2020 -0800 - - Merge pull request #1565 from bcgov/747-link-well-licence-number - - Adds link to well licence - -commit ec42e88b7443c4e4667463cd96adb1907dd50ef7 -Merge: 3f65dc4bb 016d15667 -Author: Séamus O'Connor -Date: Fri Mar 6 13:51:38 2020 -0800 - - Merge pull request #1563 from bcgov/686-fix-top-nav-for-mobile - - Shows top nav hamburger button toggle on mobile - -commit cc79a48ac313084ed32627b1551f2dacd9de4637 -Author: Séamus O'Connor -Date: Thu Mar 5 15:59:10 2020 -0800 - - Makes aquifer area-select control have a white bg - -commit 65ec21196caf54342556440b4c7ce9d784fdb5b6 -Author: Séamus O'Connor -Date: Thu Mar 5 14:04:32 2020 -0800 - - Hides well tag number dropdown for construction reports - -commit edce92914c5aa2ffe440d3890ec0a659015193d8 -Author: Séamus O'Connor -Date: Thu Mar 5 13:53:39 2020 -0800 - - Changes Aquifer lasso tool to use a different icon - -commit 3f65dc4bb025c598f96a06f933897b13b995a161 -Merge: d6e2f3004 4091f27b0 -Author: Séamus O'Connor -Date: Thu Mar 5 12:36:45 2020 -0800 - - Merge pull request #1556 from bcgov/494-show-well-yield - - Shows well yield on summary screen - -commit d6e2f3004a53ce2ecff97aa054b87797b207b6ba -Merge: 241b40639 390838679 -Author: Séamus O'Connor -Date: Thu Mar 5 12:36:36 2020 -0800 - - Merge pull request #1557 from bcgov/492-show-screen-info-on-preview - - Shows all screen info on submission preview - -commit 241b40639b36e536ed225e1365a3f0e811656ffd -Merge: 4b353c291 df3b8c48a -Author: Séamus O'Connor -Date: Thu Mar 5 12:35:53 2020 -0800 - - Merge pull request #1555 from bcgov/38-company-information-label-consistency - - Updates organization add/edit form labels to be consistent - -commit 4b353c291cb5696c59f51841d5f55b1e7b4c5671 -Merge: 541bd2f18 ccca384c3 -Author: Séamus O'Connor -Date: Thu Mar 5 12:35:10 2020 -0800 - - Merge pull request #1553 from bcgov/856-bulk-vertical-aquifer-extents - - Bulk upload of vertical aquifer extents - -commit 541bd2f18164408a5de3d28ef85a41874d2be6f7 -Merge: 14c15612e bf28cc4da -Author: Séamus O'Connor -Date: Thu Mar 5 12:33:40 2020 -0800 - - Merge pull request #1562 from bcgov/905-important-factsheets - - Highlights documents with 'factsheet' in file name - -commit d27d9365f7d204f7f18895fba1fdf3cebc1f9e1c -Merge: 8c3fb37e5 14c15612e -Author: Daine Trinidad -Date: Thu Mar 5 12:33:00 2020 -0800 - - Merge pull request #1534 from bcgov/release - - Release - -commit c58f7044dd40ce3fd7065852559fda4c9c9b2b74 -Author: Séamus O'Connor -Date: Thu Mar 5 11:42:42 2020 -0800 - - Updates copy of advanced mapping tooltip - -commit 5f06160f741609f34bf5132ecf7446129203ae0d -Author: Séamus O'Connor -Date: Thu Mar 5 09:25:40 2020 -0800 - - Adds title tooltips to Aquifer search map tools - -commit 14c15612e024900ae75d7676bc6553340c3b409a -Merge: fc6d5d925 48b9a794e -Author: Séamus O'Connor -Date: Wed Mar 4 15:29:31 2020 -0800 - - Merge pull request #1560 from bcgov/816-expire-drilling-companies - - Expire drilling companies - -commit 585ce1e065551eca781417299f4d90e3e4af6ae9 -Author: Séamus O'Connor -Date: Wed Mar 4 15:16:05 2020 -0800 - - Adds link to well licence - -commit 756fcc8f3241f64e6d9185eb5e8b14ce9cdb596b -Author: Séamus O'Connor -Date: Wed Mar 4 14:18:21 2020 -0800 - - Adds tooltip to Aquifer advanced mapping knowledge indicators - -commit fc6d5d92545cc1ae7d2356b4ec8aa3cfd292b2b7 -Merge: f1c653cea c2f198824 -Author: Séamus O'Connor -Date: Wed Mar 4 14:07:21 2020 -0800 - - Merge pull request #1561 from bcgov/933-init-sentry-only-on-prod - - Initializes Sentry only when app is loaded at prod URL - -commit 016d15667f6aa4b75552f2ba5d33443ba7893d8c -Author: Séamus O'Connor -Date: Wed Mar 4 13:54:49 2020 -0800 - - Shows top nav hamburger button toggle on mobile - -commit c2f1988246339bdc602434efb1f543603d806da3 -Author: Séamus O'Connor -Date: Wed Mar 4 13:40:26 2020 -0800 - - Changes logic to use a string const for production GWELLS URL - -commit bf28cc4da0b9e1d2b5e2cd6d770b125ac44b14dc -Author: Séamus O'Connor -Date: Wed Mar 4 13:33:41 2020 -0800 - - Fixes tests by updating Aquifer View.vue snapshot - -commit dbf17fd06cef7c73ad5e3ba7157024fde5941852 -Author: Séamus O'Connor -Date: Wed Mar 4 13:31:56 2020 -0800 - - Highlights documents with 'factsheet' in file name - -commit 89b8c4b8da65ad48802e7fb1b00eb9dd6babd561 -Author: Séamus O'Connor -Date: Wed Mar 4 12:28:06 2020 -0800 - - Initializes Sentry only when app is loaded at prod URL - -commit c20e52504521f21e73658e2ca305a75cbf248e12 -Author: Séamus O'Connor -Date: Wed Mar 4 12:25:30 2020 -0800 - - Added comment to longitude always negative - -commit 48b9a794e0c29943e3b82fc9d3246e5009d11744 -Author: Séamus O'Connor -Date: Wed Mar 4 11:12:10 2020 -0800 - - Updates migration to expire all copied drilling_company records - -commit 96647dd072efc9bd6f2c6d8aad53f9e8a5aeacc9 -Author: Séamus O'Connor -Date: Wed Mar 4 09:58:53 2020 -0800 - - Adds development notes to submission preview - -commit 1cf0d805a575857178529c647812fc7e03e65249 -Author: Séamus O'Connor -Date: Wed Mar 4 09:29:56 2020 -0800 - - Adds person_responsible and driller_name to well search API fields - -commit 3908386798d5f5f72aa45e81334b8dab9f409a48 -Author: Séamus O'Connor -Date: Tue Mar 3 13:56:33 2020 -0800 - - Shows all screen info on submission preview - -commit 4091f27b05dbd4d146543c1630eaf8d97d9c028c -Author: Séamus O'Connor -Date: Tue Mar 3 13:43:38 2020 -0800 - - Shows well yield on summary screen - -commit df3b8c48ab8001138cee776f8e36980d5b6d4376 -Author: Séamus O'Connor -Date: Tue Mar 3 13:17:45 2020 -0800 - - Updates organization add/edit form labels to be consistent - -commit 30c4dd226d34b03d666e26294cdb0a6745a26baf -Author: Séamus O'Connor -Date: Tue Mar 3 12:55:26 2020 -0800 - - Only overwrites driller_name on submission form when drillerSameAsPersonResponsible is true - -commit ccca384c323b3731c89d35985d707c3bb925ff80 -Author: Séamus O'Connor -Date: Tue Mar 3 11:02:44 2020 -0800 - - Adds API tests for bulk vertical aquifer extents - -commit b25516f80e118311c2ed0be72646fb951acc6149 -Author: Séamus O'Connor -Date: Mon Mar 2 14:26:57 2020 -0800 - - Shows empty message on well edit when there are no vertical aquifer extents - -commit 501abb8011155e32e0bacbe5ca69f4d360a30b7e -Merge: 08535c6da f1c653cea -Author: Séamus O'Connor -Date: Mon Mar 2 14:15:34 2020 -0800 - - Merge remote-tracking branch 'origin/release' into 856-bulk-vertical-aquifer-extents - -commit 08535c6da6a828b306083356b0ede9313734daeb -Author: Séamus O'Connor -Date: Mon Mar 2 14:09:19 2020 -0800 - - Logs changes to vertical aquifer extents. Shows extent changes in well history. - -commit f1c653cea59ee09ddc6179042a674599ccdaf347 -Merge: 7b0358b57 1c9751e84 -Author: Séamus O'Connor -Date: Mon Mar 2 14:03:38 2020 -0800 - - Merge pull request #1548 from bcgov/532-bulk-aquifer-documents - - Bulk aquifer documents uploading - -commit 7b0358b57e61d96787a67e39c8050819909ae774 -Merge: a3cd8ad96 fb6a54ca0 -Author: Séamus O'Connor -Date: Mon Mar 2 14:03:00 2020 -0800 - - Merge pull request #1552 from bcgov/900-show-well-cap-type-on-legacy-submissions - - Fixes bug where well_cap_type was not shown for legacy records - -commit fb6a54ca0775ed6c31a7dace3b11f43bbdf54ee8 -Author: Séamus O'Connor -Date: Fri Feb 28 14:04:54 2020 -0800 - - Outputs well_cap_type for all submission types - -commit f171300fee22cde0cccc8699b97ee0106acf03c9 -Author: Séamus O'Connor -Date: Fri Feb 28 11:08:04 2020 -0800 - - Fixes bug where well_cap_type was not shown for legacy records - -commit 73582ea2f07febbc545ab0a833412c7d65314b9a -Author: Séamus O'Connor -Date: Thu Feb 27 16:01:20 2020 -0800 - - Checks and reports conflicts for bulk vertical aquifer extents - -commit a3cd8ad968d2bb1689d152862c845fd0b4bd3c56 -Merge: f7a32e3a8 6e4bdf4eb -Author: Séamus O'Connor -Date: Thu Feb 27 11:57:08 2020 -0800 - - Merge pull request #1551 from bcgov/48-legacy-record-command-improvements - - Fixes for legacy_records command - -commit 6e4bdf4eb4134f85213041a61513804fa4c8245e -Author: Séamus O'Connor -Date: Thu Feb 27 11:13:04 2020 -0800 - - Spelling mistake fix - - Co-Authored-By: Steve Hillier - -commit 47eb4ebf36eb32d98d9390c4381fef32581bf469 -Author: Séamus O'Connor -Date: Thu Feb 27 09:38:01 2020 -0800 - - The legacy_records command no longer updates well after LEGACY submission created - -commit f7a32e3a86aabcdcf6c340db03f7526da676d1ce -Merge: 1cf146d7f f0e99b57b -Author: Séamus O'Connor -Date: Thu Feb 27 08:28:10 2020 -0800 - - Merge pull request #1537 from bcgov/702-relax-casing-validation - - Allows casing start/end to not be required when length_required=false - -commit 987a2ca629073074c861eddfa4f308179d1b3e61 -Author: Séamus O'Connor -Date: Wed Feb 26 15:33:20 2020 -0800 - - Adds bulk vertical aquifer extents CSV upload screen and API - -commit a58c7c673a99d4351b0f0e09efd8d42d33f32d08 -Merge: 1c9751e84 1cf146d7f -Author: Séamus O'Connor -Date: Wed Feb 26 10:35:52 2020 -0800 - - Merge remote-tracking branch 'origin/release' into 856-bulk-vertical-aquifer-extents - -commit 1c9751e84ae21df65f1c474589d7a3e94b9c1002 -Author: Séamus O'Connor -Date: Wed Feb 26 10:34:36 2020 -0800 - - Merges behaviour of AquiferSlimList into AquiferNameList as a V2 view - -commit 1cf146d7f3677e660175e1ef4c49efa0a01d0160 -Merge: a74e62996 41a686a37 -Author: Steve Hillier -Date: Wed Feb 26 09:15:23 2020 -0800 - - Merge pull request #1549 from bcgov/steve/rmzap - - Remove unused/buggy stages in Jenkinsfile - -commit a74e629964977b63808af2b2f5af81b56dd30adc -Merge: 397660ac8 c9df47b5f -Author: Séamus O'Connor -Date: Wed Feb 26 08:41:13 2020 -0800 - - Merge pull request #1547 from bcgov/888-missing-db-comments - - Fixes DB comments - -commit 41a686a374ab83e7db70a845be31b35524e478d3 -Author: Steve Hillier -Date: Tue Feb 25 16:42:17 2020 -0800 - - remove last functional test reference - -commit 430249c7d25aebc690298916e02533fcef200132 -Author: Steve Hillier -Date: Tue Feb 25 15:58:17 2020 -0800 - - Clean up unused/buggy stages in Jenkinsfile - -commit c9df47b5ff4bba069f5e1461b508c64de5bef829 -Author: Séamus O'Connor -Date: Tue Feb 25 15:58:05 2020 -0800 - - Allow overwriting lat/lng even when a well is specified for a vertical aquifer extent - -commit 397660ac80cb41a1dd796a57d1ab312b1e337c95 -Merge: afba0d41b 26636c67c -Author: Séamus O'Connor -Date: Tue Feb 25 15:47:23 2020 -0800 - - Merge pull request #1546 from bcgov/48-legacy-records-creation-command - - Adds command to create legacy well records - -commit f9a257d584f9bba4fbe5299be91f362d0dc1cc5d -Author: Séamus O'Connor -Date: Tue Feb 25 15:43:38 2020 -0800 - - Shows which aquifer document files are invalid - -commit 6eb0315103eebe6b9006418ecd7bbaff6b1e622e -Author: Séamus O'Connor -Date: Tue Feb 25 14:02:31 2020 -0800 - - Fixes model import issues. Updates DB with db_comments defined on models - -commit 26636c67c2a17d19f8755a0572a3fcaf8913ca11 -Merge: ee17ebe42 afba0d41b -Author: Séamus O'Connor -Date: Tue Feb 25 08:43:20 2020 -0800 - - Merge branch 'release' into 48-legacy-records-creation-command - -commit c93286e24d6c03a859658a1d398153df04f3bded -Author: Séamus O'Connor -Date: Mon Feb 24 16:19:38 2020 -0800 - - Allows uploading aquifer documents keyed by aquifer_id - -commit ee17ebe42a3a15d7646759524b227bbd46ec0ab6 -Author: Séamus O'Connor -Date: Mon Feb 24 13:39:32 2020 -0800 - - Adds --next switch to legacy_records command - -commit afba0d41b2ea3e493e39520488311c4a147f741a -Merge: 2e2e69dd2 93849b7f3 -Author: Séamus O'Connor -Date: Mon Feb 24 09:43:18 2020 -0800 - - Merge pull request #1543 from bcgov/569-vertical-aquifer-extents - - 3D aquifers a.k.a. Vertical Aquifer Extents - -commit 5434e8af65132bde6702a13c85e1297dd4460d8e -Author: Séamus O'Connor -Date: Mon Feb 24 09:34:39 2020 -0800 - - Cleanup - -commit 483fc94fb6eb1117305cde799a40447b7a52578b -Author: Séamus O'Connor -Date: Fri Feb 21 13:52:25 2020 -0800 - - Cleaned up `create_legacy_record()` comments - -commit 93849b7f3435fcecc1553da97929a98da539264c -Merge: 611bcb136 2e2e69dd2 -Author: Séamus O'Connor -Date: Fri Feb 21 13:13:14 2020 -0800 - - Merge remote-tracking branch 'origin/release' into 569-vertical-aquifer-extents - -commit 611bcb136a838c1a88f0aa357ffed82ddcd0bb3c -Author: Séamus O'Connor -Date: Fri Feb 21 12:57:52 2020 -0800 - - Shows vertical aquifer extents on well edit. Validates VAEs start / end don't overlap. - -commit f9a8c95b041e20beddd479535bd8dc4a0bd8b7c6 -Author: Séamus O'Connor -Date: Thu Feb 20 14:32:27 2020 -0800 - - Adds command to create legacy well records - -commit 2e2e69dd2fc95fee516e56908b99f852f60ed44d -Merge: 2fc3f9343 499d67835 -Author: Séamus O'Connor -Date: Thu Feb 20 08:35:44 2020 -0800 - - Merge pull request #1545 from bcgov/871-bug-well-api-geojson-flag-error - - Fixes 500 error when /wells/locations?geojson=true flag is set - -commit 5975f543daa430d799d3622a8d1f3edf599765e9 -Author: Séamus O'Connor -Date: Wed Feb 19 16:16:11 2020 -0800 - - Adds bulk aquifer documents screen - -commit 499d67835244fb3b5dc106b147266ed030879b9b -Author: Séamus O'Connor -Date: Tue Feb 18 16:32:43 2020 -0800 - - Excludes null well geom from /wells/locations?geojson=true requests - -commit 2fc3f934316989841e3442c207d32f67ab93d277 -Merge: 5b75e3a94 1050d88aa -Author: Séamus O'Connor -Date: Tue Feb 18 16:25:22 2020 -0800 - - Merge pull request #1544 from bcgov/855-bug-well-points-outside-of-bc - - Migration for any wells with positive longitude values - -commit d32c2ea2fee7fbe4388452079deb667c868d6568 -Author: Séamus O'Connor -Date: Tue Feb 18 15:48:42 2020 -0800 - - Fixes 500 error when /wells/locations?geojson=true flag is set - -commit 1050d88aad4a12f9e85a2871ed5c75b8d2ae42fa -Author: Séamus O'Connor -Date: Tue Feb 18 15:39:21 2020 -0800 - - Migration for any wells with positive longitude values - -commit 43384fb3d9497dd4338368159e6acc7615c99697 -Author: Séamus O'Connor -Date: Tue Feb 18 13:52:53 2020 -0800 - - Adds vertical aquifer extents models, api, and edit screen. - -commit 5b75e3a944acf703779891ebc66650dbcfac3f95 -Merge: 9833874d3 9f96cd385 -Author: Séamus O'Connor -Date: Fri Feb 14 11:15:19 2020 -0800 - - Merge pull request #1542 from bcgov/fix-staging-api-tests - - Fixes staging well aquifer correlation bulk upload API tests - -commit 9f96cd385bf469bafa18248c8ce0a1023854c716 -Author: Séamus O'Connor -Date: Fri Feb 14 09:39:53 2020 -0800 - - Fixes staging well aquifer correlation bulk upload API tests - -commit 9833874d3ed9ef204d66bb0cb618476abc5ca584 -Merge: e6972e70f cd850e58f -Author: Séamus O'Connor -Date: Fri Feb 14 08:29:24 2020 -0800 - - Merge pull request #1536 from bcgov/598-bulk-aquifer-well-association - - Adds bulk well aquifer correlation screen - -commit cd850e58fa055319ead060984b32d75277c92293 -Author: Séamus O'Connor -Date: Fri Feb 14 07:49:01 2020 -0800 - - Fixes top nav bulk link - -commit e6972e70f54b2ce68a233c15e7dfff6b12c7e4ae -Merge: 4eca13c4d 8818b6863 -Author: Séamus O'Connor -Date: Thu Feb 13 14:27:29 2020 -0800 - - Merge pull request #1541 from bcgov/fix-migrations - - Fixing migrations - -commit 914e942ca80ef4a7c2c6d64f35c4aab7d3d186b5 -Merge: 2cd46f13b 8818b6863 -Author: Séamus O'Connor -Date: Thu Feb 13 13:54:12 2020 -0800 - - Merge branch 'fix-migrations' into 598-bulk-aquifer-well-association - -commit 8818b6863e27991086180242aaa6d00cda2e351b -Author: Séamus O'Connor -Date: Thu Feb 13 13:44:00 2020 -0800 - - Fixing migrations - -commit 2cd46f13ba66895018ca61e4690e31806ad323a3 -Merge: 8da9c9ff5 4eca13c4d -Author: Séamus O'Connor -Date: Thu Feb 13 13:40:29 2020 -0800 - - Merge remote-tracking branch 'origin' into 598-bulk-aquifer-well-association - -commit 8da9c9ff55022b82b79529e5267571ec110290dc -Author: Séamus O'Connor -Date: Thu Feb 13 13:14:16 2020 -0800 - - Adds 'Bulk Upload' header nav link. Checks for keycloak bulk_well_aquifer_correlation_upload perm. - -commit 4eca13c4d1f21048f6d786474274476c2ffdd315 -Merge: 33740256e 56016eaa8 -Author: Séamus O'Connor -Date: Thu Feb 13 12:20:02 2020 -0800 - - Merge pull request #1538 from bcgov/747-aquifer-size-from-geom - - Changes aquifer area from user editable to a computed field from geom - -commit 64733ae2e2b7cd1922ab26166aadec4493887317 -Merge: 167949261 33740256e -Author: Séamus O'Connor -Date: Thu Feb 13 11:44:40 2020 -0800 - - Merge remote-tracking branch 'origin' into 598-bulk-aquifer-well-association - -commit 33740256ef35076264f1e6ea64bc08be304728bb -Merge: 9eb048dd6 3602fe859 -Author: Séamus O'Connor -Date: Thu Feb 13 11:24:40 2020 -0800 - - Merge pull request #1540 from bcgov/868-fix-migrations - - Sync to model definitions after running makemigrations - -commit 3602fe859c644f80af3f36d896959324ca7e0707 -Author: Séamus O'Connor -Date: Thu Feb 13 10:33:43 2020 -0800 - - Sync to model definitions after running makemigrations - -commit 1679492618b250f91d4081181c840850f39c0f56 -Author: Séamus O'Connor -Date: Thu Feb 13 09:35:17 2020 -0800 - - Changes how well aquifer correlation history is stored in the DB. Updated get_well_history to use this new table to populate the history response. - -commit 03379c15d4418ad8361980796be94f6d7f23f2e2 -Author: Séamus O'Connor -Date: Wed Feb 12 14:19:04 2020 -0800 - - Updated bulk routes. Changed UX for bulk well aquifer correlation Vue - -commit a57190162a6564007fbc50c034b92a7091ad4c82 -Author: Séamus O'Connor -Date: Wed Feb 12 13:59:53 2020 -0800 - - Moved well aquifer correlation bulk upload component to bulk/components/ - -commit 915a249b131a1e3673e89039e9f3b98e02609166 -Author: Séamus O'Connor -Date: Fri Feb 7 15:58:44 2020 -0800 - - Moves well aquifer correlation to gwells app in bulk files. Records history of bulk operations in bulk_history table - -commit 9eb048dd6436f186c971ef1acf7efe7b30623406 -Merge: 5b13d10e6 e2e88929c -Author: Steve Hillier -Date: Fri Feb 7 10:58:45 2020 -0800 - - Merge pull request #1539 from bcgov/steve/remove-fdw - - remove FDW vars from postgres deployment - -commit 5b2a7193b09e3084f8ab9860139843deae81a411 -Author: Séamus O'Connor -Date: Fri Feb 7 10:55:49 2020 -0800 - - Changes bulk aquifer correlation endpoint to only required HasAquiferEditRole perm - -commit 56016eaa823b197fa7efcf3a294c76cb03c1d648 -Author: Séamus O'Connor -Date: Fri Feb 7 10:42:30 2020 -0800 - - Fixing tests - -commit f79de62932515e3f9284b70f50222e93e9efedd9 -Author: Séamus O'Connor -Date: Fri Feb 7 10:26:50 2020 -0800 - - Fixing API tests - -commit f0e99b57bc8c8300c68271458b6d56969f469fad -Author: Séamus O'Connor -Date: Thu Feb 6 15:40:14 2020 -0800 - - Fixing bugs with casings and optionally required start/end - -commit e2e88929c7e332489b8cbaacbeff87f42af82bad -Author: Steve Hillier -Date: Thu Feb 6 15:46:12 2020 -0800 - - remove FDW vars from postgres deployment - -commit bc6b1fd6fb9d98d85646ee4d20ab993317c23cab -Author: Séamus O'Connor -Date: Thu Feb 6 14:03:17 2020 -0800 - - Fixes casing test - -commit c6abb9f8b38a49f77d9e8b05837770150267eaee -Author: Séamus O'Connor -Date: Thu Feb 6 13:56:33 2020 -0800 - - Changes aquifer area from user editable to a computed field from geom - -commit 97c9941b326ca4e9dcba0843adf065156784cc22 -Author: Séamus O'Connor -Date: Wed Feb 5 16:31:56 2020 -0800 - - Fixing Postman tests - -commit e3cdf90c8c1a500bee1470ede53322a85ccedfcf -Author: Séamus O'Connor -Date: Wed Feb 5 15:18:58 2020 -0800 - - Adds bulk well🡘aquifer association screen - -commit 527603abe720df2149c11b899c131ac3eb37e1d1 -Author: Séamus O'Connor -Date: Tue Feb 4 13:08:54 2020 -0800 - - Allows casing start/end to not be required when length_required=false - -commit 5b13d10e6776077a8716c246a62a1c2d8848bdeb -Merge: 3b8ad8a97 7953fddd9 -Author: Séamus O'Connor -Date: Tue Feb 4 10:41:42 2020 -0800 - - Merge pull request #1533 from bcgov/730-adds-ns-nb-certs - - Adds two drill and pump certifications - -commit 7953fddd9ea37de8a92e31249e597b4596396af2 -Merge: 4c524a3ff 3b8ad8a97 -Author: Séamus O'Connor -Date: Mon Feb 3 15:10:43 2020 -0800 - - Merge remote-tracking branch 'origin' into 730-adds-ns-nb-certs - -commit 3b8ad8a9707492e02c1bf8e92476423b188eea52 -Merge: 9ee62d8c9 502a85c71 -Author: Séamus O'Connor -Date: Mon Feb 3 15:08:43 2020 -0800 - - Merge pull request #1529 from bcgov/47-require-proof-of-age - - Adds NOTPROVIDED proof of age code - -commit 9ee62d8c9109a0abaaf1d15f2788339e9a934f9b -Merge: 610604f48 b58ef9a13 -Author: Séamus O'Connor -Date: Mon Feb 3 13:38:09 2020 -0800 - - Merge pull request #1535 from bcgov/825-more-export-data - - Adds more fields (well's aquifer test data) to export - -commit 4c524a3ffca5897ab7f44e6e6a48e1dc4797d0d5 -Author: Séamus O'Connor -Date: Mon Feb 3 11:20:09 2020 -0800 - - Django unit tests use ActivityCode and SubactivityCode from DB migrations - -commit 610604f48f76a7d71d9d07b6a4e9c416f5b9ede1 -Merge: 0be13da8b 5872fed9a -Author: Séamus O'Connor -Date: Mon Feb 3 10:32:51 2020 -0800 - - Merge pull request #1527 from bcgov/802-drilling-company-migration - - Drilling company migration - -commit 502a85c7182996f0a8ad5128ead9148d27efcf3e -Author: Séamus O'Connor -Date: Sat Feb 1 09:00:27 2020 -0800 - - Alters max_length to 15 for registries_proof_of_age_code to handle 'NOTPROVIDED' - -commit f136720e13e81c430995397c385d28782841b68d -Merge: 5063548fd 0be13da8b -Author: Séamus O'Connor -Date: Fri Jan 31 16:32:15 2020 -0800 - - Merge remote-tracking branch 'origin/release' into 47-require-proof-of-age - -commit 5063548fd77a6839aa4ab80b164ce35976af1a71 -Author: Séamus O'Connor -Date: Fri Jan 31 16:31:55 2020 -0800 - - Changes 'Unknown' proof of age to 'Not Provided' - -commit 44f829998dde3b83872cb597853486aef543c0f4 -Merge: 20904be38 0be13da8b -Author: Séamus O'Connor -Date: Fri Jan 31 16:18:50 2020 -0800 - - Merge remote-tracking branch 'origin/release' into 730-adds-ns-nb-certs - -commit b58ef9a13b348c5b7875145de0e067dcbd95e7ea -Author: Séamus O'Connor -Date: Fri Jan 31 16:17:56 2020 -0800 - - Adds more fields (well's aquifer test data) to export - -commit 20904be38de0aedc21fa84b0cea4394cd41edabf -Author: Séamus O'Connor -Date: Fri Jan 31 15:14:25 2020 -0800 - - Changes migration to add missing activity and subactivty code table data - -commit c531656116e836e28a0b974de4ba7b61c6f677d0 -Author: Séamus O'Connor -Date: Fri Jan 31 13:34:29 2020 -0800 - - Fixes migration - -commit 5872fed9adb02c98136dc6039f64130a7af88072 -Author: Séamus O'Connor -Date: Fri Jan 31 12:58:17 2020 -0800 - - Adds 'Flotonic Waterwell' company to well fixture 123 - -commit 0be13da8b3f0b0181aac73f8cc1679e307348a2f -Merge: 5729991af 144a046c7 -Author: Séamus O'Connor -Date: Fri Jan 31 12:03:58 2020 -0800 - - Merge pull request #1531 from bcgov/steve/psqlcheck - - fix readiness probe for postgres - -commit 7367d4cfa7846aff9486b97b523949e96b1e7bf4 -Author: Séamus O'Connor -Date: Fri Jan 31 11:13:11 2020 -0800 - - Adds migration to add NS and NB certs - -commit 8c3fb37e5b1b2706a3db5dcd4dc8ae449cde4c68 -Merge: 4731d12b4 5729991af -Author: Daine Trinidad -Date: Fri Jan 31 10:29:56 2020 -0800 - - Merge pull request #1520 from bcgov/release - - Release - -commit 8f60a8c2622a5802df6eb4cc08e01495d2277376 -Author: Séamus O'Connor -Date: Fri Jan 31 09:40:47 2020 -0800 - - Fixed migrations SQL - -commit 5729991afec284e71decc97edbad8694f6573e9f -Merge: d38b691ff 486515807 -Author: Séamus O'Connor -Date: Thu Jan 30 15:40:48 2020 -0800 - - Merge pull request #1532 from bcgov/837-fix-non-numeric-coords-input - - Fixes bug caused by non-numeric input entered into Coords.vue input boxes - -commit d38b691ff17857c11c763f6c5309c56dc1d339da -Merge: 63c26a292 18c773701 -Author: Séamus O'Connor -Date: Thu Jan 30 15:38:11 2020 -0800 - - Merge pull request #1530 from bcgov/836-fix-aquifer-water-layer-bug - - Fixes JS exception when toggling 'Water Licences' layer - -commit b0e14ebab939c721660fb3ca2c46eccf457eca83 -Author: Séamus O'Connor -Date: Thu Jan 30 15:11:47 2020 -0800 - - Updates api tests to send required UNKNOWN proof_of_age code - -commit 144a046c7680e58aef1882222707991dffda4ab9 -Author: Steve Hillier -Date: Thu Jan 30 10:41:57 2020 -0800 - - modify readiness probe for postgres - -commit 486515807172f10316e10338fce724b98600d6a5 -Author: Séamus O'Connor -Date: Thu Jan 30 10:29:49 2020 -0800 - - Fixes bug caused by non-numeric input entered into Coords.vue input boxes - -commit 18c7737010108c26f5aab55c1c203e316bf47d09 -Author: Séamus O'Connor -Date: Thu Jan 30 09:27:48 2020 -0800 - - Fixes JS exception when toggling 'Water Licences' layer - -commit 16061a6ddb73d07b9b4d02d76682ff4f5627b826 -Author: Séamus O'Connor -Date: Mon Jan 20 11:05:16 2020 -0800 - - Adds UNKNOWN proof of page code - -commit 63c26a292a7c697fe68f6be2fe51e4f6457184c4 -Merge: ae857bee1 5a5242587 -Author: Séamus O'Connor -Date: Mon Jan 20 11:29:44 2020 -0800 - - Merge pull request #1528 from bcgov/daine/compliance - - Updating COMPLIANCE.yaml - -commit ae857bee118bea3524aacd1c192817a5973350ef -Merge: 7d89439c4 6b953dd91 -Author: Séamus O'Connor -Date: Mon Jan 20 09:36:18 2020 -0800 - - Merge pull request #1523 from bcgov/784-well-history-bug - - Fixes bug with generating well history JSON - -commit 5a52425872042fdc16817971ea9dd4d8f7d1bd1f -Author: daine -Date: Mon Jan 20 08:48:57 2020 -0800 - - Updating COMPLIANCE.yaml - -commit e03f14bc045423696d8fa609d8a86921dc9b2b66 -Author: Séamus O'Connor -Date: Fri Jan 17 14:10:47 2020 -0800 - - Updates tests to work with drilling_company changes. Adds tests for filtering by drilling_company - -commit 37f45e1888bd3fc84ebde33d82e3962cb1ed3945 -Author: Séamus O'Connor -Date: Fri Jan 17 12:56:34 2020 -0800 - - Finishes migration of legacy drilling_company to registries_organization - -commit 7d89439c4278f2f30dc405f00dc2359c9a466348 -Merge: 7f6708287 97582d71d -Author: Daine Trinidad -Date: Fri Jan 17 10:14:44 2020 -0800 - - Merge pull request #1525 from bcgov/repo-mountie/add-compliance - - Add missing compliance audit file - -commit 7f6708287a42b87c5a07985e72c4f136b0a82cea -Merge: d773f04ff ffc167dfa -Author: Séamus O'Connor -Date: Fri Jan 17 09:04:39 2020 -0800 - - Merge pull request #1524 from bcgov/263-show-well-subclass - - Shows well's sub class on well detail screen - -commit ea4a3696259efb7912eef61adc9e0f0f1c463d89 -Author: Séamus O'Connor -Date: Thu Jan 16 17:01:01 2020 -0800 - - Initial migration to set org_of_person_responsible_guid = drilling_company_guid where needed - -commit 97582d71def91e6304550632a9e36b4314a63a7d -Author: repo-mountie[bot] <44246292+repo-mountie[bot]@users.noreply.github.com> -Date: Fri Jan 17 00:23:35 2020 +0000 - - Add compliance audit file - -commit ffc167dfa7b7715237943e9f446faa351d046a13 -Author: Séamus O'Connor -Date: Thu Jan 16 11:32:47 2020 -0800 - - Shows well sub class on well detail screen - -commit d773f04ff6171af30d174f55070136ad48dde777 -Merge: e07bed757 76f7cb05d -Author: Séamus O'Connor -Date: Wed Jan 15 16:19:32 2020 -0800 - - Merge pull request #1509 from bcgov/691-better-back-button-behaviour - - Improves back button behaviour - -commit e07bed757539dd8e1b72b5fcb2d6fa8e7e571d89 -Merge: 55d103ed0 29aba9f57 -Author: Séamus O'Connor -Date: Wed Jan 15 16:17:27 2020 -0800 - - Merge pull request #1522 from bcgov/773-save-empty-well-lat-lng - - Save empty well lat lng - -commit 55d103ed0fe38eb4d9a2b17baa710d58a0559f51 -Merge: cabec48fc de1a8d22d -Author: Séamus O'Connor -Date: Wed Jan 15 15:31:22 2020 -0800 - - Merge pull request #1521 from bcgov/780-change-map-layer-gw-license-label - - Changes Aquifer Map layer 'Groundwater Licences' to 'Water Licences' - -commit 6b953dd91a95b10fd801d5a9b40bfcd7481f2cf0 -Author: Séamus O'Connor -Date: Wed Jan 15 15:11:00 2020 -0800 - - Fixes bug with generating well history JSON - -commit 29aba9f5717b90dc09a0829e552736f90e472ea1 -Author: Séamus O'Connor -Date: Wed Jan 15 11:47:05 2020 -0800 - - Quick fix for well lat/lng to use validNumber too - -commit 088a97c2d414a787555272c4d5ce5ab6d10fbae0 -Author: Séamus O'Connor -Date: Wed Jan 15 11:44:06 2020 -0800 - - Fixes bug saving existing well's empty lat/lng - -commit cabec48fc28851d498cb2a69f8e26cd323a19f3f -Merge: 394defe30 23dadc56e -Author: Séamus O'Connor -Date: Tue Jan 14 15:54:04 2020 -0800 - - Merge pull request #1518 from bcgov/482-utm-coords-bug - - Fixes UTM input bug - -commit 394defe304450013851c4517cf38e37f1ff506d2 -Merge: 314aadcc3 764645c04 -Author: Séamus O'Connor -Date: Tue Jan 14 15:53:22 2020 -0800 - - Merge pull request #1517 from bcgov/700-utm-from-geom - - Derives UTM easting / northing from geom - -commit 76f7cb05dabb075ea68f9d417743b6fee82067f1 -Author: Séamus O'Connor -Date: Tue Jan 14 15:00:43 2020 -0800 - - Removes stats-webpack-plugin webpack plugin - -commit de1a8d22dbe4d873d33198d77b8ef931a3dae76a -Author: Séamus O'Connor -Date: Tue Jan 14 12:43:28 2020 -0800 - - Changes Aquifer Map layer 'Groundwater Licences' to 'Water Licences' - -commit 314aadcc39564a20611af7a6f0edffd6490298ac -Merge: 1935a6c2d 0c7afbc17 -Author: Séamus O'Connor -Date: Tue Jan 14 12:39:22 2020 -0800 - - Merge pull request #1519 from bcgov/261-save-internal-comments - - Saves internal comments on well submission - -commit 4731d12b41c5d51ca0982792e54ca05a3c889e71 -Merge: 099a4d8cc 1935a6c2d -Author: Steve Hillier -Date: Tue Jan 14 12:25:59 2020 -0800 - - Merge pull request #1515 from bcgov/release - - Release - -commit e36dd804d7bf3fc1a8fa1d4851529aa6710485b5 -Author: Séamus O'Connor -Date: Tue Jan 14 11:35:47 2020 -0800 - - Uses Webpack aliases for lodash and moment to reduce bundle size - -commit 23dadc56e738cc6e13fb638ce97c158d427b0d7b -Author: Séamus O'Connor -Date: Tue Jan 14 10:56:15 2020 -0800 - - Adds tests to Coords.vue component - -commit 764645c040a196a9787e89f6b26cb6b81e5af245 -Merge: b95595340 1935a6c2d -Author: Séamus O'Connor -Date: Mon Jan 13 16:26:52 2020 -0800 - - Merge branch 'release' into 700-utm-from-geom - -commit b9559534080e1177d0d6edc6867d4167b640bac0 -Author: Séamus O'Connor -Date: Mon Jan 13 16:19:01 2020 -0800 - - Added comment about UTM easting/northing rounding - -commit 1935a6c2d590c781914d3c4f3cebc37209372a1c -Merge: 7c46caa1a 882bba644 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Jan 13 16:18:12 2020 -0800 - - Merge pull request #1513 from bcgov/701-adds-driller-to-decommission-submission - - Stores driller information for well decommission submissions - -commit 9b2c7396e7ab6679c60c970838136130c05db047 -Author: Séamus O'Connor -Date: Mon Jan 13 16:06:57 2020 -0800 - - Fixes lat/lng well submission logic - -commit 0c7afbc17e4564e2427491ac47c74a8fc03ab85a -Author: Séamus O'Connor -Date: Mon Jan 13 11:43:43 2020 -0800 - - Adds 'internal_comments' to well submission serializers - -commit 6d17d5ea477486d16f767572aa05e36a2e276dd0 -Author: Séamus O'Connor -Date: Mon Jan 13 11:25:49 2020 -0800 - - Replaces Coords.vue input locking & watches with on-input coords conversion logic - -commit 6ae4ec05b9adb1efc9c53989db7bc11966342e1d -Merge: 980807e9f 7c46caa1a -Author: Séamus O'Connor -Date: Mon Jan 13 09:36:37 2020 -0800 - - Merge remote-tracking branch 'origin' into 691-better-back-button-behaviour - -commit 980807e9f21ed9bcf1eae42ad5b5aee70fc12893 -Author: Séamus O'Connor -Date: Fri Jan 10 16:31:01 2020 -0800 - - Fixes tests - -commit 3b65a3177f8928342a956ffd0578a49c4d6c7810 -Author: Séamus O'Connor -Date: Fri Jan 10 16:17:29 2020 -0800 - - Fixed bug where aquifer search was not reset when clicking 'Aquifer Search' links - -commit 7c46caa1aee653c7361596f1479fd971d52a17b1 -Merge: eecdef049 f89efa473 -Author: Séamus O'Connor -Date: Fri Jan 10 15:29:23 2020 -0800 - - Merge pull request #1516 from bcgov/790-fix-aquifer-loading-spinner-bug - - Upgrades axios to 0.19.1 to fix Chrome cancellation bug - -commit 4529d09320c2414732dfd5ea3f29fa6e8331cc11 -Author: Séamus O'Connor -Date: Fri Jan 10 13:49:45 2020 -0800 - - Adds pre_save signal to update utm columns computed from geom - -commit b512458291ce06f8b77cac0b6b401098fdef460e -Author: Séamus O'Connor -Date: Fri Jan 10 13:49:32 2020 -0800 - - Adds migration to re-compute utm easting/northing from geom - -commit 8c72b7a2652e54feab464af6dc47049163ff91b9 -Author: Séamus O'Connor -Date: Fri Jan 10 12:40:34 2020 -0800 - - Fixes WATER-773 bug when saving well w/o lat/lng - -commit f89efa47392e0bc687159712ea8c8df45c00c168 -Author: Séamus O'Connor -Date: Fri Jan 10 11:21:39 2020 -0800 - - Upgrades axios to 0.19.1 to fix Chrome cancellation bug - -commit 2d268622f940153bb088f1135184e2f8c7e95745 -Merge: d1459f177 eecdef049 -Author: Séamus O'Connor -Date: Fri Jan 10 09:07:01 2020 -0800 - - Merge remote-tracking branch 'origin' into 691-better-back-button-behaviour - -commit d1459f177cb8637e8ed3d4dfafa5ca1dac744c28 -Merge: a0f3943f6 11f043176 -Author: Séamus O'Connor -Date: Fri Jan 10 08:58:31 2020 -0800 - - Merge remote-tracking branch 'origin' into 691-better-back-button-behaviour - -commit eecdef049557d49ef421304087aa0de76137be80 -Merge: 11f043176 cabdc751a -Author: Séamus O'Connor -Date: Fri Jan 10 08:43:15 2020 -0800 - - Merge pull request #1514 from bcgov/790-fix-aquifer-geom-from-shapefile - - Improves aquifer edit error messages - -commit a0f3943f616980d3660dd26fab7f2cc7ce2c51f4 -Author: Séamus O'Connor -Date: Thu Jan 9 16:27:15 2020 -0800 - - Adds tests - -commit cabdc751aaa2f72429429994321fe193c1547a6e -Author: Séamus O'Connor -Date: Thu Jan 9 15:28:00 2020 -0800 - - Fixes error if .zip file is uploaded but no .shp file can be found - -commit 1ecfe8dc3497fa823c11e0944c7649e6532addb6 -Author: Séamus O'Connor -Date: Thu Jan 9 15:08:04 2020 -0800 - - Transform shapefile to 3005 - -commit 721c484d5dc1ca6d668bdbb3fab44f0fab858ed3 -Author: Séamus O'Connor -Date: Thu Jan 9 14:35:44 2020 -0800 - - Improves aquifer edit error messages - -commit 099a4d8cca9fc98fe0da7797196181663d559824 -Merge: e4d22434f 11f043176 -Author: Steve Hillier -Date: Wed Jan 8 15:14:57 2020 -0800 - - Merge pull request #1490 from bcgov/release - - Release - -commit 11f043176911db23782465bef6f4495ea83ace65 -Merge: 7c98c1a35 3fd9859ea -Author: Séamus O'Connor -Date: Wed Jan 8 13:06:41 2020 -0800 - - Merge pull request #1507 from bcgov/548-deletable-aquifer-documents - - Allows uploaded files to be deleted on aquifer edit form - -commit 7c98c1a35ecc79152eed509bba83d6feb61319dd -Merge: 6b69bd803 8c659c094 -Author: Séamus O'Connor -Date: Tue Jan 7 17:01:42 2020 -0800 - - Merge pull request #1506 from bcgov/696-browser-update-message - - Adds browser-update.org powered outdated browser detection - -commit 8c659c094da1148bb7a23a9254a165c615cfdca7 -Author: Séamus O'Connor -Date: Tue Jan 7 16:11:52 2020 -0800 - - Changes outdated browser message timeout to 1.1hrs - -commit f7d87db38ba9cd83e1b0c81a53063160bed81b4f -Merge: 6192e1f2f 6b69bd803 -Author: Séamus O'Connor -Date: Tue Jan 7 14:13:33 2020 -0800 - - Merge remote-tracking branch 'origin' into 696-browser-update-message - -commit 6b69bd80329d5d99a65fdbbe47132f11d3c303d4 -Merge: ef7888031 620db26cf -Author: Séamus O'Connor -Date: Tue Jan 7 14:08:04 2020 -0800 - - Merge pull request #1503 from bcgov/39-search-for-aquifers-in-map-view - - Shows searched aquifers on map - -commit 78fcbc56e7ed32f78e9c92ed40eefd229b1dee54 -Author: Séamus O'Connor -Date: Tue Jan 7 13:37:26 2020 -0800 - - Searches for aquifers if app loads with search query params - -commit 620db26cf94489d6c1aa4dcb99fc278a3121f5f5 -Author: Séamus O'Connor -Date: Tue Jan 7 13:34:08 2020 -0800 - - Updates tests - -commit 6192e1f2f0c0ecf5c45ce019d0e66bb4fa140efa -Author: Séamus O'Connor -Date: Tue Jan 7 13:24:37 2020 -0800 - - Always shows outdated browser message (again) - -commit 882bba6445310fe44c174b702a9b8c3b4d1c39ed -Author: Séamus O'Connor -Date: Tue Jan 7 12:43:00 2020 -0800 - - Stroes driller information for well decommission submissions - -commit 6ba666f2bb11857f6731815b0c80c8852323b472 -Author: Séamus O'Connor -Date: Tue Jan 7 12:19:29 2020 -0800 - - Simplifies aquifer search button label - -commit ef788803183a7e7bb55f6bac3a16cf1090996533 -Merge: bc6de1e2e bfbdfe174 -Author: Séamus O'Connor -Date: Tue Jan 7 11:28:33 2020 -0800 - - Merge pull request #1512 from bcgov/29-simplified-geom-aquifer-migration - - Adds migration to populate aquifer's geom_simplified column - -commit e56dc96d3105b6015fc00ad2aa29029ebab2e989 -Author: Séamus O'Connor -Date: Tue Jan 7 10:55:00 2020 -0800 - - Changes outdated browser message - -commit bc6de1e2e23c7317ab9b1841cc956b22b49b0e40 -Merge: 859387e8f a660c2f76 -Author: Steve Hillier -Date: Tue Jan 7 10:37:25 2020 -0800 - - Merge pull request #1510 from bcgov/steve/staging-cpu-increase - - increase cpu limit in staging - -commit bfbdfe1743ba227e7bce0bcaa92ab4ec2f657266 -Author: Séamus O'Connor -Date: Tue Jan 7 10:36:24 2020 -0800 - - Adds migration to populate aquifer's geom_simplified column - -commit a660c2f767c672e892a3d78d0db466f13da13563 -Author: Steve Hillier -Date: Mon Jan 6 22:42:01 2020 -0800 - - increase cpu limit in staging - -commit 859387e8fe01541e19b1e94bb0c41b37743cbf9c -Merge: bb85aa85d a2216d1ee -Author: Steve Hillier -Date: Mon Jan 6 16:00:38 2020 -0800 - - Merge pull request #1505 from bcgov/steve/screens-v2 - - Add lat/long and geometry filter to screens (drawdown) endpoint - -commit 535e691e9dd27aecd0c4b540f3e4797d44f1a83c -Author: Séamus O'Connor -Date: Mon Jan 6 15:56:48 2020 -0800 - - Always shows outdated browser message - -commit a2216d1eee8c46f5e35cfeb4bb1d2e4ba9a2a98b -Author: Steve Hillier -Date: Mon Jan 6 15:17:19 2020 -0800 - - add GDALException to error handling - -commit 316398166c08ed1549799c08f892d74e69ef0197 -Author: Séamus O'Connor -Date: Mon Jan 6 14:07:14 2020 -0800 - - Show unsupported browser message to IE 11 - -commit ab5af256db09141650f44f49a293bb908cbdef35 -Author: Séamus O'Connor -Date: Mon Jan 6 13:40:31 2020 -0800 - - Fixed warnings in tests - -commit 1525df5f75fb4585b3375471aae4ce49d064036a -Author: Séamus O'Connor -Date: Mon Jan 6 13:28:00 2020 -0800 - - Stores current well search map properties for re-display on browser back - -commit 73e72871c51dc65d8188e539a47f0258dc2b475d -Author: Steve Hillier -Date: Mon Jan 6 13:18:30 2020 -0800 - - fix raised error class - -commit 58e15d98bc5a1a36bf7de3390fc4ae15a5624a0a -Author: Steve Hillier -Date: Mon Jan 6 13:04:41 2020 -0800 - - add better error handling to filters - -commit bb85aa85de76cfede65ce8bd69d0259ed42ca0a4 -Merge: 0a5a4baeb af0684df2 -Author: Steve Hillier -Date: Mon Jan 6 10:39:42 2020 -0800 - - Merge pull request #1508 from bcgov/steve/netapp - - move to netapp storage for new dev environments - -commit b295a4a6306e911bfcf8db47c75404dc3504af03 -Author: Séamus O'Connor -Date: Mon Jan 6 10:12:14 2020 -0800 - - Increases link target size in aquifer search popup - -commit 139db2070f471d039bff19cfcaa7a106a9291619 -Author: Séamus O'Connor -Date: Fri Jan 3 15:12:36 2020 -0800 - - Fixed aquifer search reset not restoring highlighted aquifers to normal - -commit 20342b01bc7bf7abd9ac4e993cf349180efe0887 -Author: Séamus O'Connor -Date: Fri Jan 3 14:43:37 2020 -0800 - - Stores active well data for quick re-viewing - -commit a8cd05c0361e5580d8757d0986b386ac7cd240ad -Author: Séamus O'Connor -Date: Fri Jan 3 13:21:00 2020 -0800 - - Stores active aquifer data for quick re-viewing - -commit eb36c174186419e466e27983df4725fe62b70a6a -Author: Séamus O'Connor -Date: Fri Jan 3 11:19:44 2020 -0800 - - Fixed back button behaviour for well search - -commit af0684df23ceca5418b33e78879b173910552d67 -Author: Steve Hillier -Date: Thu Jan 2 17:05:34 2020 -0800 - - move to netapp storage for new dev environments - -commit 3fd9859eac61c96431e41c6566a53dec94981c05 -Author: Séamus O'Connor -Date: Thu Jan 2 13:24:21 2020 -0800 - - Fixes tests - -commit fd55e15e975b6c29f2478472e75a1dcfc77b43a7 -Author: Séamus O'Connor -Date: Thu Jan 2 12:51:16 2020 -0800 - - Uses a local npm version of browser-update.org - -commit 1c73cef49b4290e8a7302293f09d71267eb0509f -Author: Séamus O'Connor -Date: Thu Jan 2 11:40:14 2020 -0800 - - Simplified aquifer bbox search logic - -commit fa34fd51391ac27a885e7c086651c2b3e1db264c -Merge: aac83ebf7 0a5a4baeb -Author: Séamus O'Connor -Date: Thu Jan 2 11:35:00 2020 -0800 - - Merge remote-tracking branch 'origin' into 39-search-for-aquifers-in-map-view - -commit b0e4219578ec880848e0a0bdc39d82f5d39d4684 -Author: Séamus O'Connor -Date: Thu Jan 2 11:33:07 2020 -0800 - - Allows uploaded files to be deleted on aquifer edit form - -commit 0a5a4baeb17dd36f15857ded24ef42ccb316bde1 -Merge: ea1562241 f76e6ce39 -Author: Séamus O'Connor -Date: Thu Jan 2 11:29:55 2020 -0800 - - Merge pull request #1501 from bcgov/29-show-aquifers-on-search-map - - Zoom to searched aquifer - -commit bc27ff2a081c711ba01fe27a1e3877fbc8cea37c -Author: Séamus O'Connor -Date: Thu Jan 2 09:09:28 2020 -0800 - - Adds browser-update.org powered outdated browser detection - -commit 34e56596c4ccaff488e2e589c87f76cf32c85657 -Author: Steve Hillier -Date: Tue Dec 31 16:23:04 2019 -0800 - - fix long line - -commit 33e82ea271448f282b08a3a5d81ba54dfea372a3 -Author: Steve Hillier -Date: Tue Dec 31 16:19:28 2019 -0800 - - improve query speed - -commit 0a4b55fc777893d02ef0702cc36add0837d1e61f -Author: Steve Hillier -Date: Tue Dec 31 16:09:23 2019 -0800 - - radius search for screens - -commit 7d527c0686bc664a04cac5664a92b8f572927c2e -Author: Steve Hillier -Date: Tue Dec 31 13:16:16 2019 -0800 - - add a radius filter - -commit e46cd98a7583cac7f85e15260debc25bec31d840 -Author: Steve Hillier -Date: Mon Dec 30 17:18:07 2019 -0800 - - add a distance field for screen searches - -commit 2322253893a47f177ca7709c17c72a839c826f7d -Merge: 520ac0271 ea1562241 -Author: Steve Hillier -Date: Mon Dec 30 16:35:42 2019 -0800 - - Merge branch 'release' into steve/screens-v2 - -commit ea156224151674d30c981fefd53cf8e5c43a1499 -Merge: 65de9b27a adb4793a4 -Author: Steve Hillier -Date: Mon Dec 30 14:36:48 2019 -0800 - - Merge pull request #1502 from bcgov/536-link-to-well-details-from-licence - - Adds well links to license table - -commit 65de9b27a07ed2f16dc4be029c380f690f1f18fb -Merge: b8dafdffa 50d189de9 -Author: Steve Hillier -Date: Mon Dec 30 14:36:25 2019 -0800 - - Merge pull request #1500 from bcgov/749-leaflet-drag-bug - - Pins leaflet-gesture-handling npm module - -commit b8dafdffad80c5ffb23e910151e8eed2d3ef94cc -Merge: a9dc71978 bd799c109 -Author: Steve Hillier -Date: Mon Dec 30 14:36:05 2019 -0800 - - Merge pull request #1504 from bcgov/snyk-fix-3f75286c21dc2045f8b84f8bbdc3e462 - - [Snyk] Fix for 1 vulnerabilities - -commit 520ac0271683b45aeae7a2e9b878383cc67eae34 -Author: Steve Hillier -Date: Mon Dec 30 14:31:01 2019 -0800 - - add lat/long to screens - -commit e856ea4113b2f9662da9bdeffd0f04e9335eb152 -Author: Steve Hillier -Date: Mon Dec 30 14:13:55 2019 -0800 - - add geometry filters to screen/lithology endpoints - -commit bd799c1095a295065c0762ee6a60c2f11bffb2b6 -Author: snyk-bot -Date: Tue Dec 24 05:45:11 2019 +0000 - - fix: app/frontend/package.json & app/frontend/package-lock.json to reduce vulnerabilities - - The following vulnerabilities are fixed with an upgrade: - - https://snyk.io/vuln/SNYK-JS-VUEMOMENT-538934 - -commit aac83ebf7f0da99e6fef3caadacd0cf57b118e7e -Author: Séamus O'Connor -Date: Mon Dec 23 11:39:13 2019 -0800 - - Removes .finally on aquifers promise - -commit 392af17dbe83d1e8e3fbc57b0d6ad4adbf72476a -Author: Séamus O'Connor -Date: Mon Dec 23 11:29:41 2019 -0800 - - Improves behaviour of 'Reset' button in aquifer search. Scrolls to map when aquifer table row clicked. - -commit 8c1aa4571b34cb3fcc2c9e0531a95f5414d42248 -Author: Séamus O'Connor -Date: Mon Dec 23 10:19:44 2019 -0800 - - Hydrates aquifer store properly in tests - -commit f76e6ce390dfb93c1b79956e7631216049d5a00b -Merge: 34f151c81 a9dc71978 -Author: Séamus O'Connor -Date: Fri Dec 20 16:56:19 2019 -0800 - - Merge remote-tracking branch 'origin' into 29-show-aquifers-on-search-map - -commit 70c9519e078d17e9261230dc6cd48aa1ee42da5a -Merge: c0c464ab7 a9dc71978 -Author: Séamus O'Connor -Date: Fri Dec 20 16:55:29 2019 -0800 - - Merge remote-tracking branch 'origin' into 39-search-for-aquifers-in-map-view - -commit c0c464ab7232293c0c0434c5f6a7c468cb7e4e48 -Author: Séamus O'Connor -Date: Fri Dec 20 16:49:55 2019 -0800 - - Searches for aquifers narrowed to the current map view - -commit 34f151c8193a655fed404a454cf42b077c08b4bb -Author: Séamus O'Connor -Date: Fri Dec 20 10:47:19 2019 -0800 - - Handles None value for aquifer model geom in pre_save signal - -commit 2b829bdab31ccc1d4ce383e8763ecc4c78099e5a -Author: Séamus O'Connor -Date: Fri Dec 20 10:15:02 2019 -0800 - - Uses then because Node v8 doesn't support finally - -commit a9dc71978f1e18114c712b5174916544e42cd0a6 -Merge: e41f5627c be717556c -Author: Séamus O'Connor -Date: Thu Dec 19 15:56:46 2019 -0800 - - Merge pull request #1496 from bcgov/708-improve-gw-license-in-legend - - Improve Groundwater licences in legend - -commit adb4793a4840645a7117fc4c8c4d29463cbe4b38 -Author: Séamus O'Connor -Date: Thu Dec 19 15:51:54 2019 -0800 - - Adds router links to well details per-well in license table on aquifer summary screen - -commit be717556c125ec3e214da9b76fb7e7d354771c34 -Author: Séamus O'Connor -Date: Thu Dec 19 15:27:07 2019 -0800 - - Updates layers image ref var names - -commit 34f2fe57a998b1792fb0967314c89ffffbeabed2 -Author: Séamus O'Connor -Date: Thu Dec 19 15:23:49 2019 -0800 - - Fixing tests - -commit 1d8fbce3753fd7c2cde21f356be14930b07f1a47 -Author: Séamus O'Connor -Date: Thu Dec 19 14:18:24 2019 -0800 - - Adds simplified geometry to aquifer search maps and zooms into searched aquifers. - -commit e41f5627c959b8f8154d4567a00e74bd5a84ff00 -Merge: 122d318a7 0f2823cff -Author: Séamus O'Connor -Date: Thu Dec 19 08:36:55 2019 -0800 - - Merge pull request #1498 from bcgov/723-update-header-links - - Updates header link text and positions - -commit 122d318a73cda2a16a0c404b293d534a31c8eb0b -Merge: 7910861e6 a018c1803 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Dec 18 16:40:24 2019 -0800 - - Merge pull request #1495 from bcgov/steve/well-api-v2 - - Steve/well api v2 - -commit a018c18034c1bcb7f6f4def2ca27ff331a94e0a3 -Author: Steve Hillier -Date: Wed Dec 18 16:07:41 2019 -0800 - - fix indent - -commit dfb3408fb44a477ba86be38c4145dfd2922fc266 -Merge: 8b9d52294 37e82a2a8 -Author: Steve Hillier -Date: Wed Dec 18 16:06:45 2019 -0800 - - Merge branch 'steve/well-api-v2' of github.com:bcgov/gwells into steve/well-api-v2 - -commit 8b9d52294a04770894b3bb1f1f1522e4efd0daf1 -Author: Steve Hillier -Date: Wed Dec 18 16:06:35 2019 -0800 - - move geojson locations logic into v2 - -commit e4241c4d59dcb15efc860b863cedf4a41bcd7a54 -Merge: 3f0d75a36 7910861e6 -Author: Steve Hillier -Date: Wed Dec 18 15:42:46 2019 -0800 - - Merge branch 'release' into steve/well-api-v2 - -commit 37e82a2a861c8bb3b44af276acce4de1e9c51ec6 -Merge: 3f0d75a36 cca987f5c -Author: Steve Hillier -Date: Wed Dec 18 15:41:00 2019 -0800 - - Merge branch 'master' into steve/well-api-v2 - -commit 7910861e672002dda146fcf6b58849daeddf06c8 -Merge: 15ecaffd6 2eb158077 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Dec 18 14:35:57 2019 -0800 - - Merge pull request #1499 from bcgov/alex/latlonlithology - - added lat lon to lithology endpoint - -commit 50d189de923bbb10248d4d4ba24879b8f43b9b92 -Author: Séamus O'Connor -Date: Wed Dec 18 13:21:18 2019 -0800 - - Pins leaflet-gesture-handling npm module to a specific version for a drag map bug fix - -commit 2eb158077dff249535e2fa7105d6eaf43289fc94 -Author: AlexZorkin -Date: Wed Dec 18 12:56:29 2019 -0800 - - added lat lon to lithology endpoint - -commit 15ecaffd6987c92075fb08759198112962d2d55d -Merge: cad78ea92 74f50940d -Author: Séamus O'Connor -Date: Wed Dec 18 10:35:31 2019 -0800 - - Merge pull request #1497 from bcgov/685-fix-aquifer-resource-section-casing - - Fixes spelling of 'Groundwater surface water interactions' in aquifer resource section - -commit 0f2823cff3634331297fa063538a087532a695fb -Author: Séamus O'Connor -Date: Wed Dec 18 10:17:32 2019 -0800 - - Adds guard to not add aquiferLayer to map when geom is null - -commit e7a4c793aef473e84e3696fb0088b59c6063b934 -Author: Séamus O'Connor -Date: Wed Dec 18 10:12:08 2019 -0800 - - Updates header link text and positions - -commit 74f50940dc17c72ed7852c85e59ea632a1199f7e -Author: Séamus O'Connor -Date: Wed Dec 18 09:33:31 2019 -0800 - - Fixes spelling of 'Groundwater surface water interactions' aquifer resource section - -commit e6c9077b2027025af79434b154ef4f72efd90cac -Merge: ed7169ecb cad78ea92 -Author: Séamus O'Connor -Date: Wed Dec 18 09:25:25 2019 -0800 - - Merge remote-tracking branch 'origin' into 708-improve-gw-license-in-legend - -commit cad78ea926e3c095110bf22b22cad4a46826a3a0 -Merge: 22f74455c 9a2668254 -Author: Séamus O'Connor -Date: Wed Dec 18 09:13:22 2019 -0800 - - Merge pull request #1492 from bcgov/521-show-associated-wells-on-map - - Show aquifer associated wells on summary page map - -commit 22f74455c1810ffa40c9437315cce0fdfad47d95 -Merge: f52b827f7 941ad78fa -Author: Séamus O'Connor -Date: Wed Dec 18 08:51:30 2019 -0800 - - Merge pull request #1485 from bcgov/530-aquifer-search-operators - - Aquifer search improvements (all and any radios) - -commit f52b827f7390903f2f3514d30f89dab81ba2c1c3 -Merge: f5d730e03 625c80068 -Author: Séamus O'Connor -Date: Wed Dec 18 08:49:14 2019 -0800 - - Merge pull request #1494 from bcgov/685-adds-gw-sw-interaction-section - - Adds Ground/Surface water interaction section - -commit 3f0d75a36dd4fa1b120c785e407f369034df0e38 -Author: Steve Hillier -Date: Tue Dec 17 16:04:07 2019 -0800 - - put CORS method restriction back - -commit ca9b10cef9c03c0af97319157e0e5e8080ccd026 -Author: Steve Hillier -Date: Tue Dec 17 15:56:48 2019 -0800 - - remove cors credential setting - -commit d6bf79be15207b358c26d6d29f9e36f750334152 -Author: Steve Hillier -Date: Tue Dec 17 15:29:16 2019 -0800 - - move CORS settings - -commit c3488cb038784aac733327f18234bc9349b9bf5b -Author: Steve Hillier -Date: Tue Dec 17 15:27:49 2019 -0800 - - minimal cors settings - -commit d049bebb88db01d5d6217e89045ac922c748ba9e -Author: Steve Hillier -Date: Tue Dec 17 15:08:31 2019 -0800 - - adjust CORS settings - -commit 9a2668254021dc0cb5ff2d8f01ae45cc137022ea -Merge: d51138be6 f5d730e03 -Author: Séamus O'Connor -Date: Tue Dec 17 15:07:52 2019 -0800 - - Merge remote-tracking branch 'origin' into 521-show-associated-wells-on-map - -commit ed7169ecbea20d39f6afaf85954171522e79e55a -Author: Séamus O'Connor -Date: Tue Dec 17 15:01:39 2019 -0800 - - Splits Groundwater licenses into two rows when shown in the legend - -commit 4a8706eb5d7199ded81ac197c8ea6fae6b131463 -Author: Steve Hillier -Date: Tue Dec 17 14:45:22 2019 -0800 - - locations API now optionally returns geojson - -commit 9f6b6b7ee5938d58a0292b89f9d18551d4b4c14e -Merge: be251b087 39dae642e -Author: Steve Hillier -Date: Tue Dec 17 12:17:46 2019 -0800 - - Merge branch 'steve/well-api-v2' of github.com:bcgov/gwells into steve/well-api-v2 - -commit be251b087f5d9ad1a27ef048a5183107c561c2ad -Author: Steve Hillier -Date: Tue Dec 17 12:17:35 2019 -0800 - - adjust CORS settings - -commit 39dae642e0bcd3ce21dcd4aa930f260964dbb732 -Merge: abe4f4dab f5d730e03 -Author: AlexZorkin -Date: Tue Dec 17 11:44:42 2019 -0800 - - Merge branch 'release' into steve/well-api-v2 - -commit 625c80068b5ec1330907d9a7ce5e177ff57be963 -Author: Séamus O'Connor -Date: Tue Dec 17 11:09:16 2019 -0800 - - Removes unused aquifer resource fixture JSON file. Adds 2 aquifer resources for section code 'G'. - -commit abe4f4dab5db4898d67dbf24a3be48ab1d05998c -Author: Steve Hillier -Date: Tue Dec 17 10:31:12 2019 -0800 - - allow all CORS for safe methods - -commit d51138be6bd720a852509721823338595866bc3b -Author: Séamus O'Connor -Date: Tue Dec 17 10:26:02 2019 -0800 - - Changed size of ems and associated wells and layer labels on aquifer summary map. - -commit f5d730e03b5315c338369347490adb9486f6c19d -Merge: 3b9012f66 c548ee1e8 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Dec 17 09:43:23 2019 -0800 - - Merge pull request #1489 from bcgov/alex/lithologyurl - - Well Lithology Endpoint added to API - -commit 3b9012f66ddf49d2a5a7129fc3e23882e62fb1c5 -Merge: 621fd8eea 06c3cc743 -Author: Séamus O'Connor -Date: Tue Dec 17 09:15:52 2019 -0800 - - Merge pull request #1483 from bcgov/535-add-license-search-link - - Adds links to well license search page - -commit 621fd8eeac77def493ce581db41e7e57dd36bb00 -Merge: 5c49b5291 c663cc2a7 -Author: Séamus O'Connor -Date: Mon Dec 16 16:52:54 2019 -0800 - - Merge pull request #1493 from bcgov/fix-django-debug-toolbar-for-containers - - Fixes Django Debug Toolbar - -commit c663cc2a79276bdce4d7c15941234e5bc6a463b0 -Author: Séamus O'Connor -Date: Mon Dec 16 15:49:20 2019 -0800 - - Fixes Django Debug Toolbar to show up when backend is running in a container - -commit 8028c9c08a44e9789aa1ec415985b4011c649da8 -Author: Séamus O'Connor -Date: Mon Dec 16 15:48:26 2019 -0800 - - Adds aquifer_resource_section_code 'G'. Updates aquifer summary screen to show 'Groundwater Surface Water Interactions' below 'Hydraulically connected' - -commit 5c49b52915ef46e6ee32003dc9887431bb148f01 -Merge: 5c56d720b ca7765ce3 -Author: Steve Hillier -Date: Mon Dec 16 15:44:22 2019 -0800 - - Merge pull request #1491 from bcgov/steve/build-resources - - add more cpu and memory to API pods - -commit 4bac79d28267fff184a60af43a993feac12ca88c -Merge: 92644d1e9 5c56d720b -Author: Séamus O'Connor -Date: Mon Dec 16 14:48:54 2019 -0800 - - Merge remote-tracking branch 'origin' into 521-show-associated-wells-on-map - -commit 5c56d720b9f34288abeb42dfc08ec8d2b5270fd7 -Merge: fb180b8ff 5c3ed5a1e -Author: Séamus O'Connor -Date: Mon Dec 16 14:46:05 2019 -0800 - - Merge pull request #1484 from bcgov/526-highlight-aquifer-ems-wells - - Highlight wells with EMS data on aquifer summary map - -commit 92644d1e9f943c86ea43c3d21dbea55eb1556d05 -Author: Séamus O'Connor -Date: Mon Dec 16 12:53:30 2019 -0800 - - Fixes bug when loading wells on Aquifer summary map - -commit 1109a0d7d608f6c5b7829d6ff8fc26474e122337 -Merge: 0363115ef 5c3ed5a1e -Author: Séamus O'Connor -Date: Mon Dec 16 12:40:06 2019 -0800 - - Merge branch '526-highlight-aquifer-ems-wells' into 521-show-associated-wells-on-map - -commit 6224193419e6717af157b10732f0d9067c425fc5 -Author: Steve Hillier -Date: Mon Dec 16 12:23:01 2019 -0800 - - add geometry filter to locations endpoint - -commit 941ad78faa5a50112c78753e533c8f64801a1c5b -Author: Séamus O'Connor -Date: Mon Dec 16 11:22:22 2019 -0800 - - Passes request into `_aquifer_qs` for v1/v2 behaviour logic - -commit d530bc12e71f01a37edd3a8be1c9346b5080722f -Author: Séamus O'Connor -Date: Fri Dec 13 15:40:34 2019 -0800 - - Fixes typo - -commit 0363115efe4410ac4c44baeb6af3fe7766ee9e15 -Author: Séamus O'Connor -Date: Fri Dec 13 15:28:40 2019 -0800 - - Changes api/v2/wells/locations to paginate 5000 at a time. Changed Vue wells search to use response metadata to determine if errors are shown. - -commit ca7765ce3870e02fb724759a59ce7ce3441ffcff -Author: Steve Hillier -Date: Fri Dec 13 14:16:13 2019 -0800 - - add more cpu and memory to API pods - -commit c84898300dc781e5db698d7ed6e12d2e9607e6ee -Merge: 515f4213e fb180b8ff -Author: Séamus O'Connor -Date: Fri Dec 13 14:10:39 2019 -0800 - - Merge remote-tracking branch 'origin' into 521-show-associated-wells-on-map - -commit 06c3cc7436382f76abe9660c4a4de72c26d2dd4d -Merge: 7936a62fe fb180b8ff -Author: Séamus O'Connor -Date: Fri Dec 13 14:05:01 2019 -0800 - - Merge remote-tracking branch 'origin' into 535-add-license-search-link - -commit fb180b8ff8a24e848a43f818194b5e4569ba4a02 -Merge: c43c5c9a0 192e0e764 -Author: Séamus O'Connor -Date: Fri Dec 13 13:37:26 2019 -0800 - - Merge pull request #1486 from bcgov/steve/aq-fixtures - - add extra data to aquifer/wells test fixtures - -commit 515f4213ec5066f3a89b4eff22706c603510d2e8 -Author: Séamus O'Connor -Date: Fri Dec 13 13:12:35 2019 -0800 - - Splits v1/v2 urls for wells/locations to use different views. Shows associated well toggle on aquifer map layers - -commit 175614b50a9584e007c681c2529575c535da3f1f -Author: Steve Hillier -Date: Fri Dec 13 13:17:07 2019 -0800 - - change overlaps to intersects - -commit 89e866e30e26aea650ad9c5848e3b942ee118b06 -Author: Steve Hillier -Date: Fri Dec 13 13:14:06 2019 -0800 - - change bboverlaps to overlaps - -commit 192e0e7641858878c15739f215d4168118f0666d -Author: Steve Hillier -Date: Fri Dec 13 12:56:30 2019 -0800 - - add SRID to fix aquifer fixture - -commit 9debc6f0700487aa022ccb35e9d9163954564c1d -Author: Steve Hillier -Date: Fri Dec 13 11:49:36 2019 -0800 - - add licence to aquifer fixtures - -commit 5c3ed5a1eb4f63a4b71f4e463f96daa172dd49a3 -Merge: a2705b4d8 c43c5c9a0 -Author: Séamus O'Connor -Date: Fri Dec 13 11:31:30 2019 -0800 - - Merge branch 'release' into 526-highlight-aquifer-ems-wells - -commit a2705b4d87ec8de4cf912167900deb70ea5b131b -Author: Séamus O'Connor -Date: Fri Dec 13 10:46:09 2019 -0800 - - Fixing bug in main.js Sentry's init - -commit 61bde17ca6d9946056d8474e0c4878c598ae4311 -Author: Séamus O'Connor -Date: Fri Dec 13 10:17:08 2019 -0800 - - Scopes aquifer match_any search query param to v2 for default 'and' behaviour - -commit c43c5c9a0ff01cb4e5e96dd7562f8a8c9a2a361f -Merge: 7788ef718 2045ae366 -Author: Séamus O'Connor -Date: Fri Dec 13 09:55:23 2019 -0800 - - Merge pull request #1482 from bcgov/523-map-vs-page-scrolling-fix - - Use leaflet-gesture-handling plugin - -commit 21614ab7fe7d546f4afb7a6c731f0960df48bfa4 -Author: Séamus O'Connor -Date: Fri Dec 13 09:39:43 2019 -0800 - - Checks for loading prop on aquifers map before rendering aquifer and wells - -commit 5512e5cf264692efd56c7bbb41923adb12ad60b1 -Author: Séamus O'Connor -Date: Fri Dec 13 09:35:56 2019 -0800 - - Simplifies aquifer 2's fixture's geometry data - -commit 7788ef718265b57ee64938c250fa26f04857f66d -Merge: 14653ab9c 4b39a9a07 -Author: Séamus O'Connor -Date: Fri Dec 13 08:37:26 2019 -0800 - - Merge pull request #1487 from bcgov/long-form-docker-compose-volumn-syntax - - Use long form Docker Compose volume syntax (again!) - -commit c548ee1e8cc2ce794f9e477fb7c07f531694d1a7 -Author: AlexZorkin -Date: Thu Dec 12 17:01:42 2019 -0800 - - simplified url - -commit 9e18613d35e4515723433c07f0804764d109cf7a -Author: AlexZorkin -Date: Thu Dec 12 16:56:00 2019 -0800 - - lookup work - -commit 28b001f741ce0cab390712510236aa816242ae50 -Merge: 96467f5a4 1525a4cbd -Author: AlexZorkin -Date: Thu Dec 12 16:44:27 2019 -0800 - - Merge remote-tracking branch 'origin/steve/well-api-v2' into alex/lithologyurl - -commit 96467f5a49bc05d52a5779d96cdfdf4ca08e3d62 -Author: AlexZorkin -Date: Thu Dec 12 16:43:56 2019 -0800 - - adding well lithology url - -commit 31ddabb876ca0c8f1511224e9ee67fe052d4d123 -Author: Séamus O'Connor -Date: Thu Dec 12 16:33:38 2019 -0800 - - Guards against filters.pop() when filters is an empty list - -commit a34d8219a1b9d8b055f119ea5fea379401076f76 -Author: Steve Hillier -Date: Thu Dec 12 16:25:01 2019 -0800 - - fix aquifer fixture location - -commit 14ce2afd66fd6fa66dfb5cda61e9c3ca9625420d -Author: Séamus O'Connor -Date: Thu Dec 12 16:19:48 2019 -0800 - - Added 'Basic Search' and 'Advanced Search' headings - -commit 3aff2980f84474fd532ffdeec4c0a62bb8a13fa1 -Author: Séamus O'Connor -Date: Thu Dec 12 15:57:25 2019 -0800 - - Load wells on aquifer summary screen using wells/locations as it is faster. Adds ems data to api/v2/wells/locations endpoint. - -commit 4b39a9a071fbfeaf640cacfb6cc93c205926d03b -Author: Séamus O'Connor -Date: Thu Dec 12 15:51:00 2019 -0800 - - Long form docker-compose.yml volume syntax was accidentially reverted - bringing it back - -commit c7fe2834d7dcc2032c5c8bf77f2d96c25412319a -Author: Steve Hillier -Date: Thu Dec 12 15:23:58 2019 -0800 - - adjust fixture locations - -commit 0f92bc8543b02f59f8a369d64693efbb802c5231 -Author: Steve Hillier -Date: Thu Dec 12 14:56:10 2019 -0800 - - add extra data to aquifer/wells test fixtures - -commit 1525a4cbd09b6d070409bf3f9e04502539a7b677 -Author: Steve Hillier -Date: Thu Dec 12 14:36:45 2019 -0800 - - support for polygon searches (WIP) - -commit e4d22434f8129e07bb86177e290e8e2ed9c73835 -Merge: cca987f5c 14653ab9c -Author: Steve Hillier -Date: Thu Dec 12 14:06:05 2019 -0800 - - Merge pull request #1435 from bcgov/release - - Release - -commit 45fe3fb580b80c889cfdac55d790c4b8c39edb2a -Author: Séamus O'Connor -Date: Thu Dec 12 12:23:53 2019 -0800 - - Updating aquifer view tests - -commit 42db1722ee7850368988926df73ae45ba831bf12 -Author: Séamus O'Connor -Date: Thu Dec 12 11:44:32 2019 -0800 - - Updated aquifer search tests - -commit 9f2263f240633ea8fcaf7ccbc1818ff699c5d5d1 -Author: Séamus O'Connor -Date: Thu Dec 12 10:39:32 2019 -0800 - - Added EMS well legend image. Shows EMS wells in legend on map load. - -commit f9c152d653fd1ae5acbd41e4033f82fd1b8b832b -Author: Séamus O'Connor -Date: Thu Dec 12 10:12:35 2019 -0800 - - Removed git merge junk from .env - -commit 7936a62fe8bfc1a4892d8cefdc33983a09b2ff26 -Author: Séamus O'Connor -Date: Thu Dec 12 10:09:31 2019 -0800 - - Removed testing code - -commit 9d215636829c80f970ca381ffb7295a65fa74acc -Merge: 1d9bc4d4d 14653ab9c -Author: Séamus O'Connor -Date: Thu Dec 12 10:02:06 2019 -0800 - - Merge remote-tracking branch 'origin' into 535-add-license-search-link - -commit c5de5ca8e585ca074f4f64604fb0f588231804a6 -Merge: dda3c3ac9 14653ab9c -Author: Séamus O'Connor -Date: Thu Dec 12 09:36:25 2019 -0800 - - Merge remote-tracking branch 'origin' into 526-highlight-aquifer-ems-wells - -commit 995c370ca63e05cd303d12f94e7aa18190fe1395 -Author: Séamus O'Connor -Date: Thu Dec 12 09:31:22 2019 -0800 - - Adds ability to search by 'any' and 'all' matching sections (search checkboxes) - -commit 14653ab9cf166d3b19017e0bafedb6856056975e -Merge: db67e74e9 09f054d9d -Author: Séamus O'Connor -Date: Wed Dec 11 14:38:12 2019 -0800 - - Merge pull request #1480 from bcgov/allow-dev-use-of-staging-api - - Allow env API_TARGET to override API endpoint - -commit db67e74e913b366518fe4c4b03be2601d251510c -Merge: 4436b5d98 458f18744 -Author: Séamus O'Connor -Date: Wed Dec 11 14:22:09 2019 -0800 - - Merge pull request #1481 from bcgov/540-fix-obs-wells-not-displaying-inactive-wells-bug - - 540 fix obs wells not displaying inactive wells bug - -commit 2045ae36677b0da284b3e696828ab0f9200d9169 -Author: Séamus O'Connor -Date: Wed Dec 11 14:21:50 2019 -0800 - - Adds leaflet-gesture-handling Leaflet plugin to prevent accidential map zooming while trying to scroll the page - -commit 09f054d9db4c482b90acf6610be5a21b404014cc -Author: Séamus O'Connor -Date: Wed Dec 11 14:04:39 2019 -0800 - - Changed API_TARGET to work with any URL instead of just 'staging' - -commit 458f187442891416a8f78793f8a87351a7f4081d -Author: Séamus O'Connor -Date: Wed Dec 11 13:35:01 2019 -0800 - - Fixed Observation wells active/inactive logic - -commit 4436b5d988e98ce429d5fa9565ac8eb07b2ca7ce -Merge: acbbb9fad 46039665d -Author: Steve Hillier -Date: Wed Dec 11 13:24:49 2019 -0800 - - Merge pull request #1453 from bcgov/alex/cascadefixes - - Fixes to Cascading Behaviour in Models - -commit f027b4d82e10c7c468d6770bfbd63f32cd17573f -Author: Séamus O'Connor -Date: Wed Dec 11 13:00:01 2019 -0800 - - Allows using the staging API as an override by using the API_TARGET env variable - -commit dda3c3ac930ba75d4e118aba9fd51aa1ca46f9bd -Author: Séamus O'Connor -Date: Wed Dec 11 12:43:00 2019 -0800 - - ESLint cleanup - -commit acbbb9fadb2f4fcbee9a7697f2cb1835d9b1cdc3 -Merge: c4d14a24a a5405a756 -Author: Séamus O'Connor -Date: Wed Dec 11 12:29:07 2019 -0800 - - Merge pull request #1479 from bcgov/522-bug-artesian-layer - - Misc bug fixes for aquifer map - -commit c4d14a24a3540a899e7bb39c15fc70106580abce -Merge: 9d20ddcf9 f1fe0a34d -Author: Séamus O'Connor -Date: Wed Dec 11 10:44:23 2019 -0800 - - Merge pull request #1478 from bcgov/fix-docker-compose-yml-syntax-for-non-mac - - Use long form for volumes definition so non-macOS OSes can read the docker-compose.yml file - -commit a5405a756e9ebf760ac2192f56af3b8061a23468 -Author: Séamus O'Connor -Date: Wed Dec 11 10:41:04 2019 -0800 - - Cleaned up linting errors - -commit 0e78078059cea372e7e78bb7500682261ed5b935 -Author: Séamus O'Connor -Date: Tue Dec 10 16:25:18 2019 -0800 - - EMS wells show up as a layers control item like the other layers on the Aquifer map. Loads all wells even if more then 100 are returned from the API. - -commit e4b022ab99028f4cfb0d75bc05e5190774f0c3d2 -Author: Séamus O'Connor -Date: Tue Dec 10 10:37:27 2019 -0800 - - Reverted well fixture changes because API can be proxied to gwells-staging - -commit 01cb1f94215929fa87d07ec9cc5d35cbe0a9c593 -Author: Séamus O'Connor -Date: Mon Dec 9 16:59:28 2019 -0800 - - Fetches and displays wells with EMS data on aquifer map. Adds map tooltips to aquifer and EMS wells on aquifer summary page. - -commit d0717ef0b9f84e7cb2040a4e3872d9fc46584cec -Author: Séamus O'Connor -Date: Fri Dec 6 11:42:59 2019 -0800 - - Removing docker-compose.yml changes from PR - -commit 8bc9e009d80e921c64f7e48c88c30f0c79e6dd3d -Author: Séamus O'Connor -Date: Fri Dec 6 11:36:11 2019 -0800 - - Changed layers order to 'Wells - All' is below other wells on Aquifer map. - -commit 354b3d2055fce931093543fe3303988d28a45b8b -Author: Séamus O'Connor -Date: Fri Dec 6 11:05:12 2019 -0800 - - Destroys leaflet map to cleanup layers properly (refs this bug: https://apps.nrs.gov.bc.ca/int/jira/browse/WATER-522?focusedCommentId=242652) - -commit f1fe0a34d4275e63618e37799a75b60844a5c5f1 -Author: Séamus O'Connor -Date: Fri Dec 6 09:40:45 2019 -0800 - - Use long form for volumes definition so non-macOS OSes can read the file - -commit 9d20ddcf9a0ff63b536c62679e532a1fa92ec61d -Merge: c6972772e 7f5b1b3e6 -Author: Séamus O'Connor -Date: Fri Dec 6 09:15:56 2019 -0800 - - Merge pull request #1477 from bcgov/show-init-cadastral-layer-in-legend - - Adds initially selected cadastral layer to legend on aquifer search map - -commit 46039665da4307ceb38917f336adbaa7948519bd -Author: Séamus O'Connor -Date: Thu Dec 5 14:39:44 2019 -0800 - - Reverted package-lock.json changes - -commit 7f5b1b3e6e85cb9f4982441ca5fafb9ee36b5be0 -Author: Séamus O'Connor -Date: Thu Dec 5 14:35:07 2019 -0800 - - Adds initially selected cadastral layer to legend on aquifer search map - -commit 1d9bc4d4da7746d54fad87477bd5d596c5e327b1 -Merge: 059e88c53 c6972772e -Author: Séamus O'Connor -Date: Thu Dec 5 14:28:33 2019 -0800 - - Merge remote-tracking branch 'origin' into 535-add-license-search-link - -commit c6972772ed15e9ecf05bcb933d5a57b7230c80d2 -Merge: 1c72f5e01 b8925b88d -Author: Séamus O'Connor -Date: Thu Dec 5 14:07:04 2019 -0800 - - Merge pull request #1457 from bcgov/540-cleanup-obs-wells - - Categorizes observation wells into Active/Inactive - -commit 1c72f5e01b55b3b1d83774c06d122f4d322e4f31 -Merge: b8eeefb09 1995853bf -Author: Séamus O'Connor -Date: Thu Dec 5 12:57:20 2019 -0800 - - Merge pull request #1476 from bcgov/improve-docker-dev-performance-mac - - Uses 'cached' consistency check for macOS to lower idle CPU usage. - -commit b8eeefb096087d516909fea5530b8c6eb0abb9fc -Merge: 06b54a4d6 19cd8624f -Author: Steve Hillier -Date: Thu Dec 5 12:43:22 2019 -0800 - - Merge pull request #1470 from bcgov/steve/apiv2tests2 - - add v2 api tests - -commit b8925b88da7a957ed375a38b8f6120b20fc79cd8 -Merge: c6ea9a4f6 06b54a4d6 -Author: Séamus O'Connor -Date: Thu Dec 5 12:42:05 2019 -0800 - - Merge remote-tracking branch 'origin/release' into 540-cleanup-obs-wells - -commit 06b54a4d6d8316d92a8f38afe4aa6eebf421492f -Merge: 84760d711 7f6e4feb0 -Author: Séamus O'Connor -Date: Thu Dec 5 12:39:02 2019 -0800 - - Merge pull request #1475 from bcgov/522-same-aquifer-layers - - Aquifer summary map uses same layers as aquifer search map. - -commit 84760d7116d7d5daa296e20b4d4530efaebe4118 -Merge: 8f1e63580 e85e95c44 -Author: Séamus O'Connor -Date: Thu Dec 5 12:37:18 2019 -0800 - - Merge pull request #1474 from bcgov/538-knowledge-indicators-style-update - - CSS updates to knowledge indicators - -commit e85e95c44f23aeeaebba82439a599f067cc2791a -Author: Séamus O'Connor -Date: Thu Dec 5 10:55:16 2019 -0800 - - Uses Bootstrap Vue's m-0 CSS util class to remove margins instead of margin-bottom: 0 in CSS - -commit 34c8f8bef02345340855e3c6f625f905a49a391a -Author: Séamus O'Connor -Date: Thu Dec 5 10:51:17 2019 -0800 - - Uses Bootstrap Vues `text-right` CSS util helper for knowledge indicator headings - -commit 1995853bf55223ca26f4b0aaad6f1a2377de11c2 -Author: Séamus O'Connor -Date: Thu Dec 5 10:42:02 2019 -0800 - - Uses 'cached' consistency check for macOS to lower idle CPU usage. - -commit 7f6e4feb05dacbef70a4218e50b2b58e809b1920 -Author: Séamus O'Connor -Date: Thu Dec 5 10:38:12 2019 -0800 - - Shows 'Cadastral's in legend initially on aquifer map - -commit c6ea9a4f65d6476b920141d1bc114b2bee381ac4 -Author: Séamus O'Connor -Date: Thu Dec 5 08:49:33 2019 -0800 - - Changes default API version to v1 - -commit a426508571aeb9da5a8a40b7a6214b5d11deffc8 -Merge: cb86865ec 8f1e63580 -Author: Séamus O'Connor -Date: Thu Dec 5 08:36:39 2019 -0800 - - Merge remote-tracking branch 'origin' into 540-cleanup-obs-wells - -commit 059e88c53fe916b81e56012ea9a9b5bd78a34b38 -Author: Séamus O'Connor -Date: Thu Dec 5 08:35:09 2019 -0800 - - Adds links to license search - -commit cb86865ec06fc35ffc9691a9f159dfaaabcc5ae9 -Author: Séamus O'Connor -Date: Wed Dec 4 14:45:40 2019 -0800 - - Adds v1 and v2 serializers to AquiferListCreateAPIView - -commit d58f9e2fa3e61c527c868fc7250c1890febbf36e -Author: Séamus O'Connor -Date: Wed Dec 4 14:14:19 2019 -0800 - - Tweaking CSS for knowledge indicators list item bullets and veritcal seperator line. - -commit eccfdc288fdfc923d9912c1a5ae742eb8c3d7210 -Merge: da11a8f3e 8f1e63580 -Author: Séamus O'Connor -Date: Wed Dec 4 13:57:01 2019 -0800 - - Merge remote-tracking branch 'origin' into 538-knowledge-indicators-style-update - -commit 8f1e63580fb6837b5cded2141f9c95a5e71b1c30 -Merge: d0333416d b2d9fe9e6 -Author: Séamus O'Connor -Date: Wed Dec 4 13:55:51 2019 -0800 - - Merge pull request #1471 from bcgov/543-move-other-information-heading - - Move "other information" section to bottom - -commit 08812c2749e763ba34ce93024127b0f2088e7e62 -Merge: 8fbeebde6 d0333416d -Author: Séamus O'Connor -Date: Wed Dec 4 13:55:11 2019 -0800 - - Merge remote-tracking branch 'origin' into 540-cleanup-obs-wells - -commit 8fbeebde6e4b34e519e4948cab7dff542b075c86 -Author: Séamus O'Connor -Date: Wed Dec 4 13:43:21 2019 -0800 - - Removes v1 and v2 tests for observation_well_status - those tests have been moved to Postman - -commit 243f4e8ffbd16050519e5b0dfed3bffa15fe273b -Author: Steve Hillier -Date: Wed Dec 4 10:13:15 2019 -0800 - - add a well to test aquifer fixture 1901 - -commit da11a8f3e283b69edca98b6003d8a433b58688d8 -Author: Séamus O'Connor -Date: Wed Dec 4 12:45:36 2019 -0800 - - Merged in 543-move-other-information-heading - -commit d0333416def2d7f0be9e7a78a90d19342275e4ec -Merge: 2ca6452da 1381ba691 -Author: Séamus O'Connor -Date: Wed Dec 4 12:43:15 2019 -0800 - - Merge pull request #1473 from bcgov/519-fix-layers-on-aquifer-search-page - - Fixed aquifer layers on search map - -commit b2d9fe9e66541d64b868bc4702a5577cc93d478a -Merge: 1daf4c8fd 2ca6452da -Author: Séamus O'Connor -Date: Wed Dec 4 12:42:00 2019 -0800 - - Merge remote-tracking branch 'origin/release' into 543-move-other-information-heading - -commit 22f3a9bd15d473e284604d69a6df17ab503d8e6f -Author: Séamus O'Connor -Date: Wed Dec 4 12:39:44 2019 -0800 - - Aquifer summary map uses same layers as aquifer search map. - -commit 2ca6452da6f0b0ca283f90c1c518683ee34bc9e2 -Merge: 1e8166cbe 620899238 -Author: Séamus O'Connor -Date: Wed Dec 4 12:29:32 2019 -0800 - - Merge pull request #1472 from bcgov/528-links-open-new-tabs - - Fixing more links - -commit 1e8166cbe6c280f3dd1cbf0720d78e50e1e12e3c -Merge: 0849e99f9 2bb60bc14 -Author: Séamus O'Connor -Date: Wed Dec 4 12:26:18 2019 -0800 - - Merge pull request #1467 from bcgov/python-remote-debugging - - Allow remote Python debugger to be attached to dev docker container - -commit 1381ba691d2f26c54289925f20844f976bcfb798 -Author: Séamus O'Connor -Date: Wed Dec 4 11:38:30 2019 -0800 - - Moved common layer information into a layers.js file for aquifers. Updated WLS_PWD_LICENCES_SVW layer to WLS_WATER_RIGHTS_LICENCES_SVlayer. Cadastral layer is now selected by default - -commit 62089923863c7ec4df50b845c504b9d773d17079 -Author: Séamus O'Connor -Date: Wed Dec 4 10:55:47 2019 -0800 - - No longer links a 'N/A' value for water level analysis. No longer opens a new window when linking to well search for water quality information. - -commit 19cd8624f6764f9ff7d7c9e17d538969dac6172d -Merge: 05d2d9aa6 0849e99f9 -Author: Steve Hillier -Date: Wed Dec 4 10:14:15 2019 -0800 - - Merge branch 'release' into steve/apiv2tests2 - -commit 05d2d9aa687cdb9ce14bcb5992b514dac8f13dfe -Author: Steve Hillier -Date: Wed Dec 4 10:13:15 2019 -0800 - - add a well to test aquifer fixture 1901 - -commit 75077effc73e245928f6c3e2b365ff73554e8d08 -Author: Séamus O'Connor -Date: Wed Dec 4 10:04:50 2019 -0800 - - Right aligned all knowledge indicator headings - -commit 1daf4c8fd0c116e8168bc565924038a6bd9f9fad -Author: Séamus O'Connor -Date: Wed Dec 4 09:22:58 2019 -0800 - - Moves "Other information" in "Knowledge Indicators" section to the bottom of the list. Hard codes section ordering in front-end removing need for /aquifers/{id}/sections fetch - -commit 3bebd8636bc6a8973490996177240efe50b1a3d0 -Author: Steve Hillier -Date: Tue Dec 3 16:35:57 2019 -0800 - - automated v2 api tests - -commit 0849e99f9369325f9ab83500d9ad7500af06ffc6 -Merge: 53e9137f2 0b5e91832 -Author: Steve Hillier -Date: Tue Dec 3 16:25:05 2019 -0800 - - Merge pull request #1460 from bcgov/688-api-v2 - - Updates the API to support both v1 and v2 in the path - -commit 53e9137f2d7886c374f922c1e390618333d05e7b -Merge: 74138c5c4 5aabcbcf2 -Author: Steve Hillier -Date: Tue Dec 3 15:24:03 2019 -0800 - - Merge pull request #1468 from bcgov/remove-trello-from-readme - - Updated Readme to change Trello link to Jira - -commit 63bcef387274113aa36dbbfd8db34507174a41fe -Author: Steve Hillier -Date: Tue Dec 3 15:15:05 2019 -0800 - - add v2 api tests - -commit 5aabcbcf27e9e977eae45761dd7792f1bac182a7 -Author: Séamus O'Connor -Date: Tue Dec 3 14:40:51 2019 -0800 - - Updated Readme to change Trello link to Jira - -commit 2bb60bc141bcae6b01dcf6cea16c1036f419bfe6 -Author: Séamus O'Connor -Date: Tue Dec 3 14:01:31 2019 -0800 - - Allow remote Python debugger to be attached to dev docker container - -commit 74138c5c4d31fe45bb18670bd5d44339e4486135 -Merge: 4f68aaff5 b2a3e9e6d -Author: Séamus O'Connor -Date: Tue Dec 3 13:53:08 2019 -0800 - - Merge pull request #1465 from bcgov/527-aquifer-summary-print-updates - - Improves print CSS for aquifer summary page - -commit 59a022f66455bf4eded3b94164a1f9a9f1fc9838 -Author: Séamus O'Connor -Date: Tue Dec 3 12:29:38 2019 -0800 - - Sets Django API unit tests to test only /v1/. Adds test for aquifer details v1 with no observation_well_status and v2 with observation_well_status. - -commit 4f68aaff5c8a924048bb5cf79360a2ac5d442222 -Merge: d5182c160 0c6117191 -Author: Steve Hillier -Date: Tue Dec 3 11:56:33 2019 -0800 - - Merge pull request #1466 from bcgov/529-scroll-to-aquifer-search-results - - Always scroll to aquifers table after a search completes - -commit 260b17f92085f50a9bd33ecce0d022b2dcf221ab -Merge: b530c4102 0b5e91832 -Author: Séamus O'Connor -Date: Tue Dec 3 10:44:57 2019 -0800 - - Merge branch '688-api-v2' into 540-cleanup-obs-wells - -commit 0b5e9183254cc46b82bd2613508a6760a65ec5df -Author: Séamus O'Connor -Date: Tue Dec 3 10:44:15 2019 -0800 - - Changes Django tests to always use v1 for the API version - -commit 554ad2f4780a92a4a0b524e8ed8ee4db6dd5a716 -Author: AlexZorkin -Date: Tue Dec 3 09:51:04 2019 -0800 - - protect added for all well models - -commit b2a3e9e6d86c5835c95a94eea8966fefef24f6cf -Author: Séamus O'Connor -Date: Mon Dec 2 17:03:56 2019 -0800 - - Changes display: flex to block when printing Aquifer Summary page - -commit 0c6117191ed8e56d022d457a1cd08df49da7d473 -Author: Séamus O'Connor -Date: Mon Dec 2 16:26:50 2019 -0800 - - Always scroll to aquifers table after a search completes - -commit 91d8e6e1c18f1f20c9476c0afe785da82952f5dd -Author: Séamus O'Connor -Date: Mon Dec 2 15:55:22 2019 -0800 - - Improves print CSS for aquifer summary page - -commit 584f977ec3ca0725c8cae0e0fda328991158e6a2 -Author: Séamus O'Connor -Date: Mon Dec 2 11:36:16 2019 -0800 - - Extracts repeating api version regexp into a api_path_prefix() function - -commit d5182c16057ff58a3bb51082ab11906aad6986e7 -Merge: 28352be23 b21f12d1d -Author: Daine Trinidad -Date: Mon Dec 2 11:13:11 2019 -0800 - - Merge pull request #1461 from bcgov/steve/monthly-backups - - increase monthly backup retention - -commit 28352be23384843485404422fbeff7f7c8b9961d -Merge: 63d255b81 34ffa4614 -Author: Daine Trinidad -Date: Mon Dec 2 11:12:59 2019 -0800 - - Merge pull request #1459 from bcgov/steve/http-redirect - - add https redirect - -commit 63d255b8197c4510a65d5e5b1533440d83de0046 -Merge: f32f385ad ed89707a0 -Author: Steve Hillier -Date: Mon Dec 2 09:16:23 2019 -0800 - - Merge pull request #1464 from bcgov/529-scroll-to-aquifer-search-results - - Scrolls to the top of the aquifer's results - -commit ed89707a0a953b355d9aab945df65288e09a44ec -Author: Séamus O'Connor -Date: Fri Nov 29 16:13:56 2019 -0800 - - Change `response.data.results` to `this.aquifers_search_results` - -commit a24e82351faaa281908fae2980a563a08389518a -Author: Séamus O'Connor -Date: Fri Nov 29 15:53:31 2019 -0800 - - Scrolls to the top of the aquifer's results - -commit f32f385adaf2f2bd6c842e9d90e5e001f43f351c -Merge: b2489b056 8b7bc8b00 -Author: Steve Hillier -Date: Fri Nov 29 15:31:06 2019 -0800 - - Merge pull request #1463 from bcgov/534-move-artesian-wells - - Moves 'Artesian conditions' to the Well Information section - -commit b2489b056e0284e17dec5ac6a3d5e0eae3318ab6 -Merge: ce619147a 21d3a65fc -Author: Steve Hillier -Date: Fri Nov 29 15:28:12 2019 -0800 - - Merge pull request #1462 from bcgov/528-links-open-new-tabs - - Opens external links in a new window/tab - -commit 8b7bc8b0036b56ba028acde97baf25509f7f1741 -Author: Séamus O'Connor -Date: Fri Nov 29 14:47:03 2019 -0800 - - Moves 'Artesian conditions' to be underneath the Well Information section - -commit 8944f19c91ab23e531f3c2ca8909812bd9303d25 -Author: Séamus O'Connor -Date: Fri Nov 29 14:29:47 2019 -0800 - - Fixing bug in AquiferListCreateAPIView where an invalid serializers.AquiferDetailSerializerV1 was being used - -commit 21d3a65fc2ae2a46594488185d621898a6f6549d -Author: Séamus O'Connor -Date: Fri Nov 29 14:26:19 2019 -0800 - - Opens external links in a new window/tab - -commit 7c4c1a215e0f1758e6aa4affe1f865d57c770c95 -Author: Séamus O'Connor -Date: Fri Nov 29 11:29:18 2019 -0800 - - Adds version arg to all reverse()s in tests - -commit ce619147ab8e33ec29ce12fd1f90949bc3c81c80 -Merge: 2b711f62b 5b9885e47 -Author: Steve Hillier -Date: Thu Nov 28 19:18:15 2019 -0800 - - Merge pull request #1458 from bcgov/readme-changes - - Minor README.md changes + fixes noise in Jest unit:tests - -commit b21f12d1de583e7bb442d66c28225c336b1fb7a4 -Author: Steve Hillier -Date: Thu Nov 28 19:10:32 2019 -0800 - - increase monthly backup retention - -commit b530c4102d044021cb1b68e20467a9d4561fae62 -Author: Séamus O'Connor -Date: Thu Nov 28 16:26:07 2019 -0800 - - The AquiferRetrieveUpdateAPIView now checks the api version in the path and uses the corresponding versioned serializer. - -commit e63c0f768f0c19c9ed74730c62c1ccaac7f0801f -Merge: b7d86a1a9 6050b0662 -Author: Séamus O'Connor -Date: Thu Nov 28 16:24:26 2019 -0800 - - Merge branch '688-api-v2' into 540-cleanup-obs-wells - -commit 6050b06620eecc2a75574a07a8e321bc3008376d -Author: Séamus O'Connor -Date: Thu Nov 28 16:23:56 2019 -0800 - - Updates the API to support both v1 and v2 in the path. - -commit 34ffa4614eb6b4777fecfdc5906d5a433011ec4a -Author: Steve Hillier -Date: Thu Nov 28 14:12:47 2019 -0800 - - add https redirect - -commit 2b711f62b481fcf6de2b6a72d57a019ac28e8ebe -Merge: 882fc4d92 f658bf63f -Author: Séamus O'Connor -Date: Thu Nov 28 10:29:43 2019 -0800 - - Merge pull request #1456 from bcgov/542-hydraulically-connected-text-update - - Change 'Hydraulically connected' text - -commit 5b9885e47b94e1c3b2bfbdbbd9f3aa16f49b1f66 -Author: Séamus O'Connor -Date: Thu Nov 28 10:26:24 2019 -0800 - - Minor fixes to README.md. Changed jest.config.js to use moduleNameMapper instead of transform for images (png, etc) to prevent error in npm run test:unit. - -commit b7d86a1a9beeaf48407e0ae633a4aecf35403b9d -Author: Séamus O'Connor -Date: Thu Nov 28 09:44:38 2019 -0800 - - Removed 3 obs wells fixtures for aquifer fixture 123 - -commit 70463d0c1202107d351aa7ca0716960b8e50ddef -Author: Séamus O'Connor -Date: Wed Nov 27 16:29:22 2019 -0800 - - Adds 3 obs well fixtures for aquifer 123. Organizes observation wells into 'Active' and 'Inactive'. - -commit 882fc4d92e5c1309a514cb9d2b27db5c079aaaea -Merge: ef5b78137 bbb1e6334 -Author: Steve Hillier -Date: Wed Nov 27 12:39:49 2019 -0800 - - Merge pull request #1452 from bcgov/alex/wellsreversion - - added reversion to well and activitysubmission - -commit ef5b78137c4adeff1a04df9443ca8bfe06d7ff2d -Merge: 26ff64640 4c6ada82d -Author: Steve Hillier -Date: Wed Nov 27 12:39:13 2019 -0800 - - Merge pull request #1455 from bcgov/alex/obswelldescriptions - - updated obs well descriptions - -commit f658bf63f998159075928eefd2f9824fd127f8ab -Author: Séamus O'Connor -Date: Wed Nov 27 12:29:44 2019 -0800 - - Changed 'Hydraulically connected' to 'Hydraulically connected (screening level)' - -commit 4c6ada82da13b8f45c9089b3501fcf834bab2f28 -Author: AlexZorkin -Date: Mon Nov 25 21:12:34 2019 -0800 - - updated obs well descriptions - -commit c0010eca1944fa02a604d92b2854e65ad7cedec5 -Author: AlexZorkin -Date: Thu Nov 21 15:08:06 2019 -0800 - - altered cascading behaviour for code tables to be PROTECT with migrations - -commit bbb1e633492fd23d8567fa7a994b3a4ce6fae8f9 -Merge: 585d11cc2 26ff64640 -Author: AlexZorkin -Date: Wed Nov 20 12:37:24 2019 -0800 - - merge release - -commit 26ff64640f3d76fb697a88f38e1a9fb3d1241897 -Merge: efdde5ca1 14902b0dc -Author: Steve Hillier -Date: Wed Nov 20 11:32:58 2019 -0800 - - Merge pull request #1451 from bcgov/daine/fixgunicorn - - Don't autoupdate gunicorn and gevent - -commit 585d11cc25eeacfca0ea3994eb98dc69a3ec3305 -Author: AlexZorkin -Date: Wed Nov 20 11:32:39 2019 -0800 - - added reversion to well and activitysubmission - -commit 14902b0dcba90bb88aff6e63d35005ff3a219354 -Author: Daine Trinidad -Date: Wed Nov 20 11:02:01 2019 -0800 - - Horrible, horrible bug - -commit 067614e2bdb6eb302ff7422cc5cb8546951a7cd4 -Author: Daine Trinidad -Date: Wed Nov 20 10:54:36 2019 -0800 - - Set gevent to a fixed version - -commit 148760285afd524aec05a68729ec685dfe65e664 -Author: Daine Trinidad -Date: Wed Nov 20 10:52:57 2019 -0800 - - Set gunicorn version to fixed - -commit efdde5ca19cf9af208ea985e8e64eec88dbe5235 -Merge: 76969787a 14ce22043 -Author: Steve Hillier -Date: Thu Nov 14 13:17:05 2019 -0800 - - Merge pull request #1449 from bcgov/alex/obsdescriptions - - Observation Well Field Descriptions - -commit 14ce2204359335dd2560e9b4f36af20fa066ee27 -Author: Steve Hillier -Date: Tue Nov 12 10:11:05 2019 -0800 - - remove old db comments - -commit 9ce8ea2a3852286cb7862947fb85b1f32e689d6d -Author: AlexZorkin -Date: Wed Nov 6 15:47:14 2019 -0800 - - Added description for observation_well_status - -commit b32e3547837a96e43bcb3ffd17562e6932164813 -Author: AlexZorkin -Date: Wed Nov 6 10:04:46 2019 -0800 - - well number descriptions - -commit 76969787af09d905048277ea1b84487f87649ce8 -Merge: 2d0fd1b0c ff638a3e8 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Nov 4 15:44:39 2019 -0800 - - Merge pull request #1447 from bcgov/alex/wellapiupdates - - OBS Well Number and Status added to Databc api call and swagger docs - -commit 2d0fd1b0c969c81f58000ab7770ac9eb67716b84 -Merge: 95c480ba1 114717f5a -Author: Daine Trinidad -Date: Thu Oct 31 15:05:21 2019 -0700 - - Merge pull request #1448 from bcgov/daine/sentry - - Added Sentry to debug file upload issue - -commit ff638a3e8262cda6e0eec1084ea9af47d9e764ea -Author: AlexZorkin -Date: Thu Oct 31 11:47:14 2019 -0700 - - well obs name fix - -commit 114717f5ae0a6f78d79333445b75e32267b7b8d3 -Author: Daine Trinidad -Date: Wed Oct 30 16:35:23 2019 -0700 - - Added Sentry to debug file upload issue - -commit ca6650a7b9ffcac92251fced69f23fdd520ed5df -Author: AlexZorkin -Date: Wed Oct 30 14:54:11 2019 -0700 - - added observation_well_number and observation_well_status wells databc api call - -commit 95c480ba14e44d1a817e7b5fee3e4cb0645cfc1a -Merge: 34e1dce69 ad99b18ff -Author: Daine Trinidad -Date: Tue Oct 29 11:02:23 2019 -0700 - - Merge pull request #1445 from bcgov/disable-licence-cj - - Disable licence cronjob - -commit 34e1dce6932cb63f08cb2ce3889f0d3bae670b46 -Merge: fb3159c8c 2daa34e01 -Author: Steve Hillier -Date: Tue Oct 29 11:00:54 2019 -0700 - - Merge pull request #1446 from bcgov/alex/descriptionfix - - updated lithology material description - -commit 2daa34e01c9d7e98a177dc29d8fbc96c2dc52f94 -Author: AlexZorkin -Date: Mon Oct 28 19:22:15 2019 -0700 - - updated lithology material description - -commit fb3159c8cabe4ab20d7094209b4eedbd6a240f69 -Merge: 8c3980937 e6a9d02a7 -Author: Steve Hillier -Date: Mon Oct 28 16:43:22 2019 -0700 - - Merge pull request #1439 from bcgov/steve/db-comments2 - - Steve/db comments2 - -commit ad99b18ff8ce4f8a3967bd1c7c9d8784aee36037 -Author: Steve Hillier -Date: Fri Oct 25 22:41:34 2019 -0700 - - comment out cj in prod env (not demo) - -commit bf62be181a98b4aa369a553aa8a134d48f1b558f -Author: Steve Hillier -Date: Fri Oct 25 22:39:35 2019 -0700 - - remove licence import cronjob from prod env - -commit 8c39809378e8a6aa281c9f29f64938e00fd98a55 -Merge: 2e17a78a5 1062b8e35 -Author: Steve Hillier -Date: Thu Oct 24 08:49:32 2019 -0700 - - Merge pull request #1444 from bcgov/alex/lithologydescriptions - - Updated Lithology Descriptions for DataBC - -commit 2e17a78a5725e4a21aca699c355169e8973fbf3c -Merge: 1906e2929 00815a5e0 -Author: Steve Hillier -Date: Thu Oct 24 08:43:52 2019 -0700 - - Merge pull request #1441 from bcgov/steve/coord-validation - - basic validation for valid coords - -commit 1062b8e35e77140138709c1eb06f213c49a633bc -Merge: 68c944432 1906e2929 -Author: AlexZorkin -Date: Wed Oct 23 11:39:22 2019 -0700 - - Merge branch 'release' into alex/lithologydescriptions - -commit 68c9444322efcc0073b6b06eeb1cbf581310f27f -Author: AlexZorkin -Date: Wed Oct 23 11:39:08 2019 -0700 - - updated lithology descriptions to Brad Sparks suggestions - -commit 1906e29295029c51edb896a3669f234f980a7290 -Merge: aac7fd6c3 e1b8e49af -Author: Daine Trinidad -Date: Tue Oct 22 13:50:02 2019 -0700 - - Merge pull request #1443 from bcgov/daine/filterpackspelling-release - - Reloading filter packs using migration to update fixture - -commit 00815a5e01ca990046d7f9e7f36266ef318a4c03 -Author: Steve Hillier -Date: Mon Oct 21 18:59:44 2019 -0700 - - update test - -commit 1dbc436d01122e9e28349b3e25098cecec37a2d5 -Author: Steve Hillier -Date: Mon Oct 21 16:42:48 2019 -0700 - - update test to use valid coords - -commit aac7fd6c3926b6e58065f445b8ec4f320cf1a8ba -Merge: d907c65e5 7b798889a -Author: Steve Hillier -Date: Mon Oct 21 12:55:37 2019 -0700 - - Merge pull request #1442 from bcgov/steve/screen-api - - simple endpoint to return screen info - -commit e1b8e49afb8773c3c58aa85093f11e40e55a87c8 -Author: Daine Trinidad -Date: Wed Oct 16 14:47:13 2019 -0700 - - Reloading filter packs using migration to update fixture - -commit 7b798889a8274e7557c4c07d57128865e3ce3863 -Author: Steve Hillier -Date: Fri Oct 18 13:29:19 2019 -0700 - - simple endpoint to return screen info - -commit 34982ca9907a0c6c884efae8e24a5acd526f4aae -Author: Steve Hillier -Date: Fri Oct 18 11:13:36 2019 -0700 - - remove extra logging - -commit 2bf687a0cf31968f61273e7111b82bcc3228225e -Author: Steve Hillier -Date: Fri Oct 18 11:06:44 2019 -0700 - - add basic validation for valid coords - -commit d907c65e5746e65de07796f93712f3102e732279 -Merge: 1ab88c141 cf750dd88 -Author: Steve Hillier -Date: Thu Oct 17 08:55:26 2019 -0700 - - Merge pull request #1437 from bcgov/alex/lithologydescriptions - - Updated lithology_raw_data and lithology_observation db_comments - -commit e6a9d02a765a5d5abb5b9009b430c81a2dfa686a -Author: Steve Hillier -Date: Thu Oct 10 12:12:13 2019 -0700 - - remove lithology from this PR - -commit b361f6720b3c52a33224a8bc1958a1a4441b7071 -Author: Steve Hillier -Date: Thu Oct 10 11:06:40 2019 -0700 - - add comments - -commit cf750dd88369cdd7dc762b5ab2db012c549e756c -Author: AlexZorkin -Date: Thu Oct 10 10:26:29 2019 -0700 - - updated lithology_raw_data and lithology_observation db_comments - -commit 1ab88c141e2e43e7bedd562628515735fb5a4769 -Merge: 8d312d5c9 6b6e813ce -Author: Steve Hillier -Date: Tue Oct 8 12:29:38 2019 -0700 - - Merge pull request #1436 from bcgov/steve/aq-select-fix - - aquifer select now returns aquifer ID, not an object - -commit 6b6e813ce09f0e1540bfc06fc35961e62e66e449 -Author: Steve Hillier -Date: Thu Oct 3 10:13:08 2019 -0700 - - aquifer select now returns aquifer ID, not an object - -commit 8d312d5c9147fd16fb1e489309368c1da7708fc9 -Merge: fc0297438 4998c4590 -Author: Steve Hillier -Date: Tue Oct 1 12:39:40 2019 -0700 - - Merge pull request #1434 from bcgov/alex/geojsonupdates - - Geojson Updates to Lithology and Aquifer Endpoints, Updated NPM Dependancies - -commit 4998c45903cd36394aa5ddc52c3fc6a9b6afef03 -Author: AlexZorkin -Date: Mon Sep 30 20:16:53 2019 -0700 - - location fixg - -commit 9221abe74f3b8ca45d888933a8ed61c08c808eb2 -Author: AlexZorkin -Date: Mon Sep 30 20:13:51 2019 -0700 - - export to databc process added to readme.md - -commit 7a1ef605a29465dd6dd206a0b0713b38efa47bb4 -Author: AlexZorkin -Date: Mon Sep 30 19:37:28 2019 -0700 - - updated db comment on lithology raw data - -commit 6d44f176ee188ddc12f06c69400b9009302d719e -Author: AlexZorkin -Date: Wed Sep 25 13:11:07 2019 -0700 - - bug fix on realtime call - -commit c7cbee08343fd749f15106f41c91a19d4118e7e4 -Author: AlexZorkin -Date: Wed Sep 25 12:07:58 2019 -0700 - - added detail context link to aquifer geojson call, added lithology_raw_data to lithology geojson call, updated npm dependancies to fix critical issues - -commit cca987f5ca9ff06593a3a083db4b2c2cf416975b -Merge: 6fe75e251 fc0297438 -Author: Steve Hillier -Date: Thu Aug 15 14:05:47 2019 -0700 - - Merge pull request #1383 from bcgov/release - - Release - -commit fc02974386305d5e02149fed9b107f2203cf3114 -Merge: 1a44a9d55 d9bad6d6a -Author: Steve Hillier -Date: Thu Aug 15 13:16:17 2019 -0700 - - Merge pull request #1433 from bcgov/steve/aqinfo2 - - Nicer aquifer info pop up icon - -commit 1a44a9d550eea7533426feb97d17eb88352d2068 -Merge: 8bcd44988 9b6a1f984 -Author: Steve Hillier -Date: Thu Aug 15 11:36:17 2019 -0700 - - Merge pull request #1432 from bcgov/steve/a100 - - Remove WELLS/a100 reference from error pages - -commit d9bad6d6a9b7969c7be320f6838859b040ee3e49 -Author: Steve Hillier -Date: Thu Aug 15 11:02:26 2019 -0700 - - change aquifer info popup icon - -commit 9b6a1f984b3178857c78fc3463dfff60d817aa9f -Author: Steve Hillier -Date: Thu Aug 8 16:36:19 2019 -0700 - - fix up error pages and remove WELLS reference - -commit 8bcd4498851a34d1ee948c10085cc2c791dce104 -Merge: 53b8347a3 e17cb8a5c -Author: Steve Hillier -Date: Thu Aug 8 16:12:01 2019 -0700 - - Merge pull request #1431 from bcgov/steve/aquifer-info-icon - - fix icon for Aquifer info popup - -commit 53b8347a37864814793f3be497824ba0f2b789bb -Merge: 3932e168a b2235b0c9 -Author: Daine Trinidad -Date: Wed Aug 7 14:35:25 2019 -0700 - - Merge pull request #1430 from bcgov/alex/fileuploadfix - - File Upload Encoding - -commit e17cb8a5c6d973ab4f5486ba3bf28af7fe414e81 -Author: Steve Hillier -Date: Thu Aug 1 14:44:04 2019 -0700 - - fix icon for hover info - -commit b2235b0c9e5940b3d04fa51da97397e2f3bb1a30 -Author: AlexZorkin -Date: Tue Aug 6 12:52:40 2019 -0700 - - ecoding fix - -commit 3932e168a7a67647df25d4b14187e6aeaf79345d -Merge: 4d51ef0b0 912b2e523 -Author: Daine Trinidad -Date: Fri Aug 2 12:17:07 2019 -0700 - - Merge pull request #1428 from bcgov/steve/wtn-fix - - (submissions) Fix for deleting from well tag number search box - -commit 912b2e523c0ee53296f77f26955ac9fc03856145 -Author: Daine Trinidad -Date: Fri Aug 2 10:57:20 2019 -0700 - - Well formatting fix - -commit 8b08f71520e86d385f6bf84a88ae43e16def0cee -Merge: 4c4e337b4 9ad0cccce -Author: Daine Trinidad -Date: Fri Aug 2 10:27:40 2019 -0700 - - Merge branch 'steve/wtn-fix' of github.com:bcgov/gwells into steve/wtn-fix - -commit 4c4e337b4890070c372e80d00f65331ba7cd002c -Author: Daine Trinidad -Date: Fri Aug 2 10:26:54 2019 -0700 - - Set well tag number - -commit 9ad0cccce2318469d679a94ed0c3d2b70e07945d -Author: Steve Hillier -Date: Thu Aug 1 12:55:43 2019 -0700 - - fix well tag number display - -commit 1232dcb96defe2f88293ddaea1ef4b02306ae9bf -Author: Steve Hillier -Date: Thu Aug 1 11:16:49 2019 -0700 - - fix well tag display on preview - -commit 8617db33797df1afd06d0631dc6dc6ade16b01c6 -Author: Steve Hillier -Date: Tue Jul 30 13:28:38 2019 -0700 - - upgrade vue select - -commit 4d51ef0b03e25ef2d0bbb862d009b07b19cec8a7 -Merge: 449789427 c74059952 -Author: Steve Hillier -Date: Fri Jul 26 12:43:04 2019 -0700 - - Merge pull request #1427 from bcgov/steve/well_licence_fix - - set a default licensed status - -commit c74059952837495dd47ab4f8faa021eef3fa3d7e -Author: Steve Hillier -Date: Fri Jul 26 09:33:43 2019 -0700 - - update fixtures for non nullable license status - -commit 46ecc69d5b7877a609f4e20750d69f7cce60c56e -Author: Steve Hillier -Date: Wed Jul 24 12:55:29 2019 -0700 - - set a default licensed status - -commit 44978942729e27e7ad9f91837d16edf266e7417f -Merge: f3d0c5c05 98ed87105 -Author: Daine Trinidad -Date: Tue Jul 23 12:06:27 2019 -0700 - - Merge pull request #1420 from bcgov/alex/geozoomfix - - Zoom on GeoLocate - -commit f3d0c5c0524e4173a53ad7725e3eba5b4dabcd8a -Merge: 8dbfceadc 63cc81732 -Author: Daine Trinidad -Date: Tue Jul 23 12:05:31 2019 -0700 - - Merge pull request #1425 from bcgov/alex/coordinatefix - - Coordinate Acquisition Code Fix on Well Summary - -commit 8dbfceadc1b507bef1bdedcccedf229470744bc3 -Merge: 200fde587 39afc7f3a -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Jul 23 12:04:54 2019 -0700 - - Merge pull request #1426 from bcgov/alex/aquiferlabels - - Updated Aquifer Pie Chart Labels - -commit 39afc7f3af1c9d43f5564257ac1d9cf9a274b10b -Author: AlexZorkin -Date: Tue Jul 16 16:44:03 2019 -0700 - - label fix - -commit 63cc8173256f81ac9b0babafcc055a42d399aeb7 -Author: AlexZorkin -Date: Tue Jul 16 16:38:18 2019 -0700 - - removed extra row - -commit 8766df867d507193046d18f1d448035c3344bc18 -Author: AlexZorkin -Date: Tue Jul 16 16:37:06 2019 -0700 - - swapped out old field name - -commit 200fde5872fe91c85c70d157db37522c4231ad57 -Merge: a38c39cf3 7bc846a75 -Author: Steve Hillier -Date: Tue Jul 9 10:45:40 2019 -0700 - - Merge pull request #1423 from bcgov/daine/formatting - - Fixed label (ORC Number formatting) - -commit a38c39cf3f14036c8eec47c5ad30bd0f62264311 -Merge: f7e4de4a1 90121e173 -Author: Steve Hillier -Date: Tue Jul 9 10:45:23 2019 -0700 - - Merge pull request #1421 from bcgov/steve/namelist - - [1882] Registries name search - fix deleted filter - -commit 98ed8710550fb8e5cb05a18ccec7d2828f7899e3 -Author: AlexZorkin -Date: Mon Jul 8 21:02:45 2019 -0700 - - fix for geo locate - -commit d719b8362919314ea3867a0ef1bb8f5550ee2dbe -Merge: 035a6590c f7e4de4a1 -Author: AlexZorkin -Date: Mon Jul 8 17:05:22 2019 -0700 - - Merge branch 'release' into alex/geozoomfix - -commit 7bc846a75f14cc50574685a3444f509bda627e55 -Author: Daine Trinidad -Date: Fri Jul 5 15:43:39 2019 -0700 - - Fixed label (ORC Number formatting) - -commit f7e4de4a1e8ae5fc4e8d18daca3f7bbe9f92b804 -Merge: baf0473c6 03e738b08 -Author: Steve Hillier -Date: Wed Jul 3 13:01:53 2019 -0700 - - Merge pull request #1422 from bcgov/steve/wtn_search - - change well_tag_number query behavior to exact match - -commit 03e738b087915ba2aa3622cdd6a0523eea0eab25 -Author: Steve Hillier -Date: Wed Jul 3 10:14:39 2019 -0700 - - fix test - -commit b2994fb63448bec44b9ea37cdb2a774f13c01d6f -Author: Steve Hillier -Date: Wed Jul 3 10:08:07 2019 -0700 - - add a test - -commit 92144b3be8ebef4ff99caaed0cb91e934aaa194e -Author: Steve Hillier -Date: Tue Jul 2 16:42:50 2019 -0700 - - change well_tag_number query behavior to exact match - -commit 90121e1739acaaa81a654aa71761e35eeb7ca54e -Author: Steve Hillier -Date: Tue Jul 2 15:15:35 2019 -0700 - - add another driller delete request - -commit e17908501d9cb7f58f0eb2845dbed818ffac7682 -Author: Steve Hillier -Date: Tue Jul 2 13:31:48 2019 -0700 - - change the way queryset is filtered - -commit baf0473c6f968a5f437b90e08fc0ef0698e67c6e -Merge: 33a528871 ec02d23be -Author: Steve Hillier -Date: Tue Jul 2 13:22:00 2019 -0700 - - Merge pull request #1419 from bcgov/steve/survey-subm - - Add submission and edit to survey options - -commit 035a6590c841c155715a93712bed4f530b6b6078 -Author: AlexZorkin -Date: Tue Jun 25 14:09:38 2019 -0700 - - easiest fix ever - -commit ec02d23be1ade4b3915c7d04f1c454a2cdac78d6 -Author: Steve Hillier -Date: Tue Jun 25 13:39:47 2019 -0700 - - Add submission and edit to survey options - -commit 33a528871be662b910cafcc95af5c8cf8042a0b5 -Merge: 3207dbaad d4b6c6b7a -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Jun 25 10:54:07 2019 -0700 - - Merge pull request #1418 from bcgov/alex/historyitemfix - - Fix for Change History - -commit d4b6c6b7a6d2ec94915313f63d00c107be03be91 -Author: AlexZorkin -Date: Mon Jun 24 19:55:20 2019 -0700 - - null fields_provided fix - -commit 3207dbaad42c23d76d75de32aa8ee26c8467c3bc -Merge: 75259bab2 d90b0c4fa -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Jun 24 18:22:26 2019 -0700 - - Merge pull request #1417 from bcgov/steve/migr-merge - - add merge migration - -commit d90b0c4fa2f00a95362309fcf0d6bedb0110735b -Author: Steve Hillier -Date: Mon Jun 24 15:47:58 2019 -0700 - - add merge migration - -commit 75259bab2a065b8d1201b79ee4dfe5de52cdd355 -Merge: 95434f3f6 6cd2425aa -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Jun 24 15:10:07 2019 -0700 - - Merge pull request #1412 from bcgov/alex/aquisistioncode - - [1847] Acquisition code default set to 'H' - -commit 95434f3f6ce64031cce7dc23f8690a43dcec1b65 -Merge: 96b0df6d9 7e45f165c -Author: Steve Hillier -Date: Mon Jun 24 14:52:47 2019 -0700 - - Merge pull request #1416 from bcgov/steve/aq-form-fix - - fix aquifer editing - -commit 7e45f165cd1babba231d92c011ac89f69f878691 -Author: Steve Hillier -Date: Mon Jun 24 12:56:23 2019 -0700 - - test still incorrect, now passing - -commit 8a83579c7089851cce4c4c2a948e70660dc5d7e8 -Author: Steve Hillier -Date: Mon Jun 24 11:41:27 2019 -0700 - - fix test again - -commit 3117a1d95135bab6d8943bd7c9f0a87f3a2b9f6f -Author: Steve Hillier -Date: Mon Jun 24 11:19:38 2019 -0700 - - update test to work with new form code - -commit 96b0df6d98915361c1b684e5a75539c28a6c3694 -Merge: c62ec15f7 90d462941 -Author: Steve Hillier -Date: Mon Jun 24 11:10:15 2019 -0700 - - Merge pull request #1415 from bcgov/alex/historyfix - - added default None to getattr - -commit fbd0057e32162183efb5a908bb396f72c75f17bd -Author: Steve Hillier -Date: Mon Jun 24 11:07:48 2019 -0700 - - fix aquifer editing - -commit 90d462941c0b21f26c36979a9b0d84a8caf2f1ff -Author: AlexZorkin -Date: Thu Jun 20 16:55:13 2019 -0700 - - added default None to getattr - -commit 6cd2425aa2aa2fa0e44a86c79fdd2bb92a816ae3 -Author: AlexZorkin -Date: Thu Jun 20 16:50:20 2019 -0700 - - fixture fix - -commit 877fd188ea5ef716c849da858111120b242bf77c -Author: AlexZorkin -Date: Wed Jun 19 17:13:41 2019 -0700 - - fixture fix - -commit c62ec15f7982b3a74f6e112fd7df343336cfdc29 -Merge: d2b9d97a9 a41e7ed73 -Author: Steve Hillier -Date: Wed Jun 19 15:15:35 2019 -0700 - - Merge pull request #1414 from bcgov/steve/driller-resp - - filter driller names - -commit d2b9d97a90277f5e84c93b03083863307df60ac2 -Merge: a061fd4d5 ae160f7d3 -Author: Steve Hillier -Date: Wed Jun 19 11:59:40 2019 -0700 - - Merge pull request #1409 from bcgov/steve/apitests - - add a clean up test - -commit a061fd4d549a063ae4411eb451ba1ab8190120e9 -Merge: f1fe7dcc2 f890c4431 -Author: Steve Hillier -Date: Wed Jun 19 11:59:21 2019 -0700 - - Merge pull request #1413 from bcgov/steve/uploads - - fix for file uploads - -commit a41e7ed73bb571f9dc53c8b10a5c84e9c41a9bcb -Author: Steve Hillier -Date: Wed Jun 19 11:57:49 2019 -0700 - - fix typo (gt/lt) - -commit eafeec0f40bfcf13100cd90b83817a6ec7c989a2 -Author: Steve Hillier -Date: Wed Jun 19 11:54:45 2019 -0700 - - filter names on expiry date - -commit f1fe7dcc28431673d255e9b4c9b4736ece693c5a -Merge: 3cf174399 6221d46a8 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Jun 19 11:52:18 2019 -0700 - - Merge pull request #1411 from bcgov/alex/driveshoe - - [1891] removed drive shoe from casing - -commit c8c5fb9af56f9d61867a89e46b07e3a52542e52a -Author: AlexZorkin -Date: Wed Jun 19 11:51:49 2019 -0700 - - migration fix - -commit 6221d46a8cc1d419f0d149e37a37ebfe904789fa -Merge: ae2386e34 3cf174399 -Author: AlexZorkin -Date: Wed Jun 19 11:11:37 2019 -0700 - - Merge branch 'release' into alex/driveshoe - -commit 3cf1743995beba0e27609cf0b371821111884a57 -Merge: e8ccff487 478f93ebd -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Jun 19 11:11:05 2019 -0700 - - Merge pull request #1410 from bcgov/alex/provincestatecode - - [1840] added expiry date and effective date to province state code - -commit f890c44315cd8932bdf0d6187dc65f3f4c2d8013 -Author: Steve Hillier -Date: Wed Jun 19 10:58:13 2019 -0700 - - remove commented code - -commit 6ddac49b30099e568ad986c11a45e476ddc924de -Author: Steve Hillier -Date: Wed Jun 19 10:55:37 2019 -0700 - - no longer stop form submission if form didn't change - -commit 7ecb6c9ad308ec1ed2c38b8a8f01376a0e52030f -Author: Steve Hillier -Date: Wed Jun 19 10:45:13 2019 -0700 - - remove print statements - -commit 478f93ebdd3e82f25860b868b505503f47cd7d0c -Author: AlexZorkin -Date: Tue Jun 18 19:30:58 2019 -0700 - - added expiry date and effective date to province state code - -commit ae2386e3484a5b559c159a64891dfcf02ccce099 -Author: AlexZorkin -Date: Tue Jun 18 17:06:03 2019 -0700 - - removed drive shoe from casing - -commit ae160f7d3f9072b5f34a14059ceb413a54150f23 -Author: Steve Hillier -Date: Tue Jun 18 17:04:08 2019 -0700 - - add a clean up test - -commit 6a866d446f69d6b50a52dd211744958f7360db5a -Merge: 55b6cb9a0 e8ccff487 -Author: AlexZorkin -Date: Tue Jun 18 17:01:54 2019 -0700 - - Merge branch 'release' into alex/aquisistioncode - -commit 55b6cb9a0081f334893393594ec379ddf618a57e -Author: AlexZorkin -Date: Tue Jun 18 17:00:57 2019 -0700 - - aquisition code default H added - -commit e8ccff4874341a7e9a11a1cdd47956f2ce32e53b -Merge: 0c8eef388 ba865c0c1 -Author: Steve Hillier -Date: Tue Jun 18 16:51:26 2019 -0700 - - Merge pull request #1408 from bcgov/steve/legacy-dates - - skip strict validation rules for legacy records - -commit ba865c0c12983500086653a582532abf07cec4d5 -Author: Steve Hillier -Date: Tue Jun 18 16:24:39 2019 -0700 - - fix for checking for legacy record - -commit 2a26259e3dedd5350ba6b555be1d577a5a93a770 -Author: Steve Hillier -Date: Tue Jun 18 16:12:52 2019 -0700 - - skip strict validation rules for legacy records - -commit 0c8eef388e63ec48a966e84683526f35dc6af716 -Merge: c3b90cbbf 9ec9f6a2b -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Jun 17 12:59:10 2019 -0700 - - Merge pull request #1407 from bcgov/alex/historyrefactor - - History Refactoring - -commit c3b90cbbf5ce57074654168376ed08870b6d53fc -Merge: 32f0db7ff 4cb6e1fbe -Author: Steve Hillier -Date: Mon Jun 17 11:46:07 2019 -0700 - - Merge pull request #1405 from bcgov/steve/licence-cj - - add cronjob for importing licences - -commit 4cb6e1fbe434508bdd54018c65cd31b7993d49df -Author: Steve Hillier -Date: Mon Jun 17 11:10:47 2019 -0700 - - add a pause to prevent retrying db conn repeatedly - -commit 3d0f2c6203963d31ad72cd55f2b76d9aee52f3e6 -Merge: 536879170 32f0db7ff -Author: Steve Hillier -Date: Mon Jun 17 11:09:25 2019 -0700 - - Merge branch 'release' into steve/licence-cj - -commit 536879170d2ca7f570dc3a886843b9b55255aa4b -Author: Steve Hillier -Date: Mon Jun 17 10:48:51 2019 -0700 - - fix template path - -commit 9ec9f6a2bf44039adb07cea77634fca6621362ea -Merge: 43b13a2cd 32f0db7ff -Author: AlexZorkin -Date: Mon Jun 17 10:18:00 2019 -0700 - - Merge branch 'release' into alex/historyrefactor - -commit 43b13a2cddb9f854eaeefe961cd643259d6fc896 -Author: AlexZorkin -Date: Mon Jun 17 10:17:40 2019 -0700 - - object wrapper fix - -commit 32f0db7fff03d35734117a9b612f82935ebf63f4 -Merge: c6cd800c7 54e2e1f36 -Author: Steve Hillier -Date: Mon Jun 17 10:04:46 2019 -0700 - - Merge pull request #1402 from bcgov/steve/dbmigrate - - rolling deployment - -commit c6cd800c79ea776b44e83541371075bdd441fd11 -Merge: b42009434 242842f6c -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Jun 17 09:40:42 2019 -0700 - - Merge pull request #1396 from bcgov/alex/wellorientation - - [1887] Well Orientation Code Table - -commit 5456c63a127b0ad7aad1187568b23d3d3783ac25 -Author: AlexZorkin -Date: Fri Jun 14 16:50:17 2019 -0700 - - removed debug code - -commit 242842f6cd02770af61a061cf4c15a24396bcff0 -Author: AlexZorkin -Date: Fri Jun 14 16:47:23 2019 -0700 - - api test - -commit 484503ac3685cd399782e05de2c1cf309a4cd8f2 -Author: AlexZorkin -Date: Fri Jun 14 16:37:07 2019 -0700 - - styling and comments - -commit 22bf0c3d13b7a090b8519ef6469fecf55c60263e -Author: AlexZorkin -Date: Fri Jun 14 15:55:30 2019 -0700 - - serialization added - -commit 882a9a54c2ee78f506694dc7765618540e86c9da -Author: AlexZorkin -Date: Fri Jun 14 13:43:59 2019 -0700 - - style changes - -commit f183a25d49bb5b5822bf98ed7da4115042e96b2b -Author: AlexZorkin -Date: Fri Jun 14 13:33:51 2019 -0700 - - history main refactor finished - -commit 51ac4621b8c16a5f6727a3af91c24184860c1d12 -Author: AlexZorkin -Date: Fri Jun 14 12:57:39 2019 -0700 - - wip - -commit c51d2b647f65c28cd4b377a91cd8c81eabb23db0 -Author: AlexZorkin -Date: Fri Jun 14 11:35:24 2019 -0700 - - removed reversion from wells models - -commit c0b4e5fc952d2c7e35841afa2e921af8f940ffb6 -Author: AlexZorkin -Date: Thu Jun 13 17:16:31 2019 -0700 - - work in progress - -commit f864e2f6715e2aa47d094931f82839f018aba630 -Author: AlexZorkin -Date: Thu Jun 13 16:59:40 2019 -0700 - - work in progress - -commit 607d43567651a2354253608d407de6c578a50fc2 -Author: AlexZorkin -Date: Thu Jun 13 13:04:33 2019 -0700 - - work in progress - -commit 9111bbd36cc35aec5ea5baa80b6a9e677956f83c -Author: AlexZorkin -Date: Thu Jun 13 10:06:54 2019 -0700 - - api test fix - -commit 79354330fe71f45e5b4a08937ad9739944d54c21 -Merge: b437bf4fa b42009434 -Author: AlexZorkin -Date: Wed Jun 12 15:04:01 2019 -0700 - - Merge branch 'release' into alex/wellorientation - -commit b437bf4fa9f3acd75db81b231c425319b4a4af78 -Merge: 98dceb69f 26f285248 -Author: AlexZorkin -Date: Wed Jun 12 15:03:21 2019 -0700 - - Merge branch 'release' into alex/wellorientation - -commit 98dceb69f4815a06853ce84f2b122688f9132e7d -Author: AlexZorkin -Date: Wed Jun 12 15:03:14 2019 -0700 - - api tests fix - -commit b4200943438aa24dc041c8ddbda964166bd9c6a5 -Merge: 26f285248 7376ab676 -Author: Steve Hillier -Date: Wed Jun 12 15:03:12 2019 -0700 - - Merge pull request #1406 from bcgov/steve/aq-disclaimer - - add licensing disclaimer - -commit 7376ab6766b485b3bad510cb1aa46c14f72bacd0 -Author: Steve Hillier -Date: Wed Jun 12 13:55:21 2019 -0700 - - fix typo in auth guard - -commit 7753659b4e32a06d5a9e5d24032885c15843d91a -Author: Steve Hillier -Date: Wed Jun 12 13:40:17 2019 -0700 - - add licensing disclaimer - -commit 54e2e1f3666ee7ed48755c188db7760f34109c52 -Author: Steve Hillier -Date: Wed Jun 12 13:31:49 2019 -0700 - - change failure policy (retrying is handled in script) - -commit 117831668721ed8f50c0c459d97c1c67fe0d3bdf -Author: Steve Hillier -Date: Wed Jun 12 12:50:18 2019 -0700 - - add cronjob for importing licences - -commit 26f2852488a93bb3f5138b9ef0a00bfab0cee04c -Merge: 146230006 a217cf1a4 -Author: Steve Hillier -Date: Wed Jun 12 12:28:12 2019 -0700 - - Merge pull request #1404 from bcgov/alex/datevalidationfix - - Date Validation Fix - -commit 14623000698d1fb2c1c84fd90817e6c195632df3 -Merge: dd4f9a623 4ad44a3f1 -Author: Steve Hillier -Date: Wed Jun 12 12:23:32 2019 -0700 - - Merge pull request #1403 from bcgov/alex/driveshoefix - - fixed drive shoe on well summary - -commit ae954786e93fe74661fc477ac19cf451974b15ae -Author: Steve Hillier -Date: Wed Jun 12 12:21:34 2019 -0700 - - remove unused vars - -commit dd4f9a62315f71e58945ad389d70651183a2ee47 -Merge: 2be80e45c acd6fb996 -Author: Steve Hillier -Date: Wed Jun 12 12:20:07 2019 -0700 - - Merge pull request #1398 from bcgov/steve/surveys - - add a survey page - -commit 9157addfafeb4e9e3be994d7d64a0a9601c76b4b -Author: Steve Hillier -Date: Wed Jun 12 12:17:43 2019 -0700 - - Clean up Jenkinsfile - -commit a217cf1a47010fe4d7b4b3e2dba421f9db97963f -Author: AlexZorkin -Date: Tue Jun 11 17:50:42 2019 -0700 - - optimized server validation on dates, fixed work date validation on submission - -commit ea5f5e20d34b4738c58072151493c19ffcc042bb -Author: Steve Hillier -Date: Tue Jun 11 16:30:11 2019 -0700 - - make script executable - -commit 4ad44a3f1214c0f416f6453939df2b075306a596 -Author: AlexZorkin -Date: Tue Jun 11 16:20:51 2019 -0700 - - fixed drive shoe on well summary - -commit 80900a6b041b359dd1210ae75ee2aeb7f4a4ec64 -Author: Steve Hillier -Date: Tue Jun 11 16:15:41 2019 -0700 - - switch to pre deploy hook - -commit 780bee3ec653d2655d3c273b39d3ef6bebbbe35d -Merge: 471ff29f9 2be80e45c -Author: AlexZorkin -Date: Tue Jun 11 15:59:17 2019 -0700 - - Merge branch 'release' into alex/wellorientation - -commit 471ff29f90b6e352dcb15d22adb7a20badddaa8c -Author: AlexZorkin -Date: Tue Jun 11 15:57:12 2019 -0700 - - migration fix - -commit 2be80e45c81cf3f7698ae30aa3d80909a3edd4ea -Merge: 4942a2293 beb586a92 -Author: Steve Hillier -Date: Tue Jun 11 11:07:21 2019 -0700 - - Merge pull request #1401 from bcgov/steve/urllib - - ensure using a 1.24.x version of urllib - -commit 4942a2293f969a2e0835fc6230766b2d1f51ba10 -Merge: c2ea27ad9 053d60398 -Author: Steve Hillier -Date: Tue Jun 11 11:07:13 2019 -0700 - - Merge pull request #1400 from bcgov/steve/aq-typo2 - - fix typo - -commit e02731a8be3f984e05fcf07e90c1fc6907565f04 -Author: Steve Hillier -Date: Tue Jun 11 11:06:55 2019 -0700 - - migrate as soon as pod is running - -commit acd6fb9965da7adf303618eedecac409caa277ce -Author: Steve Hillier -Date: Tue Jun 11 09:39:44 2019 -0700 - - change text in survey link to admin - -commit 05d11cc5b0e1a42dbfbb99d906d6e1241708f3f2 -Author: Steve Hillier -Date: Tue Jun 11 09:38:19 2019 -0700 - - fix punctuation - -commit 27c46b47a06186b39d31fa3946f3896d8db9d8c4 -Author: Steve Hillier -Date: Tue Jun 11 08:11:37 2019 -0700 - - fix selector check - -commit c1889184c6b1e04a5aa45e51a4c517c2053a569f -Author: Steve Hillier -Date: Mon Jun 10 16:33:00 2019 -0700 - - 'manually' migrate to allow rolling deployment - -commit beb586a92f89aafe40a24ace2c6d1cb0dff4e9a2 -Author: Steve Hillier -Date: Mon Jun 10 13:14:34 2019 -0700 - - ensure using a 1.24.x version of urllib - -commit 053d603980aba33affba6c91b74ae04dacf8a4a1 -Author: Steve Hillier -Date: Thu Jun 6 17:02:54 2019 -0700 - - fix typo - -commit c2ea27ad99707490ea9785d8930c318e916afd0d -Merge: ed037344e 7f4ca1517 -Author: Steve Hillier -Date: Thu Jun 6 16:57:46 2019 -0700 - - Merge pull request #1395 from bcgov/steve/requests-update - - reduce CPU requests - -commit 6ab5efd411a23f87374fd18b6e6d64a259a68874 -Author: Steve Hillier -Date: Thu Jun 6 16:49:34 2019 -0700 - - add a survey page - -commit e420342aad117e513b7225aba9d82fe05d5626f7 -Merge: 758919f3c ed037344e -Author: AlexZorkin -Date: Thu Jun 6 14:43:37 2019 -0700 - - Merge branch 'release' into alex/wellorientation - -commit 758919f3ce2557c575be6cf2149200498a3576a8 -Author: AlexZorkin -Date: Thu Jun 6 14:43:24 2019 -0700 - - code table fix - -commit ed037344e308e4f6a85ef8e8d8b74a3f7f142569 -Merge: 57909bce5 9c0cfbfee -Author: Steve Hillier -Date: Thu Jun 6 14:15:19 2019 -0700 - - Merge pull request #1397 from bcgov/steve/ga-exports-aquifers - - add analytics events - -commit 9c0cfbfeeae4508228ece363aa078ce556e6c950 -Author: Steve Hillier -Date: Thu Jun 6 13:35:47 2019 -0700 - - add analytics for search exports - -commit 4c25aec1758dd9b36f49fb0efd0ebc2bbc428b6b -Author: Steve Hillier -Date: Thu Jun 6 13:29:36 2019 -0700 - - update urllib dep - -commit d312ee25363c8b8177ffaf1c66b630c1623c10eb -Author: Steve Hillier -Date: Thu Jun 6 13:10:24 2019 -0700 - - add analytics events to well columns and aquifer resources - -commit ea0eae550106e89768e7583b3c4514318d43c8a2 -Merge: 355783999 57909bce5 -Author: AlexZorkin -Date: Thu Jun 6 12:31:17 2019 -0700 - - Merge branch 'release' into alex/wellorientation - -commit 355783999a0110a5c17324abeb8cf95ab0bece19 -Author: AlexZorkin -Date: Thu Jun 6 12:29:26 2019 -0700 - - updated well orientation to use code table - -commit 57909bce5d27e2c4fd491ced64d9dfbc17e02127 -Merge: db6574220 e1db2b146 -Author: Steve Hillier -Date: Thu Jun 6 12:12:59 2019 -0700 - - Merge pull request #1394 from bcgov/steve/aquifer-licence-note - - add extra licensing info to aquifer page - -commit e1db2b1467fb26c751a912b803c50b38d0ebe4d5 -Author: Steve Hillier -Date: Thu Jun 6 11:01:39 2019 -0700 - - add extra licencing info to aquifer page - -commit 7f4ca15173eb243e1c7af03d8f52ce5ef960c1d9 -Author: Steve Hillier -Date: Thu Jun 6 10:29:35 2019 -0700 - - reduce CPU requests - -commit db6574220c77dc512592e9f7e72f696aa87056ff -Merge: 6f0d8f2c4 6e425f5b3 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Jun 5 09:59:42 2019 -0700 - - Merge pull request #1393 from bcgov/alex/boundaryeffect - - [1829] Boundary Effect Code Table - -commit 6e425f5b3a0cfc5c3084c107206fdcbbff801ee5 -Author: AlexZorkin -Date: Wed Jun 5 09:27:57 2019 -0700 - - removed disabled - -commit e2a4e4468d2d58a04494f70aa0b9d61b49dfbe25 -Merge: f26374444 6f0d8f2c4 -Author: AlexZorkin -Date: Wed Jun 5 09:26:55 2019 -0700 - - Merge branch 'release' into alex/boundaryeffect - -commit 6f0d8f2c486571d20fa0de4fa08fbd65501822f0 -Merge: 1ec2c9319 ee6804778 -Author: Steve Hillier -Date: Tue Jun 4 16:33:59 2019 -0700 - - Merge pull request #1386 from bcgov/alex/edithistory - - Minor Edit History Fix - -commit 1ec2c93198afc23dac9119c95a45ae49eb959f7b -Merge: bf9adaf30 fa4ba86fa -Author: Steve Hillier -Date: Tue Jun 4 16:26:07 2019 -0700 - - Merge pull request #1389 from bcgov/alex/migrationfixes - - [1889] Merged Squashes and Release - -commit bf9adaf30be477ef37785994f7db92460efdab28 -Merge: 905be13bb 5d2a1de8a -Author: Steve Hillier -Date: Tue Jun 4 16:23:18 2019 -0700 - - Merge pull request #1387 from bcgov/steve/readme-fix - - Update README.md - -commit f26374444ea1efb11cfe9eede94cc3ba76b69716 -Merge: 47436917d 905be13bb -Author: AlexZorkin -Date: Tue Jun 4 15:14:06 2019 -0700 - - merged release - -commit 47436917d2eb09ab5c0a51af66a6243fb0fa9cc2 -Author: AlexZorkin -Date: Tue Jun 4 15:09:45 2019 -0700 - - converted boundary effect numeric field into a selectable code list - -commit 905be13bb6333bfc942e0075c95c700aaf99ab1b -Merge: 163d13e3c eafaab142 -Author: Steve Hillier -Date: Tue Jun 4 12:29:42 2019 -0700 - - Merge pull request #1390 from bcgov/alex/datevalidation - - [1872] Work Date Validations - -commit 163d13e3c87ccd9eb045554a6650070f2d8642aa -Merge: 0fc666d9f 050b15ffa -Author: Steve Hillier -Date: Tue Jun 4 12:22:36 2019 -0700 - - Merge pull request #1391 from bcgov/alex/searchfixes - - [1875] Advanced Search Updates - -commit 0fc666d9f28dce412395582377637a89d04352ad -Merge: c90fcaa90 a7169da3a -Author: Steve Hillier -Date: Tue Jun 4 12:19:38 2019 -0700 - - Merge pull request #1392 from bcgov/alex/driveshoe - - [1870] Drive Shoe Code Table - -commit a7169da3a7a958132a5c17252acde4dee4ed3050 -Author: AlexZorkin -Date: Tue Jun 4 09:42:46 2019 -0700 - - fix on frontend select view - -commit b3631e2b087a0421b01849ebebce12b5ca4d6730 -Author: AlexZorkin -Date: Tue Jun 4 00:01:45 2019 -0700 - - migration fixes - -commit de304a011ed747a4b42014cbac8c0d9fb3003b88 -Author: AlexZorkin -Date: Mon Jun 3 23:40:07 2019 -0700 - - updated drive shoe references - -commit a66b5419d3fb8ad77bb84b9a8069b0e9a9924f51 -Author: AlexZorkin -Date: Mon Jun 3 22:29:58 2019 -0700 - - migrations for drive_shoe_status - -commit eafaab14243c1ed6164812abbaeeef4c4a519283 -Author: AlexZorkin -Date: Mon Jun 3 18:14:34 2019 -0700 - - mutual requirement added to work dates - -commit 5751fd4073d278837fdebde75952726e46b692b5 -Author: AlexZorkin -Date: Fri May 31 18:17:07 2019 -0700 - - validation added to start and end dates - -commit 050b15ffa1e92661f72655d422943edfdeb112e3 -Author: AlexZorkin -Date: Fri May 31 17:08:20 2019 -0700 - - search fixes - -commit 5d2a1de8ae1ed6d6c11be32e77da95aac94fc605 -Author: Steve Hillier -Date: Thu May 30 21:18:35 2019 -0700 - - Update README.md - -commit ee68047785b36f0900ca4f6002a11623ae197e36 -Author: AlexZorkin -Date: Thu May 30 15:24:03 2019 -0700 - - minor history changes - -commit 8feda9092b64ea05bd701e4f4d4250288c82ea92 -Merge: 777b82457 c90fcaa90 -Author: AlexZorkin -Date: Thu May 30 15:00:55 2019 -0700 - - Merge branch 'release' into alex/edithistory - -commit fa4ba86faf0e4615638ef108182e935e61c85f6e -Author: AlexZorkin -Date: Thu May 30 15:00:38 2019 -0700 - - migration fix - -commit 2f830223e0b5a944b6d8abe6b96af1b2e28b0a35 -Merge: 248985e2d c90fcaa90 -Author: AlexZorkin -Date: Thu May 30 14:40:00 2019 -0700 - - Merge branch 'release' into test - -commit c90fcaa90879651a4e11df4f88f3514a31d96ebc -Merge: a5f951eea ea42182b7 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu May 30 13:27:14 2019 -0700 - - Merge pull request #1384 from bcgov/alex/cleanup - - pid padding for edit - -commit a5f951eeab2b88c2347ff61fb75b3abcd659e163 -Merge: bbadd654a 80004a9d3 -Author: Steve Hillier -Date: Wed May 29 22:46:21 2019 -0700 - - Merge pull request #1385 from bcgov/aquifer-tests - - update aquifer tests - -commit 80004a9d3c18458e9522854f507407631d623193 -Author: Steve -Date: Wed May 29 22:15:34 2019 -0700 - - increase deployment timeout - -commit e6daebd8ff35fd12bd47b1931228c5394bdc7e41 -Author: Steve -Date: Wed May 29 22:00:01 2019 -0700 - - update attribution for 3rd party file - -commit 964536b90edd7c3c75bacc42ed6a9d440c1b59d8 -Author: Steve -Date: Wed May 29 21:52:52 2019 -0700 - - prevent type errors converting codes to descriptions - -commit d2912640133f5e7f3ef098d9bcdfb570686e9498 -Author: Steve -Date: Wed May 29 21:32:17 2019 -0700 - - remove data load function from migration - -commit f1962667aaa5552afa484b42edd1492b97c2ed13 -Merge: 14643b4c7 bbadd654a -Author: Steve Hillier -Date: Wed May 29 17:18:50 2019 -0700 - - merge release branch - -commit 14643b4c7e370832dd9a3da92f4b3721d5e6e9cb -Author: Steve Hillier -Date: Wed May 29 17:16:20 2019 -0700 - - fix tests - -commit ea42182b7a9dc5394488cab4cc4ee751f9923d11 -Author: AlexZorkin -Date: Wed May 29 16:30:24 2019 -0700 - - updated test - -commit 777b8245727a428bbfee6f5b2d24aadf584c36a2 -Author: AlexZorkin -Date: Wed May 29 16:10:57 2019 -0700 - - history fixes - -commit fae3f4bc7ff3cfadc7c01e71d3f0fc8d87220d17 -Author: AlexZorkin -Date: Wed May 29 11:59:04 2019 -0700 - - null codes fix - -commit 373e21e53d82a23b30778a0b43572713c4236db7 -Merge: bc6d08bc5 bbadd654a -Author: AlexZorkin -Date: Wed May 29 11:32:23 2019 -0700 - - Merge branch 'release' into alex/edithistory - -commit 62297b2cd5119525dd60c1887fd82bb876a3e911 -Merge: e4ab1ed4f bbadd654a -Author: AlexZorkin -Date: Wed May 29 11:31:41 2019 -0700 - - Merge branch 'release' into alex/cleanup - -commit 52b75979f5004caafba830ea42f7de7c9eb3651f -Author: Clark Van Oyen -Date: Wed May 29 11:09:27 2019 -0700 - - updates from PR - -commit bbadd654aae44971d50ab1f8a309cf9f30807604 -Merge: d97ff2355 5e6d8a28f -Author: Steve Hillier -Date: Wed May 29 10:36:04 2019 -0700 - - Merge pull request #1380 from bcgov/steve/documentation-cleanup - - Clean up documentation - -commit e4ab1ed4fc13128e0e03d0011cf9030d64257e6f -Author: alex@bigthink.io -Date: Tue May 28 16:44:24 2019 -0700 - - pid padding for edit - -commit 6fe75e25121cd0a9172b40b9bb0b942ae7413433 -Merge: 88e801bf5 d97ff2355 -Author: Steve Hillier -Date: Tue May 28 16:32:25 2019 -0700 - - Merge pull request #1287 from bcgov/release - - Release - -commit bc6d08bc5f224adea89a1650bb66d7c82d492d42 -Author: alex@bigthink.io -Date: Tue May 28 09:46:44 2019 -0700 - - select fix - -commit 56aff7ecbd2165a34588fe116de3827ae42e08d4 -Author: Clark Van Oyen -Date: Mon May 27 00:47:51 2019 -0700 - - move css files to use css style imports instead - -commit af41a841bf0cc62adb3c2e0abfcb67647ccbfef6 -Author: Clark Van Oyen -Date: Mon May 27 00:25:53 2019 -0700 - - get tests to pass after merge - -commit 790d7ef879e570c15e242385b93d8de698b47406 -Merge: a6e7975c2 d97ff2355 -Author: Clark Van Oyen -Date: Mon May 27 00:07:56 2019 -0700 - - Merge branch 'release' of github.com:bcgov/gwells into countable/licences - -commit a6e7975c2a7e75aa6fcc89ae20782aa9f90dfdf2 -Author: Clark Van Oyen -Date: Sun May 26 15:45:59 2019 -0700 - - refactor licence schema and api - -commit 9db04f0f8847d3f23abef6900b314bc92d7b6a38 -Author: Clark Van Oyen -Date: Fri May 24 16:23:33 2019 -0700 - - remove duplicate chart config - -commit 5a0d781136b9345532e5263701863de32ef0da8a -Author: Clark Van Oyen -Date: Fri May 24 16:22:48 2019 -0700 - - dash -> colon in chart labels - -commit 3999e10ac641eea4b97a4a3f4ce8fd836a0243a9 -Author: Clark Van Oyen -Date: Fri May 24 15:14:15 2019 -0700 - - remove tooltips - -commit d97ff2355e16c2b21494fc1179bc7bb9d2d86315 -Merge: 58f842fa9 091de8844 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri May 24 13:30:49 2019 -0700 - - Merge pull request #1379 from bcgov/alex/groundelevationfix - - Ground Elevation Validation Added to All Submissions - -commit 091de8844b5482d9a98b52f3580b1628820ceaac -Author: alex@bigthink.io -Date: Fri May 24 12:51:05 2019 -0700 - - test fixed - -commit 5deee133f0d5b875dd2161e07cf71d0e3657192f -Author: alex@bigthink.io -Date: Fri May 24 12:04:25 2019 -0700 - - minor fix - -commit b7cd5c65ab9dee5c97e8132e07d7983eb38dc71c -Author: alex@bigthink.io -Date: Fri May 24 11:50:00 2019 -0700 - - key error fix - -commit 248985e2d919f3be678c56886d99c3e3fc025f99 -Author: Sybrand Strauss -Date: Fri May 24 10:12:25 2019 -0700 - - Squashing - - Removed redundant squash migrations. - - Squashed wells down cleanly. - -commit a876b52e3f83ea1347aa1293c35946762cc5ab98 -Merge: d3bac51b5 58f842fa9 -Author: alex@bigthink.io -Date: Fri May 24 09:41:43 2019 -0700 - - merged release - -commit 58f842fa949715aebba664f25e3e82c736ab9329 -Merge: 10c4171af e70f21172 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri May 24 09:37:24 2019 -0700 - - Merge pull request #1374 from bcgov/steve/stack-refactor - - Handle numbers, related sets, many to many deletion - -commit 10c4171aff2e7808411ef473e326673eb2282235 -Merge: 5a3f47dc7 e37878679 -Author: Sybrand Strauss -Date: Fri May 24 09:30:22 2019 -0700 - - Merge pull request #1366 from bcgov/cole/well-detail-print - - [1553] Well Detail Page Print Styling - -commit d3bac51b51c574a60ad89e413505e80f8d1511f4 -Merge: 829f4e9a2 5a3f47dc7 -Author: alex@bigthink.io -Date: Fri May 24 09:21:55 2019 -0700 - - Merge branch 'release' into alex/groundelevationfix - -commit 5a3f47dc73dbf08fb8a32f7c4449a1efdd94952f -Merge: d2c496564 5f40371c0 -Author: Sybrand Strauss -Date: Fri May 24 09:02:15 2019 -0700 - - Merge pull request #1375 from bcgov/sybrand/debt/kill_webpack_loader_try_4 - - Switch from webpack to vue-cli, and switch to serving up index.html - -commit 829f4e9a275c4ea12efa003703d9ccf8e2a56212 -Merge: c12977aa2 d2c496564 -Author: alex@bigthink.io -Date: Thu May 23 16:12:13 2019 -0700 - - Merge branch 'release' into alex/groundelevationfix - -commit 5e6d8a28f14967f8ad883086c704b3db940f1a51 -Author: Steve Hillier -Date: Thu May 23 16:10:31 2019 -0700 - - fix up CWU text - -commit d2c496564d3371df053f26b670462f58cba87e02 -Merge: 2f80cc904 3c9528b7a -Author: Steve Hillier -Date: Thu May 23 15:53:59 2019 -0700 - - Merge pull request #1377 from bcgov/alex/pidfix - - PID Padding Fix - -commit 765d87b8899ae7de946d62e2565a9d2e73bb40e7 -Author: Steve Hillier -Date: Thu May 23 15:53:12 2019 -0700 - - clean up swagger spec - -commit 2b0bb0da9a75b972f3439e6e38bcad33d8bd42a8 -Author: Steve Hillier -Date: Thu May 23 15:37:38 2019 -0700 - - reorder sections - -commit abfef7d559181b37a475f262ce650d0ea59fd527 -Author: Steve Hillier -Date: Thu May 23 15:34:46 2019 -0700 - - clean up lat/lng - -commit dcb8b772106e753e5e27fc549de2269c16ad86bf -Author: Steve Hillier -Date: Thu May 23 15:33:17 2019 -0700 - - add a link to Swagger - -commit 59f1dc221160090d8115093b6122cd3c46e4dc08 -Author: Steve Hillier -Date: Thu May 23 15:32:31 2019 -0700 - - remove redundant text - -commit c74caf29cb14628c7d78b1da96f6a7d3d09e4198 -Author: Steve Hillier -Date: Thu May 23 15:29:37 2019 -0700 - - add info about REST api - -commit e70f21172e4ef18cc8ad7792e4330e96bc85d816 -Author: alex@bigthink.io -Date: Thu May 23 15:22:37 2019 -0700 - - added validation and stacker support for geom changes - -commit b813ddc6d91bf352cc1585aacb0ba3972a42915e -Author: Steve Hillier -Date: Thu May 23 14:01:37 2019 -0700 - - properly name table - -commit c12977aa2e851b1ade24a7ba61976d13fa4d1776 -Merge: 2dc1f6b94 2f80cc904 -Author: alex@bigthink.io -Date: Thu May 23 11:31:26 2019 -0700 - - Merge branch 'release' into alex/groundelevationfix - -commit 3c9528b7a5aa3d761d91c72421c25514b61f0e1d -Merge: 7ca68cce3 2f80cc904 -Author: alex@bigthink.io -Date: Thu May 23 11:30:59 2019 -0700 - - Merge branch 'release' into alex/pidfix - -commit a186ccbc5961aa96daefaedd812d56d80d553be4 -Author: Steve Hillier -Date: Thu May 23 11:25:57 2019 -0700 - - update README - -commit 2f80cc904ad7133bf980c31850c02cc49b1877d2 -Merge: d4a974dac e19cfdef0 -Author: Steve Hillier -Date: Thu May 23 10:11:59 2019 -0700 - - Merge pull request #1369 from bcgov/cole/search-bugfixes - - [1769] Search bugfixes - -commit e0ec2a4f132ed5c7dc50938b028bab35ceb619e3 -Author: Aaron -Date: Thu May 23 09:02:59 2019 -0700 - - remove snapshot updates from package json and add legend as well as fix altenrate bug - -commit e378786790314a8691061c19c0d0f07e93a13108 -Author: Cole Maclean -Date: Wed May 22 20:31:07 2019 -0700 - - Add "please print in Chrome" notice - -commit a5330afce8eeb49b6cf764d1510c38fbb679e076 -Author: Steve Hillier -Date: Wed May 22 17:04:59 2019 -0700 - - fix tests for updated field name - -commit 0153512a5c2e1157c78054430c1e595f23dd44e5 -Author: Steve Hillier -Date: Wed May 22 16:40:32 2019 -0700 - - fix lithology and drilling methods stacking - -commit 5f40371c0a1e23c39e677af6971478b7a67f58c7 -Author: Sybrand Strauss -Date: Wed May 22 16:40:25 2019 -0700 - - - Removed OrganizationAdd.spec.js - can't figure out how to fix it. - -commit d6bc1249bc1a237868a9e02e6232221e2034e1c5 -Author: Sybrand Strauss -Date: Wed May 22 15:12:32 2019 -0700 - - - Set polling to 1000 (seems to resolve MacOs utilization issue) - -commit 2dc1f6b943f6655e0265df8b140919949ed1100e -Author: alex@bigthink.io -Date: Wed May 22 14:32:35 2019 -0700 - - space - -commit 8374c091569c7394733aadd4f57d72c752aa1e2e -Author: alex@bigthink.io -Date: Wed May 22 14:30:56 2019 -0700 - - added validation for all submissions, not just edit - -commit 4396ebd26d6ab0aaf08fd7919eeb232a8a405a6a -Author: Sybrand Strauss -Date: Wed May 22 14:11:00 2019 -0700 - - Add margin to "Add new entry" button - -commit ba34190a831abcaf01b9cb25c717fdd850f25c9f -Author: Sybrand Strauss -Date: Wed May 22 14:00:11 2019 -0700 - - Fixed border colour - -commit 1297ed20942580d72c15b608d6bd539d3378d40c -Author: Sybrand Strauss -Date: Wed May 22 12:55:58 2019 -0700 - - Removed alias - -commit 37d057093126a493e2e464a304eca049063697b6 -Author: Clark Van Oyen -Date: Wed May 22 12:51:56 2019 -0700 - - pie chart labels - -commit eee308b0447f4fab221516d0b656e6c7821ce985 -Author: Sybrand Strauss -Date: Thu May 16 14:14:19 2019 -0700 - - Switch to Vue cli and using whitenoise to serve static. - - - Removed webpack in python. - - Switched to using Vue cli. - - Switched to serving Vue.js with whitenoise. - - Switched to using vue-analytics, since we no longer have the django template. - - Moved icons to frontend - - Rendering index.html on any unmtached routes - -commit b113d49dd991436de7ce31cb16caf864f7e539ed -Author: Clark Van Oyen -Date: Wed May 22 12:29:51 2019 -0700 - - Whitespace - -commit 4b17152e4c64b7904485cf6f59f08b8efcbeb398 -Author: Clark Van Oyen -Date: Wed May 22 12:25:16 2019 -0700 - - field mappings from serializer - -commit 7ca68cce365a4a354bc971d7e80eed2365747e0a -Author: alex@bigthink.io -Date: Wed May 22 09:38:08 2019 -0700 - - removed extra zero padding - -commit 70ee1d937c0406516e039cff6abb69882ad9f995 -Author: Clark Van Oyen -Date: Tue May 21 22:52:27 2019 -0700 - - spelling - -commit b9fc926422a0c9820374c4bbc0326c0055bc574e -Author: Clark Van Oyen -Date: Tue May 21 22:44:26 2019 -0700 - - export fields tweaks. - -commit 32571404134add1e6f59e49b3416e0857b6ee844 -Author: Clark Van Oyen -Date: Tue May 21 22:38:13 2019 -0700 - - Fix duplicate well tag # list - -commit 41093f0a3ed18e0fdede54c2820511515a57947b -Author: Steve Hillier -Date: Tue May 21 16:47:10 2019 -0700 - - fix API tests - -commit ccc45e06486361207a264522c23734940c290917 -Author: Steve Hillier -Date: Tue May 21 16:24:59 2019 -0700 - - add tests for removing data during staff edits - -commit 587bb3fd700fa4946379fc1d815ac80249c50b12 -Merge: c764355c1 d4a974dac -Author: Steve Hillier -Date: Tue May 21 16:06:52 2019 -0700 - - merge release branch - -commit c764355c15348622d92a8fe5d86038ffcf378450 -Author: Steve Hillier -Date: Tue May 21 15:15:11 2019 -0700 - - add a migration for previous staff edits - -commit d4a974dacb7d61a0f196146ecbe790c79b7feb46 -Merge: eec806388 cf5be9c74 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue May 21 13:35:33 2019 -0700 - - Merge pull request #1376 from bcgov/alex/oldcodecleanup - - Added back Base SPA - -commit cf5be9c744d3facc797f1c0574c6c02ca84084de -Merge: eb38b5400 eec806388 -Author: alex@bigthink.io -Date: Tue May 21 13:03:05 2019 -0700 - - Merge branch 'release' into alex/oldcodecleanup - -commit eb38b5400c8a0686f4ee9f63570f739d986e5256 -Author: alex@bigthink.io -Date: Tue May 21 13:03:00 2019 -0700 - - base spa added back in - -commit eec806388fd134f943dd3ba11a36d9ae9fec3e63 -Merge: f08612c21 8e2153833 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue May 21 12:31:16 2019 -0700 - - Merge pull request #1373 from bcgov/alex/oldcodecleanup - - [1814] Remove Old Code - -commit 8e2153833cf68f55023f6126881a7a29e87fb844 -Merge: c14091f34 f08612c21 -Author: alex@bigthink.io -Date: Tue May 21 11:54:12 2019 -0700 - - merged release - -commit f08612c21832d118ec3aa02c9edf36993017b07c -Merge: 03150ec69 093abe655 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue May 21 11:51:57 2019 -0700 - - Merge pull request #1372 from bcgov/alex/pumpnumber - - [1803] Fixed Pump Installer Registration # - -commit 03150ec69c9cfbe6133a2baf1d7cf76b7bd9b0eb -Merge: ae3261040 8b8c5bcfb -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue May 21 11:51:22 2019 -0700 - - Merge pull request #1371 from bcgov/alex/screencleanup - - [1776] Screen Data Cleanup - -commit 99ae7452914f987807c3149fa4a18100eeec5729 -Author: Steve Hillier -Date: Tue May 21 09:41:43 2019 -0700 - - fix reference to legacy record - -commit 8abd5038763c076dc9bd1aaed1338ceb49f7fa83 -Author: Clark Van Oyen -Date: Mon May 20 13:09:35 2019 -0700 - - return promise - -commit 87847ddc398bb1528d5cd552557f508e2d744250 -Author: Clark Van Oyen -Date: Mon May 20 13:06:07 2019 -0700 - - address shapefile update race cond. - -commit 06ec65fac7f0a03d995cd119e2350a636d240a46 -Merge: 67623f2e6 debc32477 -Author: Clark Van Oyen -Date: Mon May 20 12:21:56 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit 67623f2e6ee09a579aafe70361847c3d212568ba -Author: Clark Van Oyen -Date: Mon May 20 12:21:41 2019 -0700 - - match up artesian wells query with Wells app - -commit debc324776ec3a21f114e6c71515ee4238c67e38 -Author: Aaron -Date: Mon May 20 00:09:13 2019 -0700 - - es lint fixes - -commit 6076624403172b29620ac95fc24888a9503bddd2 -Author: Aaron -Date: Mon May 20 00:02:27 2019 -0700 - - render map even on cancel edit - -commit b1da3f1be7c1dc301d00d407a4707ffa76f9dcf4 -Merge: 4e89bba8b 255c14c31 -Author: Aaron -Date: Sun May 19 22:54:23 2019 -0700 - - Merge branch 'countable/licences' of https://github.com/bcgov/gwells into countable/licences - -commit 4e89bba8bb824938418d824b120975cd0217c2ba -Author: Aaron -Date: Sun May 19 22:52:29 2019 -0700 - - some refactoring of dirty code - -commit 255c14c3133b5ba54e6ff69a7c13c522f6fcbff0 -Author: Clark Van Oyen -Date: Sun May 19 11:47:06 2019 -0700 - - Attach wells based on licence when they have no aquifer - -commit 8cc3b0f5208b407420764af0ae300471697a85cd -Author: Aaron -Date: Sun May 19 04:27:46 2019 -0700 - - toggleable layers - -commit 871a75a5bd8c049bb5388100689dbd865cfe4c40 -Author: Steve -Date: Fri May 17 19:15:13 2019 -0700 - - move where user input map is created - -commit c14091f34eeb9c92cc22fd78a8fa90f95216b69d -Author: alex@bigthink.io -Date: Fri May 17 16:08:21 2019 -0700 - - fix for django tests - -commit c169849134c7c776422ef64a7f6254ed51cf9d77 -Author: Steve Hillier -Date: Fri May 17 15:55:50 2019 -0700 - - add a merge migration - -commit 9ed61eca7d27f56f14b831127855beff34415f22 -Author: Steve Hillier -Date: Fri May 17 15:32:32 2019 -0700 - - fix duplicate key - -commit 424924afb2ff1dfd6b53d360cd0ff53362fb3f28 -Author: Steve Hillier -Date: Fri May 17 15:15:57 2019 -0700 - - clean up unused imports - -commit b40c75bd46acc60f4d46c0d6d448de00cfdcada2 -Merge: 0c98956d9 ae3261040 -Author: Steve Hillier -Date: Fri May 17 15:13:31 2019 -0700 - - merge release branch - -commit 0c98956d9df8c30c16a416c53ee41bb7b614800c -Author: Steve Hillier -Date: Fri May 17 14:11:11 2019 -0700 - - fix up many to many fields - -commit 8452e3c955a2f1122072ce588cfe5da8b40aee5f -Author: Steve Hillier -Date: Fri May 17 13:10:41 2019 -0700 - - handle one to many and m2m - -commit 28860999f262bb6d62e0b6be8ac0d527fafcbc6d -Author: alex@bigthink.io -Date: Fri May 17 12:39:07 2019 -0700 - - additional unused code - -commit 361cb97c0243e6735604bb1e9eeb0874b79cdfb8 -Author: alex@bigthink.io -Date: Fri May 17 12:12:01 2019 -0700 - - removed unused code - -commit b55003ba947a9cf5520f75ff4459a470c819eec0 -Author: Steve Hillier -Date: Fri May 17 10:52:43 2019 -0700 - - send across null instead of blank for numbers - -commit 4eb277822bb02912169af65a3a328cd4dc585ff6 -Author: Steve Hillier -Date: Fri May 17 10:52:32 2019 -0700 - - track values provided in form - -commit 8b8c5bcfb93abb855a88440adf0a193ae7a6fd64 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu May 16 15:57:42 2019 -0700 - - Update app/backend/wells/management/commands/export.py - - Co-Authored-By: Sybrand Strauss - -commit 093abe655203412b9db896b14d9ccebc1996346e -Author: alex@bigthink.io -Date: Thu May 16 15:25:48 2019 -0700 - - fixed pump installers reg num for drill list - -commit ae3261040f32ec95b0baadf69022425078efe055 -Merge: 65bffb0d5 067325b24 -Author: Steve Hillier -Date: Thu May 16 15:08:08 2019 -0700 - - Merge pull request #1370 from bcgov/alex/pidcleanup - - [1827] Legal PID Cleanup - -commit 067325b247a250e4f2585d164101e654ee112422 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu May 16 13:21:12 2019 -0700 - - Update app/frontend/src/submissions/components/SubmissionForm/Location.vue - - Co-Authored-By: Steve Hillier - -commit f4afad4d6b02ba99ca4ab1334d2b24c99659eb87 -Author: Clark Van Oyen -Date: Wed May 15 23:34:37 2019 -0700 - - Add back resources migration - -commit 987b57f8ae2ca1e7aa7d29620033d67d7dcb12ff -Author: alex@bigthink.io -Date: Wed May 15 17:18:54 2019 -0700 - - altered migration to change db name - -commit 6ba4191e801e128252f2d2c8e0f1bbfe83acea91 -Author: alex@bigthink.io -Date: Wed May 15 16:51:56 2019 -0700 - - updated all reference to screen internal_diameter to diameter - -commit 1640fc68dd2c57f6293289a32ca5120806ebd564 -Merge: 968046557 65bffb0d5 -Author: alex@bigthink.io -Date: Wed May 15 16:12:37 2019 -0700 - - Merge branch 'release' into alex/pidcleanup - -commit 968046557d8c8d587fa09e43e57bf619f19ac07d -Author: alex@bigthink.io -Date: Wed May 15 16:12:26 2019 -0700 - - field text - -commit 65bffb0d5ddd31455363f0950aef344f0aa1b578 -Merge: 496245cb3 e4e332bdd -Author: Steve Hillier -Date: Wed May 15 15:21:36 2019 -0700 - - Merge pull request #1368 from bcgov/alex/remove_ems - - [1781] Remove EMS_ID - -commit 496245cb30d90dc90e4ea72b04b399577820827f -Merge: 7a40d153d 7e35091aa -Author: Steve Hillier -Date: Wed May 15 15:18:45 2019 -0700 - - Merge pull request #1364 from bcgov/steve/error-msgs - - better error messages for submissions/staff edit - -commit 7a40d153db4f0e807e64a979bd6ccd06fdc533d7 -Merge: 75d4fdd51 2c6a0bfa5 -Author: Steve Hillier -Date: Wed May 15 15:18:13 2019 -0700 - - Merge pull request #1365 from bcgov/steve/pid-zeros - - [1797] add leading zeros for legal_pid - -commit bee50b25734c44ac8d4b1cea591caf136ba9ac41 -Author: alex@bigthink.io -Date: Wed May 15 14:55:46 2019 -0700 - - pid now padded with zeroes to equal 9 digits - -commit e19cfdef03d00a9b9656e256ed4cf6723ee400f7 -Author: Cole Maclean -Date: Wed May 15 14:35:33 2019 -0700 - - Case insensitive legal search - -commit 1373bb275f88a582a755bb9642af2ef9c9221b02 -Author: Cole Maclean -Date: Wed May 15 14:24:57 2019 -0700 - - Use result column labels in column select - -commit 91f296d439e480a4bf2e1c0263fb5fcb0eb35288 -Author: Cole Maclean -Date: Wed May 15 14:24:40 2019 -0700 - - Fix finished well depth column title - -commit db81c703427294f40dd139b6d9b2fa5ed282b21a -Author: Cole Maclean -Date: Wed May 15 14:17:14 2019 -0700 - - Add handling for well disinfected status - -commit 28b101b07c69b88e4a158d2131abd3ed7a97326d -Author: Cole Maclean -Date: Wed May 15 14:09:19 2019 -0700 - - Handle lowercase true/false values for bool filters - -commit e4e332bdd133b517ce2ac4edf62b927ab2be1c56 -Author: alex@bigthink.io -Date: Wed May 15 13:56:04 2019 -0700 - - removed references to ems_id and created migration to remove from db - -commit c4e760acc7ef974e2eaf1011b256ddbed1f328de -Author: Cole Maclean -Date: Wed May 15 13:39:47 2019 -0700 - - Fix water quality odour and liner material naming - -commit 6be14505658b32f555485543c32da1cefc4e285d -Author: Cole Maclean -Date: Wed May 15 13:25:29 2019 -0700 - - Fix missing search select options - -commit a1425b2188db842cc9a0c29577c71a1c3ef515fc -Author: Cole Maclean -Date: Wed May 15 13:04:21 2019 -0700 - - Fix additonal field removal - -commit 75d4fdd516951e1c096fb3e7bd94411a05d6bbef -Merge: 13b7c5d95 e22895181 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed May 15 12:38:11 2019 -0700 - - Merge pull request #1367 from bcgov/alex/welldisinfect - - quick label fix - -commit 13b7c5d955c479c246f0b5a72d9c46da16517032 -Merge: 2da0f855e ff07dcfb6 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed May 15 12:37:02 2019 -0700 - - Merge pull request #1363 from bcgov/alex/decomvalidation - - [1850] Decommission Validation Inputs/Errors - -commit e9dd5736099004ab722da082fd3117949c90969d -Author: Cole Maclean -Date: Wed May 15 12:10:00 2019 -0700 - - Attempt to fix IE printing extra blank pages - -commit e2289518114ab29f324bc57aa63410407d84b29e -Author: alex@bigthink.io -Date: Wed May 15 11:45:37 2019 -0700 - - quick label fix - -commit 2da0f855e3e23e766cfda9651c78d09d754d0f5f -Merge: 338f4947d fdf27b6da -Author: Steve Hillier -Date: Wed May 15 11:41:47 2019 -0700 - - Merge pull request #1352 from bcgov/cole/export-search-results - - [1558] Export Well Search Results - -commit 2c6a0bfa534d49ebcc29634df90a2059bbb6a423 -Author: Steve Hillier -Date: Wed May 15 11:40:31 2019 -0700 - - add legal_pid formatter to admin serializer - -commit 338f4947d487ae228274a33b87d0815746eb9415 -Merge: 884d8fd85 aa64a623f -Author: Sybrand Strauss -Date: Wed May 15 10:55:47 2019 -0700 - - Merge pull request #1359 from bcgov/sybrand/task/duplicate_liner_perforation - - Seperating out linerperforation for well and activity submission - -commit fdf27b6da642c0e99c8af78c6b214b766eebb706 -Author: Cole Maclean -Date: Wed May 15 10:34:47 2019 -0700 - - Move export limit to 5000 wells - -commit 456b8128b6b34264e831afde0266f047988f40d8 -Author: Sybrand Strauss -Date: Wed May 15 10:30:12 2019 -0700 - - Updated snapshots - -commit dbc450ba67d05e39ed40a93d3d6d96429d7a9363 -Author: Sybrand Strauss -Date: Wed May 15 10:28:35 2019 -0700 - - Fixed unit tests - - - All issue relating to bootstrap and mount vs. shallowMount. - - Added a "quick" test run to package.json - -commit 8055087d5f8c52b79df2c04d650f3418e223ccdf -Author: Steve Hillier -Date: Wed May 15 09:37:22 2019 -0700 - - added leading zeros to API test expected value - -commit 1eb13edd6d821d8b1e796f297db4e729f64ac3a6 -Author: Cole Maclean -Date: Tue May 14 19:47:09 2019 -0700 - - Print styling for well detail page - -commit 87dcbb8cfbd42abab76e863431a71ba21a0cf976 -Author: Cole Maclean -Date: Tue May 14 19:36:06 2019 -0700 - - Print styles for single well map - - Flex width map & hide zoom buttons. - -commit 710c0ed2f2b8121357a14372ca22e3da26a6dd73 -Author: Cole Maclean -Date: Tue May 14 19:35:37 2019 -0700 - - Set print colors to black text / white bg - - Also hides back to top arrow. - -commit 7e35091aa82c677b5d9f9ce81ae3139a50a8f6c8 -Author: Steve Hillier -Date: Tue May 14 16:56:41 2019 -0700 - - remove console.log - -commit c4b7c527ce8486de91fb474bbd6431723b6db20c -Author: Steve Hillier -Date: Tue May 14 16:51:49 2019 -0700 - - better error messages - -commit ff07dcfb6d7d17ae35c127cec5d621050b902702 -Author: alex@bigthink.io -Date: Tue May 14 16:15:18 2019 -0700 - - test fix - -commit 3ea8a101cd559d0d4be1e072b46df8b8f8e07115 -Author: Cole Maclean -Date: Tue May 14 13:54:43 2019 -0700 - - Fix aquifer id serialization - -commit 9e82704e9c3966c2ae1d0dda853efc752cae97e9 -Author: Clark Van Oyen -Date: Tue May 14 12:58:41 2019 -0700 - - fix some typos - -commit 9844f49fc26f78a242712473fd45eaa449007d5a -Author: Cole Maclean -Date: Tue May 14 12:15:46 2019 -0700 - - Fix missing data in result columns - - * Fixed typo in legal district lot param name - * Fixed filter pack and liner from/to in results - * Added Aquifer No result filter - -commit 70c3cd387a55efdf04de575e6a052104a1c3fd63 -Author: Cole Maclean -Date: Tue May 14 12:21:25 2019 -0700 - - Preserve column order on export - -commit bc119438116023ad97aa7dd97145c037b4bfa19b -Author: Cole Maclean -Date: Tue May 14 11:51:06 2019 -0700 - - Set Excel column widths based on column label - -commit 6cad576516c9bda28427f028acfe3680c64901f1 -Author: Cole Maclean -Date: Tue May 14 11:46:48 2019 -0700 - - Fix prefetch/select related if no fields given - -commit e90bfd366be6975a74a9b3e5c11d90d6113c587f -Author: alex@bigthink.io -Date: Tue May 14 12:17:04 2019 -0700 - - inline validation and type number - -commit 884d8fd853c2720563936c97bd9b7c4b3721542f -Merge: c9f295f7f b0cd370dc -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue May 14 11:25:25 2019 -0700 - - Merge pull request #1360 from bcgov/alex/welldisinfect - - Well Disinfect View Logic - -commit aa64a623fe0d825eacd990b01b09234ba3a9b8d2 -Author: Sybrand Strauss -Date: Tue May 14 11:16:23 2019 -0700 - - Update app/backend/wells/migrations/0084_move_liner_perforations.py - - Co-Authored-By: Steve Hillier - -commit 82f1d442cefe53ff3cc7a64bd25adddfb53ca9c4 -Author: Sybrand Strauss -Date: Tue May 14 11:06:59 2019 -0700 - - - Address merge conflict - -commit 60bce3da6810abfb4e3f22dbfce7ff3b65a41dab -Author: Sybrand Strauss -Date: Tue May 14 11:05:46 2019 -0700 - - - Remove activity submission reference from LinerPerforation - -commit fa796c00d0dd728bba961b928afbf38600ceb6b2 -Author: Sybrand Strauss -Date: Thu May 9 17:21:05 2019 -0700 - - Seperating out linerperforation for well and activity submission - - - Removed nose (nose is no longer actively maintained, we're not using it's output, and it was throwing exceptions while handling test cases). - - Migrate existing liner perforations, to activity submission liner perforation where valid. - - Added various tests. - -commit b0cd370dcdcb2d3b62d757d5d06231f6cf920b39 -Merge: 06a277c9e c9f295f7f -Author: alex@bigthink.io -Date: Tue May 14 09:40:39 2019 -0700 - - merge release - -commit c9f295f7fdb5e753ef1d94abe859f588199aacd3 -Merge: cfd70aa3c 872e4e6f3 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue May 14 09:17:07 2019 -0700 - - Merge pull request #1358 from bcgov/alex/groundelev - - [1825][1826] Ground Elevation Validation - -commit 7d326a09e1318e907168eb77b58d79c7097d935b -Author: Cole Maclean -Date: Mon May 13 20:22:40 2019 -0700 - - Pass selected fields to export API call - -commit 6fe57e0525e065bcf2e8b10d311ac3a4610002d5 -Author: Cole Maclean -Date: Mon May 13 19:51:43 2019 -0700 - - Allow API requests to specify response fields - -commit e83fd04f2aacf20264fbfd92a27f5bd5cfb7ffb8 -Author: Cole Maclean -Date: Mon May 13 19:28:25 2019 -0700 - - Limit exports to 2k rows - -commit afe0857d86430e30da430d9c3930c0b08b1ead61 -Author: Cole Maclean -Date: Mon May 13 16:31:55 2019 -0700 - - Serialize many rows at a time - -commit 69eaf7514f6d5cfdf32f08fae533f14a5c651657 -Author: Cole Maclean -Date: Mon May 13 13:21:05 2019 -0700 - - Add Excel export format - -commit fa21229b18351b6a49f1bd38db5be62365b1acb5 -Author: Cole Maclean -Date: Mon May 13 13:20:37 2019 -0700 - - Add Excel export link - -commit 98e8f5045e2bf9fa028bd26d6afc0a4b7cd1f5d2 -Author: Cole Maclean -Date: Mon May 13 12:51:03 2019 -0700 - - Remove well_disinfected from serializer - -commit bad5baade00a3d353f893f66e860861121fa4576 -Author: Cole Maclean -Date: Sat May 4 19:54:29 2019 -0700 - - Add CSV export link to search results - -commit ed40855ebe43db969d13d31eeefd68229407d34c -Author: Cole Maclean -Date: Fri May 3 16:32:39 2019 -0700 - - Remove publication status from non-admin serializer - -commit e741f29cfbcb769a22af878df891634ddc7a41f9 -Author: Cole Maclean -Date: Wed May 1 12:11:14 2019 -0700 - - Add CSV export - -commit 872e4e6f38194797e0d3e8b10728bbbe780d8475 -Author: alex@bigthink.io -Date: Mon May 13 19:13:22 2019 -0700 - - merged migrations - -commit 06a277c9eca3e7938bd50fc2b540fa38bb09d07c -Author: alex@bigthink.io -Date: Mon May 13 17:35:03 2019 -0700 - - removed unknown selection if not edit, fixed well summary view - -commit 86bba34c58af343adfcaad7d1cc5875f839bef96 -Author: Steve -Date: Mon May 13 16:53:38 2019 -0700 - - add leading zeros for legal_pid - -commit 51529f7b3c210c10c5641194a2bc771bbfef0687 -Merge: 253422fd1 cfd70aa3c -Author: alex@bigthink.io -Date: Mon May 13 15:44:53 2019 -0700 - - Merge branch 'release' into alex/groundelev - -commit cfd70aa3c350ab8f9dd9fb180742c7a67bb7c95a -Merge: 82210c176 8931d73e8 -Author: Steve Hillier -Date: Mon May 13 15:13:33 2019 -0700 - - Merge pull request #1350 from bcgov/steve/perf-fix2 - - update csv export to use liner_perforation table - -commit 8931d73e861781907cdb86cae92148638ea7723b -Author: Steve -Date: Mon May 13 14:35:28 2019 -0700 - - add values to linerperforation - -commit 03583851045053a2d8bf93c6811319dcfccb6e7d -Author: Steve -Date: Mon May 13 13:59:17 2019 -0700 - - fix incorrect field name on linerperforation - -commit 88eb92a2a6e407d001f9b969b52392bcc5172d83 -Author: Steve -Date: Mon May 13 12:55:21 2019 -0700 - - add a merge migration - -commit 8017fffb1cfa69cc1ec299ae89bb3d1a2b40412f -Merge: 9ae701803 82210c176 -Author: Steve -Date: Mon May 13 11:38:34 2019 -0700 - - Merge branch 'release' into steve/perf-fix2 - -commit 9ae701803883b676b70ac2e1e47205e64244e58f -Author: Steve -Date: Mon May 13 11:24:14 2019 -0700 - - update perforation fixture - -commit 82210c176aa421bc62a648f1c01ea25815e0e7ce -Merge: f8652e844 a4c8f06ca -Author: Steve Hillier -Date: Mon May 13 09:36:06 2019 -0700 - - Merge pull request #1356 from bcgov/steve/editfixes - - [1726] less strict validation for surface seal thickness - -commit 087729cbdd1330f77c2d9fe2a2dbebaa92b60406 -Author: Clark Van Oyen -Date: Sat May 11 15:37:19 2019 -0700 - - full vs partial aquifer export - -commit 41a3db939e3de68bcf2f7cd860f5c82f90dae0c5 -Author: Clark Van Oyen -Date: Sat May 11 15:16:53 2019 -0700 - - show shapefile upload status. - -commit 747d3d1f770593c7a6253fd8feb10e4a0209282b -Merge: 9a14900f5 1e7e29d91 -Author: Clark Van Oyen -Date: Sat May 11 12:25:24 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit 9a14900f5f83becf71318e7f2916a6241072e915 -Author: Clark Van Oyen -Date: Sat May 11 12:25:07 2019 -0700 - - Jest config fix. - -commit 1e7e29d915bf62bc527ca7acc0808229d470015c -Author: Aaron -Date: Fri May 10 21:49:50 2019 -0700 - - restore functionality for upoad - -commit 253422fd12fb7b5269ad1157bb5b65cf3c0dff82 -Author: alex@bigthink.io -Date: Fri May 10 16:28:26 2019 -0700 - - syntax fix - -commit a8709dc5b21d539a23e748be776c7e0cc92980ad -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri May 10 15:51:58 2019 -0700 - - Update app/backend/submissions/views.py - - Co-Authored-By: Sybrand Strauss - -commit 24f818be257d1b9d9e7d2bb3058600dc501768b2 -Merge: b6d5ad682 f8652e844 -Author: alex@bigthink.io -Date: Fri May 10 15:35:25 2019 -0700 - - Merge branch 'release' into alex/groundelev - -commit f8652e844b0b01f94ae3859c057786d16a3e09c3 -Merge: ee33334f0 48fd7466c -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri May 10 14:59:27 2019 -0700 - - Merge pull request #1353 from bcgov/alex/licensinginfo - - Well Licensing will default to DB Value if E-Licensing API Fails - -commit ee33334f0aa8b3661a0d54b7716dc34d35364649 -Merge: 745eb567d 08688bdd9 -Author: Sybrand Strauss -Date: Fri May 10 14:05:48 2019 -0700 - - Merge pull request #1357 from bcgov/sybrand/squash/iteration_4 - - [1833] Squashing migrations - -commit 08688bdd9854a94162af04b80d8d1d6cd4ba4922 -Author: Sybrand Strauss -Date: Fri May 10 12:27:37 2019 -0700 - - - Fix migration conflict - -commit d1013987f4b177991d0df99d26962fac426e4036 -Author: Sybrand Strauss -Date: Fri May 10 10:48:52 2019 -0700 - - - Removed reference to update_geom_fields, no longer need to apply this migration step - -commit 37202f791eb4f4cfe5989794575d118c925b1893 -Author: Sybrand Strauss -Date: Thu May 9 15:30:04 2019 -0700 - - Squashing migrations - - - Remove redundant well migrations. - - Replacing submissions migration with better named file - - Removed redundant registries migrations - - Removed redundant gwells migrations - - Squashed more wells migrations - -commit 48fd7466c556e0769c8c7752c7a2f1f6b0142bf1 -Merge: ae3e39cbb 3ef223841 -Author: alex@bigthink.io -Date: Fri May 10 10:18:00 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit 745eb567d36b1b1971922ecb2dd217964e10a2a5 -Merge: 3ef223841 b156ee1a4 -Author: Sybrand Strauss -Date: Fri May 10 10:12:03 2019 -0700 - - Merge pull request #1354 from bcgov/sybrand/fix/bad_idir - - [1828] update_user and create_user on related records - -commit b6d5ad682b705f7b2a88b71a2757d2810dde838a -Author: alex@bigthink.io -Date: Fri May 10 09:28:14 2019 -0700 - - commenting - -commit 44a73c50fe4e7293be321d645f136cb26b56e4cf -Author: Aaron -Date: Fri May 10 06:38:02 2019 -0700 - - set view - -commit aafd43c6f3094874cb5b510c80badbc07d15a23f -Merge: 5f819e8c3 8d72004d3 -Author: Clark Van Oyen -Date: Thu May 9 23:34:15 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit 5f819e8c387d58e57351b3eed4f3b15cb989a367 -Merge: a6834328b f9804dbca -Author: Clark Van Oyen -Date: Thu May 9 23:33:53 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit 8d72004d3a3d35d0916ea476a742766d118a6449 -Author: Aaron -Date: Thu May 9 23:33:03 2019 -0700 - - r - -commit a6834328b049553a7ff3bb6accc16c90adb46a15 -Author: Clark Van Oyen -Date: Thu May 9 23:31:12 2019 -0700 - - Fixes after merge - -commit f9804dbca5faee41233b60b9a106c1437782106a -Author: Aaron -Date: Thu May 9 21:00:59 2019 -0700 - - try matching version - -commit e45ce99bb5d324434ddc0bf5fcca7222f35d12bf -Author: Aaron -Date: Thu May 9 20:49:34 2019 -0700 - - restore code for shapefile upload - -commit 8f1ed2929f191d9a94c426e2a478735bfe490724 -Author: alex@bigthink.io -Date: Thu May 9 17:32:39 2019 -0700 - - codes fix - -commit 6ccbd57ce3b9721bc3eb9c883391d92c0690dbdb -Merge: 065b20418 3ef223841 -Author: alex@bigthink.io -Date: Thu May 9 17:07:12 2019 -0700 - - Merge branch 'release' into alex/groundelev - -commit 065b204184561742a84a13148e30648c7a181c49 -Author: alex@bigthink.io -Date: Thu May 9 17:06:53 2019 -0700 - - update to client side selection list and validaiton logic - -commit 59ff490377d83c911077d247e078206d4dfef03d -Merge: be9c1ae8a 3ef223841 -Author: Clark Van Oyen -Date: Thu May 9 16:31:57 2019 -0700 - - Merge branch 'release' of github.com:bcgov/gwells into countable/licences - -commit be9c1ae8a1692995aea6700b8739b8baaa3795e7 -Author: Clark Van Oyen -Date: Thu May 9 16:31:25 2019 -0700 - - Small changes based on PR feedback - -commit 3ef223841230b592c972c1b883aca3350b97aaac -Merge: fa668ec55 3d0337eb3 -Author: Sybrand Strauss -Date: Thu May 9 15:54:24 2019 -0700 - - Merge pull request #1355 from bcgov/fix/gdal_workaround - - Force gdal to stay below 3.0 - -commit 75031f321f940017de59ffcbf69c34903e67408f -Author: alex@bigthink.io -Date: Thu May 9 15:37:06 2019 -0700 - - fix migrate issue - -commit 5910ff4e9619821814734f4bef15456547964811 -Author: alex@bigthink.io -Date: Thu May 9 15:31:46 2019 -0700 - - updated validation logic - -commit c82f4bdfdac9d17c031cb1fca0b653e50b536cea -Merge: 3c12d984c fa668ec55 -Author: alex@bigthink.io -Date: Thu May 9 12:55:20 2019 -0700 - - Merge branch 'release' into alex/groundelev - -commit 3c12d984c023955e4b627b9e1028434c3d8a1109 -Author: alex@bigthink.io -Date: Thu May 9 12:55:14 2019 -0700 - - added migration to update ground elevation methods codes from null to unkonw - -commit a4c8f06caf431afc70c567507c2d357b94a99585 -Author: Steve Hillier -Date: Thu May 9 12:39:03 2019 -0700 - - remove validation from surface_seal_thickness - -commit 6a8b93afe861cc0ac0596601fff80c0480ebbbc4 -Author: Sybrand Strauss -Date: Thu May 9 09:31:18 2019 -0700 - - Force gdal to stay below 3.0 - -commit b156ee1a466ff2353f188bd087ef5517c594f715 -Author: Sybrand Strauss -Date: Thu May 9 12:21:36 2019 -0700 - - - Added tests for remaining cases - -commit 8fed868196b5b9df52f42da2e3db4dbf309f4ed0 -Author: Sybrand Strauss -Date: Thu May 9 10:37:42 2019 -0700 - - - Fix GDAL - - Add migration - -commit ae3e39cbb8754c63b7221e3a2b821dd08c79d237 -Merge: a1bbec3de fa668ec55 -Author: alex@bigthink.io -Date: Thu May 9 09:33:54 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit a1bbec3de53e6077abeab96f8fd92e6a3ba58250 -Author: alex@bigthink.io -Date: Thu May 9 09:33:38 2019 -0700 - - moved well lookup into check - -commit 3d0337eb3f5b5567f58f21861d80cb46c3bb5b32 -Author: Sybrand Strauss -Date: Thu May 9 09:31:18 2019 -0700 - - Force gdal to stay below 3.0 - -commit bd54db55f5f67b7aebf572a2839abb70e84829d3 -Author: Sybrand Strauss -Date: Thu May 9 09:14:49 2019 -0700 - - - added migration to fix idir info on LithologyDescription, Casing, Screen, LinerPerforation and DecommissionDescription - -commit b3646f328b5831ff27a5e874290e0b36335e9476 -Author: alex@bigthink.io -Date: Wed May 8 15:51:52 2019 -0700 - - added validation for mutually required ground elevation fields - -commit fa668ec559c5e5e9c9b53bc6825feb8935dff6d4 -Merge: d6743bdff 1b5e89de4 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed May 8 15:20:58 2019 -0700 - - Merge pull request #1349 from bcgov/alex/welldisinfect - - [1809] Well Disinfected Updated to Code Table - -commit b2c314233eabed31939e6f775c4fda58563d5775 -Author: alex@bigthink.io -Date: Wed May 8 14:48:01 2019 -0700 - - added empty string check for ground_elevation - -commit 29265d5fc131b8a0f1637280e67f93ce69bb7629 -Author: Sybrand Strauss -Date: Tue May 7 12:59:40 2019 -0700 - - update_user and create_user on related records - - - Added testing for lithology - - Changed how serialization works for related records - -commit d8f2c54bd68e1167892a1ee9750940c085b3e40d -Author: alex@bigthink.io -Date: Wed May 8 11:38:13 2019 -0700 - - default to well license in database if api fails - -commit a460f3744fdc02784db16cd85e433354b907740c -Merge: ec61c9334 d6743bdff -Author: alex@bigthink.io -Date: Wed May 8 10:41:00 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit 1b5e89de432a9d74f79bca3def83de9bf61e6ca4 -Author: alex@bigthink.io -Date: Wed May 8 10:15:00 2019 -0700 - - Export fix - -commit c8ea4124d7fc84d9cc17fe4942b6fdf60b9f4bcf -Merge: 211cfe5de d6743bdff -Author: alex@bigthink.io -Date: Wed May 8 10:05:34 2019 -0700 - - Merge branch 'release' into alex/welldisinfect - -commit 96fadb4f8ea43f04a5bc6734906af5258836a31c -Merge: 1842b57a6 f74334b3f -Author: Aaron -Date: Wed May 8 01:10:23 2019 -0700 - - Merge branch 'countable/licences' of https://github.com/bcgov/gwells into countable/licences - -commit 1842b57a6c6ac1186852f1cfd191aa8d9da1223c -Author: Aaron -Date: Wed May 8 01:10:15 2019 -0700 - - cache js error and add static layers - -commit f74334b3fd30b12fd41f70303ecea14b47358ea1 -Author: Clark Van Oyen -Date: Tue May 7 23:27:29 2019 -0700 - - More migration fixes - -commit 7a1e817be231651d1cc0a32194783b3b8735673b -Author: Clark Van Oyen -Date: Tue May 7 22:31:50 2019 -0700 - - Working towards merging the big squash. - -commit 8e2f07abd46e6af7203f9cfeb4e0de9705472f30 -Merge: a9840cde7 d6743bdff -Author: Clark Van Oyen -Date: Tue May 7 19:11:31 2019 -0700 - - Merge - -commit ec61c93343c21a78be5fa2ebe8eed595f2970959 -Author: alex@bigthink.io -Date: Tue May 7 17:28:39 2019 -0700 - - adding default to db licensing status - -commit d6743bdff420ffa5547ca33e3b876a28d79a7c3b -Merge: 0580a56b8 231582fa3 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue May 7 17:16:35 2019 -0700 - - Merge pull request #1331 from bcgov/alex/changehistory - - [1782] Well Edit History For Related Record Sets - -commit 211cfe5dedcc4dea05f418a070112545370b825d -Author: alex@bigthink.io -Date: Tue May 7 16:51:23 2019 -0700 - - hide unknown on disinfect - -commit 231582fa3bd7d45a934630ab320f30e6d30f484b -Merge: 783f08005 0580a56b8 -Author: alex@bigthink.io -Date: Tue May 7 14:39:30 2019 -0700 - - Merge branch 'release' into alex/changehistory - -commit 6b3d38b6ad19cf108233ec1f669a60166e1a9222 -Author: Steve Hillier -Date: Tue May 7 13:12:03 2019 -0700 - - remove old Perforation table - -commit de381c4917782d7f3f574f627e28479b7e7f3c11 -Author: Steve Hillier -Date: Tue May 7 13:09:10 2019 -0700 - - update csv export to use liner_perforation table - -commit a9840cde7e4df808dfa2c5857b06189b519908e9 -Author: Aaron -Date: Tue May 7 06:51:23 2019 -0700 - - fix rest - -commit 13220532acd5bf19756dd61851376a7988e9f94e -Author: Aaron -Date: Tue May 7 06:45:15 2019 -0700 - - remove artesian condition url pressure has value - -commit 773e6082fbc2d3bbc5095471738fdbeffd5e475f -Author: Aaron -Date: Tue May 7 06:42:32 2019 -0700 - - fix on click - -commit 4b583a772aa4f3abbbc16384d32e878bbf2c8eca -Author: alex@bigthink.io -Date: Mon May 6 19:29:42 2019 -0700 - - updated mapping - -commit 7a9bd07b8db4b70e486631fd52a538ec5b398931 -Author: alex@bigthink.io -Date: Mon May 6 18:41:36 2019 -0700 - - made frontend selections not allow unknown - -commit cb5fe026db077db885da76c302e468ebecd4d1fd -Author: alex@bigthink.io -Date: Mon May 6 16:55:54 2019 -0700 - - cleanup - -commit e563751126ab39efbc9d5f9163e7ddd5340d2da0 -Author: alex@bigthink.io -Date: Mon May 6 16:52:48 2019 -0700 - - migration cleanup - -commit 9a6fea0753f8ae4f7412abd62a878e84d97a7b0f -Merge: 7abd1d212 0580a56b8 -Author: alex@bigthink.io -Date: Mon May 6 16:50:31 2019 -0700 - - Merge branch 'release' into alex/welldisinfect - -commit 7abd1d212090832a365c381f28a5cb4fe387ba96 -Author: alex@bigthink.io -Date: Mon May 6 16:50:18 2019 -0700 - - id fix - -commit 0580a56b8996e3aad319fa79c6730bb925cdc2f0 -Merge: c2fb16ca9 e2e5447dd -Author: Steve Hillier -Date: Mon May 6 16:33:07 2019 -0700 - - Merge pull request #1348 from bcgov/steve/edit-validation - - remove certain validations on activity submissions - -commit e2e5447dd842436838ed5d6fdd237e090533af4d -Author: Steve -Date: Mon May 6 15:59:55 2019 -0700 - - update test for changed behavior - -commit 67371dfc01573d7a6568b975521cde498f0b13d0 -Author: alex@bigthink.io -Date: Mon May 6 15:47:43 2019 -0700 - - migration cleanup - -commit d2a44a40ae5f85a79e5291012aa1d99407b03524 -Merge: 5bbe56be2 c2fb16ca9 -Author: alex@bigthink.io -Date: Mon May 6 15:17:34 2019 -0700 - - Merge branch 'release' into alex/welldisinfect - -commit 783f0800529004b0b13dbf59c7fe7ac529a4ede0 -Merge: 760e45d04 c2fb16ca9 -Author: alex@bigthink.io -Date: Mon May 6 15:11:13 2019 -0700 - - Merge branch 'release' into alex/changehistory - -commit 760e45d0427f4110a59233fa8f5dcbf0a1fb8e81 -Author: alex@bigthink.io -Date: Mon May 6 15:11:08 2019 -0700 - - requirements fix - -commit 3a13a1f1db277644c6b54c82146377831d1e37cb -Author: Steve -Date: Mon May 6 13:09:54 2019 -0700 - - remove some validations on submissions - -commit c2fb16ca9bdfd954c262d4da5a170e11624d1e2d -Merge: 092aaaef5 dfc510d41 -Author: Steve Hillier -Date: Mon May 6 11:33:57 2019 -0700 - - Merge pull request #1347 from bcgov/steve/20180506-migrations - - fix migration conflict (using merge) - -commit 092aaaef5051183d9c12db3f31d2e54415ff77f5 -Merge: 09f0d18e1 0e011273a -Author: Steve Hillier -Date: Mon May 6 11:25:40 2019 -0700 - - Merge pull request #1344 from bcgov/steve/perf-fix - - copy perforation data to liner_perforation - -commit dfc510d41a39004e34a46ac58fcf474de65ccd59 -Author: Steve -Date: Mon May 6 10:19:05 2019 -0700 - - fix migration conflict (using merge) - -commit 6eb4ac3862990763fdee862959cc3b16feddfbca -Merge: a78a3d98e 09f0d18e1 -Author: alex@bigthink.io -Date: Mon May 6 09:54:13 2019 -0700 - - merged release - -commit 09f0d18e1474fa1d605e20eab2f3ef9ccf1be394 -Merge: d8f58a85b aee242d0b -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon May 6 09:42:17 2019 -0700 - - Merge pull request #1342 from bcgov/alex/ssokey - - [1791] SSO Key Refresh - -commit 5bbe56be2c5c2902fd770dcf33d1e4ff18e38fef -Author: alex@bigthink.io -Date: Fri May 3 17:09:00 2019 -0700 - - migration merged and data update - -commit aee242d0bb8021f8f516eed2992c9c2439b3cc60 -Author: Steve Hillier -Date: Fri May 3 16:47:25 2019 -0700 - - Update app/backend/gwells/settings/__init__.py - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 0e011273ab0e5150893dddbfd22d664dfcaeb161 -Author: Steve Hillier -Date: Fri May 3 16:17:11 2019 -0700 - - add comment - -commit f690c4c3a56981336b2bebcea5585c58241ef98b -Author: Steve Hillier -Date: Fri May 3 16:14:29 2019 -0700 - - copy perforation data to liner_perforation - -commit 9ec3695d4cb9c3828eecde57dbea57632caa3fb7 -Merge: 452d48c99 d8f58a85b -Author: alex@bigthink.io -Date: Fri May 3 12:06:54 2019 -0700 - - Merge branch 'release' into alex/welldisinfect - -commit d8f58a85b846cc35531e09cbaf359e1d2868ad2d -Merge: cc79b8882 34dcf497a -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri May 3 12:04:18 2019 -0700 - - Merge pull request #1337 from bcgov/alex/subtypedates - - [1798] Update Dates of Well Construction, Alteration, Decommission - -commit ec4b81d7dad3ee689487e77d21c0ab13a39f509e -Author: alex@bigthink.io -Date: Fri May 3 12:00:02 2019 -0700 - - requirements fix - -commit 806ac5254c93c63bc46eafe0954ebdb1b90f15ee -Author: alex@bigthink.io -Date: Fri May 3 11:30:49 2019 -0700 - - dependancy fix - -commit 5861fcd43350b4d311b7cfe0a70667713559ec94 -Merge: 702cdd333 cc79b8882 -Author: alex@bigthink.io -Date: Fri May 3 10:53:23 2019 -0700 - - merged release - -commit cc79b8882ae52a68a042be1cf8fd9980c9dcc42b -Merge: 3c1be2a59 227c32046 -Author: Steve Hillier -Date: Fri May 3 10:29:17 2019 -0700 - - Merge pull request #1330 from bcgov/sybrand/feature/databc_meta_data - - [1824] Update meta-data as per DataBC requests - -commit 452d48c995c47de6e7db92cb314ed02cc33afd3e -Merge: 7d75f442d 3c1be2a59 -Author: alex@bigthink.io -Date: Thu May 2 17:24:38 2019 -0700 - - Merge branch 'release' into alex/welldisinfect - -commit 7d75f442d6ba68c9c3f0a1bd8f9da6b8455e7fd4 -Author: alex@bigthink.io -Date: Thu May 2 17:23:48 2019 -0700 - - value change - -commit bb0122cb3f4a569fc82cb64dfbccb49f68516bc3 -Author: alex@bigthink.io -Date: Thu May 2 17:22:11 2019 -0700 - - added well_disinfected_status to replace boolean - -commit 227c32046080d1d26cfb71309e008d2ab3453741 -Author: Sybrand Strauss -Date: Thu May 2 17:19:53 2019 -0700 - - - Updated to resolve security errors - -commit ef8a0afec62083bfca14df2b2e8e2fdaee9c4e67 -Author: Sybrand Strauss -Date: Thu May 2 17:02:24 2019 -0700 - - Resolve merge conflict - -commit 3c1be2a59c17857f0b9047222c5f8664d19d0e42 -Merge: 3cf5c78b6 8530e8e2e -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu May 2 16:58:30 2019 -0700 - - Merge pull request #1341 from bcgov/alex/licensinginfo - - Reset Connection by Peer Bug Fix - -commit 93bf53dde64d75d12a9a4c5b6b3595a932436a66 -Author: Sybrand Strauss -Date: Thu May 2 16:35:49 2019 -0700 - - - Changed licenced_status to licence_status on API - -commit da6555eda0bc8208c26457709ec0e148dcc7f59c -Author: Sybrand Strauss -Date: Thu May 2 15:56:42 2019 -0700 - - - More changes to descriptions - -commit 647a43917da6eb32cbce98a9337c177d8822e81a -Author: Sybrand Strauss -Date: Wed May 1 16:45:01 2019 -0700 - - - Removed LTSAOwner - -commit 499b65baf593a4c6a40ccf78ad625ec6d6e22893 -Author: Sybrand Strauss -Date: Wed May 1 16:41:52 2019 -0700 - - - Incorporated data from spreadsheets - -commit 8189539cacd135709df4a542097475cef82beb81 -Author: Sybrand Strauss -Date: Thu Apr 25 15:57:37 2019 -0700 - - - Update meta-data as per DataBC requests - -commit 3cf5c78b64f70435042e26591f599d72330221cb -Merge: a5abec2c3 53a53a231 -Author: Steve Hillier -Date: Thu May 2 16:35:12 2019 -0700 - - Merge pull request #1327 from bcgov/steve/django-upgrade - - upgrade Django, DRF, gunicorn versions - -commit 250995c2d5313bbc7214c6728f84a354200f27c9 -Merge: 0e57dcbbf a5abec2c3 -Author: alex@bigthink.io -Date: Thu May 2 15:03:52 2019 -0700 - - Merge branch 'release' into alex/welldisinfect - -commit 8530e8e2e00488c3570f3a7bd169fc2f8a75b5ad -Merge: cba9f37d3 a5abec2c3 -Author: alex@bigthink.io -Date: Thu May 2 14:08:49 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit cba9f37d30d260a39359d386890cd951da3dbcf2 -Author: alex@bigthink.io -Date: Thu May 2 14:08:44 2019 -0700 - - bug fix - -commit a78a3d98e9e0a6e83e38b052797562dfea7ae626 -Merge: 2621ba27d a5abec2c3 -Author: alex@bigthink.io -Date: Thu May 2 13:58:34 2019 -0700 - - Merge branch 'release' into alex/changehistory - -commit 2621ba27d3f9b85710854460e7c79b25488155d1 -Author: alex@bigthink.io -Date: Thu May 2 13:58:10 2019 -0700 - - geom fix - -commit a5abec2c3ae1638830ac934cb628e03954b6bfab -Merge: 96fce7c85 6ec43de29 -Author: Steve Hillier -Date: Thu May 2 13:54:35 2019 -0700 - - Merge pull request #1339 from bcgov/steve/spinny - - [1834] updates to save notifications - -commit 96fce7c8514372c3380bde7a10ac8714bda94b5d -Merge: fcd03df7b 496c7e202 -Author: Steve Hillier -Date: Thu May 2 12:18:48 2019 -0700 - - Merge pull request #1334 from bcgov/cole/map-fixes - - Well Search map bugfixes - -commit fcd03df7b487d5fbd3ca0b85e70c474d7f0f44b7 -Merge: 3684e43f5 8a27ec826 -Author: Steve Hillier -Date: Thu May 2 12:18:32 2019 -0700 - - Merge pull request #1338 from bcgov/alex/rmaquifertable - - [1800] Removed Aquifer Well Table - -commit 6ec43de2954a0e9d05a4878ccca8e6046e111b06 -Author: Sybrand Strauss -Date: Thu May 2 12:15:26 2019 -0700 - - Update app/frontend/src/submissions/views/SubmissionsHome.vue - - Co-Authored-By: stephenhillier - -commit 21fce993cd47247e8a36a4ec3e70bc3e9ccc522d -Author: Steve Hillier -Date: Thu May 2 12:11:36 2019 -0700 - - remove console log - -commit d1d156b75a93788492ec98869cd9eb3922b1a207 -Author: Steve Hillier -Date: Thu May 2 12:08:53 2019 -0700 - - updates to save notifications - -commit e17a8aeeccb784b12da608044feb0de2566ccc32 -Merge: ca7796de2 3684e43f5 -Author: alex@bigthink.io -Date: Thu May 2 11:22:45 2019 -0700 - - Merge branch 'release' into alex/changehistory - -commit 8a27ec8261a4a3e7a714fdc2da015c17b9cb71e0 -Author: alex@bigthink.io -Date: Thu May 2 10:48:37 2019 -0700 - - fixed a fixture ref old table - -commit a5a45c7b5e8f651e6ae250998e5b75db66d717ab -Merge: 061a0d985 3684e43f5 -Author: alex@bigthink.io -Date: Thu May 2 10:17:10 2019 -0700 - - Merge branch 'release' into alex/rmaquifertable - -commit 3684e43f515988383d70093b299463081c56cd81 -Merge: 29c3605ed ce58ba1d0 -Author: Steve Hillier -Date: Thu May 2 08:31:06 2019 -0700 - - Merge pull request #1335 from bcgov/alex/licensinginfo - - Licensing URL Build Config - -commit cf3cbafc630fe811eb0be343081e29ffa766e748 -Author: Clark Van Oyen -Date: Thu May 2 00:14:27 2019 -0700 - - cleanup - -commit d0acdc8cbcfba9715045fb7ed59483d77228d609 -Author: Clark Van Oyen -Date: Thu May 2 00:13:35 2019 -0700 - - Performance optimizations in DRF - -commit f42197d7b2432647bb48bd13bfc0bfeca3ee28e1 -Author: Clark Van Oyen -Date: Wed May 1 23:07:24 2019 -0700 - - New migration script, aquifer summary page fields in full. - -commit 702cdd33343afb0ab5ee4cb6fed37a3a10f95024 -Author: AlexZorkin -Date: Wed May 1 16:38:38 2019 -0700 - - cleanup - -commit 25a4581bc2a4e925b209ae107ae1381193d472cd -Author: AlexZorkin -Date: Wed May 1 16:31:23 2019 -0700 - - extra check - -commit 0b9ab64786700ac807db7a2ba777d1c9d36a841a -Author: AlexZorkin -Date: Wed May 1 16:29:16 2019 -0700 - - grabbing public key from sso - -commit 29c3605ed186c8611f9005b1fc494364fed807a5 -Merge: e0441e9ca 997fe2a94 -Author: Steve Hillier -Date: Wed May 1 15:19:11 2019 -0700 - - Merge pull request #1336 from bcgov/sybrand/feature/detailed_logging - - More detailed error logging on submission/edit failures. - -commit 061a0d98572927c1601d0931803f7ec844284174 -Author: AlexZorkin -Date: Wed May 1 15:04:42 2019 -0700 - - removed aquifer well table - -commit 0e57dcbbf1822b2e2ab7e2875eaf180719cc53b3 -Author: AlexZorkin -Date: Wed May 1 14:54:37 2019 -0700 - - changed name values - -commit 997fe2a941bcedb1d94fa49f22a71accec89521c -Author: Sybrand Strauss -Date: Wed May 1 14:42:43 2019 -0700 - - - Fix to allow pages to load when keycloak.js cannot be injected - -commit bbf99f83dc2575d00e97c1f4085edf4270e1bbd7 -Author: AlexZorkin -Date: Wed May 1 14:15:04 2019 -0700 - - cert construction in settings - -commit e0441e9ca4f7998ac50ad9af93e4cda83628bd20 -Merge: 84c1f5ebc 35d9391ad -Author: Sybrand Strauss -Date: Wed May 1 13:12:19 2019 -0700 - - Merge pull request #1333 from bcgov/sybrand/data/perforations_cleanup - - [1789/1790] Migration to clean up casing and perforation data - -commit 550539a59fc4d92f8dd67530390df16d3feae822 -Author: Sybrand Strauss -Date: Wed May 1 13:11:08 2019 -0700 - - More detailed error logging on submission/edit failures. - -commit ca7796de22c85abdb8ea4a01e19170d7d19df4d7 -Author: AlexZorkin -Date: Wed May 1 12:05:55 2019 -0700 - - refactor ignore key method - -commit 9c504dfa242b29f37fe029baebc3a499d06ceef2 -Merge: 40d664d78 84c1f5ebc -Author: AlexZorkin -Date: Wed May 1 11:32:03 2019 -0700 - - Merge branch 'release' into alex/changehistory - -commit ce58ba1d0a158089bf32f5502069c5cc67b9998c -Merge: 34d849e1f 84c1f5ebc -Author: AlexZorkin -Date: Wed May 1 11:31:41 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit 34d849e1f6d6f292db4b307f7cb8753d3db95130 -Author: AlexZorkin -Date: Wed May 1 11:31:26 2019 -0700 - - build config fix - -commit 496c7e202b6b70d1c134995ce73cafde5b92a730 -Author: Cole Maclean -Date: Wed May 1 09:37:31 2019 -0700 - - Increase marker size for easier touch interaction - -commit c18791d28f996b26d455819df6d375b60f5a86e5 -Author: Cole Maclean -Date: Wed May 1 09:34:38 2019 -0700 - - Split location and results table searches, again - - Turns out they need to be split, because pagination shouldn't update - the locations. Also fixed showing the active search notice on the - map when a result filter is active. - -commit 3c71e20ad0517efd0349b36117dac9f56ee05669 -Author: Cole Maclean -Date: Wed May 1 09:10:01 2019 -0700 - - Track last the search trigger in store - -commit 28697ace2623f4c581fe035b87d4f5a8a53c664e -Author: Cole Maclean -Date: Tue Apr 30 13:48:33 2019 -0700 - - Don't set results on search cancellation - -commit 35d9391ada64ccd55d1efc2fa3f8cc9395cc9ba7 -Author: Sybrand Strauss -Date: Wed May 1 09:20:33 2019 -0700 - - Migration to clean up data - - perforation data - - minor fix on Perforation model - - casing cleanup - -commit 84c1f5ebc7d74554b1d7307e203a8bc2837d6652 -Merge: 2a450af04 32fb64875 -Author: Sybrand Strauss -Date: Wed May 1 09:37:20 2019 -0700 - - Merge pull request #1332 from bcgov/sybrand/squash/iteration_3 - - Squashing migrations - -commit 32fb648752bd45d9e65f7e05573de108fd7c69d4 -Author: Sybrand Strauss -Date: Wed May 1 08:44:18 2019 -0700 - - Renamed province zip - -commit a230b4f0c29bd773b30b5ef57a2a66be21d0d540 -Author: Sybrand Strauss -Date: Tue Apr 30 15:38:24 2019 -0700 - - - Moved date migrations to separate file. - - Renamed some migration fixtures. - - Removed redundant aquifer migration files. - - Squashed gwells, registries and wells down cleanly. - -commit 2a450af04a0bf8d0c44858141c3eee6dcc1d5b90 -Merge: 4b8dc27b8 9ead6a385 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Apr 30 16:21:44 2019 -0700 - - Merge pull request #1311 from bcgov/alex/licensinginfo - - [1497] Well Licensing Information - -commit 34dcf497ad28b67d57f4f3ffa1a2bc1422d11c82 -Author: AlexZorkin -Date: Tue Apr 30 16:20:03 2019 -0700 - - added tests for date edits - -commit 963daa3078cc2e6c87465b624cd067686590fa67 -Merge: 5442c9a93 4b8dc27b8 -Author: AlexZorkin -Date: Tue Apr 30 15:52:39 2019 -0700 - - Merge branch 'release' into alex/subtypedates - -commit 5442c9a93e4a9b0dfad656702bc285436ecdf4c0 -Author: AlexZorkin -Date: Tue Apr 30 15:52:24 2019 -0700 - - fix duplicate in serializer - -commit 9ead6a385113d1f71459661936a3a828f02acef5 -Merge: b51719963 4b8dc27b8 -Author: AlexZorkin -Date: Tue Apr 30 14:59:05 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit 40d664d7819a9255618e2f6f8ba28e61362b1734 -Merge: 7a7f95520 4b8dc27b8 -Author: AlexZorkin -Date: Tue Apr 30 14:58:12 2019 -0700 - - Merge branch 'release' into alex/changehistory - -commit 7a7f95520eddf7357c94047e0a73fbec42943ad9 -Author: AlexZorkin -Date: Tue Apr 30 14:57:56 2019 -0700 - - bug fixes - -commit ad854093f97ed5c39e068b18820df4a84abdb629 -Author: Cole Maclean -Date: Tue Apr 30 13:14:06 2019 -0700 - - Allow additional query options to be passed to Axios - -commit 4b8dc27b81d1f2f28d5bb339801e5b6f7c67b28f -Merge: 33d48c29a 47db56327 -Author: Steve Hillier -Date: Tue Apr 30 13:01:49 2019 -0700 - - Merge pull request #1323 from bcgov/cole/map-updates - - [1551] Well Search Map Updates - -commit 33d48c29a6a5f8d4310da3fa35d78e27d26552f6 -Merge: 867688a98 3fe5d0b4d -Author: Steve Hillier -Date: Tue Apr 30 12:35:02 2019 -0700 - - Merge pull request #1328 from bcgov/steve/minio-config-fix - - change name of PVC in Minio template to match prod environment - -commit b517199630a733fa0814980dd7580303a80ccc5a -Author: AlexZorkin -Date: Tue Apr 30 10:57:23 2019 -0700 - - updated status check from e-licensing - -commit 4b84dd5b1361319696b6604a4a7d555a4d8a75d9 -Author: AlexZorkin -Date: Tue Apr 30 10:02:32 2019 -0700 - - fixed licence spelling - -commit 8eaff4c1a2bf5be43780be32f32b08929004fab0 -Merge: a792603e7 867688a98 -Author: AlexZorkin -Date: Tue Apr 30 09:35:38 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit d4052be2ae870489584ff7900e6435e3baeb996e -Merge: 2c5ecca38 66801cd28 -Author: AlexZorkin -Date: Tue Apr 30 09:24:27 2019 -0700 - - Merge branch 'alex/subtypedates' of ssh://github.com/bcgov/gwells into alex/subtypedates - -commit 2c5ecca3805b6304b0d8e74b4032b64fc109746d -Author: AlexZorkin -Date: Tue Apr 30 09:24:14 2019 -0700 - - Added comment suggesting squash strategy - -commit 66801cd28be24b50b23c6c39eb4d1446a1314b8b -Author: Sybrand Strauss -Date: Tue Apr 30 09:23:33 2019 -0700 - - Update app/backend/wells/models.py - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit e9baec5161b5d44dd65f79c32c59bc556bf40b6a -Author: Sybrand Strauss -Date: Tue Apr 30 09:23:27 2019 -0700 - - Update app/backend/wells/models.py - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 04d58744218d633899cc8e9c85f1f2a21686b9f8 -Author: Sybrand Strauss -Date: Tue Apr 30 09:23:21 2019 -0700 - - Update app/backend/wells/models.py - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit df30d59f7a5d28a554a08345ccbdc427d8c0388f -Author: AlexZorkin -Date: Tue Apr 30 09:20:52 2019 -0700 - - fix tab - -commit d751c1526a398fc5abea4b8a7debd1e424d2bb6e -Merge: e5ef234c9 867688a98 -Author: AlexZorkin -Date: Tue Apr 30 09:19:41 2019 -0700 - - Merge branch 'release' into alex/subtypedates - -commit b7fffab904e23e15913ae3bb6681e49b3c72cc38 -Author: AlexZorkin -Date: Tue Apr 30 09:18:17 2019 -0700 - - cleanup - -commit f0464d8a991b945689704bff0764fdb7d6cdb65a -Author: Clark Van Oyen -Date: Mon Apr 29 23:52:43 2019 -0700 - - Fix debug mode randomization of aquifer fkeys. - -commit 69ace00ab99b863ab5f42d6b27bdaf1b1d7a6d3c -Author: AlexZorkin -Date: Mon Apr 29 23:31:32 2019 -0700 - - import fix - -commit 51e9f7fb0286f1dda1e2bbf6052c7abcd13a4164 -Merge: 8ebf228db 867688a98 -Author: AlexZorkin -Date: Mon Apr 29 23:14:58 2019 -0700 - - Merge branch 'release' into alex/changehistory - -commit 8ebf228db3f890ad797474d072114e2c5284a0d6 -Author: AlexZorkin -Date: Mon Apr 29 23:14:39 2019 -0700 - - made history on demand and added loading indicator - -commit 76099f45ef6715761ff176240a076225d4e11605 -Author: Clark Van Oyen -Date: Mon Apr 29 22:59:42 2019 -0700 - - Remove console.log - -commit d462def472ed000f519eec70faf46a0d29ac0189 -Author: AlexZorkin -Date: Mon Apr 29 22:50:35 2019 -0700 - - added comments - -commit e4c338db5e783b69dfd765f74090164f7af32475 -Author: Clark Van Oyen -Date: Mon Apr 29 22:43:04 2019 -0700 - - Fix Aquifer Edit Behaviour - -commit e335f808c809577238c64d3e7de02aee2e937c8d -Author: Clark Van Oyen -Date: Mon Apr 29 20:46:01 2019 -0700 - - Fix the tests after aquifer feedback tickets. - -commit 15ffefdc357f6bde85c0b7c2f426757391711326 -Author: AlexZorkin -Date: Mon Apr 29 19:13:12 2019 -0700 - - reverted common change history component - -commit d44cb8dc1acaef6f2c761abc44046e1105960b10 -Author: AlexZorkin -Date: Mon Apr 29 19:12:26 2019 -0700 - - separated out well history from commone history component - -commit 47db563279c13ef858bd3c2e1454121f4c1a583c -Author: Cole Maclean -Date: Mon Apr 29 16:35:50 2019 -0700 - - Fix zoom to markers after search update - -commit 294e6d86ef9ffdc96fc4511011ef0de41655fe9d -Author: Cole Maclean -Date: Mon Apr 29 16:24:21 2019 -0700 - - Include street address/city on pop up - -commit c7110e305e3ddb5a4bec703a0543c4d46e610c16 -Author: Cole Maclean -Date: Mon Apr 29 16:23:12 2019 -0700 - - Add street address and city to locations endpoint - -commit 53a53a231f376d0a97cda8cea09f2218fb77bf61 -Author: Steve Hillier -Date: Mon Apr 29 16:11:27 2019 -0700 - - add a default value to pop - -commit d7f515a5b443a0bc414fb14bf1fc926168bf7516 -Author: Cole Maclean -Date: Mon Apr 29 15:54:04 2019 -0700 - - Comment on clear set pending search handling - -commit 04238aa6212b5de90dfda1c235cb6d8a028d54ce -Author: Steve Hillier -Date: Mon Apr 29 14:25:00 2019 -0700 - - upgrade Django, DRF, gunicorn versions - -commit 3fe5d0b4d4689454af464ef6e514ea7b131e31d7 -Author: Steve Hillier -Date: Mon Apr 29 14:04:49 2019 -0700 - - change name of pvc in minio template to match prod - -commit 755a8020d4ac2433636e4e0f6d40d208347be0f1 -Author: Cole Maclean -Date: Fri Apr 26 16:06:51 2019 -0700 - - Increase max locations to 5000 - -commit d7b388a047fb19d422c440064b4c3519ec532f44 -Author: Cole Maclean -Date: Fri Apr 26 15:53:16 2019 -0700 - - Enable searchOnMapMove after any search - -commit d15c1246cc84195dc8a7999940eb34ed527935f6 -Author: Cole Maclean -Date: Fri Apr 26 15:40:08 2019 -0700 - - Adjust active search notice styling - -commit 0f34844d4fb11e966b0c96292053c229ff354929 -Author: Cole Maclean -Date: Fri Apr 26 15:36:39 2019 -0700 - - Don't debounce 'Search this area' trigger - -commit 036642c160a23ab9797376bb030504ce04fb4365 -Author: Cole Maclean -Date: Fri Apr 26 15:21:26 2019 -0700 - - Default search as I move to on - -commit 113f3db5bfcf53ea1c788dcf8ca3121d6564c356 -Author: Cole Maclean -Date: Fri Apr 26 12:48:46 2019 -0700 - - Keep track of map constrained searches properly - -commit 02c7a6e2b72b80b2180389a8ecd896fdba5ab145 -Author: Cole Maclean -Date: Fri Apr 26 12:33:17 2019 -0700 - - Fix right click triggering zoom tool - -commit 14203df73a1ed67f4435d6d8bd2ddb8a3d1e772e -Author: Cole Maclean -Date: Fri Apr 26 12:31:01 2019 -0700 - - Updated zoom tool with custom button - -commit 0c2f9a9682bbf53ab0210bbdc44f5a111ed17f9f -Author: Cole Maclean -Date: Fri Apr 26 12:17:09 2019 -0700 - - Remove unused location count - -commit c4216c615a7fd26276a84c1e2bdbbb456275fcc7 -Author: Cole Maclean -Date: Fri Apr 26 12:12:55 2019 -0700 - - Combine well and location search - -commit 1e75c9617f4d77f1d2321a0865dd126c3110d630 -Author: Cole Maclean -Date: Wed Apr 24 14:51:56 2019 -0700 - - Cleanup map controls HTML & CSS - -commit 3dbd1bc94cf1d7f45cba5992e39ef033286b1509 -Author: Cole Maclean -Date: Wed Apr 24 14:15:13 2019 -0700 - - Add zoom tool to map - - Based on code from https://github.com/consbio/Leaflet.ZoomBox - -commit 35c6a3cf7b13de61b6239651a90471eb2855d5d7 -Author: Cole Maclean -Date: Thu Apr 18 13:56:01 2019 -0700 - - Set map bounds statically - -commit c9f0d41849b282be2864ebaeab27e7b833a1e78a -Author: Cole Maclean -Date: Thu Apr 18 13:45:04 2019 -0700 - - Add active search notice and clear button - -commit be65b5d1a3b2c041caff397373b551054fde0a9d -Author: Cole Maclean -Date: Wed Apr 17 13:47:44 2019 -0700 - - Remove on map attribution - -commit ca0375cd6a513a31f770ebfab71f6f65fc10e6f8 -Author: Cole Maclean -Date: Wed Apr 17 12:11:16 2019 -0700 - - Add search as I move option - -commit 206c394898a5393ffdacadf7ef56a8fc4191297e -Author: Cole Maclean -Date: Wed Apr 17 09:32:48 2019 -0700 - - Add consistent ordering for location endpoint - -commit e054a1d30514dc4edf1108ff862fbfd252094ae3 -Author: Cole Maclean -Date: Sun Apr 14 12:33:48 2019 -0700 - - Switched to vue2-leaflet for map - -commit daae8e340705683c7fc05dd402620cf00cd077df -Author: Cole Maclean -Date: Fri Apr 12 13:36:34 2019 -0700 - - Added vue2-leaflet to deps - - Also updated Vue, and added @types/leaflet - -commit 867688a98f30087a6293e4ba7241dcb0b8308dd6 -Merge: 1d153dace 978ad999f -Author: Steve Hillier -Date: Mon Apr 29 08:38:57 2019 -0700 - - Merge pull request #1253 from bcgov/cole/search-results - - [1552] Advanced search results - -commit 0776e00dafbddb44a9b7e87c78d27b543df5d9e1 -Author: Clark Van Oyen -Date: Mon Apr 29 01:14:04 2019 -0700 - - Change to more reasonable bulk aquifer field names. - -commit f1ea42c27b11ffd6984d84d759f3aeca6c261676 -Author: Clark Van Oyen -Date: Sun Apr 28 16:34:53 2019 -0700 - - All fixes relating to Apr 26 feedback. - -commit 1cae15d650e44fe69748c10720f417605c35a615 -Merge: d75dd2b01 1d153dace -Author: AlexZorkin -Date: Sat Apr 27 11:16:41 2019 -0700 - - Merge branch 'release' into alex/changehistory - -commit d75dd2b01b833e4ae7c6fd0872c07d116d971555 -Author: AlexZorkin -Date: Sat Apr 27 11:16:00 2019 -0700 - - bug fixes on data display - -commit 1d153daceed438c9ffc3ac780724aa5142eb42e2 -Merge: 3df344ff4 ec1127a11 -Author: Steve Hillier -Date: Fri Apr 26 13:38:02 2019 -0700 - - Merge pull request #1326 from bcgov/steve/stacking-fix - - fix for bug deleting rows of lithology, casings etc - -commit ec1127a11c2620fd23530aca9938f0c97d40586c -Author: Steve Hillier -Date: Fri Apr 26 12:35:17 2019 -0700 - - temporarily comment out diff code with side effect - -commit eb52a02e28b37284278cf44ba069ff012a1f5593 -Author: AlexZorkin -Date: Fri Apr 26 10:59:35 2019 -0700 - - minor change - -commit e4febf18597a4787231e1bdebce7d092f820ecce -Author: AlexZorkin -Date: Thu Apr 25 16:23:41 2019 -0700 - - well history data formatting - -commit 3df344ff464cf565de0e4e712a0613e890d00c21 -Merge: 63e92507e 111be7eff -Author: Steve Hillier -Date: Thu Apr 25 14:47:32 2019 -0700 - - Merge pull request #1325 from bcgov/steve/backup3 - - fix typo in backup template - -commit 111be7eff898b1faf15e02360a2a27f6d8739355 -Author: Steve Hillier -Date: Thu Apr 25 13:50:26 2019 -0700 - - fix path to template - -commit 09849e582cb56d500de46aa8a31070319123893f -Author: Steve Hillier -Date: Thu Apr 25 13:39:59 2019 -0700 - - fix typo in backup template - -commit 63e92507e9689c980905bcd5bbd8996a1e98da52 -Merge: 2cb866a97 7fd18839f -Author: Sybrand Strauss -Date: Thu Apr 25 12:54:24 2019 -0700 - - Merge pull request #1321 from bcgov/sybrand/bug/1805_more_legacy_issues - - [1805] Performance increase & optimizations - -commit 7fd18839f703e2daabef0adf5d02e970bdf6e0e8 -Author: Sybrand Strauss -Date: Thu Apr 25 11:50:08 2019 -0700 - - - Fix issue relating to saving perforation changes - -commit 23baef091507a11ca0c25580b2d181dac91b818f -Author: Sybrand Strauss -Date: Thu Apr 25 09:23:03 2019 -0700 - - - Fixed composite bug - -commit ec9b2ac12f5a96314c34d6e556e5df437c9d3dd8 -Author: Sybrand Strauss -Date: Thu Apr 18 16:31:19 2019 -0700 - - Performance increase & optimizations - - Changed stack funtion to not use serializers as much. - - Moved expensive to calculate maps into global constant maps. - - Added lock to cached global variable. - - Added tests. - -commit 2cb866a973a8fdb31bf2fa16e8be182ec42de6ac -Merge: f4362ff61 4c6939047 -Author: Steve Hillier -Date: Thu Apr 25 09:26:09 2019 -0700 - - Merge pull request #1324 from bcgov/steve/backups2 - - fix issues deploying backups - -commit 4c69390476e865d2e094a87496b38c060f23f35e -Author: Steve -Date: Wed Apr 24 19:53:45 2019 -0700 - - fix prod path - -commit 74b9ba7b3ea0838260852440a0d1c84263ce7059 -Author: Steve -Date: Wed Apr 24 19:52:44 2019 -0700 - - fix path error - -commit 79686cf5a4c0247cf42d597c2334ba1b1b54cd5f -Author: Steve -Date: Wed Apr 24 19:44:33 2019 -0700 - - fix staging variable names - -commit f4362ff6161eaec064491744a1a2a0e480f1f08f -Merge: 09ecf8982 7f78f75c5 -Author: Steve Hillier -Date: Wed Apr 24 16:49:32 2019 -0700 - - Merge pull request #1322 from bcgov/steve/backups - - Minio backups - -commit 7f78f75c527a609339ee79b46f7a61cbe2f90ae5 -Author: Steve Hillier -Date: Wed Apr 24 16:16:37 2019 -0700 - - updated cronjob schedule for test - -commit eba13095b36aa2de837621c39f63ae2523014e2c -Author: Steve Hillier -Date: Wed Apr 24 16:07:08 2019 -0700 - - change cronjob schedule - -commit 4379ba01edece094ff8c1c3d3fb9467360f1a0ca -Author: Steve Hillier -Date: Wed Apr 24 15:53:05 2019 -0700 - - cleanup Dockerfile - -commit d1c933f7b220c6a6ca4131f82a1c5f5851bbf862 -Author: Steve Hillier -Date: Wed Apr 24 15:48:59 2019 -0700 - - add an automated database backup - -commit 978ad999ff1e299edc7d3e49411fd0a40550e07b -Author: Cole Maclean -Date: Thu Apr 18 12:53:09 2019 -0700 - - Fixed WellListFilterBackend mutating queryparams during processing - -commit c55e9d728c0bb1efd33887e7a6806bcf745d0b0b -Author: Cole Maclean -Date: Wed Apr 17 11:27:16 2019 -0700 - - Display filter errors correctly - -commit 0d67ad033c786eb84bd1b134acbc7ce39c90db06 -Author: Cole Maclean -Date: Wed Apr 17 09:45:44 2019 -0700 - - Remove debug statement - -commit d1a303dbb80995a960c51554cccf200cb74b07e6 -Author: Cole Maclean -Date: Mon Apr 15 21:37:13 2019 -0700 - - Raise ValidationError on invalid filter - -commit d66bb582df3843a703f0a583d96ed059f4dbfea7 -Author: Cole Maclean -Date: Mon Apr 15 21:23:01 2019 -0700 - - Sync resets across components - -commit c41a9deed89753869943222802e16123b69fdfb7 -Author: Cole Maclean -Date: Mon Apr 15 19:48:35 2019 -0700 - - Left justify results table messages - -commit dac91552d32e39a259c65563a9c45afb15c76e31 -Author: Cole Maclean -Date: Mon Apr 15 19:19:40 2019 -0700 - - Allow search all with empty string - -commit 9e3d0168d519086c97c8011271303805b526dee9 -Author: Cole Maclean -Date: Mon Apr 15 19:18:40 2019 -0700 - - Reset locations on search reset - -commit 9e075925f86ae0e60620f3ec4605956b90341277 -Author: Cole Maclean -Date: Fri Apr 12 16:05:06 2019 -0700 - - Return 400 on bad JSON in filter_group param - -commit e479be0d60d7ed05a20bc4228f49b3f70504321e -Author: Cole Maclean -Date: Fri Apr 12 12:00:39 2019 -0700 - - Fix test for ordering by drilling methods - -commit 47dd09ab97c3c00bef9eca34eb5a0825b1ae8def -Author: Cole Maclean -Date: Wed Apr 10 21:14:54 2019 -0700 - - Add license - -commit 44aca633909cd1d11785f48c63f3913d1e6331fc -Author: Cole Maclean -Date: Wed Apr 10 21:09:11 2019 -0700 - - Order by description, not display order, for relations - -commit 9b83bc447c69ad9eee21bb04f46c66f6311a44e2 -Author: Cole Maclean -Date: Wed Apr 10 21:08:45 2019 -0700 - - Add check for undefined option value - -commit 9106282babe0a9292d014e67843b5f456a536e95 -Author: Cole Maclean -Date: Wed Apr 10 14:31:47 2019 -0700 - - Visual indicator of focus & active state for result filters - -commit 0e1ab68ccfcdd32c323b791c96b42966cc1aa91b -Author: Cole Maclean -Date: Fri Mar 22 06:08:22 2019 -0700 - - Add search results component - - * Moved lots of data used by multiple components into the Vuex store - * Removed tabulator in favour of custom component - * Added column selection modal - * Move to a simple table for results - * Add result sorting - * Add result filtering - * Updated advanced search form to use logic from filter mixin - * Removed SearchForm* components in favour of AdvancedSearchFilter - * Separate omponents for basic and advanced search - -commit 82c25a3b11a66a5ba9303346304d3e6ba6c70b06 -Author: Steve Hillier -Date: Wed Apr 24 14:53:37 2019 -0700 - - remove rclone from dockerfile - -commit 668936001786fdd8b2bcf09cb19e1784bc84bb37 -Author: Steve Hillier -Date: Wed Apr 24 14:36:14 2019 -0700 - - add example usage - -commit 2e68f47041958c078cea173c74014f3ec6a419ef -Author: Steve Hillier -Date: Wed Apr 24 14:29:55 2019 -0700 - - no longer use hostname as a backup dir - -commit 1127ea7ef4e60ffd2c3e18400fe6d1f5b5c14d8d -Author: Steve Hillier -Date: Wed Apr 24 14:01:44 2019 -0700 - - clean up unused rclone settings - -commit ffec6f39be7f9a7f48d29b2356aec34db1133d64 -Author: Steve Hillier -Date: Wed Apr 24 14:00:01 2019 -0700 - - add cronjob to jenkinsfile - -commit bb54ea4dbcedadf993d0a503e0bb1fc5fb66514d -Author: Steve Hillier -Date: Wed Apr 24 13:52:06 2019 -0700 - - add a cache dir - -commit ebd06bae6f7b017d617c20c21d9839971d30ecb2 -Author: Steve Hillier -Date: Wed Apr 24 13:31:58 2019 -0700 - - update test command - -commit e1282e14c642715d68f5bb0610e4f263ddf1661b -Author: Steve Hillier -Date: Wed Apr 24 13:19:28 2019 -0700 - - remove rclone - -commit 5c04652b6f46f3bfffb5f47411209647c7100e8b -Author: Steve Hillier -Date: Wed Apr 24 12:38:42 2019 -0700 - - add an echo for debugging - -commit 96b945760372d8777a7c44cc0cdcf1035c4ee505 -Author: Steve Hillier -Date: Wed Apr 24 11:34:55 2019 -0700 - - change name of backup volume - -commit b05e2176da57b1076a86daa50581da6fb09b2f8d -Author: Steve Hillier -Date: Wed Apr 24 11:33:16 2019 -0700 - - change attributes of intermediate backup pvc - -commit eb2144f6a375dac27a5da9cd9dc5afe5f9507d2b -Author: Steve Hillier -Date: Wed Apr 24 11:26:47 2019 -0700 - - refactor buckets into list - -commit 36ad363fe6b4939dca7c855cf158cd3cb301f8ac -Author: Steve Hillier -Date: Wed Apr 24 09:40:25 2019 -0700 - - accept list of buckets to back up - -commit 9fd4639d94bc773e657fada3652ca8c2a47aa411 -Author: Steve Hillier -Date: Wed Apr 24 09:18:04 2019 -0700 - - change sync to copy - -commit f844fe4b7ac0fe00f704d3aa5800f7ded0689625 -Author: Clark Van Oyen -Date: Tue Apr 23 19:10:28 2019 -0700 - - 2nd chart - -commit f4a329bb709a8354d019f6ab98e08d52a1b3fd63 -Author: Clark Van Oyen -Date: Tue Apr 23 17:59:32 2019 -0700 - - fix FE perf issue - -commit 5af5c2e33c0d0903b5e42bf7cde7e28731ddab95 -Author: Steve Hillier -Date: Tue Apr 23 16:46:50 2019 -0700 - - revert change to minio spec - -commit 7b615129b27158c91599c1f3bb3076bb0274e038 -Author: Steve Hillier -Date: Tue Apr 23 16:44:25 2019 -0700 - - fix error commenting out actual code - -commit c12b9294184248e659118e16a14ab1b38de7c0aa -Author: Steve Hillier -Date: Tue Apr 23 16:43:16 2019 -0700 - - finish up cronjob spec - -commit 3e5b8cbbe7def8dd99fd69403a8d7597efcad2b2 -Author: Steve Hillier -Date: Tue Apr 23 15:33:47 2019 -0700 - - fix typo in inline Dockerfile - -commit d217c4b7ec196a1dfdd4b06492240f253bfda0b4 -Author: Steve Hillier -Date: Tue Apr 23 15:29:50 2019 -0700 - - add a temporary branch name - -commit 4e712984fbd8540a04b27c2e2298f3d067a7f112 -Author: Steve Hillier -Date: Tue Apr 23 15:29:12 2019 -0700 - - add files for cloning and backing up minio - -commit a792603e77f1a5857638ebb46a48bd7cbcf1f188 -Author: AlexZorkin -Date: Thu Apr 18 17:14:55 2019 -0700 - - added e-licensing secrets to openshift and build config - -commit 8061f1c896b1153dd2d26f920ead4c0ce9867df9 -Author: AlexZorkin -Date: Thu Apr 18 17:14:42 2019 -0700 - - added e-licensing secrets to openshift and build config - -commit 8e5213660bedf6f0fa00dc7008888a682cbe509a -Merge: 495255960 09ecf8982 -Author: AlexZorkin -Date: Thu Apr 18 16:22:41 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit e5ef234c909be9068064f64f863f57e7394a15f0 -Author: AlexZorkin -Date: Thu Apr 18 15:58:51 2019 -0700 - - model fix - -commit c2bbebf400df31d9e3ceb9e3e334dbf26c7011a2 -Merge: c4cbf4755 09ecf8982 -Author: AlexZorkin -Date: Thu Apr 18 15:22:39 2019 -0700 - - Merge branch 'release' into alex/subtypedates - -commit c4cbf475589e338ac5f8fb504c655aa55cdc21e8 -Author: AlexZorkin -Date: Thu Apr 18 15:22:19 2019 -0700 - - updated client side work date form and view, removed un-needed migrations - -commit 09ecf89823b6207cf243a9f34ad243a1748f6ade -Merge: e6c9ab85c ff06d0831 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu Apr 18 14:18:40 2019 -0700 - - Merge pull request #1316 from bcgov/alex/wellstatusfix - - [1786] Well Status Code Fix - -commit e6c9ab85c0b6717250396bbb054dc8ec4b64e4f0 -Merge: a2c631ea8 301e921a6 -Author: Sybrand Strauss -Date: Thu Apr 18 14:00:44 2019 -0700 - - Merge pull request #1319 from bcgov/sybrand/bug/1805_legacy_record_logger_bug - - Fixed logger issue - -commit 301e921a662ebffe6cc84202bf93bc6a6ce5e3a2 -Author: Sybrand Strauss -Date: Thu Apr 18 11:53:09 2019 -0700 - - Fixed logger issue - -commit a2c631ea86f159df5b4f8ef7087c4cad1367f5ba -Merge: cfecb005c 58456ffa0 -Author: Sybrand Strauss -Date: Thu Apr 18 11:16:59 2019 -0700 - - Merge pull request #1318 from bcgov/1805_legacy_record_more - - Fixed to not fail on bad migration - -commit 58456ffa03e077784814addc58b2b4f437ba4eb1 -Author: Sybrand Strauss -Date: Thu Apr 18 10:18:06 2019 -0700 - - Fixed to not fail on bad migration - -commit cfecb005cc17f8e8dfcd2ccfd85fd165497c7ca8 -Merge: 83d6178c0 a823c7f81 -Author: Sybrand Strauss -Date: Thu Apr 18 09:26:23 2019 -0700 - - Merge pull request #1317 from bcgov/sybrand/bug/1805_legacy_record_fail - - Address issues relating to creation of legacy migrations - -commit a823c7f816b84c8ad092da8a55bd46edb41dbafa -Author: Sybrand Strauss -Date: Fri Apr 12 16:19:55 2019 -0700 - - Address issues relating to creation of legacy migrations - - - Unit tests for edge cases. - - Making legacy serializer more permissive. - - Re-factoring stacker to allow for easier profiling. - - Some optimization. - - No longer allowing empty lithology sets - - No longer allowing empty lithology sets - -commit 2b92ee1e4c57b83c98e7ae0026892b1f61c128a9 -Author: Steve Hillier -Date: Wed Apr 17 17:12:47 2019 -0700 - - add a basic template - -commit fb57b4cb3185f79fce6b463c103520f90c285b63 -Author: AlexZorkin -Date: Wed Apr 17 16:44:46 2019 -0700 - - added back in mixin - -commit b83b8d0cf72d32c3dabe459e497f715c4ddae25c -Author: AlexZorkin -Date: Wed Apr 17 15:56:31 2019 -0700 - - migrations and view setup - -commit 3e763f0e84d5fb8ff472288ff36287258f04d59c -Author: Aaron -Date: Wed Apr 17 13:52:50 2019 -0700 - - snapshot update - -commit cf828a1c840746ccbaed26086b50fe48c8e13a9a -Author: Steve Hillier -Date: Wed Apr 17 13:25:39 2019 -0700 - - create a minio backup build - -commit ff06d08313a5b00def6579853ab9fb08122181b5 -Author: AlexZorkin -Date: Wed Apr 17 12:08:18 2019 -0700 - - fix for staff_edit well status - -commit ec063ea789d020d6df362e01042a3dc697d0a0a0 -Author: Aaron -Date: Wed Apr 17 10:24:53 2019 -0700 - - format the ui a lil bit - -commit 474c8de41ad6bc9d960047c7d64cf2bf6291670b -Author: Aaron -Date: Wed Apr 17 10:20:19 2019 -0700 - - layer switcher stay open - -commit 495255960f7f10c459103f12d026e2673154424f -Merge: a1237dbfd 83d6178c0 -Author: AlexZorkin -Date: Wed Apr 17 09:41:39 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit a1237dbfd3dac0d8ac5d9db61dd8efc5ef55cd07 -Author: AlexZorkin -Date: Wed Apr 17 09:41:26 2019 -0700 - - moved e licensing url into env var - -commit 889d13478857c18851fb72daade9b6319b782efa -Author: Aaron -Date: Tue Apr 16 21:30:01 2019 -0700 - - legend polish - -commit 4e38a98488d2f884a5fa8f9c6f78d59c10e5aa27 -Merge: 6306a5c05 1986406aa -Author: Aaron -Date: Tue Apr 16 21:24:34 2019 -0700 - - Merge branch 'countable/licences' of https://github.com/bcgov/gwells into countable/licences - -commit 6306a5c05a88a47643725e45d338556bb08a0e15 -Author: Aaron -Date: Tue Apr 16 21:24:26 2019 -0700 - - custom legend control - -commit 38322e126e8831ed46a4361e96d0f9f281d47486 -Author: AlexZorkin -Date: Tue Apr 16 17:23:09 2019 -0700 - - added typed dates to activity_submission, started on migration to update data - -commit 1986406aa690a87a50682b907e8a5ec176c63ee6 -Merge: 2c437ff7f 45c5f006d -Author: Clark Van Oyen -Date: Tue Apr 16 16:28:06 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit 2c437ff7fed683beda85e63d3b230462cbf566f4 -Author: Clark Van Oyen -Date: Tue Apr 16 16:27:56 2019 -0700 - - reference check - -commit 83d6178c017d5d89cb1f6e08ba9b15d5e536af1f -Merge: 0950ab18a 7e8332ec5 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Apr 16 14:05:03 2019 -0700 - - Merge pull request #1314 from bcgov/alex/submissionfixes - - [1801] [1804] Hint Text and Empty Submission Warning - -commit 45c5f006d58fe21f506ee16f3c68555173284de9 -Merge: 21a99f4ba cc1e65f2e -Author: Aaron -Date: Tue Apr 16 13:02:44 2019 -0700 - - Merge branch 'countable/licences' of https://github.com/bcgov/gwells into countable/licences - -commit cc1e65f2e4c80c90b32fc6ff78c8556af27f2b6f -Author: Steve Hillier -Date: Tue Apr 16 13:02:37 2019 -0700 - - Update app/backend/aquifers/views.py - - Co-Authored-By: countable - -commit 21a99f4bad9bcc14c83e79bcacccb9be72fb8ef4 -Merge: 03711bfa1 be8eef45c -Author: Aaron -Date: Tue Apr 16 13:02:36 2019 -0700 - - Merge branch 'countable/licences' of https://github.com/bcgov/gwells into countable/licences - -commit 03711bfa101e316ccbd5ca2ba429402d1caf2f07 -Author: Aaron -Date: Tue Apr 16 13:02:25 2019 -0700 - - remove snapshot flag - -commit be8eef45c940eba8f266543f9f779f0c1fe3e351 -Merge: f696fdbbc cf9fb17d5 -Author: Clark Van Oyen -Date: Tue Apr 16 13:01:38 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit f696fdbbc41c1a04555a0cb7a4dc894a3036d6cd -Author: Clark Van Oyen -Date: Tue Apr 16 13:01:28 2019 -0700 - - Don't add shapefiles in migration. - -commit cf9fb17d5984b25632d277510600cfd107f19447 -Author: Aaron -Date: Tue Apr 16 13:01:10 2019 -0700 - - remove leftover - -commit f27f2f92216e7428dc9649507f117ac9ba105a6a -Author: Steve Hillier -Date: Tue Apr 16 12:58:56 2019 -0700 - - Update app/backend/aquifers/views.py - - Co-Authored-By: countable - -commit 51212656701ced7f10068aba4253d2341d52d38a -Author: Steve Hillier -Date: Tue Apr 16 12:58:31 2019 -0700 - - Update app/frontend/src/aquifers/components/View.vue - - Co-Authored-By: countable - -commit 7300eee524385ca90f7c51bc3d780cf569f05032 -Author: Steve Hillier -Date: Tue Apr 16 12:58:20 2019 -0700 - - Update app/frontend/src/aquifers/components/View.vue - - Co-Authored-By: countable - -commit beb584144b54bc72b3264cd6617e5e1f2582b6e3 -Author: Steve Hillier -Date: Tue Apr 16 12:58:07 2019 -0700 - - Update app/frontend/src/aquifers/components/New.vue - - Co-Authored-By: countable - -commit 768065103e7745c363c14097b44b09020b046fef -Author: Aaron -Date: Tue Apr 16 12:55:06 2019 -0700 - - esri provider for now, lint fix - -commit d614b287ec5b6ecf0c2bab381e14e7136d65e7f2 -Author: Aaron -Date: Tue Apr 16 11:18:52 2019 -0700 - - fix annoying search problem - -commit 7d9ffadf6de9f4d22720008ee02d7519b44b80ee -Merge: a84d7c747 0950ab18a -Author: AlexZorkin -Date: Tue Apr 16 09:14:52 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit 9c0ab48a04700a80197286a06f1d67a5b508278e -Merge: 2c96fc41e e0cec2cf8 -Author: Aaron -Date: Mon Apr 15 23:46:02 2019 -0700 - - Merge branch 'countable/licences' of https://github.com/bcgov/gwells into countable/licences - -commit 2c96fc41ee5ebde191192f814df32486ca521e7e -Author: Aaron -Date: Mon Apr 15 23:45:39 2019 -0700 - - setup widget for address search - -commit e0cec2cf886737fef0c1c84badc48a0074576923 -Author: Clark Van Oyen -Date: Mon Apr 15 20:26:25 2019 -0700 - - Perf fixes. - -commit 0950ab18ae3bc9ac20cb7042d8b9c12444e02487 -Merge: 3fb01ec7c e56aab44b -Author: Steve Hillier -Date: Mon Apr 15 16:46:52 2019 -0700 - - Merge pull request #1296 from bcgov/steve/filing-num - - [1777] remove submission id from submission history display - -commit e56aab44b49827a7f0e4f20771641c627e871aa1 -Author: Steve Hillier -Date: Mon Apr 15 16:18:35 2019 -0700 - - update 'history not available' text per PO - -commit 9bfc22d1323b7519e2c194ad2d2f8224626dd3fc -Author: Clark Van Oyen -Date: Mon Apr 15 16:17:48 2019 -0700 - - comments - -commit 8f2cd1b33ed15f996f5f82e41facac3f2c243088 -Merge: 26ddcdf3a 3fb01ec7c -Author: Steve Hillier -Date: Mon Apr 15 16:17:15 2019 -0700 - - Merge branch 'release' into steve/filing-num - -commit 3fb01ec7ca906a52c55d4aadb30ee6b68f904ca5 -Merge: c7c39335f 1eca42114 -Author: Steve Hillier -Date: Mon Apr 15 16:15:43 2019 -0700 - - Merge pull request #1313 from bcgov/steve/coord-history-format - - small changes to history component and 404 messages - -commit fbe1a61636a8cf6345c24dd70b198b145f2c4d66 -Author: Clark Van Oyen -Date: Mon Apr 15 16:14:03 2019 -0700 - - use analytics flag to detect non-prod env - -commit 7e8332ec5542a9901fe012438bd73da25a7bdbce -Author: AlexZorkin -Date: Mon Apr 15 16:04:31 2019 -0700 - - added hint text and empty submission warning - -commit a84d7c7477e4e48672ed63716b02ba36d79f5473 -Merge: ea78a89d7 c7c39335f -Author: AlexZorkin -Date: Mon Apr 15 15:32:03 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit c7c39335fd64fe72444d657bbe8b3964faee305c -Merge: 8d41b5e76 30665790c -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Apr 15 15:31:37 2019 -0700 - - Merge pull request #1290 from bcgov/alex/minio-config - - [1578] Minio Deployment Config - -commit ea78a89d7b540f556e32632b6c3ba88d9f23e11f -Author: AlexZorkin -Date: Mon Apr 15 15:30:59 2019 -0700 - - url into config settings - -commit bd5a1371faf05ea6c1eb1bea9ab4466c23075a42 -Merge: fa9e8cf09 8d41b5e76 -Author: AlexZorkin -Date: Mon Apr 15 15:12:03 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit fa9e8cf09ff368732cc19310685192aa55fb646d -Merge: da4a62158 5c672d3c3 -Author: AlexZorkin -Date: Mon Apr 15 15:11:40 2019 -0700 - - merge release - -commit 4d6b13b5316a7db1b7c428985c06a9f16637126d -Author: Aaron -Date: Mon Apr 15 15:07:50 2019 -0700 - - remove sort info - -commit d82ad0f0d2d9fe17848cb299da0e24d44b488a04 -Author: Aaron -Date: Mon Apr 15 15:05:38 2019 -0700 - - hydraulically connected aquifer on detail view - -commit 8d41b5e7699ed13f98c07a6cfcb9ef239f7aa19a -Merge: 5c672d3c3 6ee4eb2a5 -Author: Sybrand Strauss -Date: Mon Apr 15 14:58:27 2019 -0700 - - Merge pull request #1310 from bcgov/sybrand/squash_remove_redunant_well_files - - Remove redundant wells migration files - -commit 1eca4211495a6ca3ab713e465c46b2bc549e2969 -Author: Steve Hillier -Date: Mon Apr 15 14:56:55 2019 -0700 - - make 404 page more generic - -commit 30665790c75c5080c8a6c611dd8f7d5f60a1d153 -Author: Steve Hillier -Date: Mon Apr 15 14:39:52 2019 -0700 - - Update openshift/minio.dc.yaml - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 2c1d97fd42b0cfae6ceff6e207c87dd07690eeb3 -Author: Steve Hillier -Date: Mon Apr 15 14:39:47 2019 -0700 - - Update openshift/minio.dc.yaml - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 538b60274a7b10d90e5d80992c28aae67c0cd109 -Author: Steve Hillier -Date: Mon Apr 15 14:39:41 2019 -0700 - - Update openshift/minio.bc.yaml - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 7398ef1dfdbbdd0d2167716c14ad5e4ea36943c9 -Author: Steve Hillier -Date: Mon Apr 15 14:39:27 2019 -0700 - - Update openshift/minio.bc.yaml - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit d24301e05d54fa59ab74e7cca1df167f15728e15 -Author: Clark Van Oyen -Date: Mon Apr 15 14:27:06 2019 -0700 - - Indicate if aquifer is hydr connected in detail api. - -commit fd4c87abfb21bbed484f570f24d6c9aff19dd64d -Author: Steve Hillier -Date: Mon Apr 15 14:09:18 2019 -0700 - - change format of location changes for history - -commit 6ee4eb2a5f1cfbbfe64f427efa3fd776eeaf99a7 -Author: Sybrand Strauss -Date: Fri Apr 12 15:17:00 2019 -0700 - - Remove redundant wells migration files - -commit 916f491641e04ef5be403140f974e7e7a2529381 -Author: Sybrand Strauss -Date: Fri Apr 12 15:17:00 2019 -0700 - - Remove redundant wells migration files - -commit 5c672d3c3ffde4c46e7703bc928b4b7f183dcf3b -Merge: cddcc26c0 b0c89858b -Author: Steve Hillier -Date: Mon Apr 15 13:54:37 2019 -0700 - - Merge pull request #1306 from bcgov/steve/well-404 - - better 404 handling for well summary page - -commit 76b3fe4191a7a6f688b8aae506f6b3db9c17a96d -Author: Clark Van Oyen -Date: Mon Apr 15 11:49:58 2019 -0700 - - Instructions for licence import - -commit cddcc26c05d5c2a2d479ddaf228d4cf463fc5afd -Merge: 64b15353c 4e945eba2 -Author: Sybrand Strauss -Date: Mon Apr 15 11:26:25 2019 -0700 - - Merge pull request #1308 from bcgov/sybrand/squash_submissions_completely - - Squashed submissions - -commit 8db4a9ba4607e0d9959f11f63871afca60d94b30 -Author: Clark Van Oyen -Date: Sun Apr 14 13:55:26 2019 -0700 - - Fix duplicate results - - (for hydraulically connected aquifers query) - -commit 9a187f6abcfda75793568daf2cc04d6a0b4a3595 -Merge: fe3a0f0d3 ffcf07079 -Author: Clark Van Oyen -Date: Sun Apr 14 13:51:55 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit fe3a0f0d32cb2a45ce43c397ab3d367598439276 -Author: Clark Van Oyen -Date: Sun Apr 14 13:51:47 2019 -0700 - - Download licences from DataBC - -commit ffcf07079e19fafe3bbcf80c3f9c557ffd890939 -Author: Aaron -Date: Sat Apr 13 18:10:20 2019 -0700 - - hyda connecg - -commit b0c89858b450fe95102b7a65f73b3f3256ddc8d3 -Author: Steve -Date: Fri Apr 12 19:41:20 2019 -0700 - - fix missing import - -commit 062c5979af1d2e50f6a04bf9644da806d15ea55e -Author: Derek Roberts -Date: Fri Apr 12 16:11:09 2019 -0700 - - Added minio buildconfig template (optional?) - -commit da4a62158c03e71ed38d437495cc5fba11635362 -Merge: 8e4486140 64b15353c -Author: AlexZorkin -Date: Fri Apr 12 15:52:47 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit 8e44861406e481e6a6260d8e9cf5962b5ff1960e -Author: AlexZorkin -Date: Fri Apr 12 15:52:33 2019 -0700 - - moved response formatting to backend - -commit 98d693d43073cfbcb493de66367c488cb1d0777a -Author: Derek Roberts -Date: Fri Apr 12 15:49:38 2019 -0700 - - Removed unnexcessary status from deploymentconfig - -commit 300b73b43b59c4f6bb2aeacb37d9838c82bf36d9 -Author: Derek Roberts -Date: Fri Apr 12 15:22:28 2019 -0700 - - Renamed minio template - -commit bb92cf65c59f9847bd3c5329c08a2c0148899fc6 -Author: Derek Roberts -Date: Fri Apr 12 15:22:09 2019 -0700 - - Added params, PVC and other revisions to minio template - -commit 26fea84fff36ce6aebf9e139ebfad2aa370bc80f -Author: AlexZorkin -Date: Mon Apr 8 13:45:01 2019 -0700 - - minio config template - -commit 64b15353cf08f27dfd872d2bc2bd49c046d564df -Merge: b95f8dd5f 8d559f115 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Apr 12 14:40:05 2019 -0700 - - Merge pull request #1309 from bcgov/task/1716_minioBk - - [1716] Minio (or any PVC) Backup Cronjob - -commit fdbb0a04176ec3998141eb05ccb62a08adaa02c8 -Author: AlexZorkin -Date: Fri Apr 12 14:14:49 2019 -0700 - - formatting licence data - -commit 8d559f11541fea6106e2f4970541815c05d7bfa3 -Author: Sybrand Strauss -Date: Fri Apr 12 13:33:00 2019 -0700 - - Update openshift/docker/backup-pvc/entrypoint.sh - -commit c3ed1d4d40187fa5a7ba189b4563d7b167876301 -Author: Sybrand Strauss -Date: Fri Apr 12 13:32:55 2019 -0700 - - Update openshift/docker/backup-pvc/entrypoint.sh - -commit 4c342071131a87599ba019332a50c0b29faeb97c -Author: Derek Roberts -Date: Fri Apr 12 13:13:45 2019 -0700 - - Entrypoint.sh backups to hostname dir, improved cleanup, create/verify dest - -commit 0333433d47fb0ef221fa304084f169e5c6e466ae -Author: Derek Roberts -Date: Fri Apr 12 13:02:18 2019 -0700 - - Match mounts between entrypoint.sh and cronjob - -commit 89e848cfbdc5c464f7a4bf9fd34b06dc56b61039 -Author: Derek Roberts -Date: Fri Apr 12 12:40:51 2019 -0700 - - Correction - Alpine has to use sh, no bash - -commit 10c8ac80233902c9a1ce865806303c6e3905d3c2 -Author: Derek Roberts -Date: Fri Apr 12 12:25:44 2019 -0700 - - Cronjob on 4 AM schedule, uses new entrypoint.sh - -commit 2c2deae70ad1c689a8e11cfb5ccb78758c3a7ffa -Author: Derek Roberts -Date: Fri Apr 12 12:22:59 2019 -0700 - - Switched Dockerfile to alpine+rsync - -commit f3207d2e44a15ca0f3777952210b7639d237b917 -Author: Derek Roberts -Date: Fri Apr 12 12:22:27 2019 -0700 - - Finished vars, description and cleanup of build template - -commit 5aae76439d1b3021f3828cc8f34f85cf003014e4 -Author: Derek Roberts -Date: Fri Apr 12 12:01:29 2019 -0700 - - Cronjob consumes new image - -commit 0a7ba815ebd9c436ce8bc02ed2f93aee9169693d -Author: Derek Roberts -Date: Fri Apr 12 12:00:57 2019 -0700 - - Buildconfig for PVC backup image - -commit ea2b001a1284ffe906b07d9b3ada025ac17e8a94 -Author: Derek Roberts -Date: Fri Apr 12 10:47:12 2019 -0700 - - Changed Dockerfile FROM - -commit b264985b948e6cea261496abf4156217d32eb78d -Author: Steve -Date: Fri Apr 12 11:15:22 2019 -0700 - - fix kwarg name in url path - -commit 4e945eba2ecc649d766f5ed2cf737e890035d7c2 -Author: Sybrand Strauss -Date: Thu Apr 11 18:30:57 2019 -0700 - - Squashed submissions - - - Squashed submissions. - - Untangled model migrations from other app. - - Move codes to json file - -commit cf3047760181568145712ddb46f93d257faaee71 -Merge: f3642789b b95f8dd5f -Author: AlexZorkin -Date: Fri Apr 12 10:54:20 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit b95f8dd5f41e64b202723e8008aa8fe729b5710e -Merge: f5cd127fc 9d0aec895 -Author: Sybrand Strauss -Date: Fri Apr 12 09:21:26 2019 -0700 - - Merge pull request #1307 from bcgov/sybrand/bug/1802_casing_set_bug - - [1802] Allow creation of legacy records that are missing drive shoe - -commit 51eccba2b349277f92e0de2534b206b517b61b64 -Author: Steve -Date: Fri Apr 12 09:12:05 2019 -0700 - - fix missing import - -commit eaccc74bd4766894cd7195995816c881cf45f526 -Merge: b2e928b24 b6916d94d -Author: Clark Van Oyen -Date: Fri Apr 12 01:17:07 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit b2e928b24a825d42856f4d4cd9bd9a9891d74bda -Author: Clark Van Oyen -Date: Fri Apr 12 01:16:57 2019 -0700 - - fix postman test failure - -commit b6916d94d32eb63af685e0c371bdc8a5e3844f0c -Author: Aaron -Date: Thu Apr 11 23:59:33 2019 -0700 - - frontend sorting and water ems id - -commit 67338e5e81cd39f464d6d9dd26702f1b8aa7b17d -Author: Steve -Date: Thu Apr 11 19:44:42 2019 -0700 - - fix up imports, test classes - -commit f3642789baa72da94cd320733339586a73bb04c3 -Merge: 8f0e2df9f f5cd127fc -Author: AlexZorkin -Date: Thu Apr 11 17:22:45 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit 8f0e2df9f4e2726d202e4a9ef5ebc50551771135 -Author: AlexZorkin -Date: Thu Apr 11 17:22:14 2019 -0700 - - added api endpoint for well licence from e-licencing - -commit e7452da7923a92010788b0ce9a5f7a94288ce942 -Author: Derek Roberts -Date: Thu Apr 11 17:21:47 2019 -0700 - - Dockerfile and entrypoint.sh - -commit ed918037bc5a35ac57558db22a800a51e628f7b7 -Author: Steve Hillier -Date: Thu Apr 11 17:20:55 2019 -0700 - - add tests for 404s - -commit 9d0aec895fe17e59e7c95f6d2243c2a04fa5ff61 -Author: Sybrand Strauss -Date: Thu Apr 11 16:53:21 2019 -0700 - - Allow creation of legacy records that are missing drive shoe - - - Added asterix to UI, to indicate that city is a required field. - - Added asterix to Drive Shoe, to indicate that it's a required field. - -commit 7a0a61a28c57019838b45fb183d1555b076c8505 -Author: Steve Hillier -Date: Thu Apr 11 16:51:13 2019 -0700 - - staff edit 404 handling - -commit c2e0174d79b67b91d39892404d776f88af6e83e6 -Author: Steve Hillier -Date: Thu Apr 11 16:51:01 2019 -0700 - - history - better handling of 404 and GEOS classes - -commit f5cd127fcb7bf9fb4fd07acdc55c7deae182d3cc -Merge: 4a604390e 63555eae6 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu Apr 11 15:10:02 2019 -0700 - - Merge pull request #1297 from bcgov/alex/listsavefix - - Submission Array Change Detection Fix - -commit 11f96bf8afb373bcfb3fdf4410775905fd493151 -Merge: 719c145ff 4a604390e -Author: AlexZorkin -Date: Thu Apr 11 14:59:39 2019 -0700 - - Merge branch 'release' into alex/licensinginfo - -commit 4a604390e283608f17aeaa621a08fe3b84d76d11 -Merge: 8f0444401 99b7c612e -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu Apr 11 14:50:24 2019 -0700 - - Merge pull request #1305 from bcgov/alex/multidocupload - - [1792] Multi-Document Upload - -commit 0f682e63eff2a2b6253aa6e7d083fce081da68ba -Author: Steve Hillier -Date: Thu Apr 11 14:40:27 2019 -0700 - - better 404 handling for well summary page - -commit de69675728a9edc77d8f42a062ac3170402c3f51 -Author: Derek Roberts -Date: Thu Apr 11 14:37:01 2019 -0700 - - Template cleanup, still very basic - -commit 63555eae6b3c44cee63644624e39869307cc1222 -Merge: 838ae4ce2 8f0444401 -Author: AlexZorkin -Date: Thu Apr 11 14:30:16 2019 -0700 - - Merge branch 'release' into alex/listsavefix - -commit 838ae4ce2d5d9873ccea0cd4a2455b54e1e1dd56 -Author: AlexZorkin -Date: Thu Apr 11 14:29:59 2019 -0700 - - missing reference - -commit 719c145ff30fa520b2afce31faba0345c81db3ff -Author: AlexZorkin -Date: Thu Apr 11 14:09:59 2019 -0700 - - licensing section - -commit 99b7c612eb2fdaf6c50f73afc0c4c24298fc62fa -Author: AlexZorkin -Date: Thu Apr 11 13:29:45 2019 -0700 - - simplified js - -commit f8b23ffecee4ce00abacfe69f0b398e71180294f -Author: AlexZorkin -Date: Thu Apr 11 12:08:37 2019 -0700 - - added reset upload files - -commit 6c026719ba9914d7ffb5722a140fec43d7fa3c79 -Merge: 5c649e9ae 8f0444401 -Author: AlexZorkin -Date: Thu Apr 11 11:19:43 2019 -0700 - - Merge branch 'release' into alex/multidocupload - -commit 5c649e9aeb18faa1080c509500eb4295f0f26e81 -Author: AlexZorkin -Date: Thu Apr 11 11:19:30 2019 -0700 - - additive file upload with remove feature - -commit 8f0444401c7234d519cd71bcd6f22f7af682d1ad -Merge: 8159064ab 058932f25 -Author: Sybrand Strauss -Date: Wed Apr 10 18:28:39 2019 -0700 - - Merge pull request #1298 from bcgov/alex/removefeatureflag - - Remove Data Entry Feature Flag - -commit 8159064abbc77d15fd852034b288d22b90107648 -Merge: 90f3d55ad c0769ea9e -Author: Sybrand Strauss -Date: Wed Apr 10 18:28:26 2019 -0700 - - Merge pull request #1300 from bcgov/sybrand/bug/multiple_companies - - Migration for removing duplicate companies - -commit 90f3d55adf7bbac09b77b2d7dba5df39d6dbd165 -Merge: 63609464c 05683d0c2 -Author: Sybrand Strauss -Date: Wed Apr 10 17:43:28 2019 -0700 - - Merge pull request #1302 from bcgov/steve/firstname-fix - - remove mapping to first_name for requests - -commit c0769ea9eb10b25353eb9d86ab3380dfcdc2d632 -Author: Sybrand Strauss -Date: Wed Apr 10 17:30:41 2019 -0700 - - - Added DE_DUPLICATE_USER - -commit 903c8211e6b9c18c7178e6bb08c552f39b92c464 -Author: Sybrand Strauss -Date: Wed Apr 10 14:33:33 2019 -0700 - - Migration for removing duplicate companies - -commit 2def1bd4c9dfb6c2c6b59912f92587f0b6087532 -Author: AlexZorkin -Date: Wed Apr 10 17:20:52 2019 -0700 - - allows additional uploads - -commit 05683d0c2f5c7bfdd3cffc1972a0f69d4e28322f -Merge: 7ee0f9d8a 63609464c -Author: Steve Hillier -Date: Wed Apr 10 17:11:20 2019 -0700 - - Merge branch 'release' into steve/firstname-fix - -commit 63609464c1cf9ece533c08333a78387113ee8edd -Merge: b58635789 0c0c0c2be -Author: Steve Hillier -Date: Wed Apr 10 17:05:28 2019 -0700 - - Merge pull request #1301 from bcgov/sybrand/fix_merge_conflict - - Fix merge conflict - -commit d47bde1429cd550543e40a647311830cfefe6c33 -Author: Aaron -Date: Wed Apr 10 17:03:27 2019 -0700 - - tests passing - -commit 7ee0f9d8a932314f8896bc0c2ea273d329d4366d -Author: Steve Hillier -Date: Wed Apr 10 16:59:54 2019 -0700 - - remove mapping to first_name for requests - -commit dd5dbdf6722a4e7487db82cc81962795aebbf5a5 -Merge: 8fadb0c10 8bec49ab0 -Author: Aaron -Date: Wed Apr 10 16:54:11 2019 -0700 - - Merge remote-tracking branch 'origin/release' into countable/licences - -commit 8fadb0c105063e0a3802419584a0d90c9498a436 -Author: Aaron -Date: Wed Apr 10 16:53:27 2019 -0700 - - bunch of fixes - -commit 27d30245a587740e1e1de3696a5eba2193f78537 -Author: AlexZorkin -Date: Wed Apr 10 16:37:52 2019 -0700 - - added unit test checking for altered array between parent and child - -commit 0c0c0c2be7a6524fb4c28dc8864b9c9af777ecf0 -Author: Sybrand Strauss -Date: Wed Apr 10 16:04:05 2019 -0700 - - Fix merge conflict - -commit b586357890655762cd3935dbdf2af5465c2956b6 -Merge: cc0729def 60c60ffa4 -Author: Steve Hillier -Date: Wed Apr 10 15:20:12 2019 -0700 - - Merge pull request #1285 from bcgov/steve/emsfix - - [1777] Fix for EMS ID display on well summary page - -commit 26ddcdf3a46537875510a120723fe21404e00ed3 -Merge: 638746267 cc0729def -Author: Steve Hillier -Date: Wed Apr 10 15:03:10 2019 -0700 - - Merge branch 'release' into steve/filing-num - -commit 6387462674465e70649f236e90df5a530d274e93 -Author: Steve Hillier -Date: Wed Apr 10 13:54:25 2019 -0700 - - always show submissions history in edit mode - -commit 058932f25ae9c241439b6cc9452f2a37a1e80954 -Merge: e7265a567 cc0729def -Author: AlexZorkin -Date: Wed Apr 10 13:07:42 2019 -0700 - - Merge branch 'release' into alex/removefeatureflag - -commit b96b3d79dd483fb14b2fe4802538ae208332689b -Merge: 667ac2b8c cc0729def -Author: AlexZorkin -Date: Wed Apr 10 13:07:12 2019 -0700 - - Merge branch 'release' into alex/listsavefix - -commit cc0729def52c0fdf2608a86fd5bc28da3e56994c -Merge: 8bec49ab0 26bf5df6a -Author: Sybrand Strauss -Date: Wed Apr 10 12:45:30 2019 -0700 - - Merge pull request #1299 from bcgov/sybrand/fix_create_user_bug - - Fix for failure to modify well without correct audit information - -commit e7265a5670e3144bc3363725d06d9cc003d0471b -Author: AlexZorkin -Date: Wed Apr 10 12:08:37 2019 -0700 - - fix unit tests - -commit 26bf5df6ac455660fd83ffd77b7548788c8a2da1 -Author: Sybrand Strauss -Date: Wed Apr 10 11:59:02 2019 -0700 - - Fix for failure to modify well without correct audit information - - - Add migration to fix faulty submission records (correct audit information will have to manually fixed). - - Add test for case where well audit info is missing. - - Use DATALOAD_USER for cases where well does not have correct audit information. - -commit 3d1a3add31236b78c6c5dc8904f00532b5427a0e -Author: Aaron -Date: Wed Apr 10 11:51:43 2019 -0700 - - fullscreen widget and lots of map bug fixes - -commit 667ac2b8ce851378a4761e53a67222862d8150ca -Author: AlexZorkin -Date: Wed Apr 10 11:44:47 2019 -0700 - - updated unit tests - -commit a23956fcab26fd9693b8a5786b8b4a9e7806ac2f -Author: AlexZorkin -Date: Wed Apr 10 11:31:12 2019 -0700 - - ordering of urls fix - -commit 67b44be769e206e1218b424d2f96135e8dd44876 -Author: AlexZorkin -Date: Wed Apr 10 10:25:41 2019 -0700 - - removed feature flag - ENABLE_DATA_ENTRY - -commit fc25a554b6967a3540fba44298db4b261b3b609b -Merge: c7ef720d7 8bec49ab0 -Author: AlexZorkin -Date: Wed Apr 10 09:33:00 2019 -0700 - - Merge branch 'release' into alex/listsavefix - -commit c7ef720d7386ec01101f60834aac548fb8bf78de -Author: AlexZorkin -Date: Wed Apr 10 09:32:41 2019 -0700 - - page load fix - -commit 8bec49ab0a5013c546a963b13e1bd935bec897b5 -Merge: 4524a5823 0c900bf67 -Author: Sybrand Strauss -Date: Tue Apr 9 17:19:35 2019 -0700 - - Merge pull request #1295 from bcgov/sybrand/squash_clean_squash_some_more - - Squashing migrations - -commit cebf6dc4bcc021a7958bc451a587b3ad1d4e5c77 -Author: Steve Hillier -Date: Tue Apr 9 17:13:31 2019 -0700 - - add some text when submissions not available - -commit 7bf1779a463ae915aa781fec275a0e1a1fece146 -Author: AlexZorkin -Date: Tue Apr 9 17:00:30 2019 -0700 - - made arrays watchable on child objects for well submission - -commit 0c900bf67d5d3db7ff94e400e4121125f6f14f15 -Author: Sybrand Strauss -Date: Tue Apr 9 16:40:45 2019 -0700 - - - Fixed foreign key alterfield - -commit a92ed257b06df50ca8f448ca831205b3d82a0394 -Author: Steve Hillier -Date: Tue Apr 9 16:22:38 2019 -0700 - - remove fields from submission data display - -commit 60c60ffa4bfc4b52196b504ee4bc0fe851aa82e4 -Author: Steve Hillier -Date: Tue Apr 9 15:46:02 2019 -0700 - - add a merge migration - -commit f681c15767821f0d0860be91f4add35f9e0abffa -Author: Derek Roberts -Date: Tue Apr 9 15:44:40 2019 -0700 - - Template - take cron'd cp backups of PVCs - -commit efe2f1c76119d896789ffba287c69b3e82403f9d -Author: Sybrand Strauss -Date: Thu Apr 4 17:02:28 2019 -0700 - - Squashing migrations - - - Squashing up to 0069 in wells. - - Squashing up to 0018 in aquifers. - - Removing redundant migration files. - - Moving data migrations out of migrations, to allow for easier squashing. - -commit 7c060092762b3b4cf90a500569ef57c5ea23122b -Merge: 96351e6d5 4524a5823 -Author: Steve Hillier -Date: Tue Apr 9 14:01:01 2019 -0700 - - Merge branch 'release' into steve/emsfix - -commit d682777c82398573f373e790f2327b09cf1862f3 -Author: Aaron -Date: Tue Apr 9 13:59:34 2019 -0700 - - refactor and add moveend - -commit 62cb222b6c797d09a5470674a26c0a147f5dd759 -Merge: 296db2a8e 87f312f30 -Author: Aaron -Date: Tue Apr 9 13:54:32 2019 -0700 - - Merge branch 'countable/licences' of https://github.com/bcgov/gwells into countable/licences - -commit 87f312f3054cc16f73763f201c9304773e1d87db -Author: Clark Van Oyen -Date: Tue Apr 9 13:54:18 2019 -0700 - - fine - -commit 296db2a8ea27f4c3c2d77a41235a4484e6d3d224 -Merge: 0951bc5cc e5ac33215 -Author: Aaron -Date: Tue Apr 9 13:51:08 2019 -0700 - - test - -commit 0951bc5cc198885ba2f81793ca1318fa9cdb6c69 -Author: Aaron -Date: Tue Apr 9 13:50:11 2019 -0700 - - zoomend movened - -commit e5ac332151547739075a23ca0250c110e9c35fc5 -Author: Clark Van Oyen -Date: Tue Apr 9 13:49:10 2019 -0700 - - json.parse - -commit 0f06f61dc0775f507d8a9a9627c13ab7b8271bd7 -Author: Clark Van Oyen -Date: Tue Apr 9 13:43:01 2019 -0700 - - perf - -commit 4524a5823e49c0f51c8dbff33be73201bc9ce83f -Merge: b7a93c054 6144402bf -Author: Sybrand Strauss -Date: Tue Apr 9 13:25:45 2019 -0700 - - Merge pull request #1292 from bcgov/sybrand/bug/create_update_user_missing_clean - - Fix audit information of wells and submissions - -commit b7a93c0543a124d70457cafb42e20d78fa71aaea -Merge: 432fab33f c162aed0c -Author: Steve Hillier -Date: Tue Apr 9 13:24:27 2019 -0700 - - Merge pull request #1291 from bcgov/alex/welldepth - - Well Finished Depth Fix - -commit 6144402bf277b55b1d5c6fb68c94b338f870a967 -Author: Sybrand Strauss -Date: Tue Apr 9 12:40:11 2019 -0700 - - - Fix health check - -commit 239c76912fc2b8c37e6305517344610d7be0a17a -Author: Sybrand Strauss -Date: Tue Apr 9 09:48:37 2019 -0700 - - Removed some redundant code - -commit df3e20a97f79666bf5c9cab7ac337b361c550eb2 -Author: Sybrand Strauss -Date: Tue Apr 9 09:42:15 2019 -0700 - - Fix audit information of wells and submissions - -commit c162aed0ce9d9f17a287faa5e85466aba613caca -Author: AlexZorkin -Date: Tue Apr 9 09:23:46 2019 -0700 - - well finished depth removed from well detail and submission preview - -commit f8fdcce7f538dc6061240d5697370c22080f9b97 -Author: Aaron -Date: Mon Apr 8 21:54:26 2019 -0700 - - other bug fixes - -commit 9ee74a805a3b2f6d65e34dd31c27ab1758eb5649 -Author: Aaron -Date: Mon Apr 8 20:09:44 2019 -0700 - - front end pagination, table view based on map view - -commit 432fab33fc5fde88f266bc5c2cee55fe6a81ff1f -Merge: b6fad3875 90ca29b4f -Author: Steve Hillier -Date: Mon Apr 8 15:13:21 2019 -0700 - - Merge pull request #1286 from bcgov/steve/lith-fixes - - [1777] Fixes for staff edit page - -commit 90ca29b4f25236594a4d21ab3dbcdbdbdbd37d5a -Author: Steve Hillier -Date: Mon Apr 8 14:40:31 2019 -0700 - - remove console.log - -commit 019025e8be199b574932369af33a2edcb1ce5db7 -Author: Steve Hillier -Date: Mon Apr 8 14:36:25 2019 -0700 - - add event bus to pass event down to history - -commit 859b29598f322fb6d76b6674fc5138f30a65045e -Author: Steve Hillier -Date: Mon Apr 8 13:03:28 2019 -0700 - - fix display of drilling methods - -commit b6fad38757c1c7919477ae0bf2ffe8f1b9bfd45c -Merge: c582b975f 3c67b17d1 -Author: Steve Hillier -Date: Mon Apr 8 10:24:05 2019 -0700 - - Merge pull request #1288 from bcgov/steve/printfix - - fix Well Summary print button - -commit 96351e6d5a310ed4f407945d87451789c89d3dfc -Author: Steve Hillier -Date: Mon Apr 8 09:35:12 2019 -0700 - - remove whitespace - -commit ba724fec81a85b89c8a7150011b6d98744618771 -Author: Steve Hillier -Date: Mon Apr 8 09:34:38 2019 -0700 - - add sql to copy ems_id to ems column - -commit 3c67b17d14b72f5fa4f4311031ae5fa747b3637e -Author: Steve Hillier -Date: Mon Apr 8 09:09:47 2019 -0700 - - fix print button - -commit e9977ce4b8527804550f4494e4fbb604a5ad035e -Author: Steve Hillier -Date: Mon Apr 8 09:06:17 2019 -0700 - - create empty migration for ems_id - -commit 5106acd28b7cb00c61dbd2cf9c6d803258fa9eab -Author: Clark Van Oyen -Date: Sun Apr 7 14:13:56 2019 -0700 - - Some bugfixes, refactoring, hydraulic filter - -commit d368889aa17826435539f89dfebb8248322dadff -Author: Clark Van Oyen -Date: Sun Apr 7 13:27:12 2019 -0700 - - Simplified geoms - -commit c250a8978413f030ffd77e4938bee57dafd5427c -Merge: 0bf8a1bd8 6009046e6 -Author: Clark Van Oyen -Date: Sun Apr 7 12:03:07 2019 -0700 - - Merge branch 'countable/cleanup' into countable/licences - -commit 0bf8a1bd8992692c9752ed223e45fcfd8eb0e1d6 -Author: Clark Van Oyen -Date: Sun Apr 7 12:02:24 2019 -0700 - - fixes - -commit 3910e71437918032a1a742441a07c2fd191f3131 -Author: Aaron -Date: Sun Apr 7 00:35:46 2019 -0700 - - leverage router on popup click - -commit e658d249666ee83fa9cd710bb3b0977dd8228bc7 -Author: Aaron -Date: Sat Apr 6 23:45:33 2019 -0700 - - show map on row, detail on id click - -commit 867fd6544f4d7e0ae5e0776cfa71acc9c3cf75ca -Author: Aaron -Date: Sat Apr 6 23:29:49 2019 -0700 - - more bug fixes - -commit 41396440f3e589a45201ea0bad88b33a03609c34 -Author: Aaron -Date: Sat Apr 6 23:14:25 2019 -0700 - - no info if data isn't there, watch for null prop change for warnings - -commit 6f6fe28a634666a41adf0778afa2bd04f62e57a5 -Author: Aaron -Date: Sat Apr 6 19:38:32 2019 -0700 - - let's render map even tho geom doesn't exist. also send usage directly for reactivity - -commit 6009046e6edcae7956a2c25b70ec1e1b6a0fc7eb -Author: Clark Van Oyen -Date: Sat Apr 6 18:36:08 2019 -0700 - - fix xls download, - stop using data urls - -commit 515b55fac937bbcb0810a5b69131f3fc5b60755b -Author: Steve Hillier -Date: Fri Apr 5 15:20:35 2019 -0700 - - move data into ems column - -commit f42002281dda83f786a2a1f2255c9045de9e2e8b -Author: Steve Hillier -Date: Fri Apr 5 14:34:29 2019 -0700 - - remove ems_id field from submissions - -commit 3db5fe0190b078d6bdefabe20453f5c990ab7d6a -Author: Steve Hillier -Date: Fri Apr 5 14:29:28 2019 -0700 - - use ems field instead of ems_id for new wells - -commit 0a1bebed22aa1331886d52aa174e79a284d6f751 -Author: Steve Hillier -Date: Fri Apr 5 14:22:28 2019 -0700 - - make sure loading state is toggled off - -commit 92fa90ca65d70ad03d18edd88086f89d9dad0387 -Author: Steve Hillier -Date: Fri Apr 5 14:19:43 2019 -0700 - - fixes for staff edit page - -commit 9dfce8bcf71e5631a160125ebee1ca26d16e6525 -Author: Steve Hillier -Date: Fri Apr 5 14:11:27 2019 -0700 - - fixes for lithology - -commit f0ba34ff0ad40664168a5483f7d16ebffb6125a4 -Author: Steve Hillier -Date: Fri Apr 5 14:11:23 2019 -0700 - - fixed for 'alternative specs submitted' - -commit 77a48f0db9fa7115f1229e5e08bd90c009e4013e -Merge: 161b5fb81 5aa36775b -Author: Clark Van Oyen -Date: Fri Apr 5 14:01:09 2019 -0700 - - Merge branch 'countable/licences' into countable/cleanup - -commit 5aa36775b17c25d3b8c3de7e4f0fbd7ea59d5c69 -Author: Clark Van Oyen -Date: Fri Apr 5 14:00:05 2019 -0700 - - Omg. - -commit 151a48e4d5d30453e17459b01ea539da28410a1f -Merge: c70a1450c 19f3f587a -Author: Clark Van Oyen -Date: Fri Apr 5 13:52:00 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit c70a1450cce7a3aa2c0fd90b0245816936282006 -Author: Clark Van Oyen -Date: Fri Apr 5 13:51:51 2019 -0700 - - fix bad merge problem - -commit 19f3f587ad86fb2911d51a03fe28e1c7228f02de -Author: Aaron -Date: Fri Apr 5 13:38:54 2019 -0700 - - lint fixes - -commit 161b5fb81f3ddaa9d55d258e6c19c1b661275650 -Author: Clark Van Oyen -Date: Fri Apr 5 13:32:55 2019 -0700 - - xlsx export - -commit c67ff2a905f3287a63e6ed9323ac0c75f36e067c -Author: Steve Hillier -Date: Fri Apr 5 13:23:14 2019 -0700 - - simplify syntax - -commit 675f410c59e2b5801ce99e7c846e121a8328403f -Author: Steve Hillier -Date: Fri Apr 5 13:14:55 2019 -0700 - - add ems_id field - -commit 89c2df87d631546099e0dcabecb3771a78f58517 -Merge: 63da8aa70 a08f6795b -Author: Clark Van Oyen -Date: Fri Apr 5 13:12:01 2019 -0700 - - Merge branch 'countable/shapefiles' into countable/licences - -commit a08f6795b0f209e3c8d9054cc44b95de2cd72836 -Author: Clark Van Oyen -Date: Fri Apr 5 13:07:50 2019 -0700 - - bad merge decision fixed. - -commit 1d5da7a4afde6708c848c5227021afaa1f3f7bca -Merge: 11982c374 c582b975f -Author: Clark Van Oyen -Date: Fri Apr 5 12:57:31 2019 -0700 - - Merge branch 'release' of github.com:bcgov/gwells into countable/shapefiles - -commit c582b975fa9ebd6102fab964d453114991e7471a -Merge: 5dffd4d60 2a7a1b429 -Author: Steve Hillier -Date: Fri Apr 5 12:41:20 2019 -0700 - - Merge pull request #1284 from bcgov/cole/advanced-search-styling - - Style fixes for Advanced Search - -commit 5dffd4d60d3148648e08196c7b8af5b8a7a9639d -Merge: d797529cf 5a5944474 -Author: Steve Hillier -Date: Fri Apr 5 12:26:42 2019 -0700 - - Merge pull request #1281 from bcgov/steve/dropreplication - - [409] Drop Replication - -commit d797529cfad4426234f6ca2cc0c44e2eeaa6c195 -Merge: 5f1b26aea 6ae906078 -Author: Steve Hillier -Date: Fri Apr 5 12:25:45 2019 -0700 - - Merge pull request #1270 from bcgov/sybrand/fix_csv - - [1768] Bug in csv export file - -commit 2a7a1b429723834ae20e342db7fdf0d27a511f18 -Author: Cole Maclean -Date: Fri Apr 5 10:29:47 2019 -0700 - - Fix advanced search stacking/wrapping - -commit b18ae32031b0cc818f3911ba7f504019e76975be -Author: Cole Maclean -Date: Fri Apr 5 10:29:21 2019 -0700 - - Fix date range overlapping text box on advanced search - -commit 63da8aa70c3ca942cdfdd76c4da2d78a58210399 -Author: Aaron -Date: Thu Apr 4 23:51:20 2019 -0700 - - locate control added :) - -commit 4a5d497efa78414a4b849d1132e4116184707bc2 -Author: Aaron -Date: Thu Apr 4 21:23:35 2019 -0700 - - finish frontend styling for pie chart - -commit ee84f58f448580c81a0a102f0d2d52c9418f370d -Author: Aaron -Date: Thu Apr 4 21:16:42 2019 -0700 - - groupby and sumby for pie chart and reactivity fixes - -commit b33ce01ab4d685d202d02efd3bb0deafc1c289a2 -Author: Aaron -Date: Thu Apr 4 17:02:32 2019 -0700 - - water withdrawl volume - -commit 88e801bf58d281aa6b7bf7092a83c1f6e12d5b83 (tag: v1.54.0) -Merge: cfbb678b8 5f1b26aea -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Apr 4 16:54:14 2019 -0700 - - Merge pull request #1272 from bcgov/release - - Release - -commit 5a5944474302dad7b676b3f7f8c2497d5f17a7ea -Author: Derek Roberts -Date: Thu Apr 4 16:49:44 2019 -0700 - - Remove replication functions from gwells-deploy.sh - -commit 7f78f4d7b355eff19ac3d66dbd2c8312337e0c32 -Author: Derek Roberts -Date: Thu Apr 4 16:28:32 2019 -0700 - - Remove replication functions from db drop/recreate - -commit 29e3e8ccee64101e8936c2c4a98027573b736b4c -Author: Derek Roberts -Date: Thu Apr 4 16:26:17 2019 -0700 - - Cut down db README and accompanying script - -commit 5f1b26aea4f4f4d457d8e0f96f3c125a2644b2a5 -Merge: c4e43746d 66b99ca73 -Author: Steve Hillier -Date: Thu Apr 4 15:05:41 2019 -0700 - - Merge pull request #1283 from bcgov/steve/obs-well-link - - Replace link to obs well map for observation wells - -commit 66b99ca73e2449aa864f88442e08a6ad9af58887 -Author: Steve Hillier -Date: Thu Apr 4 14:14:52 2019 -0700 - - fix v-if that shows/hides obs well link - -commit c4e43746d657a544a475f40e710d737c0505c7cf -Merge: 7ff9ff4b9 9d44eb010 -Author: Steve Hillier -Date: Thu Apr 4 14:10:59 2019 -0700 - - Merge pull request #1265 from bcgov/steve/summaryfix - - Use regular code descriptions for well summary - -commit e1a6e22eb10ebcc4aab55152bed41acf20982100 -Author: Steve Hillier -Date: Thu Apr 4 14:09:02 2019 -0700 - - add outbound link to obs well - -commit 9d44eb010667f43b0d8602feaf8d98dbd0f835ce -Author: Steve Hillier -Date: Thu Apr 4 13:37:01 2019 -0700 - - fix staff edit details class - -commit 7ff9ff4b99491e45d9296e303e23919149534f28 -Merge: a9c9fa6b0 2ac612fe7 -Author: Steve Hillier -Date: Thu Apr 4 13:13:31 2019 -0700 - - Merge pull request #1282 from bcgov/sybrand/change_maintenance_message - - Remove "In the meantime please use the Water Well Application" messag… - -commit 1f444ae24dcd18b1ee0513c84dc34055bb1c3ee6 -Author: Steve Hillier -Date: Thu Apr 4 12:48:31 2019 -0700 - - change url path for staff edit tests - -commit 2ac612fe7c4e42f08b1e502f9d2e449147227d10 -Author: Sybrand Strauss -Date: Thu Apr 4 12:31:50 2019 -0700 - - Remove "In the meantime please use the Water Well Application" message on the maintenance screen. - -commit a9c9fa6b081a2bc171d6c4c0b0d5a561380fd18b -Merge: 2f5272d07 f2d1f4c22 -Author: Steve Hillier -Date: Thu Apr 4 12:30:38 2019 -0700 - - Merge pull request #1280 from bcgov/steve/lithfix - - Fix for lithology input - -commit 883ac02f453a512574576a3783f201e572064c55 -Author: Derek Roberts -Date: Thu Apr 4 12:29:13 2019 -0700 - - - app/database/scripts/wellsearch/wells_replication_stored_functions.sql - -commit 2f5272d073356cc0e503c9c57cb13fb64069f128 -Merge: 17c5902d8 07a5564c4 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Apr 4 12:20:08 2019 -0700 - - Merge pull request #1268 from bcgov/task/1680_verifyBks - - [1680] Verify Backups - -commit 1277f7457810d564a23238c963168522e1051e21 -Author: Derek Roberts -Date: Thu Apr 4 12:19:51 2019 -0700 - - Removed replication related files - -commit 17c5902d8a8ae0150fb9df109ac82f576af84dd8 -Merge: c71130126 7a4aeffc8 -Author: Sybrand Strauss -Date: Thu Apr 4 11:26:37 2019 -0700 - - Merge pull request #1279 from bcgov/sybrand/remove_wtn_auto_increment_post_migrate - - Remove redundant post migrate step for increasing well_tag_number cou… - -commit f2d1f4c22c115fc73321cc23a586a61edc6eb6a1 -Author: Steve Hillier -Date: Thu Apr 4 11:22:29 2019 -0700 - - add observations to preview - -commit 9ceefa8e1cbb0b838b96d6bf546e9a2d5000c977 -Author: Steve Hillier -Date: Thu Apr 4 11:15:00 2019 -0700 - - stop populating lithology dropdowns - -commit 1dfb9995f7bfa96f1e62662da4a6a1dedcbd0a26 -Author: Steve Hillier -Date: Thu Apr 4 11:12:07 2019 -0700 - - remove replication functions - -commit 07a5564c4e635e854ecd59d6b6ad1116eebef9ae -Author: Derek Roberts -Date: Thu Apr 4 10:47:18 2019 -0700 - - Moved backup to before deployment, no longer considered cleanup - -commit af94f02e6185eea1d0505fa29869dc8f838f077d -Author: Derek Roberts -Date: Thu Apr 4 10:40:55 2019 -0700 - - Comment, cleanup - -commit 7a4aeffc89120d0d5de53837a71f62ee21ba9bd6 -Author: Sybrand Strauss -Date: Thu Apr 4 10:31:59 2019 -0700 - - Remove redundant post migrate step for increasing well_tag_number count (no longer needed, data is no longer being replicated) - -commit 6ae906078c0a3e7b4364aa365af72c6df1b08848 -Author: Sybrand Strauss -Date: Tue Apr 2 19:24:12 2019 -0700 - - - Modified csv/xls export to use chunked iterator to avoid excessive memory use. - - Modified databc export to use chunked iterator thus simplifying code. - - Added readme for csv export. - -commit 7f45d6c5fca914763b5b7219746b9dde2c48189d -Author: Aaron -Date: Wed Apr 3 22:00:35 2019 -0700 - - csv download - -commit 52e7ec0d77985774a575d9cfc27776ebafe3ca0d -Author: Aaron -Date: Wed Apr 3 20:53:20 2019 -0700 - - observational wells linkage - -commit 4114853edbbefe2b75cba0adfca8f224dd33b0cc -Author: Derek Roberts -Date: Wed Apr 3 17:39:42 2019 -0700 - - Include db cleanup in backup process - -commit a7b0863cdc02350e50d6a55613d9ef1d1534f225 -Author: Derek Roberts -Date: Wed Apr 3 17:31:48 2019 -0700 - - Use just one extension commit, stop restoring w/ specific user - -commit c71130126711c1e4bd728c0237be91a771ffaa1a -Merge: c02b53b68 d7cf96c82 -Author: Steve Hillier -Date: Wed Apr 3 17:31:36 2019 -0700 - - Merge pull request #1277 from bcgov/submissionfix - - Fix For Submissions - -commit a8ea2aa8bea7a26a713af202efb5c58ea6cd5f0a -Author: Derek Roberts -Date: Wed Apr 3 17:17:42 2019 -0700 - - Make sure db restore fails cause pipeline fails - -commit f2f06a7d3ce0cc0e7fbeb9adf18da6eb183f15c1 -Author: Derek Roberts -Date: Wed Apr 3 17:02:54 2019 -0700 - - Pare down backup function - -commit d7cf96c8294b07ca51beaed0a289ad85768e6df7 -Author: AlexZorkin -Date: Wed Apr 3 17:01:59 2019 -0700 - - fix on stacker - -commit 0a6a955902116523a999caff9bee7e3cb311ad21 -Author: Clark Van Oyen -Date: Wed Apr 3 16:24:43 2019 -0700 - - attach wells to aquifer more evenly. - -commit ef869faac4019353299fc63efb008244e979a680 -Merge: 6a3190555 154bb5022 -Author: Clark Van Oyen -Date: Wed Apr 3 16:16:42 2019 -0700 - - Merge branch 'countable/licences' of github.com:bcgov/gwells into countable/licences - -commit 6a3190555019582cecc5d2de2434b2c4d237ea17 -Author: Clark Van Oyen -Date: Wed Apr 3 16:16:24 2019 -0700 - - csv fix - -commit 154bb5022c2cfb01669a43471c41ade80d5a5f27 -Author: Aaron -Date: Wed Apr 3 16:06:19 2019 -0700 - - artesian wells and observational wells - -commit c02b53b68d33a158be3f806bdcf3f6fb532056fc -Merge: 504cb300b f31d00532 -Author: Sybrand Strauss -Date: Wed Apr 3 16:00:39 2019 -0700 - - Merge pull request #1271 from bcgov/alex/replicationfixes - - [1770] Replication of Pending, New, Rejected Well Records - -commit d89164cd03d282a8704fc71dd123f63cd12e8f81 -Author: Aaron -Date: Wed Apr 3 15:15:25 2019 -0700 - - fix some stuff - -commit 504cb300b251a9d90ab2876f1921bd1621c1784c -Merge: 1dd4d570d aa77d4348 -Author: Sybrand Strauss -Date: Wed Apr 3 15:13:24 2019 -0700 - - Merge pull request #1276 from bcgov/sybrand/change_export_time - - Changed export time to not conflict with replication - -commit e89e4270cf867bc2d6f2fb781d0ef24a25ae9f97 -Author: Derek Roberts -Date: Wed Apr 3 15:07:39 2019 -0700 - - Add minimum dump size and spread out commands - -commit 1dd4d570d6438bb45f83eafee241e989b4abe414 -Merge: 740a2814b 214bf167d -Author: Sybrand Strauss -Date: Wed Apr 3 14:53:51 2019 -0700 - - Merge pull request #1269 from bcgov/steve/water-quality-table - - [1730] add water quality characteristics to replication - -commit 740a2814bb95c51206d34ec5b71f7ab67b6b3def -Merge: a6827fa1a 7893e58db -Author: Steve Hillier -Date: Wed Apr 3 14:52:33 2019 -0700 - - Merge pull request #1275 from bcgov/sybrand/fix_migration_issue - - Sybrand/fix migration issue - -commit a6827fa1a18a12b74341ab70f070c4230dea6f46 -Merge: b8a10d023 f73f00c2a -Author: Steve Hillier -Date: Wed Apr 3 14:52:01 2019 -0700 - - Merge pull request #1274 from bcgov/alex/formsubmissionfix - - Submission Form Fix - -commit aa77d4348eec451dbd95a904ed1e94ed5acdef0e -Author: Sybrand Strauss -Date: Wed Apr 3 14:35:00 2019 -0700 - - Changed export time to not conflict with replication - -commit 7893e58db8a3c1eea80f0e4b05bac33f03a6afbf -Author: Sybrand Strauss -Date: Wed Apr 3 14:21:57 2019 -0700 - - - Migration to fix null values - -commit 53a92380341b7bc810a74fafa5184b52c8ba8da5 -Author: Aaron -Date: Wed Apr 3 14:05:38 2019 -0700 - - link wells - -commit bc0cd92ce667930dc7f731133c3cb5f6a411f868 -Author: Sybrand Strauss -Date: Wed Apr 3 14:04:47 2019 -0700 - - - Seperate field update from alter - -commit c78068791082c97d5587340bcffbfb33b7154283 -Author: Sybrand Strauss -Date: Wed Apr 3 13:52:51 2019 -0700 - - - Setting required fields in aquifer tables. - - Switch from print() to logger.error(). - -commit ed2bec9467e86807f0a572b52190b657e332d7aa -Author: Derek Roberts -Date: Wed Apr 3 13:42:56 2019 -0700 - - Schema only restore to reduce time - -commit 6620503fe236c064427d1fe96054fbf96dee4945 -Author: Derek Roberts -Date: Wed Apr 3 13:42:37 2019 -0700 - - Added postgis extensions and imported into temp db - -commit 214bf167de6eb6a638fdb87962864162302e9207 -Author: Steve Hillier -Date: Wed Apr 3 13:40:45 2019 -0700 - - fix table references in water_quality function - -commit e3edb707a43faabc97c1dc05ddb1a9239b9ca0c4 -Author: Aaron -Date: Wed Apr 3 13:35:34 2019 -0700 - - fixes - -commit bc0b09a3a49a4db89d22e7a616194204cb82ac7f -Merge: 354ecedc1 b8a10d023 -Author: Steve Hillier -Date: Wed Apr 3 12:44:28 2019 -0700 - - Merge branch 'release' into steve/water-quality-table - -commit f73f00c2a897b0b1d51a8215f36d57bef7c3d69a -Author: AlexZorkin -Date: Wed Apr 3 12:37:04 2019 -0700 - - fix on submission form - -commit f31d00532e33102d0a836619a2a5b5dbf5887b83 -Author: AlexZorkin -Date: Wed Apr 3 12:17:01 2019 -0700 - - added pending and new status wells to be Unpublished - -commit b8a10d02340fba1d52634e27ec7f63534060f93d -Merge: 87da9ca6d 36946a222 -Author: Sybrand Strauss -Date: Wed Apr 3 12:02:10 2019 -0700 - - Merge pull request #1273 from bcgov/steve/router-search-fix - - add redirect from /search to / - -commit 7ffa9735d84696c90214bae2b6f84ec3c05d9d1a -Merge: 1340678f5 87da9ca6d -Author: AlexZorkin -Date: Wed Apr 3 11:53:52 2019 -0700 - - Merge branch 'release' into alex/replicationfixes - -commit 87da9ca6d1f904a7fcf244cf519781e9aba99d9a -Merge: 00b9ab86a 67ceb7a8e -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Apr 3 11:37:17 2019 -0700 - - Merge pull request #1257 from bcgov/alex/bceidupdates - - [1752] BCeID Permissions - -commit 36946a222595134c123555d5f76c53e22f1c0550 -Author: Steve Hillier -Date: Wed Apr 3 10:56:43 2019 -0700 - - add redirect from /search to / - -commit 1340678f5d752f622be6589d41e65ff4478b7704 -Merge: c666b9c4e 00b9ab86a -Author: AlexZorkin -Date: Wed Apr 3 09:58:03 2019 -0700 - - Merge branch 'release' into alex/replicationfixes - -commit 354ecedc1856f76207d0adc43871697e1417fc6a -Author: Steve Hillier -Date: Wed Apr 3 09:09:31 2019 -0700 - - update stored function - -commit 83e7b7fafadffcb0f41af1012ae94abebd10647e -Author: Steve Hillier -Date: Wed Apr 3 09:09:19 2019 -0700 - - add redirect from /search to search screen - -commit 73e51a482c45ddb4c86714d0b9a8f563591bf7a1 -Author: Aaron -Date: Tue Apr 2 23:37:53 2019 -0700 - - remove nesting, groundwater licenses - -commit 65c8b42fe8eadf3b0a162b7c820f58aea892abfa -Author: Aaron -Date: Tue Apr 2 22:08:33 2019 -0700 - - knowledge indicator transform - -commit 42f578e77ba313351b10504e697498893ce8ff3b -Merge: fd2859a06 11982c374 -Author: Aaron -Date: Tue Apr 2 20:15:24 2019 -0700 - - merge and more progress on mockups - -commit 00b9ab86a58304a89bfa193a999c98bebf5bb1fb -Merge: 548b4cf99 2e093256b -Author: Steve Hillier -Date: Tue Apr 2 20:02:18 2019 -0700 - - Merge pull request #1252 from bcgov/countable/milestone1 - - Countable/milestone1 - -commit fd2859a06eb5cf5e856cbcea0719da45c7b067a5 -Author: Aaron -Date: Tue Apr 2 19:40:17 2019 -0700 - - fix syntax error - -commit 2e093256bb54770149d60b38c58291cc34760ec7 -Author: Steve Hillier -Date: Tue Apr 2 17:08:06 2019 -0700 - - change aquifer reference - -commit d3f9624cc9ab87bfbc1d23919e81c64793a3fac4 -Author: Steve Hillier -Date: Tue Apr 2 16:56:51 2019 -0700 - - add water quality characteristics to replication - -commit 87efb324a90ad7b66f4e5ee9e685096cec14633b -Author: Derek Roberts -Date: Tue Apr 2 16:54:50 2019 -0700 - - Add a restore to verify dump - -commit 9fe7152f876f30669935e2743e0fac1f218bf202 -Author: Steve Hillier -Date: Tue Apr 2 16:36:48 2019 -0700 - - change endpoint for populating staff well edits - -commit 67ceb7a8e9b8383d24e1a3164b0787ebee283006 -Author: AlexZorkin -Date: Tue Apr 2 16:21:16 2019 -0700 - - replaced test value with proper value - -commit cde22a43d1812cf84f65d36e026835a3ac6f6164 -Author: AlexZorkin -Date: Tue Apr 2 16:20:18 2019 -0700 - - added test for pipeline to catch unit tests - -commit c666b9c4ecafeded029d9465243e2178130037fd -Author: AlexZorkin -Date: Tue Apr 2 16:00:10 2019 -0700 - - replication now pulls all wells records instead of just accepted and rejected - -commit cfbb678b8fb11b5459445c9be2a48c5d8820711d -Merge: c77b114e9 548b4cf99 -Author: Steve Hillier -Date: Tue Apr 2 15:56:21 2019 -0700 - - Merge pull request #1167 from bcgov/release - - Release - -commit 9d9216480ba0efe5af178fbffbdf9c886f8bfaa4 -Author: Steve Hillier -Date: Tue Apr 2 15:52:52 2019 -0700 - - Apply suggestions from code review - -commit 50dc089b018f8b445fb594871f9e9c20644d8b7a -Merge: 3a439cd9c 548b4cf99 -Author: Steve Hillier -Date: Tue Apr 2 15:52:03 2019 -0700 - - Merge branch 'release' into countable/milestone1 - -commit 1da7c3b125781dc0a281c688244657ee0c24d4d3 -Author: AlexZorkin -Date: Tue Apr 2 13:51:09 2019 -0700 - - added driller name to replication - -commit cd9b6a0f5d6841839b4bc359f534fc63f5bad887 -Author: AlexZorkin -Date: Tue Apr 2 11:59:26 2019 -0700 - - updated python tests - -commit 23baf3dfae8fb93c6149c360de35551f1326b2e4 -Author: Steve Hillier -Date: Tue Apr 2 11:55:28 2019 -0700 - - update postman tests - -commit 3bf13553b4da14df7a6c896dc6a3bcd7a4fbee85 -Author: Steve Hillier -Date: Tue Apr 2 10:57:05 2019 -0700 - - add more descriptions to well detail serializer - -commit d1df98f3b08d9606c0f398b4d6394e5024bc220c -Author: Steve Hillier -Date: Tue Apr 2 10:56:50 2019 -0700 - - fix staff edit aquifer association - -commit 4e36b3864c6f82ae643add0dc206e1f2c8fffa3f -Merge: a14d65ba2 548b4cf99 -Author: AlexZorkin -Date: Tue Apr 2 10:53:13 2019 -0700 - - Merge branch 'release' into alex/bceidupdates - -commit 548b4cf9993bc77a2048b1d98dc9c613577f1fa0 -Merge: c1320275c 9fca5fef1 -Author: Sybrand Strauss -Date: Tue Apr 2 09:31:40 2019 -0700 - - Merge pull request #1259 from bcgov/sybrand/databc_tweaks - - - Added experimental bounding box functionality - -commit c1320275c1e1ecfd34e074f8e351b5ca31c66587 -Merge: 25ca10bce 5feea2768 -Author: Steve Hillier -Date: Tue Apr 2 08:58:51 2019 -0700 - - Merge pull request #1264 from bcgov/steve/gafix - - add analytics events to well advanced search - -commit 11982c3748a8d9337f1cc91170e86023d01de21a -Author: Aaron -Date: Mon Apr 1 22:10:35 2019 -0700 - - remove unfinished function for now - -commit 56101f617c51b233e9ad0a1f652582854f842eea -Author: Clark Van Oyen -Date: Mon Apr 1 21:53:56 2019 -0700 - - fixture pkeys - -commit 77cb0a954922c10d28a041fdfe44d70a4e48be16 -Merge: c4b0d1cdc 25ca10bce -Author: Clark Van Oyen -Date: Mon Apr 1 21:48:57 2019 -0700 - - Merge branch 'release' of github.com:bcgov/gwells into countable/shapefiles - -commit c4b0d1cdc7c3417ce92cefef34ce175d9a3991c1 -Merge: fb1f88bec 3a439cd9c -Author: Aaron -Date: Mon Apr 1 20:34:37 2019 -0700 - - merge milestone1 to shapefile - -commit fb1f88becb175aa5b8f203218ec9939cb02fe828 -Author: Aaron -Date: Mon Apr 1 18:40:08 2019 -0700 - - frontend tests - -commit 1db0f81aa425caca46dce20cb67d10bff926ab0c -Author: Aaron -Date: Mon Apr 1 18:34:23 2019 -0700 - - fix the shapefile - -commit 987282190a1cd3ed1cbd3739cff8f8c958ee99f6 -Author: Steve Hillier -Date: Mon Apr 1 17:00:07 2019 -0700 - - splitting out staff edit and well summary views - -commit 5feea27687e27aeaac4b6dc3f56624c9b36f34df -Author: Steve Hillier -Date: Mon Apr 1 16:34:24 2019 -0700 - - add analytics events - -commit a14d65ba2703861be853fcf25ddbe0e5f3f23b68 -Author: AlexZorkin -Date: Mon Apr 1 16:19:47 2019 -0700 - - updated submission tests - -commit 829e733eeeafce5f27fb2ab3d12f29d603c6375d -Author: Steve Hillier -Date: Mon Apr 1 15:55:55 2019 -0700 - - add code descriptions to serializer - -commit 9fca5fef156bfb42fc98912cb4f96e2532be6a9c -Author: Sybrand Strauss -Date: Fri Mar 29 15:46:26 2019 -0700 - - - Added experimental bounding box functionality - - Added tests for realtime - -commit 2a13d06acc367c4f25839c195c4ae3d4d6b48d45 -Author: AlexZorkin -Date: Mon Apr 1 15:04:54 2019 -0700 - - separated submission submit and viewing rights - -commit 899bac03e6461cf1cd3be76ab93e87623e7846c5 -Merge: 1032d5ff3 25ca10bce -Author: AlexZorkin -Date: Mon Apr 1 14:36:17 2019 -0700 - - Merge branch 'release' into alex/bceidupdates - -commit 25ca10bce84678e0995febb4b9873c0d64b44cd0 -Merge: 994d8d1ed a5d6aabac -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Apr 1 14:33:45 2019 -0700 - - Merge pull request #1262 from bcgov/alex/emptyformfields - - [1741] Allow Empty Form Fields on Edit - -commit a5d6aabacddc1757e8bdbfe80f23cacb3f423cc2 -Merge: 7a232ab5f 994d8d1ed -Author: AlexZorkin -Date: Mon Apr 1 13:13:08 2019 -0700 - - Merge branch 'release' into alex/emptyformfields - -commit 994d8d1edd69a9bd96e4311f99855040524e8350 -Merge: 7573954ad 7c24c8eae -Author: Steve Hillier -Date: Mon Apr 1 12:21:02 2019 -0700 - - Merge pull request #1258 from bcgov/sybrand/increase_postgres_resources - - Increasing resources - -commit 7a232ab5f43be7c2bb5f88375b3355e81144803f -Merge: da50f5715 7573954ad -Author: AlexZorkin -Date: Mon Apr 1 12:17:20 2019 -0700 - - Merge branch 'release' into alex/emptyformfields - -commit 7573954ade9762bb95ef65cc34858036f15407a4 -Merge: 5fb8dcfa8 3f6db5d31 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Apr 1 12:16:36 2019 -0700 - - Merge pull request #1261 from bcgov/alex/geomigrations - - Fix for Geom Migration - -commit 7c24c8eae8284f3550cb5868a586b248989855ec -Merge: c400826e3 5fb8dcfa8 -Author: Steve Hillier -Date: Mon Apr 1 11:22:20 2019 -0700 - - Merge branch 'release' into sybrand/increase_postgres_resources - -commit c400826e3323b7beddc13ea3e1d84610e12d008f -Author: Steve Hillier -Date: Mon Apr 1 11:22:05 2019 -0700 - - Update openshift/postgresql.dc.json - -commit da50f57159bcc8b4f0205eee0fd14d7bfb425cdf -Merge: e83dff6c6 3f6db5d31 -Author: AlexZorkin -Date: Mon Apr 1 11:21:02 2019 -0700 - - Merge branch 'alex/geomigrations' into alex/emptyformfields - -commit 3f6db5d312e3bacb02814509e4c41183a76ed3ff -Merge: 658c31405 c8443b575 -Author: AlexZorkin -Date: Mon Apr 1 11:11:22 2019 -0700 - - Merge branch 'alex/geomigrations' of ssh://github.com/bcgov/gwells into alex/geomigrations - -commit 658c31405e8d6eec300489053059acd356d6b589 -Author: AlexZorkin -Date: Mon Apr 1 11:11:02 2019 -0700 - - exception change - -commit c8443b575676e3e7a39cd6b0a8199c0597f8d8d7 -Merge: e5f6224f8 5fb8dcfa8 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Apr 1 11:01:19 2019 -0700 - - Merge branch 'release' into alex/geomigrations - -commit e83dff6c64669c3447afee239deb765629089dd2 -Merge: e6de80394 e5f6224f8 -Author: AlexZorkin -Date: Mon Apr 1 10:48:28 2019 -0700 - - Merge branch 'alex/geomigrations' into alex/emptyformfields - -commit e5f6224f83f015ae7f87f79fc3cf0b64d6357539 -Author: AlexZorkin -Date: Mon Apr 1 10:03:19 2019 -0700 - - generalized error catch - -commit 1032d5ff3e29a3d73c55bcbaf67ef5790a1eafc5 -Merge: d63f37196 5fb8dcfa8 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Apr 1 09:42:04 2019 -0700 - - Merge branch 'release' into alex/bceidupdates - -commit e6de80394b38d5f35afe2062f95b16ef57aaf2e3 -Merge: c01c9fc5c 5fb8dcfa8 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Apr 1 09:41:32 2019 -0700 - - Merge branch 'release' into alex/emptyformfields - -commit 81218cfcd31569a6f36c08d3b6385f4b9a13c557 -Author: Clark Van Oyen -Date: Mon Apr 1 00:24:39 2019 -0700 - - csv export - -commit c3612fb7ec081ae97a1ee0e967795c3b230880fe -Author: Aaron -Date: Sun Mar 31 22:25:03 2019 -0700 - - fix lint errors and remove locate control plugin for now - -commit 3781f7e854d8201153b8899c5649d657b8513b76 -Author: Aaron -Date: Sun Mar 31 22:20:02 2019 -0700 - - selection tool - -commit c01653673d45e913cab6a8ddb19441540589228b -Author: Aaron -Date: Sun Mar 31 20:52:56 2019 -0700 - - drawing tool gwells - -commit 2633f3bae8813db9e0f8e6cbe9c3d8f89394e892 -Author: Aaron -Date: Sun Mar 31 00:17:04 2019 -0700 - - locate control namespace change - -commit 298660e8002d12092d28446f523225fb285ceb67 -Author: Aaron -Date: Sat Mar 30 23:11:14 2019 -0700 - - fix map legend bug - -commit fb70d09873f61428f27281a8b6f316eb8ccde406 -Author: Aaron -Date: Fri Mar 29 18:17:01 2019 -0700 - - prepare for pr - -commit 5fb8dcfa8c0ebf2b51fa5df26bffcb76107d6929 -Merge: d9cc1f189 9a9392a9f -Author: Sybrand Strauss -Date: Fri Mar 29 17:02:08 2019 -0700 - - Merge pull request #1260 from bcgov/sybrand/fix_jenkins_schedule - - Escape params correctly - -commit 9a9392a9f43c143279805eb332bc8db212725391 -Author: Sybrand Strauss -Date: Fri Mar 29 16:25:21 2019 -0700 - - Escape params correctly - -commit c01c9fc5c88c4e3696567e808a9f4fbaee0f7127 -Merge: 4fb4cdaf6 d9cc1f189 -Author: AlexZorkin -Date: Fri Mar 29 15:49:20 2019 -0700 - - merge release - -commit d9cc1f1894c503b5d93e22fb6b8d6b1c5b2b0427 -Merge: 144c4de0d c7acd6ff7 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri Mar 29 15:48:02 2019 -0700 - - Merge pull request #1256 from bcgov/alex/geomigrations - - Wrapped Geom Migration to Allow FieldNotExists - -commit c7acd6ff72fcc95154bd0f15c62bd794d91718c9 -Author: AlexZorkin -Date: Fri Mar 29 15:12:46 2019 -0700 - - test fix - -commit d63f3719639fb51a3fc5dc49bdd547b677f98c84 -Author: AlexZorkin -Date: Fri Mar 29 15:03:42 2019 -0700 - - test fix - -commit 2aaf5e8c67f5a999b6b42f147a3bf2a481865a0a -Merge: 83c2147af 399abbe92 -Author: AlexZorkin -Date: Fri Mar 29 14:41:02 2019 -0700 - - merge release - -commit 83c2147af2d87c8e91fdd955226e71111d4bd7ab -Author: AlexZorkin -Date: Fri Mar 29 14:40:25 2019 -0700 - - updated unit tests - -commit ca79e73c55b61c3e62375a79540ad12c29971ad7 -Author: Sybrand Strauss -Date: Fri Mar 29 14:21:14 2019 -0700 - - Switched debug to True (otherwise cors failures abound!) - -commit ec8ebe2e715d8948188babdc35590478b8efa80b -Author: AlexZorkin -Date: Fri Mar 29 14:14:53 2019 -0700 - - func fix - -commit 399abbe9218a3b7362362468ad4337c6f29eda04 -Merge: b1f6a7da4 144c4de0d -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri Mar 29 14:12:08 2019 -0700 - - Merge branch 'release' into alex/bceidupdates - -commit 4fb4cdaf63db3d6b44a73402edc9513e2ae692b8 -Merge: 25f601e32 144c4de0d -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri Mar 29 14:03:59 2019 -0700 - - Merge branch 'release' into alex/emptyformfields - -commit 7dc6bda7c78aa40cd165ea08d2c52caf628316d7 -Author: Sybrand Strauss -Date: Fri Mar 29 13:24:32 2019 -0700 - - - Making CPU and Memory limits more configurable for postgress, and increasing resources for staging, demo and production - -commit b389b106c22da919d99b10e3ca7ed6b155b684be -Merge: ef4f2c5b8 144c4de0d -Author: AlexZorkin -Date: Fri Mar 29 13:35:27 2019 -0700 - - merge release - -commit ef4f2c5b80a2fc7e1ed22ceb9b4ad7722d1d1226 -Author: AlexZorkin -Date: Fri Mar 29 13:35:03 2019 -0700 - - updated test fix - -commit 144c4de0dd938d41322b6833ab3e60f03d5b2430 -Merge: 7db16713a 009d35821 -Author: Sybrand Strauss -Date: Fri Mar 29 13:23:09 2019 -0700 - - Merge pull request #1255 from bcgov/sybrand/databc_wells - - [1720] Spatial Layers - -commit b1f6a7da41e5d1de98809ec91f5265b345711098 -Merge: a8c69f217 7db16713a -Author: AlexZorkin -Date: Fri Mar 29 12:45:47 2019 -0700 - - merge release - -commit f8ab99c472a54391411b6286a6cd06cd76f5157e -Author: AlexZorkin -Date: Fri Mar 29 12:37:24 2019 -0700 - - remove redundancy - -commit 009d3582174ec8f6e28b7a2a1a2b3d91dd6cda60 -Author: Sybrand Strauss -Date: Thu Mar 28 17:21:55 2019 -0700 - - - Moving aquifers fixtures to start id's below 2000 (loaddata doesn't increment sequence!) - - Add script to run all api tests local. - - Added geometry to one of the aquifer fixtures. - - Fixing various minor issues - -commit 2be0a460d7a222cf6080692718bb5ae21417b276 -Author: AlexZorkin -Date: Fri Mar 29 11:52:52 2019 -0700 - - added logging - -commit 10f552779f58ad37cecc6613bccb5c9ee6903ed8 -Merge: 2b0638598 7db16713a -Author: AlexZorkin -Date: Fri Mar 29 11:45:27 2019 -0700 - - merged release - -commit 2b06385988599edaca92caa423a33f5d7d200836 -Author: AlexZorkin -Date: Fri Mar 29 11:05:09 2019 -0700 - - wrapped migration to allow for null fields - -commit 2fe0cc6163307b0b7741fc0f4f9af11f9bc6c7a3 -Author: Sybrand Strauss -Date: Tue Mar 19 11:28:32 2019 -0700 - - - Switched to using %s placeholders on query. - - Changed the schedule of exports to not overlap. - - Changed config to always pull image. - - Defining api definition for /gis/wells. - - Added in db comments as post_migrate step. - - Moved well table/column comments into model. - - Refactored export to use an iterator, allowing realtime streaming and simplifying code somewhat. - - Introduced base class code table model. - - Renamed some date fields to be consistent. - - Update fixtures to use expiry_date instead of expired_date. - - Added query options and realtime option - - Changed aquifer fixtures to have more continous numbering - - Added multipleOf based on db type - -commit 7cfe7ac9a86363dd6a815f7b010736c1b3dc31dd -Author: Aaron -Date: Thu Mar 28 22:13:25 2019 -0700 - - locate control - -commit 4645501b995fdcd208fbd7de5fb45974ce2055b9 -Author: Aaron -Date: Thu Mar 28 21:17:57 2019 -0700 - - legend - -commit 7db16713a16798d0452262569b876b3d459d0705 -Merge: dee10207b 3a727caa3 -Author: Steve Hillier -Date: Thu Mar 28 17:37:14 2019 -0700 - - Merge pull request #1251 from bcgov/steve/searchtable - - remove tabulator table - -commit 3a727caa3238e18bc1396ea58040e753cae413dd -Author: Steve Hillier -Date: Thu Mar 28 17:06:01 2019 -0700 - - add per page and current page to table - -commit dd0fee6cb06762c9332ac1899e6c33a426d2db60 -Author: Steve Hillier -Date: Thu Mar 28 16:33:45 2019 -0700 - - add a router link to results in the table - -commit a8c69f217d49185436c66e25dc032f85dfa8ec01 -Merge: 1d05a3895 dee10207b -Author: AlexZorkin -Date: Thu Mar 28 16:08:22 2019 -0700 - - merge release - -commit 1d05a3895bf49494f74f91187a52c1d2a4578d50 -Author: AlexZorkin -Date: Thu Mar 28 16:07:44 2019 -0700 - - added wells_submission role to client, server, and sso - -commit 80c52a3e267911fcd7d5e6e371a1e1eab5eb9043 -Author: Steve Hillier -Date: Thu Mar 28 16:04:09 2019 -0700 - - refactor trigger strings - -commit bb980b6639844feff657dcfb9ef0bbc44d2263c8 -Author: Aaron -Date: Thu Mar 28 16:00:40 2019 -0700 - - address search outside of map - -commit 88d8d2fa6e7c87669b775f1574529d2ca87f3e96 -Author: Steve Hillier -Date: Thu Mar 28 15:43:12 2019 -0700 - - reset criteria when switching search types - -commit 87c37619e386cb90e2a656b7327ce5ee45ab2127 -Author: Steve Hillier -Date: Thu Mar 28 15:06:15 2019 -0700 - - remove console.log - -commit 34a715d592d2d2a92ddd58d9e45a9df74a223650 -Author: Steve Hillier -Date: Thu Mar 28 15:03:15 2019 -0700 - - move event now debounced in map search - -commit 3d36ca1b77440bd17172a4815c9edfd393fa6de8 -Author: Steve Hillier -Date: Thu Mar 28 14:03:49 2019 -0700 - - add a reset check to search method - -commit a140ca8832e60ed73d6d46eef832f6753a5f0cd4 -Author: Aaron -Date: Thu Mar 28 13:11:30 2019 -0700 - - more changes - -commit 3a439cd9c7a705a00e8498335d980dcd3836a953 -Merge: 3e30e5315 766f6c0c0 -Author: Aaron -Date: Thu Mar 28 12:22:56 2019 -0700 - - Merge branch 'countable/milestone1' of https://github.com/bcgov/gwells into countable/milestone1 - -commit 3e30e5315c58b7af3760541fc474af388c14af69 -Author: Aaron -Date: Thu Mar 28 12:22:47 2019 -0700 - - dark blue remove buttons - -commit 4f57cfda172ce41ce8de688f8f51158e3f4d5c1d -Merge: 747eb2aca dee10207b -Author: Steve Hillier -Date: Thu Mar 28 11:49:03 2019 -0700 - - merge in release branch - -commit dee10207b891503527f9afcd7c3f3890631964a4 -Merge: 49e304f18 846ff36f9 -Author: Steve Hillier -Date: Thu Mar 28 11:46:17 2019 -0700 - - Merge pull request #1243 from bcgov/steve/searchfixes2 - - Minor well search page fixes - -commit 747eb2aca95a71d7f2514050caa9700d19e649f8 -Author: Steve Hillier -Date: Thu Mar 28 11:29:07 2019 -0700 - - move calculation from template to computed val - -commit 670feaeb4e1e8db931110dec4f90a32688ae305b -Author: Steve Hillier -Date: Thu Mar 28 11:21:41 2019 -0700 - - remove tabulator from dependencies - -commit b1e2533e1e33324dcc805ba33ef68f37a43b6aa8 -Author: Steve Hillier -Date: Thu Mar 28 11:20:18 2019 -0700 - - remove tabulator data placeholder - -commit e21d2369b42195a19f086ac40f0ae20d8201486a -Author: Steve Hillier -Date: Thu Mar 28 11:18:49 2019 -0700 - - remove console.log - -commit 0e5852c27771769dce15f6e40ace77f16a69679b -Author: Steve Hillier -Date: Thu Mar 28 11:15:29 2019 -0700 - - enable server side sorting - -commit 846ff36f90a6e9458473edb7267c4b1ef13af48b -Author: Steve Hillier -Date: Thu Mar 28 10:56:00 2019 -0700 - - use cancel token in instance data - -commit 49e304f1857db9e88a7cd4998122549343f3e2f2 -Merge: a68e0a0ef ef578be4c -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu Mar 28 10:38:40 2019 -0700 - - Merge pull request #1249 from bcgov/alex/geomigrations - - [1751] Geom Migration Update - -commit a68e0a0effe71eb055338c1b54b1c71bfd3ee3c6 -Merge: 13c1517ad 3f485b532 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Thu Mar 28 10:37:59 2019 -0700 - - Merge pull request #1241 from bcgov/alex/idirbceidfields - - [1731] IDIR BCEID Updates to Authentication and Prod Tables - -commit de95bed3218ccd0a059f84f950b400f566764c91 -Author: Steve Hillier -Date: Thu Mar 28 10:24:37 2019 -0700 - - set a max zoom and pan limit - -commit 25f601e321ebf5a66c2954728962cf0a6653202d -Author: AlexZorkin -Date: Thu Mar 28 09:31:14 2019 -0700 - - value is not None - -commit 1f3805e2506c46e5d4ef9c43949d31e46bea7637 -Author: Steve Hillier -Date: Thu Mar 28 09:29:44 2019 -0700 - - fix cancel token - -commit 3f485b532d4b440b0c55a3d1e41fab86d67c556b -Author: Sybrand Strauss -Date: Thu Mar 28 09:16:03 2019 -0700 - - Update app/backend/registries/views.py - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 5c86f13021a96b89e94a14d1eb420841d72359ad -Author: Sybrand Strauss -Date: Thu Mar 28 09:15:54 2019 -0700 - - Update app/backend/registries/views.py - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 59f4a8a353f70e5949669592c132b1dc0eafff03 -Author: Steve Hillier -Date: Thu Mar 28 09:10:23 2019 -0700 - - switch to bootstrap table - -commit 8cd1a50b597eb535aaae2f3802b386c313de19ae -Author: Aaron -Date: Wed Mar 27 23:30:06 2019 -0700 - - more of julies implementation - -commit 4a3e2ae1973a5fefae9bbb59d49aa3e036d1e9ef -Author: Steve Hillier -Date: Wed Mar 27 21:55:23 2019 -0700 - - refactor well search cancellations - -commit d247384b9bd59cb4ccef88a737ecc61ac7387e8b -Author: Aaron -Date: Wed Mar 27 17:45:34 2019 -0700 - - next tick fixes popups sometimes not rendering - -commit 673f483deecf22a6ffb05350ee654afc548db1ea -Author: Aaron -Date: Wed Mar 27 17:10:06 2019 -0700 - - fix bug on popup - -commit 766f6c0c0914e4c0b66a1cc438bb5280e1d57075 -Merge: 347bef38d 13c1517ad -Author: Steve Hillier -Date: Wed Mar 27 17:03:01 2019 -0700 - - Merge branch 'release' into countable/milestone1 - -commit d9a137b8359137e315786ebe57dbe1fac87d361f -Author: Steve Hillier -Date: Wed Mar 27 15:58:10 2019 -0700 - - correct typo in for loop - -commit 9f04fd678662f7f3678c01badbbd77c7da245e1a -Author: Steve Hillier -Date: Wed Mar 27 15:51:07 2019 -0700 - - add tests for WellSearch component - -commit 0d1f19b51cfc2cd60da066401fb2482e639fe9e6 -Author: Steve Hillier -Date: Wed Mar 27 15:50:46 2019 -0700 - - geolocate button zooms into location - -commit ef578be4c709234423e9d7fd7f782a732f79a5c4 -Author: AlexZorkin -Date: Wed Mar 27 15:48:33 2019 -0700 - - updated migrations to populate geom from lat lon before lat lon are deleted - -commit f996c768000a001eabb35b13dfcaaa73e32cd103 -Author: Aaron -Date: Wed Mar 27 14:26:02 2019 -0700 - - open popup on click - -commit e07332d4a382157a3bd0d0de40ab5c2aeed5c975 -Author: Aaron -Date: Wed Mar 27 14:13:39 2019 -0700 - - more updates - -commit 73a6f9bad43bdd20f69fbaa16fa2476fd75a8d05 -Author: Steve Hillier -Date: Wed Mar 27 13:17:26 2019 -0700 - - add raw data to lithology in well summary - -commit 30c945e4aa48a6f0047b3304c9b3b7d888b41677 -Author: Steve Hillier -Date: Wed Mar 27 13:13:24 2019 -0700 - - order well tags and prevent search jumpiness - -commit 9794afbf70148872f3d6a3c400da67d3eca97f2c -Author: AlexZorkin -Date: Wed Mar 27 12:17:41 2019 -0700 - - added deep-diff npm package - -commit a59d6a76727da0b4d3978c7d9c707f22b310621a -Author: AlexZorkin -Date: Wed Mar 27 12:17:00 2019 -0700 - - added form check to find differences and only submit when real changes are made - -commit f6a8826a6241305299211160325e9ef02b5ce029 -Author: Aaron -Date: Wed Mar 27 11:46:37 2019 -0700 - - more improvements - -commit c08653745a4cc783cb7ab0b3bf7c9a844bfd25f5 -Author: Aaron -Date: Tue Mar 26 23:31:47 2019 -0700 - - start julies designs - -commit 5696fd2de5cd730577f9f4cd4f97f96d957e590a -Merge: ec19d11d5 347bef38d -Author: Aaron -Date: Tue Mar 26 22:34:16 2019 -0700 - - merge milestone to shapefile - -commit 7c99bb6f9fbdbf7709d8e843e59386c86d4d883e -Author: AlexZorkin -Date: Tue Mar 26 17:09:09 2019 -0700 - - added compare form, added stack to see empty strings and objects - -commit 1df585da351a59e7eb69f73557e1e2a8654121fa -Author: Steve Hillier -Date: Tue Mar 26 16:43:08 2019 -0700 - - improve speed of tag lookup - -commit eb36a1f61b3e96f4ce82613359021cfc8e3670ea -Author: Steve Hillier -Date: Tue Mar 26 14:57:28 2019 -0700 - - clean up old comment - -commit ec19d11d5e6de9097aff8eecbffca8d36b8e8d86 -Merge: c7aa18003 620625f14 -Author: Aaron -Date: Tue Mar 26 14:34:13 2019 -0700 - - merge fixes - -commit 620625f14f81ac3d4d6da430ccd08b3aa7fdecf1 -Author: Daeyoung Park -Date: Tue Mar 26 17:12:47 2019 -0400 - - map - -commit 07946ab8ad5a857a76d3442558c8f54c77768051 -Author: Steve Hillier -Date: Tue Mar 26 14:06:30 2019 -0700 - - fix search and map panning - -commit 913a838bc6eeda7f36719ce010de2fb1aa1cdaa3 -Merge: 8bd432d52 13c1517ad -Author: AlexZorkin -Date: Tue Mar 26 13:28:48 2019 -0700 - - merge release - -commit 8bd432d5226ce5bba83c71ad216047b635695358 -Author: AlexZorkin -Date: Tue Mar 26 13:28:10 2019 -0700 - - updated api-test expectation - -commit d8f0fce30dd337b52c4b125a94ba32f807fcea17 -Author: AlexZorkin -Date: Tue Mar 26 12:02:22 2019 -0700 - - fixed unit test permissions - -commit c7aa1800330a6e6b08f8ff2bc3cda79206925b70 -Author: Clark Van Oyen -Date: Tue Mar 26 10:56:26 2019 -0700 - - dev env bulk attach - -commit 19567bdf57dda52366318f45ee6ae0bfdcebd6d6 -Author: Aaron -Date: Tue Mar 26 00:54:20 2019 -0700 - - layers working - -commit 71b3a76f60d2b795e5be29841303d3f4566f5e9e -Author: Aaron -Date: Mon Mar 25 21:27:12 2019 -0700 - - fix 100+ lint issues - -commit 8929debbd64e47561b1fe1a38cbc4f0fd195d314 -Author: Clark Van Oyen -Date: Mon Mar 25 20:59:58 2019 -0700 - - perf - -commit 9347c3391f86f2e1c14477a6247eee34505a8064 -Author: Clark Van Oyen -Date: Mon Mar 25 20:52:46 2019 -0700 - - Knowledge Indicators API, Licence Import - -commit e9f1d1657b022e0cd1170fb799560b8c273103ac -Author: Aaron -Date: Mon Mar 25 18:24:52 2019 -0700 - - restore stuff on shapefile branch - -commit 347bef38d43ca314cf484429fc7545a4577ab9c4 -Author: Aaron -Date: Mon Mar 25 18:14:32 2019 -0700 - - clean up this branch - -commit 33d33d555f53ed282b5b1c326c63f2b28c855053 -Author: Steve Hillier -Date: Mon Mar 25 17:20:27 2019 -0700 - - display search help only after search triggered - -commit 4706fa2412af95fac2bd52279cd319bea8728e42 -Author: Steve Hillier -Date: Mon Mar 25 15:44:14 2019 -0700 - - update 'too many wells to display' error message - -commit 09da9b5ead9cb557129f8d9118f7d59e1d67225a -Author: AlexZorkin -Date: Mon Mar 25 12:56:26 2019 -0700 - - simple comment - -commit 1e849b2b14fb9bab0e815dcad27f8dec34d0a9e3 -Author: Clark Van Oyen -Date: Mon Mar 25 12:21:39 2019 -0700 - - remove bad ref - -commit 7c8ff86585f21bf1a0c31ce4e3103b35b970355a -Author: Aaron -Date: Mon Mar 25 12:15:34 2019 -0700 - - let - -commit 1d25cb565b462a7e8a0fa1dbbec78a76f6c25fa4 -Author: Aaron -Date: Mon Mar 25 11:01:01 2019 -0700 - - fix text decoration ink - -commit 4372f1f2d0af0ac2b1b66625a48d1ff89dd78990 -Author: Aaron -Date: Mon Mar 25 10:57:06 2019 -0700 - - spacing and definition - -commit a9336056e6320196da8239f15bca36505ddef48a -Author: Daeyoung Park -Date: Mon Mar 25 03:45:49 2019 -0400 - - clicked aquifer id show on map - -commit b80140384b9efdf07ce4ece58fa6912c7308ed40 -Author: Daeyoung Park -Date: Mon Mar 25 01:59:05 2019 -0400 - - add aquifer geom to view page map and zoom to it - -commit 79aa7d1f646f1654a3df8b020da69f844bdd182f -Author: Daeyoung Park -Date: Mon Mar 25 01:49:54 2019 -0400 - - add aquifers to map with pop ups, add geo search - -commit 993ec39016a29734ccfc64056cbac31a815c4fa6 -Author: Steve Hillier -Date: Fri Mar 22 16:55:56 2019 -0700 - - smoother map functionality - -commit ca7bff15684dc4a4d681803f0893959ffeb47e36 -Author: AlexZorkin -Date: Fri Mar 22 16:29:52 2019 -0700 - - added support for api-tests testuser - -commit 797128b8f1a2f8b870c05292d599d1cd6f907f3e -Author: Steve Hillier -Date: Fri Mar 22 15:55:47 2019 -0700 - - prevent auto scrolling if map already in view - -commit 13c1517ad038654d168d10fc34d057e3f7968408 -Merge: 40d802a4c 490b20d69 -Author: Steve Hillier -Date: Fri Mar 22 15:44:02 2019 -0700 - - Merge pull request #1235 from bcgov/steve/searchfixes - - [1713] Well search fixes - -commit 483257d2a5b2a36c5c25ad951af857c99823135c -Merge: 6b663db4d 40d802a4c -Author: AlexZorkin -Date: Fri Mar 22 14:13:10 2019 -0700 - - merge release - -commit 6b663db4d77732f96271902a31ab38508e7294b7 -Author: AlexZorkin -Date: Fri Mar 22 14:01:54 2019 -0700 - - make all new usernames uppercase to stay consistent with existing data in prod - -commit f6f122021fa1fed058e5a94b3854bb214e554547 -Author: AlexZorkin -Date: Fri Mar 22 13:35:51 2019 -0700 - - merge release - -commit 40d802a4cbbcf662a6f5062b848728905ab173b4 -Merge: a9d140a58 c9ccb7093 -Author: Steve Hillier -Date: Fri Mar 22 13:32:57 2019 -0700 - - Merge pull request #1228 from bcgov/django-test-rc-failure - - use HTTP for Minio calls - -commit 490b20d693618df3eb16cc405fb54aedd4dc739d -Author: Steve Hillier -Date: Fri Mar 22 13:30:57 2019 -0700 - - reset marker list if an error occurs - -commit 97f78bbbf1072238c67d81430d672f313db24d07 -Author: Steve Hillier -Date: Fri Mar 22 13:24:35 2019 -0700 - - separate map css classes (they conflicted) - -commit a9d140a58386ca8cca8e966cdf784e2b38d66319 -Merge: 307ecff83 ad75e9141 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri Mar 22 13:12:15 2019 -0700 - - Merge pull request #1237 from bcgov/alex/unpublishedwells - - [1628] Unpublished Wells Search Results - -commit 307ecff83fb3cf651e10cd9023cb2e9bb23d9b70 -Merge: 72247c714 3ab1d3aa7 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri Mar 22 13:11:11 2019 -0700 - - Merge pull request #1239 from bcgov/alex/generaldisclaimer - - [1260] Added General Disclaimer to Submit Preview Screen - -commit 795a645bc7fcf70ae35a5b6ddecbfb58573b8331 -Author: Steve Hillier -Date: Fri Mar 22 12:48:26 2019 -0700 - - add important tag to max-width for large screens - -commit bc980c4136520261df51fa9626e36ba445dd6b9c -Author: Aaron -Date: Fri Mar 22 11:31:54 2019 -0700 - - lint fix - -commit 2bcbba1283a9750f8376b5457d0f91893c0733a8 -Author: Clark Van Oyen -Date: Fri Mar 22 10:55:42 2019 -0700 - - remove dups in search. - -commit f86dcd50e1b407f250e37d216f496c6afd1a7d68 -Author: Aaron -Date: Thu Mar 21 19:31:12 2019 -0700 - - generate proper hashurl - -commit c1bc463f855b98cafb40e52afa44010870b3bc1f -Author: Aaron -Date: Thu Mar 21 19:01:02 2019 -0700 - - new snapshot - -commit 1aa982e95301b09c04575ce3ca53174c248ef2f4 -Author: Aaron -Date: Thu Mar 21 17:58:17 2019 -0700 - - lint fix - -commit 047258221f9c85c2c6cda59b4878a58827757cd7 -Author: Aaron -Date: Thu Mar 21 16:45:40 2019 -0700 - - search is trigged via search - -commit cd6f4c3ce5ed7d012981d62bba58b93d216c7486 -Author: Steve Hillier -Date: Thu Mar 21 15:34:20 2019 -0700 - - add another fixture to test class - -commit a79ec7ec22fe4d6bc930d799e452b05ec9d8bad8 -Author: Steve Hillier -Date: Thu Mar 21 15:29:57 2019 -0700 - - add fixture to test - -commit ecec3cfb85924bed874e85fe5603ae67a2c1e915 -Author: Steve Hillier -Date: Thu Mar 21 15:26:30 2019 -0700 - - use prefetch_related to reduce number of queries - -commit 3ab1d3aa78157de599597167b26f5ad4710a6de2 -Author: AlexZorkin -Date: Thu Mar 21 15:18:09 2019 -0700 - - added general disclaimer to submit preview screen - -commit a500bb450eb5a990a32428bf84096b4aeab6e79d -Merge: f06c034e7 72247c714 -Author: AlexZorkin -Date: Thu Mar 21 14:57:01 2019 -0700 - - Merge branch 'release' into alex/idirbceidfields - - Lines starting with '#' will be ignored, and an empty message aborts - -commit f06c034e708724717d7a76089156fcf8f4a67c60 -Author: AlexZorkin -Date: Thu Mar 21 14:55:51 2019 -0700 - - known sso method - -commit b2cae9686ea518e7191b6733fe64f09cd052ad3f -Author: Steve Hillier -Date: Thu Mar 21 14:55:17 2019 -0700 - - add tabindex to badge - -commit 72247c7148f3c0a5a5f3056cfc3e1b0963eb0936 -Merge: 800c74056 a663f6e78 -Author: Sybrand Strauss -Date: Thu Mar 21 14:46:55 2019 -0700 - - Merge pull request #1238 from bcgov/sybrand/table_meta_data - - Update metadata - -commit 1c1ef7553fbad8982946b430f29fd4ee05ca1e22 -Author: Steve Hillier -Date: Thu Mar 21 14:41:44 2019 -0700 - - uncomment code - -commit 4ce87186602a1d2ad2fde349899e7bbe2777c4af -Author: Steve Hillier -Date: Thu Mar 21 14:29:24 2019 -0700 - - add a case for no records found - -commit 66eee8a387621c99150be855894fc514d60f426c -Author: AlexZorkin -Date: Thu Mar 21 14:26:07 2019 -0700 - - added check for idir\ or bceid\ in authentication - -commit f101a114fde971db4301a418935c572b46b2080b -Author: Steve Hillier -Date: Thu Mar 21 14:24:36 2019 -0700 - - make info box on basic search tabbable - -commit ebd63f4ad33847788c27ade409b3aa60e25b8141 -Author: Aaron -Date: Thu Mar 21 14:09:17 2019 -0700 - - remove other from fixture - -commit a663f6e78a827777020cdb0fcbbe33198ae75635 -Author: Sybrand Strauss -Date: Thu Mar 21 14:06:43 2019 -0700 - - Update metadata - -commit f2e9bbc11980143f206421ea856179a618541d0c -Author: AlexZorkin -Date: Thu Mar 21 11:49:13 2019 -0700 - - forced username to exist when creat_user or update_user is set - -commit 233a4f9ab03689513953033611ee6ae149f38908 -Merge: 254b08d09 49d99f5af -Author: Clark Van Oyen -Date: Thu Mar 21 11:28:26 2019 -0700 - - Merge branch 'countable/shapefiles' of github.com:bcgov/gwells into countable/shapefiles - -commit 254b08d0933a4b746bc53cc2c38c86fdd95f86d5 -Author: Clark Van Oyen -Date: Thu Mar 21 11:28:19 2019 -0700 - - disable broken migration - -commit ad75e91411f89d92d2bb654137d73191ba9fb8e2 -Merge: 4ae2cce9f 800c74056 -Author: AlexZorkin -Date: Thu Mar 21 10:32:57 2019 -0700 - - Merge branch 'release' into alex/unpublishedwells - -commit 38e728a2289e672c56e4c47057a747a10875df96 -Merge: 09817ba4c 800c74056 -Author: Steve Hillier -Date: Thu Mar 21 10:31:01 2019 -0700 - - Merge branch 'release' into steve/searchfixes - -commit 800c740567afb4572cc265c3094132bf75740fbf -Merge: b427271b2 28f8aa5c4 -Author: Steve Hillier -Date: Thu Mar 21 10:30:32 2019 -0700 - - Merge pull request #1236 from bcgov/cole/map-fixes - - Revert to bounding box style geom filter - -commit 09817ba4ca48ba2309a856eb9daa3b6020af38ef -Author: Steve Hillier -Date: Thu Mar 21 10:26:14 2019 -0700 - - update snapshots - -commit 4ae2cce9fd5f523e258dd0bea74b8e7d494cc79e -Merge: 22783d8a4 b427271b2 -Author: AlexZorkin -Date: Thu Mar 21 09:15:54 2019 -0700 - - Merge branch 'release' into alex/unpublishedwells - -commit 49d99f5af6f3a74a4996cc6966f4f03250d32fab -Author: Aaron -Date: Wed Mar 20 19:57:21 2019 -0700 - - remove axios reference - -commit 5e99b5913820554751c2326a9f28b05486bc82ff -Author: Aaron -Date: Wed Mar 20 19:57:03 2019 -0700 - - clean up - -commit 0e74aacffb25d9b0b7de2aedb2043ae39b8019ee -Author: Aaron -Date: Wed Mar 20 19:51:52 2019 -0700 - - UI for uploading or updating shapefile in the aquifer View and Form Vue components. - -commit 804a256e351b27e40d6b67158f14e23a40bb960b -Author: Aaron -Date: Wed Mar 20 19:51:25 2019 -0700 - - UI for uploading or updating shapefile in the aquifer View and Form Vue components. - -commit 28f8aa5c4e4960f654232489b6d05490eb2cb653 -Author: Cole Maclean -Date: Wed Mar 20 19:48:52 2019 -0700 - - Revert to bounding box style geom filter - -commit 03942edc2693bd917d2cf53944f12ec73b3bd1f1 -Author: Aaron -Date: Wed Mar 20 18:22:15 2019 -0700 - - set shapefile in vuex - -commit 08702ce0838c45d72bd8369a9fed5cd749e0364b -Author: Steve Hillier -Date: Wed Mar 20 17:49:36 2019 -0700 - - reset button resets map view to default - -commit 536e2ab1825fd123a29005ed0b54d70f0e70532b -Author: Steve Hillier -Date: Wed Mar 20 17:36:33 2019 -0700 - - fix container width - -commit 2993044b7a6c1572d44d72ae7edf047b3a55dd9b -Author: Steve Hillier -Date: Wed Mar 20 17:36:28 2019 -0700 - - tie search results to map bounds - -commit 22783d8a494b7a61c0295ffc2e0a7d955f903565 -Author: AlexZorkin -Date: Wed Mar 20 17:33:14 2019 -0700 - - added checks that exclude unpublished wells if user does not have edit role - -commit b427271b2fd5cd165330c56c4c9eed2abd77c010 -Merge: 61cdb4f21 fce21576a -Author: Sybrand Strauss -Date: Wed Mar 20 15:33:10 2019 -0700 - - Merge pull request #1233 from bcgov/sybrand/fix/tests_overwriting_databc_export - - Fixed unit test to use correct mocks! - -commit 61cdb4f2123a9ff25f8408a9449ac0f6e16118e4 -Merge: 1b5b91f80 3e50e7d8d -Author: Steve Hillier -Date: Wed Mar 20 15:02:38 2019 -0700 - - Merge pull request #1231 from bcgov/steve/mapfixes - - adjust bounding box filter - -commit fce21576adc4ce04d9d8714495c2773a3e9e8371 -Author: Sybrand Strauss -Date: Wed Mar 20 14:49:49 2019 -0700 - - Fixed unit test to use correct mocks! - -commit 3e50e7d8df272310c749d1ba1efed301917a56c9 -Author: Steve Hillier -Date: Wed Mar 20 14:28:07 2019 -0700 - - remove print statement - -commit 6c79c68f9cb42e573655ebc3862021907ffdda8f -Author: Steve Hillier -Date: Wed Mar 20 14:25:53 2019 -0700 - - change where bounding box filter is applied - -commit 6672fbe38cfd911a1a34dee6517e612c8a148986 -Merge: de43e7bd0 1b5b91f80 -Author: Steve Hillier -Date: Wed Mar 20 14:22:36 2019 -0700 - - fix conflicts - -commit 1b5b91f8090e8f44d28123b5bcb6330e4224893c -Merge: 59823f4e2 ded7f5540 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Mar 20 13:53:26 2019 -0700 - - Merge pull request #1224 from bcgov/cole/advanced-search-form-pt2 - - [1556] Advanced Search - Search Options - -commit dbcf643a246a4639f64af9ec32054b8ffb35208b -Author: Aaron -Date: Wed Mar 20 13:28:18 2019 -0700 - - aquifer - -commit 59823f4e2ef39dc917e4b4848bcce99d8a7fb419 -Merge: a151fb640 8522f6e33 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Mar 20 13:06:39 2019 -0700 - - Merge pull request #1232 from bcgov/alex/replicationfix - - Replication Fix on Lat Lon - -commit d4eb2daf105332b2078ae35c2ab078d55269b38b -Author: Clark Van Oyen -Date: Wed Mar 20 12:25:46 2019 -0700 - - remove hardcoded ID - -commit 5401742cf78236f0582351f54b9f106f452e818e -Author: Clark Van Oyen -Date: Wed Mar 20 12:15:54 2019 -0700 - - support multipolygon -> polygon sanitation - -commit 3af0fd1c95339ff6851028448a14910b414d9986 -Author: Clark Van Oyen -Date: Wed Mar 20 11:46:27 2019 -0700 - - Bulk import - -commit 8522f6e33c6614e21a6933cf823daf742a0d9812 -Author: AlexZorkin -Date: Wed Mar 20 09:40:55 2019 -0700 - - replication fix on lat lon - -commit dd31fa84a09f08d02b8e380cb706e721ed380c3a -Merge: 45704762d 45cc4ee5b -Author: Clark Van Oyen -Date: Tue Mar 19 18:24:22 2019 -0700 - - Merge branch 'countable/shapefiles' of github.com:bcgov/gwells into countable/shapefiles - -commit 45704762d45f990c1e2a757e0df2d6d6a153dbc1 -Author: Clark Van Oyen -Date: Tue Mar 19 18:24:04 2019 -0700 - - auto-upload real aquifers shapes. - -commit de43e7bd0e9e4f9fbf03b0bd74d3ed5da80492f9 -Author: Steve Hillier -Date: Tue Mar 19 17:33:53 2019 -0700 - - adjust bounding box filter - -commit a151fb64016c433a0b7334a2f081d202be1d1f0a -Merge: 708c1b827 140cb54e2 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Mar 19 17:04:30 2019 -0700 - - Merge pull request #1229 from bcgov/task/1738_jenkinsDbBkCleanup - - [1738] Auto-Cleanup Pipeline Backups - -commit 140cb54e2cc95138d5d114d5f05f1b98224c2f0b -Author: Derek Roberts -Date: Tue Mar 19 16:30:53 2019 -0700 - - Removed extra var saves - -commit a2f210064ac5675f737883962bd5679bf8bb3c6b -Merge: f00539474 127bfd8f1 -Author: Aaron -Date: Tue Mar 19 15:48:43 2019 -0700 - - Merge branch 'countable/milestone1' of https://github.com/bcgov/gwells into countable/milestone1 - -commit 45cc4ee5b5c58e830bda9626ae830abd8ca2a616 -Merge: aeb517c81 d31813b8e -Author: Daeyoung Park -Date: Tue Mar 19 18:13:48 2019 -0400 - - Merge branch 'countable/shapefiles' of github.com:bcgov/gwells into countable/shapefiles - -commit aeb517c81cbe7eb42aaccc6c66a77dc1d8ba2345 -Author: Daeyoung Park -Date: Tue Mar 19 18:13:33 2019 -0400 - - working on aquifers map - -commit 53f5e840836147a65d86174ab2cddd611b41b125 -Author: Daeyoung Park -Date: Tue Mar 19 17:15:29 2019 -0400 - - update aquifer detailed view (layout, geom data) - -commit d31813b8efb0c97b0a791de6061598dea8f2ea06 -Merge: f833e5824 c9ccb7093 -Author: Clark Van Oyen -Date: Tue Mar 19 14:13:06 2019 -0700 - - Merge branch 'django-test-rc-failure' into countable/shapefiles - -commit 708c1b8273546f5653985a2861019a7316c31566 -Merge: 65ac27f77 7da53597f -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Mar 19 13:56:22 2019 -0700 - - Merge pull request #1230 from bcgov/steve/mapsearchfix - - map locations now use same filter as well search - -commit c2385f89cfa672f072569fd0a4b9d3e166ec8877 -Author: Derek Roberts -Date: Tue Mar 19 13:46:04 2019 -0700 - - Move db backup and cleanup to end of PROD - -commit 5d684aaaac1f924b967a49f7663cfb15dae2931a -Author: Derek Roberts -Date: Tue Mar 19 13:43:52 2019 -0700 - - Db backup cleanup function - -commit 7da53597f9cb4117cecbaed1dbb77f4693289815 -Author: Steve Hillier -Date: Tue Mar 19 12:38:17 2019 -0700 - - add a test for well locations endpoint - -commit c9ccb7093c7bf7932a2836e35f7215d7b1450acd -Author: Clark Van Oyen -Date: Tue Mar 19 12:26:01 2019 -0700 - - Actually use is_secure variable. - -commit 0c1b6f1df2294c6d8a95756e39b23874cda831f3 -Author: Steve Hillier -Date: Tue Mar 19 12:24:26 2019 -0700 - - map locations now use same filter as well search - -commit bb3d1ad85a13d97bc46758fb6db3246fa8e0f9e1 -Author: Clark Van Oyen -Date: Tue Mar 19 12:23:51 2019 -0700 - - git to ignore all Excel files - -commit bdfb0317efa2f3429d2d8586eb55520556b2010b -Author: Clark Van Oyen -Date: Tue Mar 19 12:22:14 2019 -0700 - - remove unintended file - -commit 409d4942bf5db085c919ea33a94d59aeb9ac55c3 -Author: Clark Van Oyen -Date: Tue Mar 19 12:04:11 2019 -0700 - - missing file - -commit 1c08b106c678638a168d09ab8a1cb7764d5b95b8 -Author: Clark Van Oyen -Date: Tue Mar 19 12:03:26 2019 -0700 - - Another case of passing is_secure to Minio - -commit 9cf1183e81f97189f4938b0c5a3edbac56603866 -Author: Derek Roberts -Date: Tue Mar 19 12:00:29 2019 -0700 - - Backup cleanup testing block in DEV - -commit 65ac27f7750d0ed896aff8b3bce11ce2f8da44c6 -Merge: dfaf72d80 ebb033d2e -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Mar 19 11:49:45 2019 -0700 - - Merge pull request #1216 from bcgov/task/1679_jenkinsBackups - - [1679] Jenkinsfile Backups - -commit f833e58242b809c4329f4777185a6c1abac49bfb -Author: Clark Van Oyen -Date: Tue Mar 19 11:41:42 2019 -0700 - - add shapefile - -commit dfaf72d8003ac04352f925f9ed5b11ea0837a610 -Merge: d44b9cec3 70418cfb8 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Mar 19 11:09:36 2019 -0700 - - Merge pull request #1226 from bcgov/alex/geomupdate - - [1682] GEOM Update - -commit ed8f9a4ae1af71f39c630d4dcf2463f1f0424357 -Author: Clark Van Oyen -Date: Tue Mar 19 11:03:12 2019 -0700 - - check minio proto caonically - -commit ab15479f804e236bfc0a305c91e3aba387348a35 -Author: Clark Van Oyen -Date: Tue Mar 19 10:53:52 2019 -0700 - - use HTTP for Minio calls - -commit 70418cfb85b316f1063d96788ba962d8d8c82b80 -Author: AlexZorkin -Date: Tue Mar 19 10:39:56 2019 -0700 - - added comments explaing 4326 choice - -commit 76e9a3df64576719a015cc9ab5a529a1b239e33e -Author: AlexZorkin -Date: Tue Mar 19 10:19:26 2019 -0700 - - fixed srid on replication - -commit ebb033d2eb7480d9bbd58175109fc2342e2b3f70 -Author: Derek Roberts -Date: Tue Mar 19 09:47:45 2019 -0700 - - Making sure to fail fn on backup fail - -commit 7eef627af7e77292bc5e5a91f0352fa5c4192fe5 -Author: Clark Van Oyen -Date: Mon Mar 18 22:27:20 2019 -0700 - - README instructions for shapefile import - -commit 913eb53c220abf4d8b2e1da6178b9f4ba9068235 -Author: Clark Van Oyen -Date: Mon Mar 18 22:26:28 2019 -0700 - - shapefile import mgnt command - -commit ded7f554008ca239924cf54d009c8ae627f621fd -Author: Cole Maclean -Date: Mon Mar 18 20:11:46 2019 -0700 - - Added support for "any value" to a few more fields. - - "EMS ID" and "Observation Well Number". Also cleaned up spacing. - -commit 556f8f0e4e7b298cc6a6630e5d28fee238ea21f4 -Author: Derek Roberts -Date: Mon Mar 18 17:30:20 2019 -0700 - - Move db backup to early portion of deployment, not own stage - -commit 030ffa39e12c325d6aadde2893d11607b8c558bb -Author: Derek Roberts -Date: Mon Mar 18 17:24:52 2019 -0700 - - Move db backup (and yes/no prompt) to right before PROD deployment - -commit 088b80abfd4c476319c493ffd8b450855f378632 -Author: Derek Roberts -Date: Mon Mar 18 17:06:09 2019 -0700 - - Simplify dump name - -commit bd557810218dd8d175ed7ff6257665019319e91f -Author: Derek Roberts -Date: Mon Mar 18 16:55:51 2019 -0700 - - Move db backup to STAGING before deployment - -commit 13249a21d7714686eed7e94d9bddb4e37188ce30 -Author: Derek Roberts -Date: Mon Mar 18 16:30:06 2019 -0700 - - Use function for db backup - -commit 8f9864acc6307f7d3fbf1fd188a83a8149e7b717 -Author: Derek Roberts -Date: Mon Mar 18 13:59:46 2019 -0700 - - Fix and split up backup cmd - -commit 4bfc26a305b2aa9d82ce7ca84ea43d39179662f4 -Author: Derek Roberts -Date: Thu Mar 14 15:05:24 2019 -0700 - - Fixed oc command - -commit 0a5419b77d503f3f3e42ae4b5e3bb1be81742921 -Author: Derek Roberts -Date: Thu Mar 14 15:02:50 2019 -0700 - - Revised vars - -commit 7f03d8a7874145f35b3257755fe61a7eb3b4147b -Author: Derek Roberts -Date: Thu Mar 14 14:29:36 2019 -0700 - - Test backup in DEV - -commit 68aecb46e592cd530fea8badd08058bc8bb95b53 -Merge: b6b0997ac aea67bc8c -Author: AlexZorkin -Date: Mon Mar 18 16:48:47 2019 -0700 - - Merge branch 'cole/bbox-filter' into alex/geomupdate - -commit b6b0997ac7b9389b58c2b77668acb630c060beec -Merge: c70b73463 d44b9cec3 -Author: AlexZorkin -Date: Mon Mar 18 16:48:04 2019 -0700 - - Merge branch 'release' into alex/geomupdate - -commit c70b734630e57bd439778c81e9636e3df453c7a3 -Author: AlexZorkin -Date: Mon Mar 18 16:47:40 2019 -0700 - - submissions test fixes - -commit d44b9cec39bb085c4cba39c5aa094b10de31ee05 -Merge: ca9d8a5f3 ffbfafa37 -Author: Sybrand Strauss -Date: Mon Mar 18 16:19:55 2019 -0700 - - Merge pull request #1214 from bcgov/sybrand/databc_optimize - - [1720] DataBC - server pre-rendered JSON - -commit 7000dc8f17cb3c876c394335cf1ad7dbd3baeb97 -Author: AlexZorkin -Date: Mon Mar 18 16:12:28 2019 -0700 - - altered lat lon to use geom field - -commit ffbfafa37acefc6197b841720c47a46dd53886ac -Author: Sybrand Strauss -Date: Wed Mar 13 14:47:15 2019 -0700 - - - Switched from realtime GeoJSON to pre-created files stored on S3 server. - - Changed API to redirect to pre-created files. - - Changed directory for wells export, in order to re-use export bucket for multiple export types - - Using common cronjob for all python manage.py commands - - Updating replication to work with non-null values - - Reading data from db in chunks in order to avoid excessive memory usage - - Serializing and writing to file on record by record basis in order to reduce memory usage - -commit ca9d8a5f31417d06a6855ad627fb21fe70d7fdd5 -Merge: 74a1c7726 97390e34a -Author: Steve Hillier -Date: Mon Mar 18 13:54:17 2019 -0700 - - Merge pull request #1215 from bcgov/alex/samedrillerfix - - [1714] Fix Person Responsible Edit Submission - -commit 74a1c7726eae7e3b4854eb2d429c418595626f19 -Merge: 235d2b30b 26cb67819 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Mar 18 13:48:47 2019 -0700 - - Merge pull request #1219 from bcgov/alex/lithaddrows - - [1702] Lithology Table Additions - -commit 235d2b30b03f09cabe8448695554e4796fdc0c62 -Merge: 51bd28871 fb0cc5c6b -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Mar 18 13:37:53 2019 -0700 - - Merge pull request #1225 from bcgov/alex/pagenotfound - - [956] Added 404 Page Not Found Page and Routing - -commit 127bfd8f1de04201ba82dbee8042debcfe603143 -Author: Daeyoung Park -Date: Mon Mar 18 16:22:33 2019 -0400 - - remove map stuff - -commit 57f0f229c85dd9e9f5edef9c9fea094c860e1810 -Merge: 86e6dddfb c8e5192a2 -Author: Daeyoung Park -Date: Mon Mar 18 16:11:02 2019 -0400 - - Merge branch 'countable/milestone1' of github.com:countable-web/gwells into countable/milestone1 - -commit 86e6dddfb3787e9a541db1f48ae272ca09db3604 -Author: Daeyoung Park -Date: Mon Mar 18 16:10:44 2019 -0400 - - map size - -commit c8e5192a21b8a7852b55866aa3aa8ba662099cc9 -Merge: 2046bcf41 51bd28871 -Author: Clark Van Oyen -Date: Mon Mar 18 13:00:50 2019 -0700 - - Merge branch 'release' of github.com:bcgov/gwells into countable/milestone1 - -commit 312142f024b13c3e78aac3e962d427b1173d84cc -Merge: 974b9d534 2046bcf41 -Author: Clark Van Oyen -Date: Mon Mar 18 12:56:43 2019 -0700 - - Merge branch 'countable/milestone1' into countable/milestone5 - -commit 2046bcf41e40d1ac88028bfd0b10036eaebd6db4 -Merge: ccf3b15f8 45c22cfd1 -Author: Clark Van Oyen -Date: Mon Mar 18 12:37:05 2019 -0700 - - Merge branch 'countable/milestone1' of github.com:countable-web/gwells into countable/milestone1 - -commit 26cb678194cce616574879059b8d0d19496e9244 -Author: AlexZorkin -Date: Mon Mar 18 11:29:46 2019 -0700 - - fix for unit tests - -commit 51bd28871e7210e1a11b9da206449b047d66e2fa -Merge: 794466ec0 029238d1a -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Mar 18 10:58:15 2019 -0700 - - Merge pull request #1221 from bcgov/alex/replicationfix - - Fix for Replication on Null Fields - -commit 794466ec0fd0fc6b6d4a2b776ae9e89bdf91620a -Merge: 17d9f0fcd b843400ff -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Mar 18 10:13:11 2019 -0700 - - Merge pull request #1222 from bcgov/alex/multicallsfix - - [1625] Added Lag Input for Latitude Longitude Fields on Submission and Edit - -commit 974b9d534c56fdb8818b3748cc6398d2dc7f7ba0 -Author: Clark Van Oyen -Date: Mon Mar 18 00:17:28 2019 -0700 - - shapefile upload api - -commit f00539474b06f45e1a19990f945b3df7f3201983 -Author: Aaron -Date: Sun Mar 17 21:48:38 2019 -0700 - - Start the page with 0 aquifers - -commit 609e1e6e751df1285d5730a7f63bc035c9da18b6 -Author: Daeyoung Park -Date: Sun Mar 17 21:35:38 2019 -0400 - - update aquifer detail view layout - -commit 45c22cfd133a49cf47fdd9d23e347ff24292baff -Author: Daeyoung Park -Date: Sun Mar 17 20:50:54 2019 -0400 - - add aquifer map with togglable layers - -commit 88a6d87347444a4eee512966a1c39d163cd2c4be -Author: Clark Van Oyen -Date: Sun Mar 17 12:07:00 2019 -0700 - - shapefile WIP - -commit d9cc0e54d43e3ad8491223d53cb9bb1cc9497d64 -Author: Cole Maclean -Date: Sat Mar 16 20:00:59 2019 -0700 - - Boolean/range combo field, and a few bugfixes. - -commit c0ec789b6cad904651f48c0ceb13b936de36f20e -Author: Cole Maclean -Date: Sat Mar 16 19:59:08 2019 -0700 - - Artesian flow/pressure bool filters, and m2m filter fixes. - -commit 8fa3fbd502bb6053b2349df963b48f25a87cf5df -Author: Cole Maclean -Date: Sat Mar 16 14:51:57 2019 -0700 - - Small form behaviour cleanups. - - * Track which tab users are on in hash - * Default to selected placeholder in select fields - * Don't submit empty filters to server - -commit 2532d081f34ebc2091ea7afa03b67efa66829b45 -Author: Cole Maclean -Date: Sat Mar 16 14:01:18 2019 -0700 - - Fixed match any, try 2. - -commit 1873ed2a8d98316274d77195f9cfa020ec99314e -Author: Cole Maclean -Date: Thu Mar 14 19:31:34 2019 -0700 - - Removed some code now handled by filters. - -commit fb0cc5c6b424ae1486779420ddce9c404d70ff43 -Author: AlexZorkin -Date: Fri Mar 15 17:27:47 2019 -0700 - - padding - -commit 817ef4e59051efac07dba3a3826b89b539aa18a5 -Author: AlexZorkin -Date: Fri Mar 15 17:25:26 2019 -0700 - - added pagenotfound page for 404 - -commit b843400ff4bea17bc20c8e9277477fe625f878b9 -Author: AlexZorkin -Date: Fri Mar 15 15:29:52 2019 -0700 - - added timeout to coords and coordsMap calls to insideBC api endpoint to avoid un-necessary calls - -commit 029238d1af9b47deb289159798a68c1886d9e269 -Author: AlexZorkin -Date: Fri Mar 15 14:05:34 2019 -0700 - - added coalesce around possible update related null fields, used created as default - -commit 17d9f0fcdfd53d0041ac1f9ed2d1bed973fbc660 -Merge: 201c2fdb1 cf25573c6 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri Mar 15 11:10:31 2019 -0700 - - Merge pull request #1220 from bcgov/alex/migrationfix - - Fix for Null fields Migration - -commit cf25573c6e487cdffa86c365d49bb8b9c5c7c8ab -Author: AlexZorkin -Date: Fri Mar 15 10:33:00 2019 -0700 - - fix on create_date - -commit 15d2c0286db4351d297188609c7fe6fd9d5e8918 -Merge: 426475c1e ccf3b15f8 -Author: Clark Van Oyen -Date: Thu Mar 14 22:38:30 2019 -0700 - - Merge branch 'countable/milestone1' into countable/milestone5 - -commit ccf3b15f809bef3985b5267b1f305a981b5cf960 -Author: Clark Van Oyen -Date: Thu Mar 14 22:38:12 2019 -0700 - - Yet another migration - -commit 426475c1ec313827adc9d54bb2ee6286be100ee7 -Merge: cb7fc4e20 b4124a1b8 -Author: Clark Van Oyen -Date: Thu Mar 14 22:24:21 2019 -0700 - - Merge branch 'countable/milestone1' into countable/milestone5 - -commit b4124a1b8335c82d91f40312b2d355c361ea8cc1 -Merge: da0321caf 201c2fdb1 -Author: Clark Van Oyen -Date: Thu Mar 14 22:23:27 2019 -0700 - - Merge branch 'release' of github.com:bcgov/gwells into countable/milestone1 - -commit cb7fc4e208d19abedd0ba5789cf5de6d8fd7ae46 -Merge: 2aa846da5 201c2fdb1 -Author: Clark Van Oyen -Date: Thu Mar 14 22:23:18 2019 -0700 - - Merge branch 'release' of github.com:bcgov/gwells into countable/milestone5 - -commit da0321caf8e5a172f889c6300d8e567faebba94a -Author: Clark Van Oyen -Date: Thu Mar 14 22:19:09 2019 -0700 - - Merge intent - - Resolve various unofficial backlog required for merge, review comments. - -commit 8c2910720941f61d1975286012f25e2f4e2947b9 -Author: Clark Van Oyen -Date: Thu Mar 14 21:57:45 2019 -0700 - - Fix migrations - -commit aea67bc8c24ad78a8a756ff085c3a415b80231fa -Author: Cole Maclean -Date: Thu Mar 14 20:11:25 2019 -0700 - - New geom filter point names: sw_lat, sw_long, ne_lat, ne_long - - Also removed latitude and longitude filters. - -commit 2aa846da55a9396e9aa6a990bf42a0ec9d979743 -Merge: 5e4629d94 7b00310e5 -Author: Clark Van Oyen -Date: Thu Mar 14 18:38:06 2019 -0700 - - Merge branch 'countable/milestone1' of github.com:countable-web/gwells into countable/milestone5 - -commit 5e4629d946d7566ba7fd7549b60cb955bd300d37 -Merge: 0bdf74f73 290491444 -Author: Clark Van Oyen -Date: Thu Mar 14 18:37:27 2019 -0700 - - Merge branch 'countable/milestone1' of github.com:bcgov/gwells into countable/milestone5 - -commit 0bdf74f73a732f51e9502698a6b5158e8cb64d5d -Author: Clark Van Oyen -Date: Thu Mar 14 18:36:35 2019 -0700 - - adjust fixtures for better behaviour on dev/prod - -commit 434bbcda93fc82efed21d5e482393911324a3d5f -Author: AlexZorkin -Date: Thu Mar 14 16:42:15 2019 -0700 - - added 10 rows to empty lithology table, fixed lithology view on well summary - -commit 201c2fdb14d71282099460fc8d2ce014a5fd6b60 -Merge: 1d4ca407b c790f49f7 -Author: Steve Hillier -Date: Thu Mar 14 14:10:21 2019 -0700 - - Merge pull request #1183 from bcgov/cole/advanced-search-form - - [1556] WIP: Advanced Search - Search Options - -commit 1d4ca407befa97c3d32fc34fb71cc35884210492 -Merge: 13c396639 6b8367551 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Mar 14 12:45:58 2019 -0700 - - Merge pull request #1207 from bcgov/task/1679_backups - - [1679] Backup Container - -commit 6b836755192518ebc57bdc45da4b568e9fce9036 -Author: Derek Roberts -Date: Thu Mar 14 11:03:40 2019 -0700 - - Improved cronjob tag to include db deployment - -commit 77f80120d1096f6072c34d79237f4ba92ac64f94 -Author: Derek Roberts -Date: Wed Mar 13 16:53:43 2019 -0700 - - Allow executing script from outside dir - -commit b298ee95add46b43ee4076a7f923b2e4ad546c10 -Author: Derek Roberts -Date: Wed Mar 13 16:52:20 2019 -0700 - - Improved help message - -commit 560bc968a67102d7b8a42e9eb5abe6454b8799f9 -Author: Derek Roberts -Date: Wed Mar 13 15:32:43 2019 -0700 - - Missed param - -commit 470423136aca5b63b614dc64b22cd0922167388d -Author: Derek Roberts -Date: Wed Mar 13 14:54:43 2019 -0700 - - Revised cronjob labels - -commit 0544614f9d64f67233fdfebb413f884854b288da -Author: Derek Roberts -Date: Wed Mar 13 14:46:22 2019 -0700 - - Setup script for cron backups - -commit 5ec710cabc4dcb6757ae87d03c3c0f5fc8a5d887 -Author: Derek Roberts -Date: Wed Mar 13 12:00:49 2019 -0700 - - +JOB_DEADLINE_SECONDS - -commit cc007bc384675402f77bc287fea2ca56334c752c -Author: Derek Roberts -Date: Wed Mar 13 11:58:02 2019 -0700 - - Cleaned up labels, comments, descriptions - -commit 4677663ff2ad9017489305ff8980e503710159cc -Author: Derek Roberts -Date: Wed Mar 13 11:17:10 2019 -0700 - - GWells specific defaults in backup.bc.yaml - -commit bd2c7ffcbcd14ec3d31f193892b5370a1dc7e711 -Author: Derek Roberts -Date: Wed Mar 13 10:40:00 2019 -0700 - - Removed backup.cj.json - -commit 9ab544f17d69ca53f9c391683b0c90f05e65af68 -Author: Derek Roberts -Date: Wed Mar 13 10:38:45 2019 -0700 - - Renamed: backup-template.cj.yaml -> backup.cj.yaml - -commit 04e1dc47accd18442b6f633de133c86ec19d4c01 -Author: Derek Roberts -Date: Wed Mar 13 10:37:40 2019 -0700 - - Replaced backup JSON with YAML - -commit 8831946a128a8c30f916eed32f897fa332128f64 -Author: Derek Roberts -Date: Wed Mar 13 10:27:15 2019 -0700 - - Setup and consume PVC - -commit 27ca5f00d28885144b01e144842ad1f11a9e99f4 -Author: Derek Roberts -Date: Tue Mar 12 18:00:56 2019 -0700 - - Continue to sub in vars - -commit ceba527ee3eba8111d2e9cf38a7affe53480ca75 -Author: Derek Roberts -Date: Tue Mar 12 17:50:38 2019 -0700 - - Remove hard coded namespace setting - -commit fe606a304a211325d267ecc4e08fabff473f8e11 -Author: Derek Roberts -Date: Tue Mar 12 17:50:06 2019 -0700 - - Consolidate variables - -commit 271afe6a2fa0d61f65ac7c5a2673a60812ed1d81 -Author: Derek Roberts -Date: Tue Mar 12 17:10:49 2019 -0700 - - Template uses more from vars - -commit 3c923ed278ea53f07d674e4e2fe81e48bc692288 -Author: Derek Roberts -Date: Tue Mar 12 16:50:56 2019 -0700 - - Var rev for secret, config map and db name - -commit db0c276b5f61244f262c239944499ed3fa3af2fa -Author: Derek Roberts -Date: Tue Mar 12 16:30:02 2019 -0700 - - Setup and consume Config Map defaults - -commit 1240f3f5995e6c7a57dd5d87438b44ff82e238f6 -Author: Derek Roberts -Date: Tue Mar 12 15:55:56 2019 -0700 - - Added and consumed params - -commit c8fb109462601fc81b02abd578e188cf762b7cbd -Author: Derek Roberts -Date: Tue Mar 12 14:53:44 2019 -0700 - - Template for backup jobs on STAGING, still early - -commit 57e8fe405a3ec20068f42407e79e90bdfcbe1953 -Author: Derek Roberts -Date: Fri Mar 8 15:34:41 2019 -0800 - - Registry Docker login comments - -commit 489ff04acd303de52e823793e3b395719fa3792b -Author: Derek Roberts -Date: Fri Mar 8 11:08:23 2019 -0800 - - Copied over build, deployment and cronjob configs from backup-conatiner project - -commit c790f49f74c850fae6eb2c983cb7aef3937f0d19 -Author: Cole Maclean -Date: Wed Mar 13 21:27:08 2019 -0700 - - Moved publication status to main form as per mockup. - -commit 994814c37997d3d59ebb710b558fb254fc8c1ce3 -Author: Cole Maclean -Date: Wed Mar 13 20:51:33 2019 -0700 - - Added remaining additional search fields. - -commit a702303d27f73d7f5aaf069aec90e723caac64e0 -Author: Cole Maclean -Date: Tue Mar 12 21:26:22 2019 -0700 - - Added combined range filters - -commit 062681f5d700066f9c4ad8822109ce03c9e923b4 -Author: Cole Maclean -Date: Tue Mar 12 20:49:27 2019 -0700 - - Switched to tabs; better range layout. - -commit 9b01ac45c2059f392e565f5e9ca2e27cef4a2f46 -Author: Cole Maclean -Date: Tue Mar 12 07:36:59 2019 -0700 - - Default to match any = true - -commit 1b88e4f9b91d2c2b5e0c2cc39efcb44cc8183bec -Author: Cole Maclean -Date: Sun Mar 10 22:00:57 2019 -0700 - - Updated comment. - -commit 321c745aee078cd5d4b6298df3589424892a163d -Author: Cole Maclean -Date: Sun Mar 10 21:29:37 2019 -0700 - - Internal field support, added more fields. - - Also fixed a few formatting issues. - -commit b614c63aa7529d0a3dc405966d7dc6ef1be8d207 -Author: Cole Maclean -Date: Sun Mar 10 10:29:38 2019 -0700 - - Support for internal fields in well list. - -commit 1bb57bb746fc25b8e0c67bd58c02708a6bf1be7d -Author: Cole Maclean -Date: Sun Mar 10 09:09:13 2019 -0700 - - Added bounding box filter. - -commit 131996de6a33216fbfa7dd5a1011f446a573888e -Author: Cole Maclean -Date: Sun Mar 3 20:31:52 2019 -0800 - - Initial advanced search form. - -commit ae8e115f00d94f2337f85bda54a3a85a5dd3fcd4 -Author: Cole Maclean -Date: Fri Mar 1 16:45:31 2019 -0800 - - Updated search form. - -commit 70ce3dace88f8bac07d1a359579bc457d57d2b5c -Author: Cole Maclean -Date: Tue Mar 5 16:04:23 2019 -0800 - - Any/all filter support. - -commit f4b66d3efe18b312b74fd4bacb0a41bfc20c4048 -Author: Cole Maclean -Date: Tue Mar 5 14:03:04 2019 -0800 - - Allow public searching by company name. - -commit 711718882e1bfa30e2a3afdef9d74bbb9cbbd61e -Author: Cole Maclean -Date: Sun Mar 3 20:31:14 2019 -0800 - - Allow aquifer id to be a text box. - -commit 79751559993a345695e0cacc2f60b416ec0b58bb -Author: Cole Maclean -Date: Fri Mar 1 16:44:48 2019 -0800 - - Added wells store with driller/org API calls. - -commit a9941efb72e22bee210f0ceb955c2e50bfccd431 -Author: Cole Maclean -Date: Fri Mar 1 16:09:24 2019 -0800 - - Added licenced status codes to options API endpoint. - -commit 97390e34acd46cd1aa2b7a947731d66dc543f1d5 -Author: AlexZorkin -Date: Wed Mar 13 16:59:49 2019 -0700 - - fix on driller name search reset - -commit 7b00310e561d172b3b8609209d732ec0efd011fc -Author: Daeyoung Park -Date: Wed Mar 13 14:02:10 2019 -0400 - - merge migrations - -commit 06c5e935cd3adc8472821633cb839fc7f2833112 -Merge: a85d80a6b 13c396639 -Author: Daeyoung Park -Date: Wed Mar 13 13:48:49 2019 -0400 - - merge release branch - -commit a85d80a6b3bdebc3caca233dd2557ddf1f5e0cd5 -Author: Daeyoung Park -Date: Wed Mar 13 13:45:26 2019 -0400 - - merged migration - -commit 13c3966391b3015f7b2f509f76df49916fa3299c -Merge: e52ffd79b 687bd6f62 -Author: Steve Hillier -Date: Wed Mar 13 09:37:38 2019 -0700 - - Merge pull request #1098 from bcgov/steve/subm-history - - [1530] simple well activity report history (starting point) - -commit 687bd6f62870d28ec8accb3950f5c4f9cf56b4c0 -Author: Steve Hillier -Date: Tue Mar 12 17:19:53 2019 -0700 - - fall back on the 'stacked' update_user value - -commit e52ffd79b5f1a62d04eb36834161d3b1cdc4ddc0 -Merge: 57ee4f469 5b8799e3c -Author: Sybrand Strauss -Date: Tue Mar 12 16:23:15 2019 -0700 - - Merge pull request #1213 from bcgov/sybrand/bigger_timeout - - Increasing the timeout even more to find the limit - -commit 5b8799e3c4479bc9333de9b204362b77f2e31479 -Author: Sybrand Strauss -Date: Tue Mar 12 15:42:38 2019 -0700 - - Increasing the timeout even more to find the limit - -commit 6fe0c12671d038b46e9db822a923c50f06d199c3 -Merge: 8f0537ced 57ee4f469 -Author: Steve Hillier -Date: Tue Mar 12 15:25:44 2019 -0700 - - Merge branch 'release' into steve/subm-history - -commit 57ee4f469e5b72eabda2524cef513015fc1c98b0 -Merge: 50f64d814 07f209ec5 -Author: Sybrand Strauss -Date: Tue Mar 12 14:08:07 2019 -0700 - - Merge pull request #1212 from bcgov/sybrand/tinker_with_timeout - - Increase the timeout to 60 seconds to allow for query to complete. - -commit 8f0537ced0ad751a495b4f1641c2c85816fb14ad -Merge: be69a2091 50f64d814 -Author: Steve Hillier -Date: Tue Mar 12 14:00:57 2019 -0700 - - Merge branch 'release' into steve/subm-history - -commit 50f64d814e4514f34bc0699628cd77c962052a1b -Merge: ed47d5041 a02aa24ef -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Mar 12 13:58:04 2019 -0700 - - Merge pull request #1211 from bcgov/alex/nullfieldsfix - - Fix for Pending Trigger Events Registries Migration - -commit be69a209140aed424ab4ac435a84480b826b45cf -Author: Steve Hillier -Date: Tue Mar 12 13:37:22 2019 -0700 - - remove print - -commit a02aa24efc00d5d7f4c88972a9b23d2c57c0b719 -Merge: 67c160e74 ed47d5041 -Author: AlexZorkin -Date: Tue Mar 12 13:26:53 2019 -0700 - - Merge branch 'release' into alex/nullfieldsfix - -commit 07f209ec5c238650f4e19f6e5724c45a67cd78a0 -Author: Sybrand Strauss -Date: Tue Mar 12 13:22:49 2019 -0700 - - Increase the timeout to 60 seconds to allow for query to complete. - -commit e1762e39056f599c3cb17a8b661782ea98847bd7 -Author: Steve Hillier -Date: Tue Mar 12 13:04:55 2019 -0700 - - add a scroll to top after submitting a well report - -commit 718411fb470bfe5679d8189aafc3552f395db3f8 -Author: Steve Hillier -Date: Tue Mar 12 12:55:49 2019 -0700 - - fix the way create/update user is tracked for well stacking - -commit 67c160e74d0adc6a630506486197d09c1a19a417 -Author: AlexZorkin -Date: Tue Mar 12 12:44:55 2019 -0700 - - fix for pender trigger events error on production data - -commit f9cbc9d1c0c4549a37e6adad5f79ea197481843e -Author: Steve Hillier -Date: Tue Mar 12 12:28:42 2019 -0700 - - change the way the edit link is formed - -commit 10da0b44a15195b9e6cc45ce8d62732023743080 -Author: Steve Hillier -Date: Tue Mar 12 12:22:41 2019 -0700 - - remove unused code - -commit cb3287a18d96ac45ce6f30bf17927d7d17f9cb18 -Merge: 294850315 ed47d5041 -Author: Steve Hillier -Date: Tue Mar 12 12:04:31 2019 -0700 - - fix conflicts with merged PR - -commit ed47d504105da7b33363c1b10c6b08373c074441 -Merge: 50a86af75 fc47e107f -Author: Sybrand Strauss -Date: Tue Mar 12 11:54:35 2019 -0700 - - Merge pull request #1203 from bcgov/feature/databc_prototype - - DataBC API prototype - -commit 294850315b9c5b61351bfe8b64a7eb3459dadfb9 -Merge: a0955aa89 50a86af75 -Author: Steve Hillier -Date: Tue Mar 12 11:23:24 2019 -0700 - - fix merge conflicts - -commit fc47e107f2e2aba99d5c414d811b05a0ded0e515 -Author: Sybrand Strauss -Date: Wed Mar 6 18:19:11 2019 -0800 - - Adding spatial endpoints for DataBC - - - Added gwells/api/v1/gis/wells - - Added gwells/api/v1/gis/aquifers - - Added gwells/api/v1/gis/lithology - - Added geometry column to aquifer - - Removed duplicate aquifer_id and move to after company_of_person_responsible - - Some pep8 related formatting - - Added tests for new endpoints - - Changed nose.cfg to reference directories where possible - - Fixed unit test failures on registries - -commit 8bac09f7d1dc37eee74af38a6ac8d0e778cf325d -Merge: 290491444 50a86af75 -Author: Daeyoung Park -Date: Tue Mar 12 12:46:33 2019 -0400 - - Merge remote-tracking branch 'upstream/release' into countable/milestone1 - -commit 50a86af75192612e3e785cfd96e9cd9e3fd00f8c -Merge: 9d44db454 46b37b06a -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Mar 12 08:39:19 2019 -0700 - - Merge pull request #1205 from bcgov/alex/nulleffectivedates - - [1392][1411] Non-Nullable Fields Update - -commit 46b37b06ad32978c82b3bc8efff7dc3ee25eb80d -Author: AlexZorkin -Date: Mon Mar 11 23:52:52 2019 -0700 - - fixed migration field types, updated fixtures, updated registry entities to use expired_date to check for deleted records - -commit 290491444538a4e65fbbbe99f3aa7b1d7f2695a2 -Author: Daeyoung Park -Date: Tue Mar 12 02:33:26 2019 -0400 - - fix lint error - -commit d258763f407d131b0629e90126ebec4b0c679ef6 -Author: Daeyoung Park -Date: Tue Mar 12 02:33:06 2019 -0400 - - updated aquifers api tests for resources - -commit 2e07538879721870b0d319fdfaacef6ecd75db61 -Author: Clark Van Oyen -Date: Mon Mar 11 17:38:47 2019 -0700 - - fix new aquifer api - -commit 247d0c80b4d0fb1374306cdf346c62c5a678b890 -Merge: 8b134bb15 479a7c7f8 -Author: Clark Van Oyen -Date: Mon Mar 11 17:34:42 2019 -0700 - - Merge branch 'countable/milestone1' of github.com:countable-web/gwells into countable/milestone1 - -commit 8b134bb15eb99a699a388e304324f75a4f311111 -Author: Clark Van Oyen -Date: Mon Mar 11 17:34:25 2019 -0700 - - fix create flow - -commit 479a7c7f8b6ba48b2317ad0ed117c01939f62efd -Author: Daeyoung Park -Date: Mon Mar 11 20:34:04 2019 -0400 - - add resources array - -commit a0955aa89cfba0ecce754e3f51e1546b8cef7f80 -Merge: 89c159365 9d44db454 -Author: Steve Hillier -Date: Mon Mar 11 15:52:14 2019 -0700 - - Merge branch 'release' into steve/subm-history - -commit 89c159365691a1c5a95bafaa76c3a2b789a65496 -Author: Steve Hillier -Date: Mon Mar 11 14:09:34 2019 -0700 - - refactor to use server side filtering - -commit 3961249e7baf4ece6efec765c5bc42d17216234c -Merge: f2be6bb71 9d44db454 -Author: AlexZorkin -Date: Mon Mar 11 11:26:57 2019 -0700 - - Merge branch 'release' into alex/nulleffectivedates - -commit 9d44db45405ec1b2a00b2f5806bd0e13bee960fb -Merge: 8f20a1081 efd6a1821 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Mar 11 11:02:38 2019 -0700 - - Merge pull request #1208 from bcgov/alex/welldevmethodfix - - [1703][1712][1714] Wells Edit Bug Fixes - -commit efd6a18212959c4a90df019eb227032022f90b5e -Merge: 2a3d28672 8f20a1081 -Author: AlexZorkin -Date: Mon Mar 11 09:55:02 2019 -0700 - - Merge branch 'release' into alex/welldevmethodfix - -commit e820186d196cda1077182ee68616755f5cb7b035 -Author: Clark Van Oyen -Date: Sun Mar 10 23:31:07 2019 -0700 - - Python tests passing now. - - had to disable a large fixture with prod FK references, please review - and advise. - -commit 2a390b5eaa0bba1a83a78e8514881691545d7163 -Author: Clark Van Oyen -Date: Sun Mar 10 13:24:43 2019 -0700 - - new tests for search page - -commit 8c4d94d24a63eea95f6678d723189a0a437447de -Author: Clark Van Oyen -Date: Sun Mar 10 12:35:23 2019 -0700 - - Comments, remove dead code. - -commit d778cfe335b1d45c65fe1c371947b98bc5cfb3ba -Author: Clark Van Oyen -Date: Sun Mar 10 12:32:04 2019 -0700 - - resource fixture, search updates. - - Import all aquifer resource data in a migration, add resource - section search. - -commit 86d8fb24220d764f67205d6ff588de29842deb0d -Merge: 089b21612 8f20a1081 -Author: Clark Van Oyen -Date: Sat Mar 9 13:31:37 2019 -0800 - - Merge branch 'release' of github.com:bcgov/gwells into countable/milestone1 - -commit 089b21612a1a626bb9dc4e70e2982d493079243a -Merge: 71dab1696 9b7915d64 -Author: Clark Van Oyen -Date: Sat Mar 9 13:31:28 2019 -0800 - - Merge branch 'countable/milestone2' into countable/milestone1 - -commit 71dab1696d731b0ca4b700c20d64b99e11ae3c54 -Author: Clark Van Oyen -Date: Sat Mar 9 12:51:49 2019 -0800 - - Vue unit tests passing now - -commit 167139381763a4b05a5b51341b8a7d2d7e63780b -Author: Clark Van Oyen -Date: Sat Mar 9 12:27:12 2019 -0800 - - match test snapshot - -commit f2be6bb711a1b07cfaa1fc48c0436b130345446b -Author: AlexZorkin -Date: Fri Mar 8 17:17:31 2019 -0800 - - datetime format fix in fixtures - -commit fab4e602030ba898aa3f33bd4a00a481e096f6da -Merge: 0da797c5d 8f20a1081 -Author: Steve Hillier -Date: Fri Mar 8 16:39:26 2019 -0800 - - Merge branch 'release' into steve/subm-history - -commit 0da797c5d0e1fd9fa737ed3a8994f2f4f0fd23f9 -Author: Steve Hillier -Date: Fri Mar 8 16:35:55 2019 -0800 - - add change history for Well records - -commit f4129e85d25b9b00940e57202f2bc84393701761 -Author: AlexZorkin -Date: Fri Mar 8 16:25:54 2019 -0800 - - moved update script to further migration - -commit d7a8eb4bd987cd78c91b94f67ac5f15cf0ecf59d -Author: AlexZorkin -Date: Fri Mar 8 16:18:40 2019 -0800 - - update user migrations - -commit 2cb8b131df1477fcf250021b5b48037a90b20c77 -Merge: 3d7259289 8f20a1081 -Author: AlexZorkin -Date: Fri Mar 8 16:05:15 2019 -0800 - - Merge branch 'release' into alex/nulleffectivedates - -commit 3d72592893a28c1c490855e9878c3d2d2f060b16 -Author: AlexZorkin -Date: Fri Mar 8 16:04:20 2019 -0800 - - update migrations to avoid datetime warning - -commit 7e76084ae968dc804c8d4eaec6a9c48ed9b8d1d4 -Author: AlexZorkin -Date: Fri Mar 8 15:13:13 2019 -0800 - - updated fixtures to use non null values on create update date fields - -commit 8f20a1081f2ed218cc435c94bc4e99897c552b9a -Merge: c2621815c af2c14ec2 -Author: Steve Hillier -Date: Fri Mar 8 14:27:15 2019 -0800 - - Merge pull request #1175 from bcgov/steve/spafixes - - [1659] minor fixes for single page app - -commit badae1de4b69b1e72a0d8aea048bcfc26d8c4316 -Author: Steve Hillier -Date: Fri Mar 8 13:33:11 2019 -0800 - - add an error that submission detail request failed - -commit 2a3d286724fc359e6b2c2bee759f82ba300bb548 -Merge: 1e5d10784 afd593de6 -Author: AlexZorkin -Date: Fri Mar 8 13:30:35 2019 -0800 - - Merge branch 'alex/removesubfields' into alex/welldevmethodfix - -commit afd593de6d1699ebc7e5acb6f206fde90cee7c62 -Author: AlexZorkin -Date: Fri Mar 8 13:30:07 2019 -0800 - - made owner email and phone fields only show on well edit - -commit af2c14ec2d01723635a8b47ac9bd1b916b1b7013 -Author: Steve Hillier -Date: Fri Mar 8 13:20:02 2019 -0800 - - remove old tests from nose.cfg - -commit 1e5d107843f059a737014b7b6b72d0c6532a430d -Merge: a4dbcf2a3 c2621815c -Author: AlexZorkin -Date: Fri Mar 8 12:59:01 2019 -0800 - - Merge branch 'release' into alex/welldevmethodfix - -commit a4dbcf2a3aa1e8efb15db0eaa649ad555c2abca0 -Author: AlexZorkin -Date: Fri Mar 8 12:48:49 2019 -0800 - - added serializer fix for returning person and org objects back after edit submit - -commit c3e4b7219eea195053aab53deef4d9da1b62497f -Author: Steve Hillier -Date: Fri Mar 8 11:06:10 2019 -0800 - - remove extra created hook - -commit ac57f067dfbe2d9c01fca18b5ee72baf1a2a8647 -Merge: 44e749829 c2621815c -Author: Steve Hillier -Date: Fri Mar 8 11:05:02 2019 -0800 - - Merge branch 'release' into steve/spafixes - -commit 0f6e1554d9ced7e5792ac7b9e008adf32f18cdc7 -Author: Steve Hillier -Date: Fri Mar 8 11:01:58 2019 -0800 - - adjust loading skeleton - -commit c2621815cf27b54c7715dfd1671234a0cb0d7007 -Merge: 9b7915d64 62f9245d0 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Mar 8 10:08:19 2019 -0800 - - Merge pull request #1206 from bcgov/bug/prodHostVar - - Vars prodUrl and prodHost straightened out - -commit 9c8b554456cbab4e558f9be67f6093ffdf0e9382 -Author: Clark Van Oyen -Date: Thu Mar 7 19:35:50 2019 -0800 - - Propagate a field rename - -commit e921fb663fa915e64b8cb6d9b37d040b0afb45bb -Author: Steve Hillier -Date: Thu Mar 7 18:09:31 2019 -0800 - - let activity reports load without changing page height - -commit 0b3031dc56ceac56509a548659e1209285218207 -Author: Clark Van Oyen -Date: Thu Mar 7 16:33:18 2019 -0800 - - Changes based on review - - code standards, db naming scheme, regressions - -commit 62f9245d041a8b863a5b028efb966e7cbb966b47 -Author: Derek Roberts -Date: Thu Mar 7 16:11:47 2019 -0800 - - Vars prodUrl and prodHost straightened out - -commit f6d3369eb7429fc515c7ae2a343bafe97bd0ac55 -Author: AlexZorkin -Date: Thu Mar 7 15:10:49 2019 -0800 - - removed placeholder field that had no pk and was breaking form submit - -commit ad105db7db0f8fdf3e7d53f8e1e93ac0712ce1ef -Author: AlexZorkin -Date: Thu Mar 7 14:26:51 2019 -0800 - - added not null alteration on update_user - -commit 2f323cc7c111d754f78cc8a7c0d9a8cefe821c4a -Author: Clark Van Oyen -Date: Thu Mar 7 12:56:23 2019 -0800 - - Move aquifer scraper script to canonical location. - -commit 0669194f27c328a5907409ea99b919407480fd9c -Merge: 90d23df68 0ad31b44a -Author: Clark Van Oyen -Date: Thu Mar 7 12:50:27 2019 -0800 - - Merge branch 'countable/milestone1' of github.com:bcgov/gwells into countable/milestone1 - -commit 97ebc231e090caae3d46baef163a8238a336555a -Author: AlexZorkin -Date: Thu Mar 7 12:44:53 2019 -0800 - - registries replication - -commit c15fda94e7f5900775fd5ed81da1f275a233b12e -Author: AlexZorkin -Date: Thu Mar 7 12:44:40 2019 -0800 - - added update for update_user and edited replication - -commit 0ad31b44aee382fe8beffd10ae842131742b73f7 -Author: Derek Roberts -Date: Thu Mar 7 12:38:17 2019 -0800 - - Tweak minio entrypoint - -commit 8dab93fc02fa8a51b9e60674047ba02d4d9f27fa -Author: Derek Roberts -Date: Thu Mar 7 12:37:50 2019 -0800 - - Add Dockerfile and move minio entrypoint - -commit 90d23df68d76b0fabf76ce056dcd8ad596fc1e6c -Author: Clark Van Oyen -Date: Thu Mar 7 12:31:00 2019 -0800 - - Initial work on search updates. - -commit ea8b5b8b6d32a853c49cce2a378166bb5733a29e -Author: Clark Van Oyen -Date: Thu Mar 7 12:30:33 2019 -0800 - - cleanup - -commit 899690057b33fcd3ad2850eb2489b23205043e01 -Author: AlexZorkin -Date: Wed Mar 6 17:26:13 2019 -0800 - - migrations for effective expiry create update dates - -commit a8b8c8c2034a5303e81b94ea5b09146f2de2538f -Author: AlexZorkin -Date: Wed Mar 6 17:22:22 2019 -0800 - - revert update_user to avoid pending transaction issues - -commit 77298bc719dcc63a298a3c974d8ba89559fdf220 -Author: AlexZorkin -Date: Wed Mar 6 17:07:07 2019 -0800 - - updated fields to use not nullable and default values - -commit ebcc2d2310fd323142fc3b5e07ac23ff97203597 -Author: Steve Hillier -Date: Wed Mar 6 15:58:18 2019 -0800 - - fix up submission report history - -commit d78b29f668ad7a83b63f8ce4b01aa45ee48d35dd -Author: Steve Hillier -Date: Wed Mar 6 15:16:40 2019 -0800 - - add activity description field to well submission serializer - -commit 047cdd6c9232f252418ac0383fe52ac0a0212c54 -Author: Steve Hillier -Date: Wed Mar 6 15:14:41 2019 -0800 - - add legacy and staff edit serializers for user display of submissions - -commit 49c18aff49d9e471ce9ac4c545281e9a68b07896 -Merge: 421789096 9b7915d64 -Author: Steve Hillier -Date: Wed Mar 6 15:01:36 2019 -0800 - - Merge branch 'release' into steve/subm-history - -commit 44e7498299abf62e2544165e170091882721c300 -Merge: 8c57f3d15 9b7915d64 -Author: Steve Hillier -Date: Wed Mar 6 14:43:38 2019 -0800 - - Merge branch 'release' into steve/spafixes - -commit 9b7915d6464f4254d6c063ef115564eda566a103 -Merge: cb602dd5e bbcffe623 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Mar 6 13:52:18 2019 -0800 - - Merge pull request #1200 from bcgov/task/1583_testFolderMove - - API and functional tests in ./tests/ - -commit 20f975ceea01e6695b87e2be84197faf28b933d8 -Author: Clark Van Oyen -Date: Wed Mar 6 11:18:17 2019 -0800 - - Update README.md - -commit bbcffe6231b0c197521d2d13dcc33a435711a1ae -Author: Derek Roberts -Date: Wed Mar 6 09:24:57 2019 -0800 - - Moved API and functional tests into ./test/ - -commit 108858e3cc8d8f705390ac118becbef464f29f07 -Author: Derek Roberts -Date: Mon Mar 4 18:57:00 2019 -0800 - - Pointed Jenkinsfile to ./tests/ - -commit cb602dd5ea627914d04408030d0d3487c41eb713 -Merge: 1e93cc548 f162d21ea -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Mar 6 10:00:13 2019 -0800 - - Merge pull request #1199 from bcgov/bug/openshiftWrapper - - Bug in Jenkinsfile _openshift() wrapper handling - -commit f162d21ea22fd65f9ac2f6223ce9841f4e8997a0 -Author: Derek Roberts -Date: Wed Mar 6 09:19:06 2019 -0800 - - Removed double use of _openshift wrapper - -commit 6dce839213fefcc40ad2810daa98751316e56dc4 -Merge: adc2594e9 1e93cc548 -Author: Clark Van Oyen -Date: Tue Mar 5 22:23:42 2019 -0800 - - Merge branch 'release' of github.com:bcgov/gwells into countable/milestone1 - -commit adc2594e9d8ba1b44b8366b8c6574b898b6c3165 -Author: Clark Van Oyen -Date: Tue Mar 5 22:22:47 2019 -0800 - - minio entrypoint, finish resource serializers. - -commit 1e93cc54899a8fc27692d74732d5f3ed3caeb001 -Merge: 99a3d2a27 3dcd6ee3b -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Mar 5 20:58:14 2019 -0800 - - Merge pull request #1195 from bcgov/task/1059_zap - - [1059] ZAP Testing - -commit 3dcd6ee3b760ef35f018a25a91943a9d95da3ab7 -Author: Derek Roberts -Date: Tue Mar 5 20:11:45 2019 -0800 - - Increased RAM for ZAP container - -commit 5b7024ad7ac2d326ee3f5a67c1aecabfc32ee980 -Author: Derek Roberts -Date: Tue Mar 5 20:10:58 2019 -0800 - - Changed ZAP podname to work for STAGING - -commit e4b3fa8b09c8c0f8d9f77c4a014223c6fc9357cd -Author: Derek Roberts -Date: Tue Mar 5 16:00:49 2019 -0800 - - Move ZAP from DEV to STAGING - - Revision - -commit 4f563a311b018489ead69da86f51b483c4231ace -Author: Derek Roberts -Date: Tue Mar 5 15:32:46 2019 -0800 - - ZAP run deadline and resources, rename zapTest to zapTests - -commit 4db87a3606298d311df8a5060f45465e0681ffc1 -Author: Derek Roberts -Date: Tue Mar 5 15:26:50 2019 -0800 - - ZAP cleanup - -commit 2bdc0f0f428dd4167e8fe33dc1b1f21bb74a94a2 -Author: Derek Roberts -Date: Tue Mar 5 15:02:41 2019 -0800 - - Added URL var to ZAP, revised run - -commit 6591cfbc6ac4fe6d579145feeb9600e700671fbe -Author: Derek Roberts -Date: Mon Mar 4 21:43:25 2019 -0800 - - Update ZAP image pull - -commit 35fea08791a2258a98b1b92cd6f9762fb75ae19f -Author: Derek Roberts -Date: Mon Mar 4 19:58:37 2019 -0800 - - ZAP tests stage - -commit ded1ce9a056dd4e924362379641e946ed26edd3e -Author: Derek Roberts -Date: Mon Mar 4 19:25:10 2019 -0800 - - Jenkins + ZAP testing function - -commit 686e17714192e4697226bbda464a04b5afb0bc7d -Author: Derek Roberts -Date: Mon Mar 4 19:24:55 2019 -0800 - - Move ZAP folder back into use in ./tests/ - -commit 99a3d2a275ab49872d22d18bc971f68f6abe781d -Merge: a2625dcd0 1aae12f43 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Mar 5 13:09:19 2019 -0800 - - Merge pull request #1194 from bcgov/task/1583_timeBoundQuota - - [1583] Time Bound Quota Adjustments - -commit 42178909651d8d4a4037ff5a912e1bd497061cc4 -Merge: 1862b2da3 a2625dcd0 -Author: Steve Hillier -Date: Tue Mar 5 12:04:40 2019 -0800 - - Merge branch 'release' into steve/subm-history - -commit 1aae12f43815cc7e429b2741c285474ac02248c1 -Author: Derek Roberts -Date: Wed Feb 27 20:00:23 2019 -0800 - - Reduce API pod min resources - - Container template settings for time bound resources - - Merge cleanup - -commit a2625dcd0ac1c1f7001ef9c3ef76ad6ffa357b51 -Merge: 8d740f381 406d54190 -Author: Sybrand Strauss -Date: Tue Mar 5 10:09:11 2019 -0800 - - Merge pull request #1197 from bcgov/fix/border_merge - - Fix merge issues - -commit 406d54190f363070ac99f77ad34e0ad8efaf63fd -Author: Sybrand Strauss -Date: Tue Mar 5 09:37:45 2019 -0800 - - Fix merge issues - -commit 9824eff081d7b21d81da9cc9190f3f44ca6f3b13 -Author: Clark Van Oyen -Date: Mon Mar 4 22:06:27 2019 -0800 - - Aquifer Resources - - Frontend, backend and fixture with loader. - Still need ajax wiring, view. - -commit 8d740f38189356047590598ad08e8c287ce81057 -Merge: 0fc13622a 6fdecdab6 -Author: Steve Hillier -Date: Mon Mar 4 17:51:35 2019 -0800 - - Merge pull request #1193 from bcgov/task/1583_timeBoundQuota - - [1583] Use OpenShift Time Bound Quota - -commit 0fc13622a1cdc058eb1a31237b950ce91a2c98f2 -Merge: 7f5d181f9 64d7477de -Author: Steve Hillier -Date: Mon Mar 4 17:51:12 2019 -0800 - - Merge pull request #1188 from bcgov/task/1583_commonFixtures - - [1583] Common fixture load - dev and deploy - -commit 7f5d181f9cd9044f4b2e6a244a5e4088da86af3e -Merge: 5490e2f72 11673eb49 -Author: Steve Hillier -Date: Mon Mar 4 17:46:54 2019 -0800 - - Merge pull request #1186 from bcgov/steve/single_well_map - - [1659] update the way wells are mapped for well search/detail - -commit 5490e2f7236ca2060f1154a27390874f43f7582d -Merge: b0ce98cc4 e690b6d39 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Mar 4 17:39:56 2019 -0800 - - Merge pull request #1190 from bcgov/alex/assigndatafix - - Fixed Vue Warning on Submission - -commit 11673eb4989ba56dc2e04372602f3eb0e64fc23e -Merge: bb317295f b0ce98cc4 -Author: Steve Hillier -Date: Mon Mar 4 17:20:44 2019 -0800 - - Merge branch 'release' into steve/single_well_map - -commit 1862b2da38aa1b2371f4f1cca1f0ed053baabc0a -Merge: 482873e27 b0ce98cc4 -Author: Steve Hillier -Date: Mon Mar 4 17:16:34 2019 -0800 - - Merge branch 'release' into steve/subm-history - -commit 64d7477dec9aaa482d33dcf9a09b816eec7180ed -Author: Derek Roberts -Date: Wed Feb 27 14:59:56 2019 -0800 - - Cut down load_fixtures.sh a bit - -commit 4d02c91491a2350bf86a94d0d63ca851768ab960 -Author: Derek Roberts -Date: Wed Feb 27 13:08:26 2019 -0800 - - git update-index --chmod=+x - -commit 74e5735caf50c945964521494f9dabfe259b4d6c -Author: Derek Roberts -Date: Wed Feb 27 12:24:59 2019 -0800 - - Consume fixtures script - -commit 52913ac4fadb425b0ef30b8152728dd99686944b -Author: Derek Roberts -Date: Wed Feb 27 12:22:43 2019 -0800 - - Load fixtures script - -commit 6fdecdab6c0c4342d1c54b464e62a3e870d8496f -Author: Derek Roberts -Date: Wed Feb 27 19:59:21 2019 -0800 - - Container template settings for time bound resources - -commit b0876290a015738a5e1b089f710b6af4a76a517a -Author: Derek Roberts -Date: Wed Feb 27 15:00:45 2019 -0800 - - API tests yaml resources: compute-time-bound-quota - -commit e690b6d3942812455bf1442084b2ea0abb220671 -Author: AlexZorkin -Date: Mon Mar 4 17:03:21 2019 -0800 - - migration fix - -commit b0ce98cc484076d10e2cef30cacbff120ac4b2b9 -Merge: 5be1cad15 06f070cb7 -Author: Steve Hillier -Date: Mon Mar 4 17:03:09 2019 -0800 - - Merge pull request #1191 from bcgov/steve/migrationfix - - Fix conflicting migrations - -commit 06f070cb77ead1dbb5ea175e85be7ae1bb08f88e -Author: Gary Wong (BC Gov) -Date: Mon Mar 4 16:04:28 2019 -0800 - - Updated table and column metadata. - -commit 580132f28b1a64e7f8fb2cee3db3f73c19b83940 -Author: Steve Hillier -Date: Mon Mar 4 15:45:41 2019 -0800 - - merge conflicting migrations - -commit bb317295f7cc803d2e225d87f5f77d4d31d09b03 -Author: Steve Hillier -Date: Mon Mar 4 15:38:27 2019 -0800 - - revert zooming to single marker - -commit 482873e2786c7542473b55395947de954382e5b7 -Author: Steve Hillier -Date: Mon Mar 4 15:36:01 2019 -0800 - - human readable submission reports - -commit 864986d9fc81135bc27c5dc2a3ad9af515fee96f -Author: AlexZorkin -Date: Mon Mar 4 14:55:02 2019 -0800 - - fixed vue warning - -commit 8c57f3d1575532242a1c6dfe5a84579b5f596f13 -Merge: 9e0de4e41 5be1cad15 -Author: Steve Hillier -Date: Mon Mar 4 14:01:00 2019 -0800 - - Merge branch 'release' into steve/spafixes - -commit 9e0de4e418a2b44dc194fe4751a6cd34409cbb96 -Author: Steve Hillier -Date: Mon Mar 4 13:59:44 2019 -0800 - - remove unused code - -commit 73dc5c8cd1f3b60a8706d8cb30094c21c3f980ee -Author: Steve Hillier -Date: Mon Mar 4 13:59:14 2019 -0800 - - Update views.py - -commit 5be1cad155156c0399d46f3f26db281f3774c908 -Merge: dbd9e19dd 3a8b48dd4 -Author: Steve Hillier -Date: Mon Mar 4 13:57:48 2019 -0800 - - Merge pull request #1180 from bcgov/bug/1545_api_fail_email - - [1545] Errors when email not specified in SSO - -commit e40a163a117cb80deee86815f1468456b5cb6637 -Author: Steve Hillier -Date: Mon Mar 4 12:58:12 2019 -0800 - - fix warning when running node tests - -commit a10b7c33fa4d6fe47649449e49bc05b3bd019f5a -Author: Steve Hillier -Date: Mon Mar 4 12:42:06 2019 -0800 - - fix multiple import - -commit f76dbc9febf34a6bd16881e97a41bf0decd73819 -Merge: 2ed05df49 dbd9e19dd -Author: Steve Hillier -Date: Mon Mar 4 11:26:16 2019 -0800 - - fix merge conflicts and update branch - -commit dbd9e19ddb2bcec2803cdf858daad01bc143f720 -Merge: b91fc3347 4a0726b05 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Mar 4 10:59:03 2019 -0800 - - Merge pull request #1185 from bcgov/bug/1665_apiTestUnbreak - - [1665] Re-enable API tests using fixtures - -commit b91fc3347c134b9182341f3b2bb3e89f75230e4c -Merge: 26c5ba9f5 dd1b1044d -Author: Steve Hillier -Date: Mon Mar 4 10:55:38 2019 -0800 - - Merge pull request #1181 from bcgov/feature/restrict_map_gis - - [1546] Using province border geometry to establish if point is inside bc - -commit cd37c866cf38d7f5a2a443f7edfd34f913cf3919 -Author: Steve Hillier -Date: Mon Mar 4 10:03:21 2019 -0800 - - update the way wells are mapped for well search/detail - -commit 4a0726b056c50f707be844695c8537ee0e351944 -Author: Derek Roberts -Date: Mon Mar 4 09:59:48 2019 -0800 - - Re-enable API tests using fixtures (accidentally skipped) - -commit 26c5ba9f5dc005a184a91afda7d36a6a59e4c4b1 -Merge: b5161ec36 91353b791 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Mar 4 09:36:45 2019 -0800 - - Merge pull request #1182 from bcgov/alex/submissionbugfixes - - [1696][1695] Fixed Submission/Edit Routing - -commit 3a8b48dd4a8e58f1e77344ce9760e7ee12311f37 -Author: Sybrand Strauss -Date: Fri Mar 1 16:48:14 2019 -0800 - - - Fall back to using username for the users name, when the users name isn't available - -commit 91353b7911fbc273c7d526963db1bde1cd525fee -Author: AlexZorkin -Date: Fri Mar 1 16:29:27 2019 -0800 - - fixed trailing comma in registry documents - -commit dd1b1044dbbd0fef9fa98336bed197f5655564f2 -Author: Sybrand Strauss -Date: Fri Mar 1 16:22:57 2019 -0800 - - Using province border geometry to establish if point is inside bc - -commit 267f72ee0c00757ab0688fe5e60542d16930c66b -Author: AlexZorkin -Date: Fri Mar 1 16:16:12 2019 -0800 - - added logic to reload submission/edit when route changes - -commit dd44b0337f6a4647dd4338fa848fa3cd7aa1a638 -Author: Sybrand Strauss -Date: Fri Mar 1 15:22:37 2019 -0800 - - - Changed code so it will no longer cause errors if email is not specified in SSO. - - Cleaned up gwells.Profile (removed un-used fields). - - Fixed some linting errors. - -commit b5161ec3687d98b3d07da433a87e8406e20324c7 -Merge: 91e38a23f 1dd546e14 -Author: Sybrand Strauss -Date: Fri Mar 1 12:36:01 2019 -0800 - - Merge pull request #1179 from bcgov/debt/1330_roles - - [1330] Align Django groups with Keycloak roles - -commit 1dd546e143e047a4b8979190178e249e6157ea72 -Author: Sybrand Strauss -Date: Wed Feb 27 14:55:42 2019 -0800 - - - Squashed migrations on gwells as part of removing migration step that loads various group permissions - - Removed registries_adjudicator and registries_statutory_authority (now relying on finer grainer roles) - - Removed model based permissions from registries - - Removed all unused roles - - Squashed registries migrations - - Handle group integrity error exception better - - Fixed route (view -> aquifers-view) - - Handling edge case on group creation contention - -commit fb626867be85832425fbd215fcded7bb2dd7056c -Merge: 30fa7475a 91e38a23f -Author: Steve Hillier -Date: Thu Feb 28 11:56:30 2019 -0800 - - fix conflict - -commit 91e38a23f09ffc8afedb5bc9b70b65a08534d069 -Merge: 6d81e3315 887248b3a -Author: Steve Hillier -Date: Wed Feb 27 20:44:56 2019 -0800 - - Merge pull request #1176 from bcgov/alex/wellstagsearchfix - - [1674] Fix Well Tag Search - -commit 887248b3a8837342657699676d92767065cd959f -Author: Sybrand Strauss -Date: Wed Feb 27 17:00:12 2019 -0800 - - Update app/frontend/src/submissions/store/index.js - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 30fa7475a9585132cc545860aa8a14d697fecd11 -Author: Steve Hillier -Date: Wed Feb 27 16:50:15 2019 -0800 - - fix well location count - -commit dfcc7054b6a20ad8e9d3e5ea8ed930c04b95946b -Author: AlexZorkin -Date: Wed Feb 27 16:38:14 2019 -0800 - - notification fix - -commit 89019e71ddd5019b3e76685369deac43f2ba7e25 -Author: Steve Hillier -Date: Wed Feb 27 16:32:58 2019 -0800 - - add info to map pins - -commit 45cda24c4253a74c707407d611e75cb8446840c9 -Author: AlexZorkin -Date: Wed Feb 27 16:30:23 2019 -0800 - - fix on well tag search - -commit 6d81e3315749b30b96d0c73ed647b71b1e641938 -Merge: 111278f1b 2841a0e4f -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Feb 27 15:50:51 2019 -0800 - - Merge pull request #1174 from bcgov/alex/fixdocuploadwell - - Fix Document View On Well Summary - -commit 2841a0e4fca22024a5e9650e127a3a58987de6ae -Author: AlexZorkin -Date: Wed Feb 27 14:39:58 2019 -0800 - - fixed linting issue - -commit e6ecb11cef286e5b29ed6bd9f22b6450be2c3971 -Author: Steve Hillier -Date: Wed Feb 27 14:25:14 2019 -0800 - - fix indent/whitespace - -commit 40213c7572425b124fa83d329b13c99db54fde03 -Author: Steve Hillier -Date: Wed Feb 27 14:21:11 2019 -0800 - - fix the limit on well location search results - -commit f6d511d3d5f29187c37e3a37870cecae1742edd2 -Author: AlexZorkin -Date: Wed Feb 27 14:14:35 2019 -0800 - - removed edit role requirement on internal documents - -commit 55f01d94b506a7f4e1a93e10421a6f83aabb147b -Author: Steve Hillier -Date: Wed Feb 27 13:57:07 2019 -0800 - - add a back to top button - -commit 8170f1dbfbaa4d8bb3efd3e7cb25f64f8195284d -Author: AlexZorkin -Date: Wed Feb 27 11:23:58 2019 -0800 - - fix to show documents on well summary - -commit 111278f1b51cb0584e3ccc7565741ea5a6f2d9eb -Merge: 53f66ebb4 9174acad9 -Author: Sybrand Strauss -Date: Wed Feb 27 10:50:35 2019 -0800 - - Merge pull request #1162 from bcgov/feature/spatial-attributes - - Addition of geom and updates to ETL - -commit 9174acad937db4705226396b49050a506258398a -Author: Sybrand Strauss -Date: Tue Feb 26 18:39:06 2019 -0800 - - - Updated fixtures to contain valid geom field - - Removed redundant fixtures no longer referenced - - Update fixtures to not conflict with production data - -commit 8d7d041913c95010a89734d68789ed6041c6bbbe -Author: Gary Wong (BC Gov) -Date: Tue Feb 26 15:36:47 2019 -0800 - - Removed un-necessary conversion migration step. - -commit 9d55780f779415b481c305ec838f899250b35d43 -Author: Gary Wong (BC Gov) -Date: Mon Feb 25 16:19:11 2019 -0800 - - Adding data conversion of existing lat/long well locations. - -commit 0cf241b3e9002179289613f86d689f2506a213bf -Author: Gary Wong (BC Gov) -Date: Fri Feb 22 16:55:19 2019 -0800 - - Addition of geom and updates to ETL. - -commit f384f662599ae96feb96ca3f9352591d6cdbb777 -Author: Steve Hillier -Date: Tue Feb 26 17:17:03 2019 -0800 - - minor fixes to well search and document display - -commit 43a774ec5e7628477d18232a7f602c3c6050d78e -Author: Steve Hillier -Date: Tue Feb 26 16:55:02 2019 -0800 - - tidy up readme and remove old test file - -commit 53f66ebb42768c4affabe007daa452e1c3ea46bb -Merge: 0f73a7ee5 f3d4bfbe1 -Author: Steve Hillier -Date: Tue Feb 26 16:45:17 2019 -0800 - - Merge pull request #1171 from bcgov/alex/registrylabels - - [1054] Updated Registry Labels - -commit f3d4bfbe160ec82b1f79312ecd2be26ae6db13c0 -Merge: 86c0fc157 0f73a7ee5 -Author: AlexZorkin -Date: Tue Feb 26 16:22:14 2019 -0800 - - Merge branch 'release' into alex/registrylabels - -commit 86c0fc1578b409f6719397486f23e6ddc05df832 -Author: AlexZorkin -Date: Tue Feb 26 16:21:39 2019 -0800 - - fixed orcs format - -commit 0f73a7ee56258f3af03a4f65f68e239bef29999b -Merge: c9697b56d 479e06e6b -Author: Steve Hillier -Date: Tue Feb 26 16:04:45 2019 -0800 - - Merge pull request #1130 from bcgov/steve/spa - - Single page application - -commit d1860308c3ded5802d115f0f0670c3b09b0a1264 -Merge: ad981e4e9 c9697b56d -Author: AlexZorkin -Date: Tue Feb 26 15:31:59 2019 -0800 - - Merge branch 'release' into alex/registrylabels - -commit ad981e4e92a6acc70d971b23c504ae9bf3762e52 -Author: AlexZorkin -Date: Tue Feb 26 15:30:56 2019 -0800 - - added orcs and website labels to registry - -commit c9697b56d376911d26d9fd42555e686cdef5920b -Merge: ed50d9eeb da063691a -Author: Steve Hillier -Date: Tue Feb 26 14:53:44 2019 -0800 - - Merge pull request #1170 from bcgov/alex/unpublishedreplication - - [1557] cont. Added Replication for Unpublished Records - -commit 479e06e6b0e3de249ca5c047a48e4709ea8cb066 -Author: Steve Hillier -Date: Tue Feb 26 14:50:59 2019 -0800 - - remove leftover modal - -commit 3dd3c003d8710014a20072aef5915529a17ae958 -Merge: e7259cf98 ed50d9eeb -Author: Steve Hillier -Date: Tue Feb 26 14:48:55 2019 -0800 - - fix merge conflicts - -commit ed50d9eeb0231e7a2d3a2def581d0babf01dcf62 -Merge: 1e69d863c ead5c1bc9 -Author: Steve Hillier -Date: Tue Feb 26 14:40:51 2019 -0800 - - Merge pull request #1163 from bcgov/alex/documentupload - - [1635][1638][1639] Restricted Document Upload - -commit e7259cf9813fc09855906bc94f6ca818fbc4dd44 -Merge: b04495db1 1e69d863c -Author: Steve Hillier -Date: Tue Feb 26 14:34:43 2019 -0800 - - fix merge conflicts - -commit 1e69d863cdb5c84ed1b388a75ffb518ddcaa6931 -Merge: 7239bec14 60c62bc3a -Author: Steve Hillier -Date: Tue Feb 26 14:31:12 2019 -0800 - - Merge pull request #1158 from bcgov/alex/notyclosebtn - - [1629] Add Close Button on Error Notifications - -commit b04495db1ef7ffa376565fdf3f47f9c88f80bb97 -Author: Steve Hillier -Date: Tue Feb 26 14:28:02 2019 -0800 - - minor README update - -commit b9dfe1e52d3673800d9624e6410766fa1fb7530c -Author: Steve Hillier -Date: Tue Feb 26 14:24:09 2019 -0800 - - update README - -commit 60c62bc3a371fa41f530b0b8a37a5c272861de02 -Author: AlexZorkin -Date: Tue Feb 26 13:47:07 2019 -0800 - - updated aria-label - -commit 8dfbadc6711a853a7e9e1a74bbbf95f4b755911c -Merge: b19defd4e 7239bec14 -Author: Steve Hillier -Date: Tue Feb 26 13:41:51 2019 -0800 - - fix merge conflicts with release branch - -commit 808b936d134c98a892b16adcc7abe1883243bfdd -Merge: 4977d6d93 7239bec14 -Author: AlexZorkin -Date: Tue Feb 26 13:41:39 2019 -0800 - - Merge branch 'release' into alex/notyclosebtn - -commit da063691a8c294ddf2e34ed1bc9d58fe82794bd1 -Merge: 856df3095 7239bec14 -Author: AlexZorkin -Date: Tue Feb 26 13:40:49 2019 -0800 - - merged release - -commit 7239bec1464aa10713fb16d3c19591b494492ea2 -Merge: dcc567fcb 20dddc3bf -Author: Steve Hillier -Date: Tue Feb 26 13:34:49 2019 -0800 - - Merge pull request #1168 from bcgov/alex/removeoldregistry - - [1580] Removed Legacy Registry Page and References - -commit dcc567fcb9d59463bb8d473c7c79cd512531372e -Merge: 566918a9f 5f5c7ea77 -Author: Steve Hillier -Date: Tue Feb 26 13:24:46 2019 -0800 - - Merge pull request #1169 from bcgov/alex/removeaquifersavebtn - - [1566] Removed Bottom Save Button from Activity Submission Form - -commit 566918a9f6943e83bed62e7b43689b78bfda4691 -Merge: 5e3aa86c7 f96b69035 -Author: Steve Hillier -Date: Tue Feb 26 13:21:30 2019 -0800 - - Merge pull request #1166 from bcgov/alex/aquiferlithcode - - [1609] Well Testing Aquifer Details Lithology Code - -commit 20dddc3bf2c6c20ad94c953cf34716bba4a61e23 -Author: AlexZorkin -Date: Tue Feb 26 12:58:39 2019 -0800 - - removed test reference - -commit f96b690354175d82b8dc74775c26eb6ca7f12e4e -Merge: e6c416cb4 5e3aa86c7 -Author: AlexZorkin -Date: Tue Feb 26 12:07:45 2019 -0800 - - Merge branch 'release' into alex/aquiferlithcode - -commit 856df3095d6e42e24b1ca6f3d016e4a269d48bf8 -Merge: b7b17c544 5e3aa86c7 -Author: AlexZorkin -Date: Tue Feb 26 12:07:16 2019 -0800 - - Merge branch 'release' into alex/unpublishedreplication - -commit 5f5c7ea77625afa54f484841e562c9369445bba3 -Author: AlexZorkin -Date: Tue Feb 26 12:00:23 2019 -0800 - - removed save button from activitysubmissionform - -commit e6c416cb4ce5ec4f748759ec2f85694f12cb7fbf -Author: AlexZorkin -Date: Tue Feb 26 11:45:17 2019 -0800 - - syntax fix - -commit b7b17c54496e0ceaeb58c99328f565db007d4c3f -Author: AlexZorkin -Date: Tue Feb 26 11:43:02 2019 -0800 - - name fix - -commit ead5c1bc9082fa3580a7b90ff6676d1477a3e600 -Merge: bcb512488 5e3aa86c7 -Author: AlexZorkin -Date: Tue Feb 26 10:33:56 2019 -0800 - - Merge branch 'release' into alex/documentupload - -commit bcb512488b89e70757580f0dd895c6cb4ffd8ae9 -Author: AlexZorkin -Date: Tue Feb 26 10:33:35 2019 -0800 - - added view to see internal document upload result - -commit d8bac2d1f2364a36b6087b9f575ea4ec8e563f2b -Merge: 7ed18a9bb 5e3aa86c7 -Author: AlexZorkin -Date: Tue Feb 26 09:22:48 2019 -0800 - - Merge branch 'release' into alex/removeoldregistry - -commit 7ed18a9bb7b9078c53af6fc6753b2363cd36d2ba -Author: AlexZorkin -Date: Tue Feb 26 08:54:07 2019 -0800 - - removed registry page and all references - -commit 5e3aa86c7df6d5a0748b557b3be2c95c3cd58d09 -Merge: 08ccd39bb 254e68d8e -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Feb 25 23:26:53 2019 -0800 - - Merge pull request #1164 from bcgov/task/1613_PRStrategy - - [1613] Revise PR Strategies and Reduce Obstacles - -commit 254e68d8e14288f96b671dd51e959f60f907806f -Author: Derek Roberts -Date: Mon Feb 25 20:06:54 2019 -0800 - - Revise vars for STAGING, DEMO and PROD - -commit 308aa313341a36f010882aaba4ed34320bf8e656 -Author: Derek Roberts -Date: Mon Feb 25 19:31:41 2019 -0800 - - Feature PR target now release, not dev - -commit fd07bad15ef27e6e7b62608fa0caf75f5ea99222 -Author: Derek Roberts -Date: Mon Feb 25 18:54:07 2019 -0800 - - Consistency - helper fn vars now camelCase - -commit 1f77783369086cae762f0023d74f4a95e7535603 -Author: Derek Roberts -Date: Mon Feb 25 18:41:06 2019 -0800 - - Consistency - pipeline vars now camelCase - -commit ed6671b5f55b809609c237ca8657c4477b46a620 -Author: Derek Roberts -Date: Mon Feb 25 18:15:49 2019 -0800 - - API tests w/ fixtures only on DEV PRs - -commit e74999e1c9ef6f7eb554d744efc7cbe0b6f7accb -Author: Derek Roberts -Date: Mon Feb 25 17:29:42 2019 -0800 - - Further simplification and consistency - -commit 147de39be874fa8f3a8d8b31ff3bce6f0aa2550e -Author: Derek Roberts -Date: Mon Feb 25 15:06:42 2019 -0800 - - Continue to revise URL handling - -commit 8d010d8ddea5551eb8b83022a94751dadea0be99 -Author: Derek Roberts -Date: Mon Feb 25 14:11:56 2019 -0800 - - Revise URL handling - -commit fea1d12715764b191d40faea566c52e1a690315d -Author: Derek Roberts -Date: Mon Feb 25 14:01:59 2019 -0800 - - DEV_URL in envvars - -commit 44d64b154f9999d145a1ad2668a632442690ebc8 -Author: Derek Roberts -Date: Mon Feb 25 13:16:02 2019 -0800 - - Report deploy success after deploy, not fixtures - -commit b7f829ad713d887d958e4d8d2d9f39c99bc7e61d -Author: Derek Roberts -Date: Mon Feb 25 13:06:21 2019 -0800 - - Removed STAGING deploy prompt (not automatic) - -commit db6b6f33e0ca407ad513986d321f4374580d78d0 -Author: Derek Roberts -Date: Mon Feb 25 12:31:59 2019 -0800 - - STAGING tasks only on dev PRs - -commit b19defd4eb0fdf5cdb4e8a9af3387a7921a27b33 -Author: Steve Hillier -Date: Mon Feb 25 21:05:52 2019 -0800 - - remove unused routers and old entrypoints - -commit 0db59f237d89065d7a9b333349d4bef7ec3e030d -Merge: 96dc1538c 08ccd39bb -Author: Steve Hillier -Date: Mon Feb 25 21:00:58 2019 -0800 - - fix conflicts with upstream branch - -commit 08ccd39bbc67629916e0bd5c232b846f58e0f022 -Merge: 7c27b60c1 734dc5914 -Author: Steve Hillier -Date: Mon Feb 25 20:53:33 2019 -0800 - - Merge pull request #1145 from bcgov/task/squash_sprint_51 - - Squashing migrations - -commit 96dc1538c7effe8aa61c9aee93998d380a84c9db -Author: Steve Hillier -Date: Mon Feb 25 20:49:09 2019 -0800 - - fix two remaining test URLs - -commit 1f0defabfcd6d553460f9fa80398d891b23ee686 -Author: Sybrand Strauss -Date: Mon Feb 25 18:00:14 2019 -0800 - - Update app/frontend/src/submissions/views/SubmissionsHome.vue - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 1e35a07bb93143edc47d68dbb9c43a628fdfa4c8 -Author: Sybrand Strauss -Date: Mon Feb 25 18:00:09 2019 -0800 - - Update app/frontend/src/registry/components/people/PersonDetail.vue - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 1350850ba324c8720533b17d2d0615359101510e -Author: Sybrand Strauss -Date: Mon Feb 25 18:00:04 2019 -0800 - - Update app/frontend/src/registry/components/people/PersonAdd.vue - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit 711527986903d36a4b97e1e0399f72cbbf4d4e2c -Author: Sybrand Strauss -Date: Mon Feb 25 17:59:59 2019 -0800 - - Update app/frontend/src/aquifers/components/View.vue - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit b9a32f7edfe7e2b90dd95f494c35c6efe75c2f92 -Author: Sybrand Strauss -Date: Mon Feb 25 17:59:42 2019 -0800 - - Update app/frontend/src/aquifers/components/New.vue - - Co-Authored-By: AlexZorkin <47334977+AlexZorkin@users.noreply.github.com> - -commit aac0f7f5038d9cbe0cda2251c5090eea4d120350 -Author: AlexZorkin -Date: Mon Feb 25 17:58:26 2019 -0800 - - comma - -commit fb4a8a50fc17d97b2f7982b207a290b76cc615fc -Author: AlexZorkin -Date: Mon Feb 25 17:56:52 2019 -0800 - - replication for aquifer_lithology_code - -commit 74cafca2c6b698eff99e61d39baffe5ad8f32238 -Author: AlexZorkin -Date: Mon Feb 25 17:46:00 2019 -0800 - - syntax fix - -commit 5942fc2173fd4545501b4b106c8764325a07657e -Author: AlexZorkin -Date: Mon Feb 25 17:34:17 2019 -0800 - - added replication for unpublished records - -commit dc8d765b45a714af5aa494a72ccede0b944b09bf -Author: AlexZorkin -Date: Mon Feb 25 16:10:56 2019 -0800 - - fixed id on view - -commit ca7fc12d88eb4524b7489dc300d9357bd51b4837 -Author: AlexZorkin -Date: Mon Feb 25 16:10:42 2019 -0800 - - moved well specific aquifer lithology out of aquifers - -commit cf817fb239fd318786fda1885adfeeea347be432 -Author: Steve Hillier -Date: Mon Feb 25 16:08:27 2019 -0800 - - update API test URLs - -commit 418251cbd53156416c6d3a2e6e6ca73abb7ba1bb -Author: AlexZorkin -Date: Mon Feb 25 15:22:19 2019 -0800 - - frontend for aquifer lithology dropdown - -commit 638d30e0544fb4afbe5a3ff0aee69f30c9d34337 -Author: Steve Hillier -Date: Mon Feb 25 14:48:43 2019 -0800 - - refactor remaining API endpoints - -commit 066566fcc3513e9e8eeff660af1052ef69cbee2e -Author: Steve Hillier -Date: Mon Feb 25 13:23:18 2019 -0800 - - make endpoint URLS more consistent (no trailing slash) - -commit 734dc5914f1dca8120ccf9b3210a1f01034a6a7f -Author: Sybrand Strauss -Date: Tue Feb 12 16:48:37 2019 -0800 - - - Squashed 10 migrations on wells - - Added/modified workaround migration on submissions to deal with squash issue - - Added missing migration in wells - -commit 6ee8e050134d7c4a765d5bf1fa24082d07854af0 -Author: Steve Hillier -Date: Mon Feb 25 11:50:14 2019 -0800 - - remove unused Caddy templates - -commit 8e7f59792378a720c1e51eab2dc09bb3415007ef -Merge: ce6f40fdd 7c27b60c1 -Author: Steve Hillier -Date: Mon Feb 25 08:58:49 2019 -0800 - - Merge branch 'dev' into steve/spa - -commit eec7535ba49f6ffa089576188de0453a70fbb154 -Author: AlexZorkin -Date: Fri Feb 22 17:49:02 2019 -0800 - - added lithology code model, serializer, view and migration - -commit 8dd2b8c506bab82ae7ea9f13ff4b5979c6344545 -Merge: ad4db5638 7c27b60c1 -Author: AlexZorkin -Date: Fri Feb 22 17:19:50 2019 -0800 - - Merge branch 'dev' into alex/documentupload - -commit ad4db5638da9812f34b630db09b9679b7cf05856 -Author: AlexZorkin -Date: Fri Feb 22 17:17:40 2019 -0800 - - dev cors headers - -commit ee60dad45c43a29d4eb0b7c19d9ed2f28c0316ba -Author: AlexZorkin -Date: Fri Feb 22 17:13:20 2019 -0800 - - fixed alert and error logic for document uploads, fixed viewing uploaded public and private documents - -commit 7c27b60c1009895b85ec627aaabb62ce2f8993eb -Merge: b04736964 f5f744702 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Feb 21 16:57:05 2019 -0800 - - Merge pull request #1159 from bcgov/task/1576_GDALBuilds - - [1576] GDAL Builds - -commit c77b114e9031afadcaaa2a2b61a26eb347ec0837 -Merge: 69ba06692 b04736964 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Feb 21 16:33:34 2019 -0800 - - Merge pull request #1136 from bcgov/dev - - Release - -commit f5f744702653ff645ecf47b5d8910c81fc58a7cf -Author: Derek Roberts -Date: Thu Feb 21 16:09:15 2019 -0800 - - File renaming in backend Docker readme - -commit 0d169379b403a095ab6eddc3daf4f0b798217be4 -Author: Derek Roberts -Date: Thu Feb 21 16:06:55 2019 -0800 - - Removed extra backend Docker builds - -commit 252a826167f0afca48584b9aed5d782fc2cf5f66 -Author: Derek Roberts -Date: Thu Feb 21 16:06:38 2019 -0800 - - Consolidated backend builds - -commit 6e17a63686090965a980b95cb7903fd2a063c1f8 -Author: Derek Roberts -Date: Thu Feb 21 15:47:08 2019 -0800 - - Docker Compose - use existing image for backend - -commit d446ef289def37f6f8b25fc04add920547a6eea1 -Author: Derek Roberts -Date: Thu Feb 21 12:15:31 2019 -0800 - - Dockerfile comments - -commit 47bf867243e0ba59031926585d347e04f898da48 -Author: Derek Roberts -Date: Thu Feb 21 09:44:00 2019 -0800 - - Added GDAL back into backend/requirements.txt - -commit ef455e53a0874e0e18158d370d0f7d75bbd635cc -Author: Derek Roberts -Date: Thu Feb 21 09:34:32 2019 -0800 - - Docker-Compose - upgrade pip - -commit a94a20a7f25068fe76a45dc5028f475968464a78 -Author: Derek Roberts -Date: Thu Feb 21 09:34:04 2019 -0800 - - Docker-Compose - one vol for each minio - -commit 939093b8ed4142aaf2b286cbcd35ddf2b5c61e15 -Author: Derek Roberts -Date: Thu Feb 21 09:31:30 2019 -0800 - - Dockerfile - start/workdir - -commit a4e44eb4da8cee5292a77c2caa7ee0ddccaff94d -Author: Derek Roberts -Date: Thu Feb 21 09:30:50 2019 -0800 - - Dockerfile - add gdal location to config - -commit ca57622aeee8dc37f025ac73e432f426684d6263 -Author: Derek Roberts -Date: Thu Feb 21 09:29:58 2019 -0800 - - Dockerfile - add GDAL compile - -commit 5ada4ebe5a5942e44890cc6a94c171ff8f6fa84a -Author: Derek Roberts -Date: Wed Feb 20 15:52:07 2019 -0800 - - Added buckets to docker-compose - -commit b04736964737afbdf96f21ee03dafb3c8231840c -Merge: e225cd30a b0254644b -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Feb 21 15:37:45 2019 -0800 - - Merge pull request #1161 from bcgov/bug/pipelineCondition - - [bug] Pipeline Condition - -commit b0254644b446248511cf15b965ce4b6a0117e607 -Author: Derek Roberts -Date: Thu Feb 21 15:36:27 2019 -0800 - - Jenkinsfile - var correction in second location - -commit ecbbe4e33cbf7f5bdb22429eecc14f2f2c6045e4 -Author: Derek Roberts -Date: Thu Feb 21 14:49:01 2019 -0800 - - Jenkinsfile - check SUFFIX not PROJECT - -commit be062dc6fa9c0dc68cd6692362314a562ac8c496 -Author: AlexZorkin -Date: Thu Feb 21 10:54:25 2019 -0800 - - fixed double alerts showing - -commit ce6f40fdd460fffcb7b9f57fe4a73411f6cf7e69 -Merge: 81f9c26e6 e225cd30a -Author: Steve Hillier -Date: Wed Feb 20 16:52:43 2019 -0800 - - fix merge conflicts - -commit 81f9c26e6626628f062c0ac512bd187e99ad3e74 -Author: Steve Hillier -Date: Wed Feb 20 16:51:23 2019 -0800 - - add trailing slash to well detail endpoint - -commit e225cd30af826d5797db32dfff4259468d632bfb -Merge: 8fe3b360a 968261906 -Author: Steve Hillier -Date: Wed Feb 20 16:35:15 2019 -0800 - - Merge pull request #1127 from bcgov/cole/wells-search-api - - [1550] Well Search API - -commit 968261906a3e23db7692dfaf5907a587d294746d -Merge: afa306829 8fe3b360a -Author: Steve Hillier -Date: Wed Feb 20 15:51:34 2019 -0800 - - Merge branch 'dev' into cole/wells-search-api - -commit afa306829c63ffdb56423d6ad1bd4994c7eda422 -Author: Steve Hillier -Date: Wed Feb 20 15:47:02 2019 -0800 - - disable well search API tests in staging and demo environments - -commit 8fe3b360a877ed75136857453e085e45c713e8f9 -Merge: 9b3661c1c 66e0bfc21 -Author: Steve Hillier -Date: Wed Feb 20 15:26:16 2019 -0800 - - Merge pull request #1157 from bcgov/task/1606_dockerfiles - - [1606] Docker Compose and Dockerfiles - -commit 58b28073699b0e054dd16f2844928daae47fc9cf -Author: Cole Maclean -Date: Wed Feb 20 12:35:16 2019 -0800 - - Updated ordering tests to accomodate nulls. - -commit 66e0bfc2191c01a9c63411df6d9b475b038966b5 -Author: Derek Roberts -Date: Wed Feb 20 12:07:26 2019 -0800 - - Pared down backend Dockerfile, added startdir - -commit d8e12a660c327d2d7091582a889d37b5a4f3f096 -Author: Derek Roberts -Date: Wed Feb 20 12:06:41 2019 -0800 - - Add make backend to Makefile - -commit 37851e896d4ce7b377eb28aaa7144321881c8044 -Author: Derek Roberts -Date: Mon Feb 18 13:02:46 2019 -0800 - - DC consume backend Dockerfile - -commit c219c97ca9c2f8631ea7cb288f6282cea44a2839 -Author: Derek Roberts -Date: Fri Feb 15 15:03:27 2019 -0800 - - Added packages to backend Dockerfile - -commit f61d844cfb483a561d38a4e7ac0a8229080e3c93 -Author: Derek Roberts -Date: Fri Feb 15 14:09:16 2019 -0800 - - Early Dockerfile for GeoDjango - -commit 80f75a8ac32a070ed37f286d03b4dfe2d8cc606d -Author: Steve Hillier -Date: Wed Feb 20 10:13:54 2019 -0800 - - fix container div - -commit ab3b23e671bd31ce79963541a970484497c29cc8 -Merge: 1e9ea7728 9b3661c1c -Author: Steve Hillier -Date: Wed Feb 20 10:05:33 2019 -0800 - - merging dev changes and fixing merge conflicts - -commit 4977d6d93daf94c0618e9890246787fe94671fb6 -Author: AlexZorkin -Date: Wed Feb 20 09:35:11 2019 -0800 - - styling - -commit 2d2346886a9e54ff3c180f31d720d7183c3ae800 -Author: Cole Maclean -Date: Wed Feb 20 09:32:33 2019 -0800 - - Run well search API tests on Jenkins. - -commit 051575c35895c0512e0eaaaf2cc54dd7aa2c5e29 -Author: Cole Maclean -Date: Mon Feb 18 11:39:37 2019 -0800 - - Updated filters, tests, and fixtures to accomodate model changes on dev. - -commit 4d811fae1c9fdb29b703cb65d05681e22cc26ae7 -Author: Cole Maclean -Date: Thu Feb 14 19:03:36 2019 -0800 - - Updated postman tests with folder layout; added ordering and search tests. - -commit 0951c98b941175a420539f8832a9c9df336f8439 -Author: Cole Maclean -Date: Thu Feb 14 18:49:09 2019 -0800 - - Added combined legal fields filter - -commit 5e69852766ef5601aa57c0980f0c2f6da1cc948f -Author: Cole Maclean -Date: Thu Feb 14 14:27:06 2019 -0800 - - Added water quality characteristics to test fixture. - -commit 0e441043a259e4046c80b4fda1b07be0843861fa -Author: Cole Maclean -Date: Sun Feb 10 20:54:17 2019 -0800 - - Updated well list filters. - - Added additional postman tests as well. - -commit 6bf0df9c382d83b9524305407ac249de6ff2ce1a -Author: Cole Maclean -Date: Sun Feb 10 20:53:19 2019 -0800 - - Added additional db row for filter tests. - -commit 11ab975bdad5f4592a3da3d202ed7f0a46e1c6e2 -Author: Cole Maclean -Date: Wed Feb 6 13:18:30 2019 -0800 - - Rename FilterSet for consistency. - -commit 5ca43425d06727f9c3c778065bc3ae9e88ddb3c0 -Author: Cole Maclean -Date: Wed Feb 6 13:08:32 2019 -0800 - - Added postman tests for well search filters. - -commit bf8cb2d807438cee2602df205fb80157a32f0cfb -Author: Cole Maclean -Date: Wed Feb 6 13:07:54 2019 -0800 - - Initial filters/advanced search for well list endpoint. - -commit ac2f3e7d46353cc38bc28efbccf77ae0e2bad01a -Author: AlexZorkin -Date: Tue Feb 19 20:42:29 2019 -0800 - - added x close button to error notifications - -commit 2ed05df4902dbfa182f1c495e1a5bac713a5c3b7 -Author: Steve Hillier -Date: Tue Feb 19 17:04:58 2019 -0800 - - convert keys to a human readable format - -commit 9b3661c1ccebffc3436ec50a90f06286c1b93e84 -Merge: 1fab57e6c fb8c90c28 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Tue Feb 19 12:18:44 2019 -0800 - - Merge pull request #1153 from bcgov/alex/savingrecords - - [1573] Saving and Error Notifications on Well Edit - -commit fb8c90c2828810d5eb0e9eb479f72e354a64546f -Merge: a106aa36c 1fab57e6c -Author: AlexZorkin -Date: Tue Feb 19 11:29:44 2019 -0800 - - Merge branch 'dev' into alex/savingrecords - -commit a106aa36c59dbaa0a78986ad91f34b871e3d9f6d -Author: AlexZorkin -Date: Tue Feb 19 11:29:23 2019 -0800 - - fix for jest loading static files - -commit 1fab57e6c27483282e8e70d3a8ed89f3b90af9dd -Merge: ecbde2a22 200c7197b -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Feb 18 12:12:06 2019 -0800 - - Merge pull request #1156 from bcgov/cole/gdal-issue - - docker-compose change to get the backend running with GDAL - -commit 200c7197b70ea360f9b1da398b8ad5968c23b4bb -Author: Cole Maclean -Date: Mon Feb 18 11:48:24 2019 -0800 - - Run the backend with GDAL 2.1 (stretch pkg version). - -commit 71506f401c312038e20edf078f94134f0652d2c8 -Author: AlexZorkin -Date: Fri Feb 15 16:53:24 2019 -0800 - - fix webpack dir - -commit ca92329b80fcc771fad48a4404a1ca54917a24cc -Author: AlexZorkin -Date: Fri Feb 15 16:31:19 2019 -0800 - - webpack-test dir - -commit b6d0679caf2bbdfc61cab20e62293a5a14e839cf -Author: AlexZorkin -Date: Fri Feb 15 15:22:53 2019 -0800 - - removed extra cell field on corporation info - -commit 7e0f935ff938c17f9cac66e207911cea70517fdd -Author: AlexZorkin -Date: Fri Feb 15 14:51:54 2019 -0800 - - migration created - -commit c902feb921cdd87f72229ed46a937b9c9b9c9d48 -Merge: 6109c9585 485c4cc28 -Author: AlexZorkin -Date: Fri Feb 15 14:30:04 2019 -0800 - - merged migrations and fixed conflict - -commit 485c4cc28dc2cfe9c8e00c4e63e3df7c7d246b24 -Author: AlexZorkin -Date: Fri Feb 15 11:45:36 2019 -0800 - - extended commenting - -commit 7d768ae801b2fc4c4d52aba214aabffa52ce0658 -Author: AlexZorkin -Date: Thu Feb 14 16:00:22 2019 -0800 - - small fix for bug task 1564 - -commit 5bad617f69c9abe66d402cebbb2eaf41485bb10f -Author: AlexZorkin -Date: Thu Feb 14 15:38:21 2019 -0800 - - added comments - -commit 75f94285569e4d99b3485cdf51e81125f6fc365d -Author: AlexZorkin -Date: Thu Feb 14 15:20:44 2019 -0800 - - updated error parsing logic and styling - -commit 6c368ceb63a809ac8d926125498d15a970e9d94e -Author: AlexZorkin -Date: Thu Feb 14 12:50:41 2019 -0800 - - updated helper - -commit a7acbb2495d44296c5bcd53802883204eeac7225 -Author: AlexZorkin -Date: Thu Feb 14 11:21:52 2019 -0800 - - helper directory - -commit 37626b0c6b7b7a30108633ceb73c5bc19bdbe87a -Author: AlexZorkin -Date: Thu Feb 14 10:54:31 2019 -0800 - - error cleaning - -commit 3129a2ee6ee405d42a273f444b527b0045b9e7fe -Author: AlexZorkin -Date: Thu Feb 14 09:11:58 2019 -0800 - - combine function - -commit 9cf2257aaa48c7733365e5e8def7d8f524959e56 -Author: AlexZorkin -Date: Wed Feb 13 17:26:05 2019 -0800 - - reducing errors function - -commit 6a7ff7456ceafc09a05e37607c7b8c84542adb93 -Author: AlexZorkin -Date: Wed Feb 13 16:04:14 2019 -0800 - - added noty notifications - -commit 832c057449af9a6d6c644a03de1318fb161b8bed -Author: AlexZorkin -Date: Wed Feb 13 09:21:59 2019 -0800 - - fixed modal params, removed scroll to top - -commit aa1a8432abd1364b7983ff74c2afbeda6479d7ee -Author: AlexZorkin -Date: Tue Feb 12 16:54:47 2019 -0800 - - converted alerts to modals and adding saving animation - -commit ecbde2a229baa1f96cd0f5a4a8b35322433c9282 -Merge: 525ac7290 ac3793875 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Feb 15 13:30:08 2019 -0800 - - Merge pull request #1154 from bcgov/alex/othercodes - - [1574] Add 'Other' code values to lookup tables - -commit ac379387589a661f658a19f0c1a545716c846d93 -Author: AlexZorkin -Date: Fri Feb 15 12:27:07 2019 -0800 - - fixed migration conflict - -commit cab79b1b960ee8753f0dc7207fe2c997b6164cee -Merge: 04210c636 525ac7290 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri Feb 15 11:53:22 2019 -0800 - - Merge branch 'dev' into alex/othercodes - -commit 6109c9585fc1c7f0154d496449783bb71dc44ffa -Merge: 6c6731b63 525ac7290 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Fri Feb 15 11:50:09 2019 -0800 - - Merge branch 'dev' into alex/savingrecords - -commit 6c6731b63d3d83f4904fd233f03d1bbf7f2cb9e9 -Author: AlexZorkin -Date: Fri Feb 15 11:45:36 2019 -0800 - - extended commenting - -commit 525ac72903e801bce6fdaac546fc84c09ba8f299 -Merge: fa48ac656 5e725d64e -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Feb 15 11:33:06 2019 -0800 - - Merge pull request #1132 from bcgov/alex/wellpublicationstatus - - [1557] Added Published / Unpublished state to wells - -commit 04210c6360fea76ebeacb648d180bf8b6d9164ec -Author: AlexZorkin -Date: Fri Feb 15 10:47:19 2019 -0800 - - added migration to add other code values to screen_assembly_type filter_pack_material and decommission_material lookup tables - -commit 4b498080a764fd052073823da1d82d7601087c37 -Author: AlexZorkin -Date: Thu Feb 14 16:00:22 2019 -0800 - - small fix for bug task 1564 - -commit 9dd87ab7e4bbef4fd9a2f83070f3a7621539240b -Author: AlexZorkin -Date: Thu Feb 14 15:38:21 2019 -0800 - - added comments - -commit d6b4457655ac8804ff824ac9fa085989a77ec4ed -Merge: c12cbd3ac fa48ac656 -Author: AlexZorkin -Date: Thu Feb 14 15:26:09 2019 -0800 - - removed commented code and merged dev - -commit c12cbd3ac21b1c2c748eccfe6073252c9b478774 -Author: AlexZorkin -Date: Thu Feb 14 15:20:44 2019 -0800 - - updated error parsing logic and styling - -commit 5e725d64e17c7fb5ff9dd459ccb961725f4b077c -Author: Gary Wong (BC Gov) -Date: Thu Feb 14 13:53:38 2019 -0800 - - Fixed well_publication_status_code to be defaulted in well, not xform_well, table. - -commit 4b2ce41f159767cdf975f4faee0db8b5754de3bc -Merge: 129237a67 fa48ac656 -Author: Steve Hillier -Date: Thu Feb 14 13:13:39 2019 -0800 - - Merge branch 'dev' into steve/subm-history - -commit d6131962d3a02977749373848bc1c58d7a3d350b -Merge: f4e65a561 fa48ac656 -Author: AlexZorkin -Date: Thu Feb 14 12:51:20 2019 -0800 - - Merge branch 'dev' into alex/wellpublicationstatus - -commit fa0cdb76c805b6ac009f5fc24cb04b619f01ca3b -Author: AlexZorkin -Date: Thu Feb 14 12:50:41 2019 -0800 - - updated helper - -commit fa48ac65649b82fa2d86ff04a3cf7b2a85edb523 -Merge: d7b268217 891eadde2 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Feb 14 12:27:00 2019 -0800 - - Merge pull request #1146 from bcgov/milestone-5-bug-fixes - - Milestone 5 bug fixes - -commit f4e65a561bb2ea4cf933e37e4ea8d2d73554299d -Author: Gary Wong (BC Gov) -Date: Thu Feb 14 11:23:29 2019 -0800 - - Adding default value to well_publication_status. - -commit 5739d1c4a5969695f3f6f3190699ccce4f97f90b -Merge: 28b53e4c2 d7b268217 -Author: AlexZorkin -Date: Thu Feb 14 11:22:34 2019 -0800 - - Merge branch 'dev' into alex/wellpublicationstatus - -commit 9503d57cfd51276e02cf841e96862497f4119dcc -Author: AlexZorkin -Date: Thu Feb 14 11:21:52 2019 -0800 - - helper directory - -commit 891eadde25547fbf846a98c05825287806de4bcf -Author: Sean Rumsby -Date: Thu Feb 14 10:38:02 2019 -0800 - - Fix issue causing submissions not to upload - - Null object exception was being thrown in the formSubmit method. This change puts a check on the evaluation to ensure that does not happen. - - Cleaned up the resulting logging to actually log normal JS errors instead of only HTTP type errors. - - Clean up eslint error - -commit e7e8e6ccc22e9cec8bb65d1f8b94a5f3ac06dec4 -Author: Sean Rumsby -Date: Tue Feb 12 17:46:02 2019 -0800 - - Removed ability to delete documents from well summary page - -commit 392268341c3af802ca55fbd7565da22d976895af -Author: Sean Rumsby -Date: Tue Feb 12 17:43:27 2019 -0800 - - Added logic to ensure that all documents for drillers are private - -commit d7b268217d796392f8a10994c9b4a1ae9c310aaf -Merge: 48cce4981 c2166e34e -Author: Steve Hillier -Date: Thu Feb 14 11:03:38 2019 -0800 - - Merge pull request #1151 from bcgov/steve/aqname - - [1565] update the way that aquifer names are returned - -commit 48cce4981aad9124555443c64295af3575d1501f -Merge: b8db26073 e2d3166ab -Author: Steve Hillier -Date: Thu Feb 14 11:02:41 2019 -0800 - - Merge pull request #1129 from bcgov/milestone-5 - - Milestone 5 - -commit 28b53e4c2cd98379b126e1035a6a8e972bb1e6a4 -Merge: a0a26f19f b8db26073 -Author: AlexZorkin -Date: Thu Feb 14 10:55:10 2019 -0800 - - Merge branch 'dev' into alex/wellpublicationstatus - -commit 3ea3d5b60cbfe5f8913b069e3cb06a76d4a870d8 -Author: AlexZorkin -Date: Thu Feb 14 10:54:31 2019 -0800 - - error cleaning - -commit b8db260736f1a34084be90dde4029ef19b214fb5 -Merge: 484f04008 ba910c6d1 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Feb 14 10:33:19 2019 -0800 - - Merge pull request #1152 from bcgov/task/1606_dcImages - - [1606] Docker Compose - use default python, add GDAL - -commit ba910c6d171a5db8774e953e79716d10876c2e4d -Author: Derek Roberts -Date: Wed Feb 13 17:18:58 2019 -0800 - - Docker Compose - use default python, add GDAL - -commit e2d3166ab7443d7c9312f330a76a17a821639d9d -Author: Sean Rumsby -Date: Wed Feb 6 15:51:30 2019 -0800 - - Update disable_private to False so we can delete private documents - -commit a526bc0510e3ccadc03712bd2aa74ca54df59d17 -Author: Sean Rumsby -Date: Wed Feb 6 15:50:56 2019 -0800 - - Added swagger spec formation to list files endpoints - -commit a0a26f19f2f81fa02250d58e4a3eea7799e2db77 -Author: AlexZorkin -Date: Thu Feb 14 09:27:10 2019 -0800 - - merged migrations - -commit 182d5df60e94904704db68879e5c25418ff0ccd6 -Author: AlexZorkin -Date: Thu Feb 14 09:11:58 2019 -0800 - - combine function - -commit ec776411467cfb58fee80220f57359a2acb4ca92 -Author: AlexZorkin -Date: Wed Feb 13 17:26:05 2019 -0800 - - reducing errors function - -commit c2166e34e3ea5c8a2235bf81f0a953d321096031 -Author: Steve Hillier -Date: Wed Feb 13 16:25:01 2019 -0800 - - add a comment - -commit 14c227caf13a3f7d821dc4187aadb724ffa78bf2 -Author: Steve Hillier -Date: Wed Feb 13 16:21:03 2019 -0800 - - update the way that aquifer names are returned - -commit 1e9ea7728a6f4911f2c030cbc7e38107cff6a954 -Merge: 52e1a71f8 484f04008 -Author: Steve Hillier -Date: Wed Feb 13 16:07:12 2019 -0800 - - Merge branch 'dev' into steve/spa - -commit d37d92f3cf6195b4e7c7f4b2ba8c001b89e828a1 -Merge: e01d33fe7 484f04008 -Author: AlexZorkin -Date: Wed Feb 13 16:04:56 2019 -0800 - - Merge branch 'dev' into alex/wellpublicationstatus - -commit 3694ceb7e1130bfcabd1987f2c8ecb0e74b0db2f -Author: AlexZorkin -Date: Wed Feb 13 16:04:14 2019 -0800 - - added noty notifications - -commit 484f0400854f3888ace519e7c329f5f81e2e5870 -Merge: 23a4c4056 50a33e38a -Author: Sybrand Strauss -Date: Wed Feb 13 16:01:32 2019 -0800 - - Merge pull request #1149 from bcgov/fix/replication - - Increased comments column to 2000 in xform_well, added unknown well class code in migration - -commit 52e1a71f8ac6b082c686e96db4811f04d44bdce5 -Merge: f8c7b8d11 23a4c4056 -Author: Steve Hillier -Date: Wed Feb 13 15:31:34 2019 -0800 - - merge in dev branch - -commit 50a33e38a3573e0b889c169d3404a9413090619f -Merge: cb6d8c4e5 23a4c4056 -Author: Sybrand Strauss -Date: Wed Feb 13 14:48:23 2019 -0800 - - Merge branch 'dev' into fix/replication - -commit cb6d8c4e5a2110ae6666bf09d3f885ccb9ddb879 -Author: Sybrand Strauss -Date: Wed Feb 13 13:55:23 2019 -0800 - - Added unknown well class code in migration - -commit 23a4c405683465c296e82a9fd34419f739b036da -Merge: 0345eb7eb 2a091ee24 -Author: Steve Hillier -Date: Wed Feb 13 13:44:58 2019 -0800 - - Merge pull request #1144 from bcgov/alex/lithdecimals - - [1572] Edit Form Rehydrate on Success - -commit 129237a678af2b1a61dbbfc9562c9e02d36a4e49 -Merge: 88fb88e54 0345eb7eb -Author: Steve Hillier -Date: Wed Feb 13 12:57:33 2019 -0800 - - Merge branch 'dev' into steve/subm-history - -commit c5e014b3fc6112e55e46454eb74299324ab486c5 -Author: Sybrand Strauss -Date: Wed Feb 13 12:00:42 2019 -0800 - - - Increased comments column to 2000 in xform_well, to match oracle source - -commit 2a091ee24efc2d43480be2e099ae2c7918fbb43c -Merge: 334f6d84b 0345eb7eb -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Feb 13 11:26:27 2019 -0800 - - Merge branch 'dev' into alex/lithdecimals - -commit 0345eb7eb50bb011a13eb497a5c0edc669404228 -Merge: 9c1eeac4f b807358fb -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Feb 13 11:22:40 2019 -0800 - - Merge pull request #1147 from bcgov/feature/docker-compose - - OpenShift 3.11 upgrade fixed the prior bug that required explicit 443 … - -commit b807358fbc2c90e867364ca5a4ba44bb99e02979 -Author: Gary Wong (BC Gov) -Date: Wed Feb 13 10:34:00 2019 -0800 - - Fixed mdillon reference. - -commit ca82d96c5c26467aacdda632e08da9eea48ebd99 -Author: Gary Wong (BC Gov) -Date: Wed Feb 13 10:07:08 2019 -0800 - - OpenShift 3.11 upgrade fixed the prior bug that required explict 443 port; so removing that port # - -commit c68492fe9d16f402c57b0e36580ef6b5d150c07b -Merge: 0969b73a6 9c1eeac4f -Author: AlexZorkin -Date: Wed Feb 13 09:25:35 2019 -0800 - - Merge branch 'dev' into alex/savingrecords - -commit e01d33fe75361e73b270f0e143efde5b645858e3 -Merge: 1969db776 9c1eeac4f -Author: AlexZorkin -Date: Wed Feb 13 09:24:41 2019 -0800 - - merged dev and fixed conflict on options get - -commit 0969b73a6c2834a955f2abcf0a26ab3868b37645 -Author: AlexZorkin -Date: Wed Feb 13 09:21:59 2019 -0800 - - fixed modal params, removed scroll to top - -commit 334f6d84bc4e1a9e7592e050fc288ee73d82534e -Merge: e6127968b 9c1eeac4f -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Wed Feb 13 09:18:37 2019 -0800 - - Merge branch 'dev' into alex/lithdecimals - -commit 9c1eeac4f6fbe9fdd0000a2eecaaaef755795124 -Merge: 342ceed86 ed2071031 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Feb 12 23:46:00 2019 -0800 - - Merge pull request #1123 from bcgov/feature/gis-backend-with-configmap - - [1576] Feature/gis backend with configmap - -commit ed207103167c60a2607a932466fb4d4d5e3df37d -Author: Derek Roberts -Date: Tue Feb 12 18:10:53 2019 -0800 - - Docker Compose now using public db image - -commit de9b5f49c9f265d5aad7091278b7c8bfce078eab -Author: Derek Roberts -Date: Tue Feb 12 17:26:55 2019 -0800 - - Jenkinsfile - corrected project in test fn - -commit fbb1d0b8f98db8f90fae1d38f6b6896e7098bf02 -Author: Derek Roberts -Date: Tue Feb 12 16:55:58 2019 -0800 - - Jenkinsfile - logic goof - -commit 9693e6599757048c8418d75b25cfb0a2c1da031c -Author: Derek Roberts -Date: Tue Feb 12 15:16:21 2019 -0800 - - Jenkinsfile - Django tests using fn - - Typo - -commit 5b923735beb522be87ce431b337095c0d6e01f6e -Author: Derek Roberts -Date: Tue Feb 12 14:49:38 2019 -0800 - - Added django testing function - -commit d99bca80111394ddf829e245ab76f4dc8150c791 -Author: Derek Roberts -Date: Tue Feb 12 12:39:58 2019 -0800 - - Jenkinsfile - revised stage triggers, unit tests for staging - -commit 8d2f568d0f585858e6b47dab5afa092e42b454d9 -Author: Gary Wong (BC Gov) -Date: Tue Feb 12 10:12:12 2019 -0800 - - Handoff to Derek. - -commit 6128b50ecfa6d328a8239aad3b14c12cc75eaaf6 -Author: Gary Wong (BC Gov) -Date: Tue Feb 12 09:05:25 2019 -0800 - - Cleaned up test bc.json and reset docker-images/ (just python-gdal) - -commit 49298bb38af1cd2865ae8a7b98f6851c9fe6f577 -Author: Gary Wong (BC Gov) -Date: Tue Feb 12 07:32:33 2019 -0800 - - Clean up no longer necessary docker-image/postgis files. - -commit 1bbf76146568d2710496c65e50ccc78dfc7a6e7f -Author: Gary Wong (BC Gov) -Date: Tue Feb 12 00:29:28 2019 -0800 - - Re-applying TEST -> STAGING edits. - -commit 1ce4a2c679203410ceca3481218c55bd907e81e2 -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 23:57:45 2019 -0800 - - Synced w /dev branch. - -commit 26f8c881f307a731d0b3a0ffa4c813727d92fd37 -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 23:18:02 2019 -0800 - - Referenced correct PostGIS FDW image rather than old Postgres FDW image. - -commit 8f38f0a882d10ea7d7f8b61d6e5be6e3b4786b85 -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 15:48:00 2019 -0800 - - Correcting ENV variables to work our images. - -commit 1f47bdf073aca36285d1c7cac042babd910123ab -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 15:04:00 2019 -0800 - - Fixed imageStreamTag typo. - -commit c672bc73d94343c447a817a14301126750c63c67 -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 14:53:39 2019 -0800 - - Cleaned out docker-images as we can now pull from OpenShift Image repo anonymously. - -commit 45678cc4e69daf23f09cde76a06094cc2cc2fad2 -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 11:23:40 2019 -0800 - - Switching PostGIS local docker image to alpine. - -commit 76d9038fba1842723d054f1379a809a393d11551 -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 11:00:48 2019 -0800 - - Correct version #'s in new Dockerfile. - -commit 4be9f46a51184c3fda47f130f0feba343f1af03e -Author: Sybrand Strauss -Date: Mon Feb 11 10:19:17 2019 -0800 - - Allowing app to be run without specifying geos/gdal path (for mac and debian based systems) - -commit ff9a40f4ef49a11d14bbfc4845d538b914d999a9 -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 10:15:10 2019 -0800 - - Removed Dockerhub dependency. - -commit 548569761dd46f98cfdad2cd2d9344cc15572e9f -Author: Gary Wong (BC Gov) -Date: Mon Feb 11 09:25:52 2019 -0800 - - Renamed RHEL7 Docker to be the default (no file extension) - -commit 1ac9b1507c7b15c70229ca28054f13eaf1faf079 -Author: Sybrand Strauss -Date: Mon Feb 11 09:25:53 2019 -0800 - - Removed engines array - -commit 6f677c39bf9e7beef89c473d913914a4639dd593 -Author: Gary Wong (BC Gov) -Date: Fri Feb 8 19:03:35 2019 -0800 - - Corrected typos. - -commit f36d51873fce0473ad88b46c6e7503276aa56c89 -Author: Gary Wong (BC Gov) -Date: Fri Feb 8 16:15:07 2019 -0800 - - Removing DATABASE_ENGINE as we are only on PostGIS (not sqllite, postgres, etc.) - -commit 255d64c10d9b773e74395a2e07503fc78da0f734 -Author: Gary Wong (BC Gov) -Date: Fri Feb 8 14:19:01 2019 -0800 - - Reversing last temporary update. - -commit 855805df812c6fddd8e7cc238c1d11d5fab54008 -Author: Gary Wong (BC Gov) -Date: Fri Feb 8 14:17:22 2019 -0800 - - Temporarily adding back when expression to 'DEV - Smoke Test' stage. - -commit 3e57451143708613b80498c838ce826824b8c2d3 -Author: Gary Wong (BC Gov) -Date: Wed Feb 6 16:33:16 2019 -0800 - - Updated Pipeline to run test in all DEV stages. - -commit 7a9da50433daae82aee7d8a09ced0b0e8c5a8321 -Author: Gary Wong (BC Gov) -Date: Mon Feb 4 22:23:23 2019 -0800 - - R/e build config. - -commit a9e950ada89e6e4c88a46f9bd711acff3e17eed9 -Author: Gary Wong (BC Gov) -Date: Mon Feb 4 16:32:20 2019 -0800 - - Continuing to refactor Dockerfile structures, adding in-line build to docker-composer. - -commit db167b174a29aa79282695f04538498d67c56b51 -Author: Gary Wong (BC Gov) -Date: Mon Feb 4 14:45:18 2019 -0800 - - Start of refactoring Dockerfile images and references. - -commit 9a2be0b5d4c289209c0c2e29e3a16e5ebd1a6964 -Author: Gary Wong (BC Gov) -Date: Mon Feb 4 09:09:54 2019 -0800 - - Ensure the moved Dev - Django Unit Tests stage runs for all non-master pipelines. - -commit fc99f37aee67bb9f4911555e6a82b957363271f1 -Author: Gary Wong (BC Gov) -Date: Mon Feb 4 09:02:57 2019 -0800 - - Ensure base models are from contrib.gis - -commit f4aaf4b275186c64f411423d7e13ad0d4be4b7ed -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 18:42:26 2019 -0800 - - Reverting reversion of new stage to avoid duplicates. - -commit 45101fbf347027f6bb218528bb58ce32a6cdc69a -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 18:33:42 2019 -0800 - - Reverting other renamed Stage name. - -commit 105ba5dfddea040ff4e90dc5098d0b560bca76e4 -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 17:37:19 2019 -0800 - - Retrieve *_LIBRARY_PATH from environmental variables rather than hard-coded. - -commit be635a8e5fac671900ccf2c1532e9771eca91729 -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 17:00:55 2019 -0800 - - Reverting stage names to as before. - -commit 9b9c13cedd32f293cf9ef6c444a429c9e0a26ca2 -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 16:50:02 2019 -0800 - - set ENABLE_ADDITIONAL_DOCUMENTS. - -commit b99944f03358a370759bc3c7270cd8fb6f6e653c -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 13:59:03 2019 -0800 - - Avoiding snyk error. - -commit 9f0336fca9de3c7487784e2a72392e438bdb54df -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 12:14:09 2019 -0800 - - Syncing . - -commit 15ed7372b4838c7730924d0738dde06be601efc6 -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 11:53:17 2019 -0800 - - Put back erroneously deleted ENV vars. - -commit 593b25d75632b6dcf0c824945777c00d8b00d648 -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 11:44:15 2019 -0800 - - Swapping out pygdal due to snyk - -commit df0dc7cf80f799d3cbeff4edeab8fe3c75845d27 -Author: Gary Wong (BC Gov) -Date: Fri Feb 1 10:17:29 2019 -0800 - - Switching over registries, submissions apps to use django.contrib.gis.db - -commit 35eb86361bb0c6abbf363c3b5d8f1674ae630314 -Author: Gary Wong (BC Gov) -Date: Thu Jan 31 23:10:20 2019 -0800 - - Remove all references to sqlite. - -commit dfea471a03098be87ff91f843f6522f2788b5988 -Author: Gary Wong (BC Gov) -Date: Thu Jan 31 22:25:45 2019 -0800 - - Fixed typo on openshift.selector() object name. - -commit f0655918c0591a3a98c982313d3602f1c090fdeb -Author: Gary Wong (BC Gov) -Date: Thu Jan 31 22:03:08 2019 -0800 - - Better describe the pipeline stages (inline comments), and remove '-m' parameter that is no longer needed now that we are not using conftest.py - -commit 931510782e8597c44714112232d007112f36e918 -Author: Gary Wong (BC Gov) -Date: Thu Jan 31 21:32:22 2019 -0800 - - Move Unit Tests from Build to Deploy, forcing use of postgis over sqlite. - -commit f8c7b8d1142741f6f53462d898b4a65600af08c1 -Author: Steve Hillier -Date: Tue Feb 12 16:55:28 2019 -0800 - - remove trailing slash from url - -commit c1e42c231a9f15810dc61ef72fd8fc2a5fa1f4bf -Author: AlexZorkin -Date: Tue Feb 12 16:54:47 2019 -0800 - - converted alerts to modals and adding saving animation - -commit 342ceed86f8d67d4192f6c3074eee18130343e52 -Merge: 96a128d00 5a55498cc -Author: Sybrand Strauss -Date: Tue Feb 12 16:45:57 2019 -0800 - - Merge pull request #1142 from bcgov/feature/sybrand_tweaks_sprint51 - - [1388] Added "decommision" to sealant_material and backfil_material - -commit 1969db776504d1f1ce0c889f8ad3af3a5761f88d -Merge: 71c2312ad 96a128d00 -Author: AlexZorkin -Date: Tue Feb 12 16:00:36 2019 -0800 - - Merge branch 'dev' into alex/wellpublicationstatus - -commit e6127968b1166823225a9d2d9b61af5f775f0f2c -Merge: 3973046dc 96a128d00 -Author: AlexZorkin -Date: Tue Feb 12 15:52:24 2019 -0800 - - Merge branch 'dev' into alex/lithdecimals - -commit 3973046dc7c8a5fd0fbd6cdc29a07f033d01e19b -Author: AlexZorkin -Date: Tue Feb 12 15:41:03 2019 -0800 - - updated form success to rehydrate altered data triggering re-render - -commit 5a55498ccbcce539d9edbe2bf66aabebca1f52bc -Author: Sybrand Strauss -Date: Mon Feb 11 09:11:20 2019 -0800 - - - Switched from String to Array for developmentMethod - - sealant_material -> decommission_sealant_material - - backfill_material -> decomission_backfill_material - - fixed well tag search (old code sneaked back in!) - - Fix spelling mistake (decomission -> decommission) - -commit 96a128d00dd3134f4f6dc76a809fcb9a36e8ce47 -Merge: 1fca355e6 4e689e3f4 -Author: Steve Hillier -Date: Tue Feb 12 14:04:26 2019 -0800 - - Merge pull request #1143 from bcgov/steve/lithdescriptor - - [502] add lithology descriptor to submission preview - -commit 71c2312ad9fb853d4416e53347e64c7f484b2381 -Author: AlexZorkin -Date: Tue Feb 12 12:08:12 2019 -0800 - - added null=false to fields on publication status model and adjusted migrations to match - -commit 4e689e3f4978177278b14a83c6d1ebc1c0df8bb5 -Author: Steve Hillier -Date: Tue Feb 12 11:55:14 2019 -0800 - - add lithology descriptor to submission preview - -commit 325a2796fb689b8bf50588bc05e79d0bfd981d71 -Author: AlexZorkin -Date: Tue Feb 12 10:47:18 2019 -0800 - - merged migrations and updated export file - -commit 1c7e3534f1091d15a69193103b83c70b8174b55e -Merge: 4bff780cd d8d3eba69 -Author: AlexZorkin -Date: Tue Feb 12 10:38:48 2019 -0800 - - merged release branch and fixed conflict on export and api-test - -commit 4bff780cda128844198063c99efb67c75b762e0a -Author: AlexZorkin -Date: Tue Feb 12 10:27:36 2019 -0800 - - added api test for publication state change - -commit 1fca355e642ff96737bb08b6861f610e15caac34 -Merge: 67243b17c 35287937d -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Feb 11 23:28:03 2019 -0800 - - Merge pull request #1135 from bcgov/task/1388_submissionTweaksII - - [1388] Submission Tweaks II - -commit 35287937d950b966fe04b91eac119de3afaba2f3 -Author: Derek Roberts -Date: Mon Feb 11 16:35:37 2019 -0800 - - display_orders shuffled for less impact - -commit 3a27a38447c269ba38842c0f2d820f4318ecf9ec -Author: Derek Roberts -Date: Mon Feb 11 13:12:56 2019 -0800 - - display_orders shuffled for less impact - -commit 1440bdb42d2d8f39df8776637b02b4ae87255f93 -Author: Derek Roberts -Date: Tue Feb 5 15:20:37 2019 -0800 - - Submission - Show Decommission Materials description not code - -commit 79e199c82894a1f1b76e1b2cc83ee4dc4266b2cd -Author: Derek Roberts -Date: Fri Feb 1 15:50:38 2019 -0800 - - Swapped Hydro-fracturing yes|no order for consistency - -commit 78bf5f6d561a3655175b5c72d79dc89923d5dcc3 -Author: Derek Roberts -Date: Fri Feb 1 15:48:26 2019 -0800 - - Swap Alternative Specs check for radio button - -commit bc71c447da751e1274b76eba80e5d46c7f01746b -Author: Derek Roberts -Date: Fri Feb 1 13:23:31 2019 -0800 - - Settle for correcting DUO/DUAL in description only, not code - - Show-stopping typo in fixture data - -commit 7a2487f436c3a5e13f2847be20583ce723dd3414 -Author: Derek Roberts -Date: Fri Feb 1 13:15:46 2019 -0800 - - Corrected Duo Rotary to Dual Rotary - -commit ac6d1b81667b4698f609412a25ae1968effef230 -Author: Derek Roberts -Date: Fri Feb 1 12:34:48 2019 -0800 - - Makefile - handle sigint, still cleanup - - Makefile - cleanup vols on down cmd - - Makefile - use set -m instead of || true to handle sigint - -commit 5c8bf2dd8bba5ecb9b497bb6a9459df0a932b1e9 -Author: Derek Roberts -Date: Fri Feb 1 12:28:14 2019 -0800 - - Loosen type restrictions on number input - -commit a36e531b78af1bc18cc61d9a90359e2df743380f -Author: Derek Roberts -Date: Fri Feb 1 12:26:09 2019 -0800 - - Typo in fixture - -commit 67243b17c528fc4e5fb59dfffd335c2764e3fedb -Merge: ffa17a876 6a2e52448 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Feb 11 21:44:24 2019 -0800 - - Merge pull request #1139 from bcgov/task/1590_routeRevision - - [1590] Clearly split variables and routes from TEST into DEMO and STAGING - -commit 6a2e52448be08e63bd7e8a7c54ddbf9302ec67be -Author: Derek Roberts -Date: Mon Feb 11 21:08:03 2019 -0800 - - Updated Jenkinsfile stage targets - -commit a135b5aa2b8caca6cf0a17c3cf0dc068595a0528 -Author: Derek Roberts -Date: Mon Feb 11 20:34:44 2019 -0800 - - Clearly split variables and routes from TEST into DEMO and STAGING - -commit 7f5b70288f23972801803cab3eb3ffb185004deb -Author: AlexZorkin -Date: Mon Feb 11 20:11:35 2019 -0800 - - updated migration information and table constraints, benched unpublished exclude until advanced search is done - -commit ffa17a8768d858f0c1bb65c36002c384defdef3c -Merge: 39629aa49 65e979dbb -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Feb 11 19:55:40 2019 -0800 - - Merge pull request #1133 from bcgov/alex/decomtableposition - - [1562] moved decommission table below decommission information - -commit 65e979dbb0725c88b94cd056bbfa45f3ce33a4cc -Merge: 31d1beb8a 39629aa49 -Author: Steve Hillier -Date: Mon Feb 11 17:12:16 2019 -0800 - - Merge branch 'release/1.48.1' into alex/decomtableposition - -commit 39629aa496bd2901ce197635caccc18fe7dee6d3 -Merge: afeb4f49c bda2c0052 -Author: Steve Hillier -Date: Mon Feb 11 16:58:55 2019 -0800 - - Merge pull request #1131 from bcgov/alex/wellviewfix - - [1542] fixed aquifer link on well detail view - -commit bda2c005264453672e804a74f8fec5ae8866c366 -Merge: decce31ef afeb4f49c -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Feb 11 15:35:17 2019 -0800 - - Merge branch 'release/1.48.1' into alex/wellviewfix - -commit 31d1beb8a4ed91c99e29185a8134976508ea1162 -Merge: fb3cf8e78 afeb4f49c -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Feb 11 15:24:40 2019 -0800 - - Merge branch 'release/1.48.1' into alex/decomtableposition - -commit afeb4f49c97c5e0f5d801b5aaec795ae3a5a4b54 -Merge: c0ae4fb66 a36813c57 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Feb 11 15:08:00 2019 -0800 - - Merge pull request #1134 from bcgov/alex/requiredfieldsfix - - [1561] removed asterisks from unrequired fields on edit - -commit decce31ef11d85347c1142083b64551b766eb5f8 -Merge: 6006b6afb c0ae4fb66 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Feb 11 13:15:12 2019 -0800 - - Merge branch 'release/1.48.1' into alex/wellviewfix - -commit fb3cf8e785f3d27c8b44f4edb3f422beba84389a -Merge: 8106d0a31 c0ae4fb66 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Feb 11 13:14:52 2019 -0800 - - Merge branch 'release/1.48.1' into alex/decomtableposition - -commit a36813c57cd520502ff36c556a14fd859bdeaf66 -Merge: 1910b343e c0ae4fb66 -Author: Alex Zorkin <47334977+AlexZorkin@users.noreply.github.com> -Date: Mon Feb 11 13:12:21 2019 -0800 - - Merge branch 'release/1.48.1' into alex/requiredfieldsfix - -commit c0ae4fb665962c76d90924afea8189764a417dcb -Merge: d8d3eba69 9e5b80c98 -Author: Steve Hillier -Date: Mon Feb 11 13:05:49 2019 -0800 - - Merge pull request #1122 from bcgov/steve/lithology - - [502] Update lithology input form - -commit 1910b343eaa4f1ad2cee023ec5fd951870dc4915 -Author: AlexZorkin -Date: Mon Feb 11 10:50:36 2019 -0800 - - removed asterisks from unrequired fields on edit - -commit 9e5b80c98bdf6a2577fd1643cc572ff4a2250d5d -Merge: 5bc6d7d99 d8d3eba69 -Author: Steve Hillier -Date: Mon Feb 11 09:18:23 2019 -0800 - - Merge branch 'release/1.48.1' into steve/lithology - -commit d8d3eba69746eef29f8dce9aab64b001cace1ee7 -Merge: 1ceda8890 d30ae3901 -Author: Sybrand Strauss -Date: Mon Feb 11 09:02:16 2019 -0800 - - Merge pull request #1115 from bcgov/feature/sybrand_tweaks_sprint50 - - [1388] Submission | Tweaks - Sybrand Branch - Sprint 50 - -commit 8106d0a31d0fd39ed2374b0dbd8d676c6c3f26cc -Author: AlexZorkin -Date: Fri Feb 8 16:56:40 2019 -0800 - - moved decommission table below decommission information - -commit 354a21835b04ed807795492a3c3616704dc80c50 -Author: AlexZorkin -Date: Fri Feb 8 15:53:46 2019 -0800 - - added exclude clauses for unpublished wells for well search and export - -commit dab52e3e18397c7bdd8442828ef3a3ce8e0774b2 -Author: AlexZorkin -Date: Fri Feb 8 14:22:10 2019 -0800 - - finished staffedit view for well publication status - -commit cbc632c7d7546533a340ebad7b7114b1682f10de -Author: AlexZorkin -Date: Fri Feb 8 11:26:28 2019 -0800 - - added serializers for publication status, updated well api endpoints, created view component for publishing status selection - -commit 6006b6afbe6bde7c6e9a287801aab0c6b1e6a43a -Author: AlexZorkin -Date: Fri Feb 8 09:32:39 2019 -0800 - - added empty state label - -commit d30ae3901e42aaa5f9c1f752de93dd08fff8fa8e -Author: Sybrand Strauss -Date: Tue Jan 29 10:53:08 2019 -0800 - - - Added api for check if coordinate is in BC, using bounding rectangle - - Updated coords and coordsmap control to use api to check if point is in BC. - - Changed drilling method to many to many field - - Updated replication script - - Removed wellsearch_large - no-one is using it - - Changed input widget for water quality characteristics - - Switching well development method to ManyToMany relationship - - Changed around order of fixtures (not technically required, but I prefer them ordered by dependancy) - -commit 88fb88e54e18a0150e693c5fb90ab9b3130317c8 -Author: Steve Hillier -Date: Thu Feb 7 17:16:46 2019 -0800 - - add date and user to submission report details - -commit c82afba2da2504ea05ba181d8e7eb28019b42e4e -Author: AlexZorkin -Date: Thu Feb 7 16:52:22 2019 -0800 - - created and added well_publication_status to well and activitysubmission, added fixture code to migration - -commit 1fd55ae53abb5e60fc1b90a290a99e76fa3d134b -Author: Steve Hillier -Date: Thu Feb 7 15:44:04 2019 -0800 - - filter out staff edits from report history - -commit a852d7dc738bd40554ef1d97a9d7c5892e81e7a1 -Merge: 138ab2d62 1ceda8890 -Author: Steve Hillier -Date: Thu Feb 7 15:24:22 2019 -0800 - - merge in upstream changes (need migrations) - -commit e01cf162be3736f59a478000bf87bbfa0b19f7e0 -Author: Steve Hillier -Date: Thu Feb 7 14:38:20 2019 -0800 - - comment out functional tests that run against the old templates - -commit 73305b4b37119d42b09be5c68c7441c8badc868d -Author: Steve Hillier -Date: Thu Feb 7 13:58:35 2019 -0800 - - fixes for tests/linting - -commit 5bc6d7d9918880d1dac3e2e14a7e64dfe84ddb7f -Merge: 3f4e17882 1ceda8890 -Author: Steve Hillier -Date: Thu Feb 7 13:54:44 2019 -0800 - - Merge branch 'release/1.48.1' into steve/lithology - -commit 1ceda8890221aa126f1582a7005cabaaaaa69bc6 -Merge: 217fb5086 a23d4e612 -Author: Steve Hillier -Date: Thu Feb 7 13:54:26 2019 -0800 - - Merge pull request #1125 from bcgov/steve/doc-ga - - [962] add google analytics to well document downloads - -commit f6c89b90ca7802cf08c1a7ac7b1e8692e1cb5ef8 -Author: AlexZorkin -Date: Thu Feb 7 13:15:05 2019 -0800 - - fixed aquifer link on well detail view - -commit be0df3868916849383fd1bfb1a07d815ff2457d2 -Merge: 8e1cc86f4 217fb5086 -Author: Steve Hillier -Date: Thu Feb 7 13:15:05 2019 -0800 - - merge in upstream changes from release 1.48.1 - -commit a23d4e61209d644542e4bee64863f0f7f44dd059 -Merge: bf8cd42de 217fb5086 -Author: Steve Hillier -Date: Thu Feb 7 12:48:18 2019 -0800 - - Merge branch 'release/1.48.1' into steve/doc-ga - -commit 217fb50869f752220bed5d6479a1fc0d06d90f91 -Merge: 2ce8cefa3 17e8483f1 -Author: Steve Hillier -Date: Thu Feb 7 11:37:09 2019 -0800 - - Merge pull request #1128 from bcgov/alex/decommtext - - [1563] added decommission order entry explanation - -commit 17e8483f1a780f34bdc3412eae45b02c0c98e516 -Author: Alex Zorkin -Date: Wed Feb 6 14:00:49 2019 -0800 - - added decommision order entry explanation - -commit bf8cd42de621fc22faae386371a735cfee253c0e -Merge: 5923c1dc5 2ce8cefa3 -Author: Steve Hillier -Date: Wed Feb 6 13:52:11 2019 -0800 - - Merge branch 'release/1.48.1' into steve/doc-ga - -commit 2ce8cefa325efee6bf80ce6166d1467a52f3c360 -Merge: f950a2995 a91009f11 -Author: Steve Hillier -Date: Wed Feb 6 13:51:50 2019 -0800 - - Merge pull request #1126 from bcgov/steve/anchor-links - - [1560] fix anchor link scrolling - -commit a91009f114a4d0918c15f949a4df43ba676a79f8 -Merge: 6d0faafbd f950a2995 -Author: Steve Hillier -Date: Wed Feb 6 11:27:37 2019 -0800 - - Merge branch 'release/1.48.1' into steve/anchor-links - -commit f950a2995ebb1ade794c75d031043e87f644c5c7 -Merge: 3a88f4a5a aa5262c1b -Author: Steve Hillier -Date: Wed Feb 6 11:26:58 2019 -0800 - - Merge pull request #1124 from bcgov/milestone-4 - - Milestone 4: Add permissions for uploading to public/private sources - -commit aa5262c1b81bd191370b16d33a543f4780b1865c -Author: Sean Rumsby -Date: Tue Feb 5 20:55:27 2019 -0800 - - Added bucket name to private document URL generation - -commit 6d0faafbd206fed6831efc8ecb9114d719448cc7 -Author: Steve Hillier -Date: Tue Feb 5 12:49:08 2019 -0800 - - fix anchor link scrolling - -commit 5923c1dc55a8118a071cf3b730d778f94e462c48 -Author: Steve Hillier -Date: Tue Feb 5 11:31:20 2019 -0800 - - add google analytics to well document downloads - -commit 3f4e17882afc49ef262c361c5991369eb5b91c54 -Author: Steve Hillier -Date: Mon Feb 4 16:35:11 2019 -0800 - - add 'descriptor' column - -commit 6a857018eb5ef33d7867bd7ebbc8ba6c45ea6754 -Author: Steve Hillier -Date: Mon Feb 4 14:43:25 2019 -0800 - - undoing related_name so we don't need a separate migration - -commit dc5e8848820f6fbd3c5f96ec83cefc9108e5dfce -Author: Steve Hillier -Date: Mon Feb 4 14:38:45 2019 -0800 - - remove lithology materials model - -commit 4f58d349d544e14ca2aabd3dd997abdc40dfe906 -Merge: 4e0a7c6a8 3a88f4a5a -Author: Steve Hillier -Date: Mon Feb 4 13:47:53 2019 -0800 - - Merge branch 'release/1.48.1' into steve/lithology - -commit c93ee1bcf90f3199772ca2fa3c7427cdad1ac2e5 -Author: Sean Rumsby -Date: Mon Feb 4 11:40:15 2019 -0800 - - Fixed bug that prevented deleting documents from private buckets - -commit ca9ae296100dd2aff5a3e4326ddcbe4f42550a20 -Author: Sean Rumsby -Date: Mon Feb 4 11:18:00 2019 -0800 - - Fixed bug that did not redirect private documents into the correct private bucket - -commit 0eeb4850e49f5019664f7630c1fb802e4c59f58b -Author: Sean Rumsby -Date: Mon Feb 4 09:33:53 2019 -0800 - - Added frontend components for specifying public/private status - - This allows users to determine whether the file should be readable by the public, or only for those with the corresponding edit roles for the space they are in (wells, aquifers, or the registry) - -commit 71400d5f90ef43bde417c5b136049b4207eacf64 -Author: Sean Rumsby -Date: Mon Feb 4 09:18:31 2019 -0800 - - Fixed bug that prevented private documents from being saved - -commit 2e79475e4361238fc0980691adcfbd18e8c0a078 -Author: Sean Rumsby -Date: Sun Feb 3 14:08:25 2019 -0800 - - Added backend logic to include/exclude private files in API response based on user roles - - Added logic to allow users to get presigned URLs for private files - -commit be89b6c6f44d6fb2549484431392ba2d73dd16bc -Author: Sean Rumsby -Date: Sun Feb 3 13:56:50 2019 -0800 - - Added frontend display logic for private documents - -commit 3a88f4a5a0bb1c54bd5d37d2f1e48eaec4326174 -Merge: 8e5753648 b4d5c841d -Author: Steve Hillier -Date: Fri Feb 1 15:04:16 2019 -0800 - - Merge pull request #1108 from bcgov/milestone-2 - - Milestone 2 - -commit b4d5c841df0b4cb935730b2613d3782b4a279528 -Author: Sean Rumsby -Date: Fri Feb 1 14:25:04 2019 -0800 - - Fixed linting errors in project - -commit 48e915591fa8169a9ca579956eac6d6f3617b9f1 -Merge: 3000dc606 8e5753648 -Author: Steve Hillier -Date: Fri Feb 1 14:20:00 2019 -0800 - - Merge branch 'release/1.48.1' into milestone-2 - -commit 3000dc60639f951564fb3c93c27caf0cbe24681d -Author: Sean Rumsby -Date: Fri Feb 1 13:24:46 2019 -0800 - - Updated snapshot test for new bind variables - -commit 8e5753648325b2363826b14decd43e4ec5d53fe5 -Merge: 4d79ce72a 67a7f0ae5 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Feb 1 13:24:43 2019 -0800 - - Merge pull request #1120 from bcgov/task/1388_submissionTweakAdjustment1 - - [1388] Submission Tweaks - Patch - Date Format - -commit 251d75e112020a8ebfd30ec20db339eb2fa5d4d4 -Author: Sean Rumsby -Date: Fri Feb 1 13:20:50 2019 -0800 - - Updated document store to properly remove Authorization Header - -commit 0f11b7a6ad4248d6770f74f5bed601523d4d014e -Author: Sean Rumsby -Date: Fri Feb 1 12:14:53 2019 -0800 - - Added refresh of files after document deletion - - Also fixed bug where sometimes the files would upload prior to them actually being stored in S3. - -commit ac08e4d2a3f038402ad919c62cc79088ef68ce23 -Author: Sean Rumsby -Date: Fri Feb 1 09:00:34 2019 -0800 - - Added ability to delete documents - - Added a "Remove" link to all viewing document sections. If applicable, only when in edit mode of the record. - - Added Django routes and views and augmented the document servcei to use the minio service to purge documents from the S3 store. - - Does not yet refresh the file list when a document is removed. - -commit 68588bdd1a411dc301ec97b0017779804c2b76b2 -Author: Sean Rumsby -Date: Thu Jan 31 19:35:04 2019 -0800 - - Refactored APIService.js to remove Authorization on AWS requests - -commit d5a564817133d3fa7d4afdba697684a9f6793d02 -Author: Steve Hillier -Date: Tue Jan 29 11:51:51 2019 -0800 - - remove submission bucket - -commit 969919227a17954e1df579b1f7b8f9689ea82cfe -Author: Steve Hillier -Date: Mon Jan 28 10:54:16 2019 -0800 - - added more env variables - -commit 9c7453fa7f94ddd6acfd398037816a47916cd78d -Author: Steve Hillier -Date: Mon Jan 21 18:25:21 2019 -0800 - - add extra env vars for document buckets - -commit ffec54dcd9da44a9f8cac97e190e155812ab885a -Author: Steve Hillier -Date: Thu Jan 17 14:49:55 2019 -0800 - - add aquifer docs env variable to deploy config - -commit 67a7f0ae57916791d0d68d1c5868b77946269f5a -Author: Derek Roberts -Date: Fri Feb 1 11:30:01 2019 -0800 - - Well Class date format typos - -commit 4d79ce72ad2a3652ad694d91e544ef9bf8051724 -Merge: bd2b31ca6 8fb4cab4e -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Feb 1 10:35:55 2019 -0800 - - Merge pull request #1095 from bcgov/task/1388_submissionTweaks - - [1488] Submission Tweaks - -commit 4e0a7c6a8622cc757d6fdf27d0a80c582ee28f14 -Author: Steve Hillier -Date: Fri Feb 1 09:25:45 2019 -0800 - - fix up observations on frontend and add observations to serializer - -commit 2bf08db263cf0780d3d1725942b7c8b63fa8fde2 -Merge: 07f9fbf95 bd2b31ca6 -Author: Steve Hillier -Date: Fri Feb 1 09:15:32 2019 -0800 - - Merge branch 'release/1.48.1' into steve/lithology - -commit 07f9fbf95e328f0ed6052b3de055763a6d86b1f8 -Author: Steve Hillier -Date: Fri Feb 1 09:15:06 2019 -0800 - - add materials to lithology model and observations to UI - -commit 8fb4cab4e977a17734859b4ed752cc13319b8916 -Author: Derek Roberts -Date: Thu Jan 31 16:38:51 2019 -0800 - - Makefile revision and add django admin/superuser - -commit 81bb0081b898397a07854f86390c0a8017ca3bec -Author: Derek Roberts -Date: Thu Jan 31 16:38:08 2019 -0800 - - DC rename api to backend and webapp to frontend - -commit 18545886a6fb19e3baeecfe24a98570e2a664413 -Author: Derek Roberts -Date: Thu Jan 31 16:21:34 2019 -0800 - - Check null/undefinited a little more thoroughly - -commit 39334305a511a0f963a15b70325a88b0e910d451 -Author: Derek Roberts -Date: Thu Jan 31 15:48:07 2019 -0800 - - Leave fix for separate PR - -commit c670fd9b6b2d98260b24be77fcac7d3efaf3658c -Author: Derek Roberts -Date: Thu Jan 31 15:46:18 2019 -0800 - - Removed unnecessary enabled flag - -commit 89a87395f35008ad2020b08b6c2ba1e8135ce8e9 -Author: Derek Roberts -Date: Thu Jan 31 15:43:19 2019 -0800 - - Reverted drillers to persons api path change - -commit 861f60a63d13e17e1769a798f26c86a43a454bec -Author: Derek Roberts -Date: Thu Jan 31 14:48:41 2019 -0800 - - Updated missing reg no message - -commit db6c4830596256aa587d370170e3b127183a0bb3 -Author: Derek Roberts -Date: Thu Jan 31 14:40:43 2019 -0800 - - gitignore cleanup - -commit 1b3461bf3c49ff03cd9d13758193c73e109e6584 -Author: Derek Roberts -Date: Thu Jan 31 14:27:33 2019 -0800 - - Stopped saving DB full of fixtures to subdir - -commit 466c09eabfebcc05ac26dc864c8ba11002b91309 -Author: Derek Roberts -Date: Thu Jan 31 14:26:08 2019 -0800 - - Logic cleanup - - Spacing - -commit 61d06d40cd8613e78949ab0a5c214e8a21e5724a -Author: Derek Roberts -Date: Thu Jan 31 13:25:42 2019 -0800 - - Changes around using PersonNameSerializer instead of PersonListSerializer - -commit f07108a93c06cff6007c9a4e8dba1333db575647 -Author: Sybrand Strauss -Date: Thu Jan 31 11:37:11 2019 -0800 - - Added a serializer - -commit 735b05b3df885e27846bd8386832050d69c3e568 -Author: Derek Roberts -Date: Wed Jan 30 15:16:24 2019 -0800 - - Reverted use of PersonListSerializer back to PersonNameSerializer - -commit b1f35d13c2a6d29c5d46d0280b78ed5d13e28c50 -Author: Derek Roberts -Date: Tue Jan 29 17:33:38 2019 -0800 - - More post-merge cleanup - -commit 6192c9c69bf824f696b7eeafb313bb3cc853177f -Author: Derek Roberts -Date: Tue Jan 29 11:27:55 2019 -0800 - - Post-rebase cleanup - -commit eea4da8e230dad42e9607c96c73b132ebfaaf434 -Author: Derek Roberts -Date: Fri Jan 25 17:19:57 2019 -0800 - - Make Decommission materials deselectable - -commit 172b8e34cecf620b39a4861bc6f796f4e4c0e083 -Author: Derek Roberts -Date: Fri Jan 25 16:47:49 2019 -0800 - - Hydro-fracturing Performed defaults to NO - -commit 96a48503f6a77789ef19eb5879a3cc0906383e50 -Author: Derek Roberts -Date: Fri Jan 25 16:02:12 2019 -0800 - - Change dropdowns in Casing Details to behave like Lithology - -commit f814740b72dfec7ed5d94d49c7c44cc165fd6b0d -Author: Derek Roberts -Date: Fri Jan 25 15:34:36 2019 -0800 - - Allow clearing of Casing Details type and material - -commit 618904d5750e662e6df09591125ac8eb511a6789 -Author: Derek Roberts -Date: Fri Jan 25 13:58:07 2019 -0800 - - Revise MethodOfDrilling.vue to handle already defined error - -commit 9b5285ab2e6e391075df4f1fc9efadc5913cc317 -Author: Derek Roberts -Date: Fri Jan 25 13:05:31 2019 -0800 - - Added land district numbers to names in pull-down - -commit f2d6fc6418b0503bb32607f6c517bc0c47519f30 -Author: Derek Roberts -Date: Thu Jan 24 16:24:59 2019 -0800 - - Cleanup - -commit 5fa30f80978d56f540390bc1c27fb0dca2e80117 -Author: Derek Roberts -Date: Thu Jan 24 15:05:34 2019 -0800 - - Swap double for single string quotes - -commit 7d3f6a32688debb310d5ac264c764de352ef7f65 -Author: Derek Roberts -Date: Thu Jan 24 13:37:32 2019 -0800 - - Fn for person responsible w/ reg#, case for unavailable - -commit 25be8fb8798c7df6018dd6d04c13be980be21214 -Author: Derek Roberts -Date: Wed Jan 23 16:50:50 2019 -0800 - - Added drill reg no to Person Responsible for Work - -commit 08772ff6bc3a77b4bb8928bae4c53cf04f4aa568 -Author: Derek Roberts -Date: Thu Jan 17 15:20:33 2019 -0800 - - Refine date placeholder, remove old hints - -commit d0f8a4e93ac95a1856ae477bea14370f05c4337e -Author: Derek Roberts -Date: Thu Jan 17 15:03:04 2019 -0800 - - Well Type placeholder for date format - -commit 37b91f04429788720267de2d0f78cf7e27ec1d2d -Author: Derek Roberts -Date: Thu Jan 17 13:07:44 2019 -0800 - - Revised Person Responsible for Work wording - -commit 08d487fcd3dd17117d8e3e202e36742bc507d1e8 -Author: Derek Roberts -Date: Tue Jan 15 14:28:51 2019 -0800 - - Revised Same As check and its behaviour - -commit e9742298e7a92fa2e8fd26af908cf0c4530b02ff -Author: Derek Roberts -Date: Mon Jan 14 12:53:07 2019 -0800 - - Added testing CSVs and XLSX files to gitignore - -commit 69f6ad7e7d21e80262c8596013ad9197d2bc44e1 -Author: Derek Roberts -Date: Mon Jan 14 20:52:57 2019 -0800 - - Revised Person Responsible wording and arrangement - -commit 890bc6de18ff96d104e6f82546fadece17b211fe -Author: Derek Roberts -Date: Mon Jan 14 20:47:35 2019 -0800 - - Set default Orientation of Well to Vertical - -commit d54f42682908416d6528152950b95b6475c24746 -Author: Derek Roberts -Date: Fri Jan 11 14:16:18 2019 -0800 - - Rename Decommissioning to Decommission - -commit bd2b31ca64a3bc14c4936cea042d087d4ab7575d -Merge: a36f8c982 ab7ce5ad9 -Author: Steve Hillier -Date: Thu Jan 31 14:38:08 2019 -0800 - - Merge pull request #1102 from bcgov/steve/aquifer-env-vars - - add Aquifer docs env variable to deploy config - -commit f43f02ede21e8d2780a6e9c9f70a4bba94e7867d -Author: Sean Rumsby -Date: Fri Jan 25 15:49:05 2019 -0800 - - Updated snapshot specs for new file components - -commit 173b90ed7f9259eca5c6da2712e23ee84057be58 -Author: Sean Rumsby -Date: Fri Jan 25 13:04:26 2019 -0800 - - Removed all snake_case from Vue variable names - -commit 79ae09be26c7cdf9529578cd4a1bd90878892bec -Author: Sean Rumsby -Date: Fri Jan 25 10:50:14 2019 -0800 - - Cleanup all linting errors - -commit 292d16aec5bbb116da52a1612088d5179efa5c84 -Author: Sean Rumsby -Date: Fri Jan 25 10:07:47 2019 -0800 - - Updated aquifer tests for new fetchFiles mocks - -commit feec5d791780171c4dc8aef021c4b04e0c23118e -Author: Sean Rumsby -Date: Fri Jan 25 10:07:16 2019 -0800 - - Removed superfluous logging messages from Django backend - -commit 8819f657d0f246878d4d91b531aa13dbd5be6eb2 -Author: Sean Rumsby -Date: Thu Jan 24 17:19:28 2019 -0800 - - Added ability to view submitted documents for wells and submissions - -commit c46fcbe83b53de693b2bba8973091a4e3df2adab -Author: Sean Rumsby -Date: Wed Jan 23 17:54:46 2019 -0800 - - Added ability to view public documents for registrant documents - - Registrant documents do not have deep folder structure like wells and aquifers do. This is because it is assumed that there are fewer registrant documents being uploaded so this is not a current requirement. - -commit e3ca22b3e234e6fecd60c457e6bf02e790a37773 -Author: Sean Rumsby -Date: Wed Jan 23 10:15:33 2019 -0800 - - Added viewing document for aquifers - - Refactored the API calls for formatting documents to be extractable into other document type. Added methods for viewing documents from aquifers leveraging this code. Added events to ensure that the calls get made in the correct order (ie, we don't fetch the files on save until after the files have been stored into S3). - -commit ab7ce5ad9465f8b1f1bb4f1db213812e10536652 -Merge: f10ac8f0e a36f8c982 -Author: Steve Hillier -Date: Thu Jan 31 09:57:23 2019 -0800 - - Merge branch 'release/1.48.1' into steve/aquifer-env-vars - -commit a36f8c982670f171c8e97abf493ab3d34781e5ff -Merge: 02af313b2 02f20b471 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jan 30 18:13:14 2019 -0800 - - Merge pull request #1116 from bcgov/task/1554_makefileTests - - Added tests to Makefile - -commit 02f20b47137ad3d7e0226704387ab2ba9199f6c5 -Author: Derek Roberts -Date: Wed Jan 30 16:40:17 2019 -0800 - - Added tests to makefile - - Makefile tests now test-django, removed unnecessary npm install - - Makefile + test-node and test for both node and django - -commit f10ac8f0e1d3f5aa79fdad2a141b6cde19cbb585 -Merge: ce059235f 02af313b2 -Author: Steve Hillier -Date: Wed Jan 30 16:16:44 2019 -0800 - - Merge branch 'release/1.48.1' into steve/aquifer-env-vars - -commit 02af313b2baeb9467dc67166cf80110c56cf9d5f -Merge: 04e4605fa d7b3cfe85 -Author: Steve Hillier -Date: Wed Jan 30 16:15:44 2019 -0800 - - Merge pull request #1114 from bcgov/feature/python-gdal - - python-gdal (GEOS, PROJ.4, GDAL) - -commit 8e1cc86f4f62d9dc98ccf1bce2105f2ac33c976e -Author: Steve Hillier -Date: Wed Jan 30 16:08:58 2019 -0800 - - remove tests that rely on frontend being built first - -commit d7b3cfe8525c314a614d93fb4866911f9e5994e6 -Author: Gary Wong (BC Gov) -Date: Tue Jan 29 17:08:50 2019 -0800 - - Re-adding full path to rhscl image. - -commit 8aa12a04ce9f40c4e482d95e92804f500b469854 -Author: Gary Wong (BC Gov) -Date: Tue Jan 29 16:59:12 2019 -0800 - - Refer to Github repo instead of local, and with specific branch as an example. - -commit d26a8888d74c2ebb57f3dcddfa02ce0fa005bfd2 -Author: Steve Hillier -Date: Tue Jan 29 17:01:31 2019 -0800 - - fix title for groovy test specs - -commit 17e11c3cb487e14b74dc8ee5ded13fface8bd2db -Author: Gary Wong (BC Gov) -Date: Tue Jan 29 16:59:12 2019 -0800 - - Refer to Github repo instead of local, and with specific branch as an example. - -commit 5c42d6812995aa4c91044f1101642261ea85757f -Author: Steve Hillier -Date: Tue Jan 29 14:14:08 2019 -0800 - - update selectors for groovy test specs - -commit 4964cb6c815a1c00579e08d6d91fcfc537104aa2 -Author: Steve Hillier -Date: Tue Jan 29 14:09:22 2019 -0800 - - fix a bug in the auth flow - -commit 089c7d325bf399c45cee8a8a1f5a70085b1b8686 -Author: Gary Wong (BC Gov) -Date: Tue Jan 29 12:59:16 2019 -0800 - - python-gdal DockerFile - -commit fe997f3ddf455a403a24f8fdefa898a4c457bb82 -Author: Steve Hillier -Date: Tue Jan 29 12:53:32 2019 -0800 - - change input IDs to match functional tests - -commit ce059235fba6530c684fc6e4ee9b25f24cfe30ac -Author: Steve Hillier -Date: Tue Jan 29 12:38:07 2019 -0800 - - fix linting issues - -commit 564ad899b28cbf4a321ded056ce3eeff2cb2eaff -Author: Steve Hillier -Date: Tue Jan 29 11:51:51 2019 -0800 - - remove submission bucket - -commit 21bfa2f2a9637fba729262062330419b40c24a41 -Author: Steve Hillier -Date: Mon Jan 28 14:07:42 2019 -0800 - - remove a test spec that tests a child component (difficult to mock out) - -commit 391c218fc0fb55be537f06e98d8ccd296a68dccc -Author: Steve Hillier -Date: Mon Jan 28 10:54:16 2019 -0800 - - added more env variables - -commit 32c7ba366d3d74a03a288c8338949ad3579d56aa -Author: Steve Hillier -Date: Fri Jan 25 17:11:54 2019 -0800 - - remove old well detail link - -commit 808db085e60cea8486ac961ecd01e65325b59df9 -Author: Steve Hillier -Date: Fri Jan 25 17:10:28 2019 -0800 - - refactor to use single page app when going to site home - -commit 49d12b194c0eb3df974d90155507f2a7a8ee4b55 -Author: Steve Hillier -Date: Fri Jan 25 15:34:21 2019 -0800 - - new well search page mimics old one (bookmarkable searches) - -commit 55cae2d3fff3385dc3dd7d48245085b5d90984ab -Author: Steve Hillier -Date: Thu Jan 24 16:06:46 2019 -0800 - - fix up printing view - -commit 8fad15f578b2b56588fa02ee6e7c8cf26ee27e38 -Author: Steve Hillier -Date: Thu Jan 24 16:06:40 2019 -0800 - - add tabulator table library - -commit 8c7eb5e1857d810aa16fbccd3e31d5576c5826c2 -Merge: 95c78ba91 04e4605fa -Author: Steve Hillier -Date: Wed Jan 23 16:34:53 2019 -0800 - - merge upstream release 1.48.1 - -commit 95c78ba91e754fba1665c2560714de20be4f3dd0 -Author: Steve Hillier -Date: Wed Jan 23 10:06:14 2019 -0800 - - add router guard to ensure auth process completes before routing - -commit 731249e0de1fb3d5986eee99c4e10f1d34da018d -Author: Steve Hillier -Date: Mon Jan 21 18:25:21 2019 -0800 - - add extra env vars for document buckets - -commit b41e6f07c4c041a335e68162bd50f09503027e4c -Merge: a0de34582 04e4605fa -Author: Steve Hillier -Date: Mon Jan 21 16:01:58 2019 -0800 - - Merge branch 'release/1.48.1' into steve/aquifer-env-vars - -commit 04e4605fa87256fbbbb927cbf21ebe410c66418a -Merge: 99f2e914e f79908038 -Author: Steve Hillier -Date: Mon Jan 21 14:53:43 2019 -0800 - - Merge pull request #1100 from bcgov/aquifer-file-upload - - Aquifer file upload - -commit f79908038d7b4aa0521669e2ef692d1d91d5a3a5 -Author: Sean Rumsby -Date: Mon Jan 21 13:59:47 2019 -0800 - - Updated newman tests to work on detail routes - -commit c25eced43884573a0ba5470b1cf711637ace0c64 -Author: Sean Rumsby -Date: Mon Jan 21 11:41:43 2019 -0800 - - Added ability to upload files against applicants - - Include ability to add attachmentd to new person records created. Updated tests to pass correctly when running unit tests. - -commit 63d9551bd47fb1beb4a584f1d984677dd4d75399 -Author: Sean Rumsby -Date: Fri Jan 18 13:22:59 2019 -0800 - - Updated well URLs to be able to add WTN onto file - -commit 54e0062cdcf26c961151c74ed62e3f02519defba -Author: Sean Rumsby -Date: Fri Jan 18 13:22:43 2019 -0800 - - Updated submission and well-edit views for document submission - -commit efadcac64ce443a3181c91d75ecfc7abac01ad0a -Author: Sean Rumsby -Date: Thu Jan 17 13:59:06 2019 -0800 - - Refactored document upload to be application agnostic - - By removing the store from aquifers and placing it into the common module, we can abstract the document upload process to not be tightly coupled to aquifers only. It now accepts a parameter that allows the caller to specify what type of file is being uploaded, allowing the code to be re-used. - -commit 1c5c8ad2bd604370f7cc08089cd74ec85e0e21b8 -Author: Sean Rumsby -Date: Wed Jan 16 12:19:18 2019 -0800 - - Updated aquifer put url to enter correct bucket - - Updated document service to be able to handle a application provided bucket, with fallback to default public/private bucket if none is specific. This allows in individual application to be able to use the same service to upload documents. - -commit 2b3c52245db59ef1de65ea7eb08cd785b97bb953 -Author: Sean Rumsby -Date: Wed Jan 16 12:10:09 2019 -0800 - - Added front end file submission for aquifers - - Updated API put url to include the aquifer ID, which allows the filename to be manipulated and stored correctly in an S3 source. - - Updated Vue forms to include a bootstrap file attach input, and stores the documents into an S3 source. - -commit 2b833b95e75ea0f4a28766db6f950993d348c5c5 -Author: Sean Rumsby -Date: Mon Jan 7 10:06:29 2019 -0800 - - Added presigned URL endpoints for S3 uploading - - Added end-points for generating a presigned PUT URL for document uploading. This will allow a frontend client to request a key for uploading a document, and then be able to upload the document directly to an S3 compatible source - removing the need for the Django application to act as a middleman and handle the files / uploading directly. - - This commit does not contain file name validation at this time. - -commit 99f2e914ea8f84291672bfd782f99393bf539ba7 -Merge: 69ba06692 c8a0fde7f -Author: Sybrand Strauss -Date: Mon Jan 21 12:16:59 2019 -0800 - - Merge pull request #1103 from bcgov/feature/1388_sybrand_tweaks - - [1388] Submission | Tweaks (Sybrand's Branch) - -commit a0de34582cf379b51f8d238eb8fd5cae00179a89 -Merge: 00a947626 69ba06692 -Author: Steve Hillier -Date: Mon Jan 21 12:03:05 2019 -0800 - - Merge branch 'release/1.48.1' into steve/aquifer-env-vars - -commit c8a0fde7f47c8561d6bd6f9994bb2f363bffe0df -Author: Sybrand Strauss -Date: Tue Jan 15 16:22:39 2019 -0800 - - - Added ordering to wells/tags/ search. - - Loading all the well tag numbers, and filtering results on browser. - - Limiting well results displayed. - - Added bold max display text on WTN label. - - Loading all persons responsible results, and filtering on client side. - - Added bold max display text on person responsible for work. - - Added company of person responsible to Person Responsible for Work control - - Change "driller_responsible_for_work" to "person_responsible_for_work" on model - - Added company for person responsible for work to preview - - Incorporated code review comments - -commit 69ba066926cbd9204322fac629a05828ae1c7282 -Merge: ebedb46d5 0ccd33ca4 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Jan 17 18:22:44 2019 -0800 - - Merge pull request #1086 from bcgov/release/1.48.0 - - Release 1.48.0 - -commit 00a9476265948549136bce50ea92bac94dbb1990 -Author: Steve Hillier -Date: Thu Jan 17 14:49:55 2019 -0800 - - add aquifer docs env variable to deploy config - -commit 37dae0216ee1271cdd67c00f85f200fbed3cd266 -Author: Steve Hillier -Date: Thu Jan 17 11:03:56 2019 -0800 - - add links to well search - -commit ba80ed0c350d0b63cf38757d49d09fa3cd4b5e68 -Merge: 45983700d 0ccd33ca4 -Author: Steve Hillier -Date: Thu Jan 17 10:53:22 2019 -0800 - - merge upstream release/1.48.0 - -commit 0ccd33ca4f2acc3f200d34aac859cb2848b34fca -Merge: 53d087442 1dbf53fd7 -Author: Steve Hillier -Date: Thu Jan 17 10:35:00 2019 -0800 - - Merge pull request #1033 from bcgov/steve/lithprototype - - [1418] Lithology input prototype - -commit 138ab2d628ac1bcea1d1cdad07690637cb27a919 -Merge: 861427dcb 53d087442 -Author: Steve Hillier -Date: Wed Jan 16 16:59:27 2019 -0800 - - Merge branch 'release/1.48.0' into steve/subm-history - -commit 861427dcb2926f10d9ebca26ce268f27ab2e04b2 -Author: Steve Hillier -Date: Wed Jan 16 16:53:54 2019 -0800 - - simple submission history - -commit 1dbf53fd784ce296ecdbc4504aa928d2dd8efa21 -Merge: 63e769561 53d087442 -Author: Steve Hillier -Date: Wed Jan 16 16:51:59 2019 -0800 - - Merge branch 'release/1.48.0' into steve/lithprototype - -commit 53d087442deaf1950a106a8fda0f041dc05676b5 -Merge: 18dd3b7eb 0268f2d87 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jan 16 16:48:34 2019 -0800 - - Merge pull request #1092 from bcgov/bug/1524_wellExportFail - - [1524] Well Export Fail - -commit 0268f2d878e8353ac8962ee09baa0632229fc170 -Author: Derek Roberts -Date: Wed Jan 16 15:39:41 2019 -0800 - - Added patch for Workbook - -commit aa8ef7dc07f65b064ee5e589885b96204c3c441c -Author: Derek Roberts -Date: Wed Jan 16 15:11:09 2019 -0800 - - Added patch for zipfile - -commit e6626db5fc2081cafcb569245f21254cc4a013bb -Author: Derek Roberts -Date: Tue Jan 15 16:25:51 2019 -0800 - - Handled sqlite case where field is tuple, not object - -commit 0c3e674479c7512503d47eaee252e72f0eebd292 -Author: Sybrand Strauss -Date: Tue Jan 15 15:07:25 2019 -0800 - - Added patch for open, to avoid creating real files during test - -commit 60ef3fb4c3fb70dd571b7e4aa83f48e8183bedd2 -Author: Sybrand Strauss -Date: Fri Jan 11 12:22:21 2019 -0800 - - - Added a unit test for export - - Added test to nose.cfg - -commit 63e769561bfef89d6046175d16a81e87cc2b6971 -Author: Steve Hillier -Date: Wed Jan 16 09:17:04 2019 -0800 - - address PR review comments (unused code) - -commit 4b595344048d77c437b0f22802a0e54ec913ce7d -Author: Steve Hillier -Date: Tue Jan 15 16:27:01 2019 -0800 - - merge migration - -commit 624f6897431b716c2880ff6a28facce5f2a17aed -Merge: e778de9ad 18dd3b7eb -Author: Steve Hillier -Date: Tue Jan 15 16:26:21 2019 -0800 - - merge in upstream release branch - -commit 45983700d8771534f93f16e380eeef7937b5749f -Author: Steve Hillier -Date: Tue Jan 15 16:19:51 2019 -0800 - - fix location search - -commit 18dd3b7eb184e6dddb7559953b397d3d58692a7f -Merge: 23199a1f2 158251daa -Author: Sybrand Strauss -Date: Tue Jan 15 15:43:09 2019 -0800 - - Merge pull request #1097 from bcgov/feature/1159_well_yield - - [1159] Well yield information - -commit e778de9ad14454e916efc4b605ae89d768e00001 -Author: Steve Hillier -Date: Tue Jan 15 14:38:12 2019 -0800 - - add API tests - -commit 158251daac2091658015375d4ccc311540e85d2d -Author: Sybrand Strauss -Date: Thu Dec 20 14:59:44 2018 -0800 - - - Swap SWL with Drawndown - - Removed redundant activity submission code (from django forms) - - Updated api tests - - Get rid of productiondata - - Updated migration - - Simplified gwells.forms - - Update export to work with new production data location - - Update replication to work with new production data location - - Added recommended pump depth & rate (for edit view only) - - Update fixtures - - Added default rate unit of measure - -commit 5d5eefc96ea1ca6abe2ff183803c0fff724f8018 -Merge: 8e07ec8a8 23199a1f2 -Author: Steve Hillier -Date: Tue Jan 15 13:44:39 2019 -0800 - - Merge branch 'release/1.48.0' into steve/lithprototype - -commit 23199a1f26174043423d23a8a2830808c35d75a0 -Merge: f7227fd9a bebf2f860 -Author: Steve Hillier -Date: Tue Jan 15 13:43:56 2019 -0800 - - Merge pull request #1096 from bcgov/steve/lic-req - - add link & analytics for water licenses to well search page - -commit 8e07ec8a8fa412aa6c26f2481cc661515879fd70 -Author: Steve Hillier -Date: Tue Jan 15 13:28:24 2019 -0800 - - add lithology to staff edits - -commit bebf2f860e1e619deafd853e5fb34ec1b6a75da0 -Author: Steve Hillier -Date: Tue Jan 15 12:25:56 2019 -0800 - - add a period at end of sentence with water license link - -commit 48e64f099f59e3dbeae39d4ee9d1a78fc5481bd7 -Merge: be8c91f26 f7227fd9a -Author: Steve Hillier -Date: Tue Jan 15 12:05:33 2019 -0800 - - Merge branch 'release/1.48.0' into steve/lic-req - -commit f7227fd9a385069515e0820f381a316dc8cfb038 -Merge: da5c0501d 845e7a30d -Author: Steve Hillier -Date: Tue Jan 15 12:05:13 2019 -0800 - - Merge pull request #1093 from bcgov/steve/aqhistory - - [1278] Add change history to Aquifers - -commit 845e7a30dc6c8864169333e4a580cb1b21610d1e -Merge: e4f514ab9 da5c0501d -Author: Steve Hillier -Date: Mon Jan 14 15:03:05 2019 -0800 - - Merge branch 'release/1.48.0' into steve/aqhistory - -commit be8c91f265504ecebbbde9e68c5aef4f496d7ba0 -Author: Steve Hillier -Date: Mon Jan 14 11:56:58 2019 -0800 - - add link & ga to well search page - -commit e4f514ab9fef003a231046d55903fd13f1539341 -Author: Steve Hillier -Date: Mon Jan 14 09:53:05 2019 -0800 - - add a permission class for aquifer editing - -commit 976d6567832f11c999691b65ad898a4cc8d4ad52 -Merge: 6ffdcfd37 35876d1fe -Author: Steve Hillier -Date: Mon Jan 14 08:57:36 2019 -0800 - - merge release 1.48.0 - -commit 5978766334b85b87b7f35215d2efdf7c017d0995 -Author: Steve Hillier -Date: Fri Jan 11 15:50:27 2019 -0800 - - remove dead code - -commit c96ef65eb26f36a382f42b2446d5dd96796956a0 -Author: Steve Hillier -Date: Fri Jan 11 15:48:27 2019 -0800 - - merge conflicting migrations - -commit c123304a9cf3c8689934277af32a86ed0eb57894 -Author: Steve Hillier -Date: Fri Jan 11 15:35:41 2019 -0800 - - fix lithology material code model string - -commit bacefbe54e7d955a0163caa13fd48e94c393cd4d -Author: Steve Hillier -Date: Fri Jan 11 15:29:29 2019 -0800 - - add extra lithology fields to serializer and preview - -commit 2254b385572b7a744d04f068459794355ac3f97a -Author: Steve Hillier -Date: Fri Jan 11 14:20:38 2019 -0800 - - add more fields to lithology serializer - -commit 1cc97f1f33af0fecb71aab7d6fe9092b511e622e -Merge: c5480b377 5b9b402ab -Author: Steve Hillier -Date: Fri Jan 11 12:17:34 2019 -0800 - - merge upstream release 1.48.0 - -commit 6c6c0e4438505d82a9ee080cb907e7988595226a -Author: Steve Hillier -Date: Fri Jan 11 12:01:59 2019 -0800 - - change app loaded by dev server back to submissions - -commit da5c0501dce95643191af9a577d05f9caa91021b -Merge: 5b9b402ab 3e94bda21 -Author: Steve Hillier -Date: Fri Jan 11 11:19:00 2019 -0800 - - Merge pull request #1091 from bcgov/steve/obsinfo - - change observation well link description - -commit 541606090aa3a3ee0042209a97007b326a9a638d -Author: Steve Hillier -Date: Thu Jan 10 16:37:18 2019 -0800 - - Add change history to Aquifers - -commit 3e94bda21c25cfeffbfa2161e7067b640cd56d1c -Merge: 4774c5629 5b9b402ab -Author: Steve Hillier -Date: Thu Jan 10 13:56:07 2019 -0800 - - Merge branch 'release/1.48.0' into steve/obsinfo - -commit 5b9b402abd61616a19f8df0cf2277c460cde5957 -Merge: 118ce9564 ff15af25c -Author: Steve Hillier -Date: Thu Jan 10 13:54:24 2019 -0800 - - Merge pull request #1090 from bcgov/task_testSmokeTests - - [bug] Make sure TEST smoke tests run - -commit 4774c562983c349f6ae0fe22ef3e34151ac3a001 -Author: Steve Hillier -Date: Thu Jan 10 13:20:33 2019 -0800 - - change observation well link description - -commit ff15af25c15904a7a83c842bc30253e5fafd2bad -Author: Derek Roberts -Date: Thu Jan 10 10:41:10 2019 -0800 - - Make sure TEST smoke tests run - -commit 118ce9564d3946890f76eebab2eb95b5fe35e71e -Merge: 5ad9fc043 445dd8dd6 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Jan 10 13:01:47 2019 -0800 - - Merge pull request #1085 from bcgov/task/1272_obsWellInfo - - [1271] Observation Well Information - -commit 445dd8dd6f844ac9644e862c5b7ece1c1e007eb0 -Author: Steve Hillier -Date: Thu Jan 10 12:08:34 2019 -0800 - - create merge migration - -commit 7eb1305d961b7f24438f250d2910e5a100c22a3f -Merge: c1131c5a8 5ad9fc043 -Author: Steve Hillier -Date: Thu Jan 10 12:08:25 2019 -0800 - - pull in upstream release branch - -commit 5ad9fc0433f32456516631739902fbbf0584bd4c -Merge: 7aa7a79d2 75211fb01 -Author: Steve Hillier -Date: Thu Jan 10 11:33:10 2019 -0800 - - Merge pull request #1080 from bcgov/steve/linkaq - - [414] Associate a well with an aquifer (on staff edit page) - -commit c1131c5a89132463c1372c5bbf7f9366d219ba16 -Author: Derek Roberts -Date: Thu Jan 10 09:55:39 2019 -0800 - - ObsWellNo migrations - -commit 0cff1500c0fff9a924045f7b27ae000ba9c0b2e3 -Author: Derek Roberts -Date: Thu Jan 10 09:36:27 2019 -0800 - - Field lengs for ObsWellNo upped from 3 to 30 - -commit e7580560b48507ced6d10a6673d51477ebf7f168 -Author: Derek Roberts -Date: Thu Jan 10 09:33:29 2019 -0800 - - Shorten submission link - -commit 75211fb016b16b55cbac27063ad8cf9b3730cd86 -Merge: 98ee28f0a 7aa7a79d2 -Author: Steve Hillier -Date: Thu Jan 10 08:58:24 2019 -0800 - - Merge branch 'release/1.48.0' into steve/linkaq - -commit 4f21badc891f24acbcc795726f164a75378fd700 -Merge: 1f9504c68 7aa7a79d2 -Author: Steve Hillier -Date: Wed Jan 9 21:47:48 2019 -0800 - - Merge branch 'release/1.48.0' into task/1272_obsWellInfo - -commit 7aa7a79d2bd758637e9d19ffdae94bff8be180e3 -Merge: ed827650c 246bc12bb -Author: Steve Hillier -Date: Wed Jan 9 21:47:26 2019 -0800 - - Merge pull request #1078 from bcgov/steve/token3 - - [1344] schedule token renewal instead of setting onTokenExpired - -commit 1f9504c68fb96fcea27afd43a6f8082b8d51f409 -Merge: d99b2ef7a ed827650c -Author: Steve Hillier -Date: Wed Jan 9 16:24:24 2019 -0800 - - Merge branch 'release/1.48.0' into task/1272_obsWellInfo - -commit 98ee28f0ad505ad1e11b651b6a5f1f3e25271f2c -Merge: 9863638ee ed827650c -Author: Steve Hillier -Date: Wed Jan 9 16:11:23 2019 -0800 - - Merge branch 'release/1.48.0' into steve/linkaq - -commit 246bc12bbf3410f566350f49fe8d4b1bf5431151 -Merge: 369292ecd ed827650c -Author: Steve Hillier -Date: Wed Jan 9 16:11:05 2019 -0800 - - Merge branch 'release/1.48.0' into steve/token3 - -commit ed827650cf6cf80cc6d147206eb82e8c1d831508 -Merge: 50d38e4b7 5c9800f4d -Author: Steve Hillier -Date: Wed Jan 9 16:10:49 2019 -0800 - - Merge pull request #1079 from bcgov/steve/internal-comments - - [1118] added a check for authentication to the submissions router - -commit d99b2ef7aca14c621e8f68e9386679451d484233 -Author: Steve Hillier -Date: Wed Jan 9 16:08:00 2019 -0800 - - disabled test for other branch - -commit 5c9800f4dfa102555cedde0bd719ca16706d40a9 -Merge: af3fc79bb 50d38e4b7 -Author: Steve Hillier -Date: Wed Jan 9 15:36:18 2019 -0800 - - Merge branch 'release/1.48.0' into steve/internal-comments - -commit 37fd9766fc63ad4354c3ddbfb156c28470958fb7 -Author: Steve Hillier -Date: Wed Jan 9 15:28:22 2019 -0800 - - add tests for monitoring well info edits - -commit 9863638ee4788e145956bf331864a5546dd199f3 -Merge: bb8bbc6f5 50d38e4b7 -Author: Steve Hillier -Date: Wed Jan 9 15:14:22 2019 -0800 - - Merge remote-tracking branch 'origin/release/1.48.0' into steve/linkaq - -commit 8425a0336921cfa183ec408dbd74b94e8475564e -Merge: 98b04514e 50d38e4b7 -Author: Steve Hillier -Date: Wed Jan 9 15:13:48 2019 -0800 - - Merge remote-tracking branch 'origin/release/1.48.0' into task/1272_obsWellInfo - -commit 98b04514edeec3a1f05dac312f7e467110d79cf3 -Author: Steve Hillier -Date: Wed Jan 9 15:13:29 2019 -0800 - - use code for dropdown - -commit 50d38e4b75bc9ff5fe55bbae44afaeaa8c215423 -Merge: 35876d1fe 29d7f33f3 -Author: Steve Hillier -Date: Wed Jan 9 15:12:57 2019 -0800 - - Merge pull request #1089 from bcgov/steve/deploy-app-with-recreate - - Switch app deploy strategy from rolling back to recreate - -commit 29d7f33f3c37c707452475775784aaf4379591d2 -Author: Steve Hillier -Date: Wed Jan 9 13:00:20 2019 -0800 - - Switch app deploy strategy from rolling back to recreate - -commit af3fc79bb1785f31a967bb0ceff1f38a3e395667 -Merge: cb9c3e755 35876d1fe -Author: Steve Hillier -Date: Wed Jan 9 10:16:28 2019 -0800 - - Merge branch 'release/1.48.0' into steve/internal-comments - -commit bb8bbc6f573d2e5bfd44b5c0111a347a29bbca64 -Author: Steve Hillier -Date: Tue Jan 8 13:18:20 2019 -0800 - - change env var string - -commit 369292ecd17e7bff576a37d33ada480d373e8377 -Author: Steve Hillier -Date: Tue Jan 8 13:04:28 2019 -0800 - - when updating token, only re-store token if the token was refreshed - -commit cb9c3e755d92eaaafbde595b13996bfc9caa39b0 -Author: Steve Hillier -Date: Tue Jan 8 12:51:02 2019 -0800 - - remove auth from main.js (handled in router) - -commit 5f2f65ac73bb7a743f13b5cc4261126309b40d91 -Author: Sybrand Strauss -Date: Tue Jan 8 12:45:53 2019 -0800 - - Update app/frontend/src/common/authenticate.js - - Co-Authored-By: stephenhillier - -commit 7251544cf2356fc42f6f2bf1f2853dc41823c6b3 -Author: Steve Hillier -Date: Tue Jan 8 11:33:42 2019 -0800 - - add observation well details to backend view for staff edits - -commit 05f6fb2a78176f26c1df329a2b1a554b559a3b07 -Merge: 3c1ec5f84 35876d1fe -Author: Steve Hillier -Date: Mon Jan 7 17:20:18 2019 -0800 - - Merge branch 'release/1.48.0' into steve/linkaq - -commit 3c1ec5f84e9013b5e513c3a5b6e586b7e869ebea -Author: Steve Hillier -Date: Mon Jan 7 17:19:43 2019 -0800 - - remove odd double-quote in sea of single quotes - -commit 1eec93db13d72797d364e291f543de8fe1d6254c -Author: Steve Hillier -Date: Mon Jan 7 17:05:52 2019 -0800 - - change avi to aquifer_vulnerability_index - -commit 084edd5a174c51fcdaf132dec3a44442093aa7e8 -Author: Derek Roberts -Date: Mon Jan 7 15:48:55 2019 -0800 - - Commented out fields we don't have data for yet - -commit b3aef2b0770efbf7ffaead5f509212cf785f9951 -Author: Derek Roberts -Date: Mon Jan 7 14:54:37 2019 -0800 - - Sync obsWellNumber and obsWellStatus - -commit c99b537beb92f7d4027341ea732171e2f4b089e1 -Author: Derek Roberts -Date: Mon Jan 7 13:05:23 2019 -0800 - - Remove :key and other cleanup - -commit bbc7bcb78600cc1cc08400dfb2769c0909fa209c -Author: Derek Roberts -Date: Fri Jan 4 09:59:02 2019 -0800 - - Form now visually correct (or at least close) - -commit 013b0338f5989981a0ad13b0e19a9d9bfb4ec35c -Author: Derek Roberts -Date: Wed Jan 2 15:43:21 2019 -0800 - - Rought ObsWellInfo and load in ActivitySub form - -commit 35876d1fe14f1ee2c25f4159f7e6d420911b2379 -Merge: 69c9ccdcd f90e69228 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Jan 7 17:00:31 2019 -0800 - - Merge pull request #1087 from bcgov/1512_autoRebuildRelease - - [1512] PRs Rebuild Staging Env - -commit f90e692286c32c6a6b6cf4ee7e4d3f8aa5d21bff -Author: Derek Roberts -Date: Mon Jan 7 14:04:52 2019 -0800 - - Stop prompting on DEMO build, some stage labeling - -commit 8b42a3dc9a6103b33f7b533d12f71724ab93e87a -Author: Sybrand Strauss -Date: Mon Jan 7 12:16:50 2019 -0800 - - Fix typo - - Co-Authored-By: stephenhillier - -commit e4d6495de6a7525459baa1e2268cfff847a83c0b -Author: Derek Roberts -Date: Wed Jan 2 15:41:21 2019 -0800 - - Makefile - keep container logs in foregrount - -commit 414e87f4d8628139e8ff635381b4af4765319cf6 -Author: Derek Roberts -Date: Wed Dec 12 16:52:03 2018 -0800 - - Removed never used api make - -commit bf886dd5b9d001efb6e2865536d189243df82f16 -Author: Derek Roberts -Date: Wed Dec 12 16:23:29 2018 -0800 - - Removed fixtures from Makefile (handled in docker-compose.yml) - -commit 40da7e72b915e1ff15788b408c661658dfa35f8f -Author: Derek Roberts -Date: Wed Dec 12 16:22:19 2018 -0800 - - Update fixtures in docker-compose.yml - -commit 29876e3e063a5308635caa7dc9e4385ed138d0f1 -Author: Derek Roberts -Date: Mon Jan 7 09:19:26 2019 -0800 - - DEMO PRs also skip DEV sections - -commit 1e1022825bb1b07fe440fa4852a220de0ba157ee -Author: Derek Roberts -Date: Mon Jan 7 09:17:28 2019 -0800 - - Master PRs skip DEV sections - -commit b7a2c7e1020d683427e3e05241d7dd2962508e23 -Author: Derek Roberts -Date: Sun Jan 6 21:12:32 2019 -0800 - - Test rolling deployments - -commit 382d8327f744e4ed97d9b7278c21dba30dd00329 -Author: Derek Roberts -Date: Sun Jan 6 21:02:23 2019 -0800 - - Removed out of use postgresql.bc.json - -commit c358501e56b3e3693ff8aeaf4a686dd8074bc671 -Author: Derek Roberts -Date: Sun Jan 6 18:06:13 2019 -0800 - - Set PRs to rebuild STAGING - -commit 69c9ccdcd7d0f2c0136d8878ba3030c077944759 -Merge: ebedb46d5 f4982c9be -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jan 2 15:39:43 2019 -0800 - - Merge pull request #1083 from bcgov/task/1355_BDD_AquiferAddEdit - - [1355] BDD Test - Aquifer Add/Edit - -commit f4982c9bea28cb7c8419d8e18b6b63f2d4eac76a -Author: Nick Phura -Date: Wed Nov 21 17:10:16 2018 -0800 - - 1355 - - Aquifer add/edit tests. - - Combine Search and Add/Edit tests into one test set. - - Update some htmml IDs. - - Misc minor updates. - - Update SearchSpecs to use values that exist in Dev, Test, Demo, and Prod. - - Update Jenkinsfile SmokeTests to run SearchSpecs. - -commit 580dfa005a9bc6e566c589ee343776e957d4a7ab -Author: Steve Hillier -Date: Wed Jan 2 12:46:46 2019 -0800 - - add error catch to aquifer search - -commit ebedb46d5154420aa2f6290ff242b5dc10696abd -Merge: 848838a6a bd8e20c10 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jan 2 12:36:43 2019 -0800 - - Merge pull request #1081 from bcgov/release/1.47.2 - - Release 1.47.2 - -commit 48c734835c42b7ea11ef9346f168a8c57f1404d4 -Author: Steve Hillier -Date: Wed Jan 2 12:23:37 2019 -0800 - - fix well test data entry/display - -commit bd8e20c104e789967ee291e783139bba008dfd36 -Merge: 7b878837d e149bb773 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jan 2 11:00:26 2019 -0800 - - Merge pull request #1084 from bcgov/task/1522_postGISdc - - [1522] PostGIS in Docker Compose - -commit e149bb7734e3e76969a693530e8e7de270b6c0af -Author: Derek Roberts -Date: Wed Jan 2 10:24:28 2019 -0800 - - Rolled PostGIS back to regular PostgreSQL 9.6 for now - -commit c3a72de23ed358d72200feb84d22340490014b92 -Author: Steve Hillier -Date: Tue Jan 1 18:50:20 2019 -0800 - - add aquifer/well test data to form - -commit 919f1d64455913f2ee77129639f6b4211957a9b8 -Author: Steve Hillier -Date: Mon Dec 31 14:52:43 2018 -0800 - - add aquifer data to staff edits api - -commit 7b878837da8158821358ffce567d20a3466e8895 -Merge: 201156a2f 7670077de -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Dec 31 11:26:39 2018 -0800 - - Merge pull request #1077 from bcgov/task/1314_demoEnv - - [1314] Stable demo/testing environment and branch - -commit 7670077deacf77923ad2586530912a62b8b18a8d -Author: Derek Roberts -Date: Mon Dec 31 10:45:00 2018 -0800 - - Make functionalTest fn usage clearer - -commit 19b5df70e80feb931ebc7529d7efadb6e97afd59 -Author: Derek Roberts -Date: Fri Dec 28 23:40:35 2018 -0800 - - TEST and DEMO API tests using fn - -commit 97115dd1141e8303adb06b68b4eece22b7e8802e -Author: Derek Roberts -Date: Fri Dec 28 23:19:28 2018 -0800 - - DEV API tests using fn - -commit 6b233602e57a3f25547b74030246b0ea7d10b9bf -Author: Derek Roberts -Date: Fri Dec 28 22:42:25 2018 -0800 - - Jenkinsfile function for API tests - -commit 9ad3afabdd8660466f427e879e99dfbde0ff6470 -Author: Derek Roberts -Date: Fri Dec 28 20:05:30 2018 -0800 - - Change DEMO_HOST to standard test route - -commit 83b657934d76ab7f98643b08a29a590976486a00 -Author: Derek Roberts -Date: Fri Dec 28 18:41:19 2018 -0800 - - PROD now using smoke/fn test function - -commit 945af7b1e2571b686bb21cc39a0b8a627c8a5041 -Author: Derek Roberts -Date: Fri Dec 28 18:28:06 2018 -0800 - - Fix full test trigger - -commit b1b07137accb323eec72b3bc7878f03b404e2bb3 -Author: Derek Roberts -Date: Fri Dec 28 18:25:47 2018 -0800 - - Replace smoke tests blocks with function - -commit 4732cba2a897b1abe022125a90c57d9efa9eccc2 -Author: Derek Roberts -Date: Fri Dec 28 16:19:18 2018 -0800 - - Added funtional test method - -commit ed218c9db1cca3a08e0f2aeafcb5021fa40a6a21 -Author: Derek Roberts -Date: Thu Dec 27 15:39:39 2018 -0800 - - Add API tests to DEMO env - -commit 29055611f61b3064dbc7462e435954192349483b -Author: Derek Roberts -Date: Thu Dec 27 15:23:25 2018 -0800 - - Added smoke tests to DEMO env - -commit 64382b5d334a3aef917b98315704ff89cc612f26 -Author: Derek Roberts -Date: Thu Dec 27 14:59:36 2018 -0800 - - Added demo environment triggered by demo branch PR - -commit aed9f4ed52432d1ff1fbca2f4795c809c5c81265 -Author: Derek Roberts -Date: Thu Dec 27 13:10:00 2018 -0800 - - Added DEMO vars to Jenkinsfile - -commit d5d5cc75de8785216d3eb9c97d0210f2e0b33bf1 -Author: Derek Roberts -Date: Thu Dec 27 12:43:03 2018 -0800 - - Change staging route - -commit 9b35dc3320b03b7ab240c4f40394ad59a3e587b0 -Author: Derek Roberts -Date: Tue Dec 11 16:29:37 2018 -0800 - - Extra var sub - -commit 201156a2f4181d5073446f25e0dd94fb8da5a688 -Merge: d36c26917 76005ec7f -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Dec 31 11:02:57 2018 -0800 - - Merge pull request #1082 from bcgov/task/enable_docker_postgis - - Revised dump script to ignore DB-wide spatial_ref_sys table - -commit 76005ec7fe52a224bc4dc0d5c79a3db01d0812ce -Author: Gary Wong (BC Gov) -Date: Mon Dec 31 09:48:14 2018 -0800 - - Revised dump script to ignore DB-wide spatial_ref_sys table (from postGIS). - -commit f1a6e3c6de0fa127c2f35e148db3ae87906b8347 -Author: Steve Hillier -Date: Fri Dec 28 16:07:56 2018 -0800 - - add API test for associating well with aquifer - -commit b38ad15a7d95b4757567682187c3192765f785ce -Author: Steve Hillier -Date: Fri Dec 28 16:04:52 2018 -0800 - - allow associating a well with an aquifer (on staff edit page) - -commit 4cfb72ea4e5ee783ecf3f99494dfe50aadc6bc02 -Author: Steve Hillier -Date: Fri Dec 28 13:12:19 2018 -0800 - - added a check for authentication to the submissions router - -commit 2a98ddeaa87d8ae4b738d41d79bae93f199b395f -Author: Steve Hillier -Date: Fri Dec 28 12:04:08 2018 -0800 - - schedule token renewal instead of setting onTokenExpired - -commit d36c26917416fd00f4a472e4ab8a1b87101ece9d -Merge: 1bcf76f0a 0fab9528d -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Dec 25 12:20:19 2018 -0800 - - Merge pull request #1046 from bcgov/1419_smokeTests - - [1419] Smoke Tests - -commit 0fab9528d087ccaa96a963ad7d31347862fb2a3e -Author: Derek Roberts -Date: Mon Dec 24 18:42:39 2018 -0800 - - TEST and PROD smoke tests using AquiferSearchSpecs - -commit 70ff8698319783f8f4529eb24adb4966fc0a50fc -Author: Derek Roberts -Date: Fri Dec 21 14:43:40 2018 -0800 - - Bumped chromeDriverVersion from 2.44 to 2.45 - -commit b562c5e10c5b6138fb3cae8d025acba02bd50947 -Author: Derek Roberts -Date: Fri Dec 21 10:38:05 2018 -0800 - - Stage name constency, cleanup - -commit bbe4ae2645f4b08b8d986f8c1ebbd089debe8e12 -Author: Derek Roberts -Date: Fri Dec 21 10:35:10 2018 -0800 - - Replaced semi-broken DEV functional tests with smoke tests - -commit 7000eaeea2644449da90aefe3bd13aafcb2e04db -Author: Derek Roberts -Date: Thu Dec 20 17:42:01 2018 -0800 - - Used authenticate from most recent release - -commit a793b1098ef852e42b625dffc8032a5da29b63e1 -Author: Derek Roberts -Date: Thu Dec 20 15:06:16 2018 -0800 - - Completed TEST hostname for BDD - -commit b204bc54a7af5f416ddccdf6b8e56e9229d6b1d8 -Author: Derek Roberts -Date: Thu Dec 20 13:49:52 2018 -0800 - - Switch TEST smoke tests to FlowSpecs - -commit 7c4cc4e4213cc5ea376573e717318c8f4d6382b6 -Author: Derek Roberts -Date: Thu Dec 20 13:26:50 2018 -0800 - - Removed duplicate PR number from API container name - -commit aa201c9e182821839122ab8dfb8c15733b7138c3 -Author: Derek Roberts -Date: Thu Dec 20 12:49:32 2018 -0800 - - Revise Staging Smoke Test vars and config - -commit 70cbc811f3d6198f25ff8a642f2445cc995c8c8f -Author: Derek Roberts -Date: Thu Dec 20 12:22:10 2018 -0800 - - Uncomment Smoke Tests - -commit a86d1b266660b817b5991dafa0e816b3e264f3dd -Author: Derek Roberts -Date: Thu Dec 20 12:17:03 2018 -0800 - - Removed Slack integration - -commit c3be240a3100c379cf91e5dc066e31dfff7e02ef -Author: Derek Roberts -Date: Wed Dec 19 13:52:51 2018 -0800 - - Comment out smoke tests until BDD issues are solved - -commit 949bf1f7732611825a50bb75c80ad2072c3823e7 -Author: Derek Roberts -Date: Wed Dec 19 13:42:28 2018 -0800 - - Added volumes and single run to commented functional testing - -commit 7e3c4ded62ba3d3ef4c051fdc6c67cddb3ab059b -Author: Nick Phura -Date: Mon Dec 10 17:00:19 2018 -0800 - - Update config versions for use with newly built bdd image. - Add experimental settings that may resolve local storage pipeline issues. - -commit 5678977a264970ed7b58bf445f0490d04ea02751 -Author: Derek Roberts -Date: Wed Dec 5 15:51:38 2018 -0800 - - selenium version bumped up to 3.141.59 - -commit 40351ea397572197bcad2a0dd51d558093742b59 -Author: Sybrand Strauss -Date: Tue Dec 4 13:08:15 2018 -0800 - - Added check for window.localStorage existence - -commit d6c63b2faa32a2991242620aeaf0e1d4efa4b993 -Author: Derek Roberts -Date: Mon Dec 3 11:43:51 2018 -0800 - - Add Smoke Tests to PROD - -commit 8ea62d46f53e77077c6fbcf55b45d23f41a7ca1c -Author: Derek Roberts -Date: Mon Dec 3 11:25:20 2018 -0800 - - Changed smoke test target, added x64 var - -commit 94398749e49468b1025f41b920ca3e024c91369f -Author: Derek Roberts -Date: Mon Dec 3 10:06:50 2018 -0800 - - Added PVC to BDD - -commit 802745dbf18d6e5e1a2029533df4e446e58b238c -Author: Derek Roberts -Date: Fri Nov 30 16:41:33 2018 -0800 - - Reintroduced smoke tests against TEST - -commit 1bcf76f0a46bf65f5ffcfad1e667645cf851e50e -Merge: 848838a6a 245edf433 -Author: Gary Wong -Date: Mon Dec 24 14:07:24 2018 -0800 - - Merge pull request #1075 from bcgov/task/enable_docker_postgis - - Enable spatial DB on docker-compose, clean up documentations. - -commit 245edf4338f3d313ed9e7fb91f2b9b974f260ac2 -Author: Gary Wong (BC Gov) -Date: Mon Dec 24 12:58:15 2018 -0800 - - Added .. cascade to drop statement. - -commit 18838ff77f2511a57dd7d1be4574f2bc34704477 -Author: Gary Wong (BC Gov) -Date: Mon Dec 24 10:51:33 2018 -0800 - - Enable spatial DB on docker-compose, clean up documentations. - -commit 848838a6aa8a2b40bee66f769c4d3087350beb2b -Merge: 131d27ce5 bd2f63047 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Dec 20 17:28:26 2018 -0800 - - Merge pull request #1074 from bcgov/release/1.47.1 - - Release 1.47.1 - -commit bd2f63047819c4b94b7ce8644c5a34f2a954b8f8 -Merge: 131d27ce5 b06784e05 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Dec 20 15:44:42 2018 -0800 - - Merge pull request #1073 from bcgov/task/1363_postgis_dc - - Pointing postgresql to bcgov\postgresql-9.6-oracle-fdw:v1-stable - -commit b06784e05147e7dff5ee0ad320cf30172824e77b -Author: Gary Wong (BC Gov) -Date: Thu Dec 20 15:02:56 2018 -0800 - - Pointing postgresql to bcgov\postgresql-9.6-oracle-fdw:v1-stable - -commit 131d27ce5923d7938511df61298f0d0dc17e627d -Merge: b96cb24fc f4029a953 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Dec 20 14:15:26 2018 -0800 - - Merge pull request #1070 from bcgov/release/1.47.0 - - Release [1.47.0] - -commit f4029a953744b22f7e822a9eed1362e7bc0e1414 -Merge: 7988026ec 78fcc6c2b -Author: Sybrand Strauss -Date: Thu Dec 20 12:33:19 2018 -0800 - - Merge pull request #1072 from bcgov/bug/1517_sso_redirect - - [1517] Major re-factor of common/authenticate.js - -commit 78fcc6c2bff3885207945fdde8d3a26bb4669af9 -Author: Sybrand Strauss -Date: Thu Dec 20 11:04:46 2018 -0800 - - Major re-factor of common/authenticate.js - Resolved redirect to SSO server issue for invalid redirect URI's - Removed Keycloak from package.json (library did not match SSO server version) - Keycloak now loads from SSO server (this is best practice) - API changed to provide clientId (required for current Keycloak library version served up by SSO server) - -commit 7988026ec58ad90fa4d035bedb9a6edef27a990c -Merge: cf60b824b 7345bef64 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Dec 19 15:21:12 2018 -0800 - - Merge pull request #1071 from bcgov/bug/1513_private_documents - - [1513] Private documents not displaying bug - -commit 7345bef64530fcfa1d016751290e9c929969cbf2 -Author: Sybrand Strauss -Date: Wed Dec 19 11:44:48 2018 -0800 - - - Changed user details to only be updated when changed - - Updated keycloak to latest version - - Changed when keycloak is changed in store - - Changed where resolve() is called as part of auth - - Fixed failing unit test (rogue STL_PULL reference!) - -commit cf60b824b54134a2b9b0228991bb14ac74135227 -Merge: 95ec26965 75aa9d565 -Author: Sybrand Strauss -Date: Tue Dec 18 09:26:36 2018 -0800 - - Merge pull request #1053 from bcgov/steve/editsets - - Allow staff edits of foreign key sets - -commit 75aa9d565db997c00d02dcba6786b69c8d7b3dd5 -Merge: a8710072d 95ec26965 -Author: Sybrand Strauss -Date: Mon Dec 17 15:02:29 2018 -0800 - - Merge branch 'release/1.47.0' into steve/editsets - -commit 95ec269657e301fe57801a10424ab8e306b31b2d -Merge: 94faef9c1 1b6a5bb6b -Author: Sybrand Strauss -Date: Mon Dec 17 14:59:57 2018 -0800 - - Merge pull request #1069 from bcgov/document/architecture - - Added a container diagram - -commit a8710072dec83c491fd8a9d0ac2e5518d3f6296b -Merge: 1c3d80eed 94faef9c1 -Author: Sybrand Strauss -Date: Mon Dec 17 14:45:53 2018 -0800 - - Merge branch 'release/1.47.0' into steve/editsets - -commit 1b6a5bb6b6e8dbfda1aafb27555a3e68afa2a27b -Author: Sybrand Strauss -Date: Fri Dec 14 17:09:07 2018 -0800 - - Added a current, and "vision" container diagram in pics folder, updated README.md - -commit 94faef9c197d05f80f6a9bdbb3110fe3bffa4d93 -Merge: fff6924d7 5d0b8b790 -Author: Sybrand Strauss -Date: Mon Dec 17 10:57:44 2018 -0800 - - Merge pull request #1068 from bcgov/task/1413_remove_stl_pul_ot - - Removed references to STL_PUL_OT - -commit 5d0b8b790b8fb92e12b91141372ca56171b410a5 -Author: Sybrand Strauss -Date: Mon Dec 17 10:39:19 2018 -0800 - - Removed STL_PUL_OT references - -commit 1c3d80eed6c1798cf2d57e117943d4c1b7c332c9 -Author: Steve Hillier -Date: Fri Dec 14 17:19:23 2018 -0800 - - add production data set tests - -commit f7cdf625dd408550508c212ee816a436a0b2b9ba -Author: Steve Hillier -Date: Fri Dec 14 17:08:18 2018 -0800 - - update API tests for sets - -commit 0536d46ed26c1e9c131ecbf6e1a3e3bd7b51bfce -Author: Steve Hillier -Date: Fri Dec 14 16:35:04 2018 -0800 - - remove redundant v-if checks - -commit ffbf08e783a2aae49c6d9d5fc846228127eb0f8d -Author: Sybrand Strauss -Date: Fri Dec 7 15:25:50 2018 -0800 - - Removed references to STL_PUL_OT - -commit cc579fec6df678f88d04f09d834c6176638c27a5 -Author: Steve Hillier -Date: Fri Dec 14 10:26:25 2018 -0800 - - deep watch form fields to check updated status (for save button) - -commit 6c9ee8350aaaab3241a14fa96b47fb5ef53eda9a -Author: Steve Hillier -Date: Thu Dec 13 16:08:34 2018 -0800 - - fix decommission for staff edit - -commit ab27d1eb3ba582b63fbd227b5d914f974c577725 -Author: Steve Hillier -Date: Thu Dec 13 15:50:35 2018 -0800 - - add internal comments and decommission info to staff edit - -commit ea26fbaa5ef9ddc4888549899b62584d0baa86a3 -Author: Steve Hillier -Date: Thu Dec 13 13:49:12 2018 -0800 - - fix 0 values - -commit 8998798dd934f771069cd165e4b12bd72fcb625e -Author: Steve Hillier -Date: Thu Dec 13 12:54:32 2018 -0800 - - merging migrations - -commit cab906b86ec50472a0e8838b170b1808b864fafe -Merge: cb14f3dee fff6924d7 -Author: Steve Hillier -Date: Thu Dec 13 12:30:07 2018 -0800 - - merge upstream changes (release/1.47.0) - -commit 6ffdcfd37672ad403c2b00b722a90c50bd4f32b8 -Author: Steve Hillier -Date: Thu Dec 13 11:04:22 2018 -0800 - - filter invalid coords for map - -commit fff6924d7e21c5f3b1fb5262201e620fe3f459e4 -Merge: b96cb24fc c26310285 -Author: Steve Hillier -Date: Thu Dec 13 09:55:51 2018 -0800 - - Merge pull request #1064 from bcgov/steve/kc - - fix token refreshing - -commit 8c92ef99423bcce5c34e1cf7d76b45ea1aae8083 -Author: Steve Hillier -Date: Thu Dec 13 00:09:14 2018 -0800 - - try clustering wells - -commit 4d7226cfec29a155089dffa4181efdc7b7e37cf2 -Merge: 069ff5a11 b96cb24fc -Author: Steve Hillier -Date: Wed Dec 12 19:01:44 2018 -0800 - - merge upstream release 1.47.0 - -commit 069ff5a114fde2de0358773a1a47611f89b17924 -Author: Steve Hillier -Date: Wed Dec 12 17:03:15 2018 -0800 - - update search page look - -commit b189e66fbeb405d2c5438c8e1430951e63a65bf3 -Author: Steve Hillier -Date: Wed Dec 12 16:49:27 2018 -0800 - - fix docker compose - -commit cb14f3deec6e8f8f7b52b2ddb7e8abc895217793 -Author: Steve Hillier -Date: Wed Dec 12 16:35:46 2018 -0800 - - update yield component - -commit ec3f4422ec01badbad893208e5616218c1a61866 -Merge: 0db46b57e 7a98c8306 -Author: Steve Hillier -Date: Wed Dec 12 15:29:07 2018 -0800 - - Merge branch 'steve/edit-new-fields' into steve/editsets - -commit c2631028597af517926bb6868c440824f976af76 -Merge: d0e78f658 b96cb24fc -Author: Steve Hillier -Date: Wed Dec 12 15:27:19 2018 -0800 - - Merge branch 'release/1.47.0' into steve/kc - -commit 0db46b57e65a06b60eb3992b4f5c5297e80685d5 -Author: Steve Hillier -Date: Wed Dec 12 15:19:40 2018 -0800 - - fix filter pack material/size - -commit 8c4bb097c40c9d411de1cc55e4a86c91ac9dabed -Author: Steve Hillier -Date: Wed Dec 12 14:13:38 2018 -0800 - - comment out liner detail section with a note - -commit b96cb24fc2505492e51bec36c80efc06ca6ffe3b -Merge: d55f19954 8319b0ce6 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Dec 12 13:21:11 2018 -0800 - - Merge pull request #1066 from bcgov/release/1.46.2 - - Release 1.46.2 - -commit 144dabe369c3c21424b1156ae7907e6179e49f8e -Author: Steve Hillier -Date: Tue Dec 11 16:36:19 2018 -0800 - - make filter more flexible - -commit 5bd61c3ccd4abcaad5a0bc0053ca6bc39857d125 -Author: Steve Hillier -Date: Tue Dec 11 14:27:54 2018 -0800 - - fix backfill section - -commit d0e78f658f4a4b5143b9dc24532e94945799d8f8 -Merge: 08a9280ab 8319b0ce6 -Author: Steve Hillier -Date: Tue Dec 11 13:19:13 2018 -0800 - - Merge branch 'release/1.46.2' into steve/kc - -commit 8319b0ce65dc074f9a5e856e8592f78739af2e8c -Merge: b05e4086a df835e17a -Author: Sybrand Strauss -Date: Tue Dec 11 13:14:27 2018 -0800 - - Merge pull request #1065 from bcgov/feature/1152_map - - Fix empty string be interpreted as 0, causing plot of point at 0,0 - -commit 97b787630e59ddf939d0baa7d93d63847fccd79f -Author: Steve Hillier -Date: Tue Dec 11 13:14:27 2018 -0800 - - fix bugs from feedback (well id, liner display on detail page) - -commit df835e17a292ae1c01607134a74ab15a31ed56f0 -Author: Sybrand Strauss -Date: Wed Dec 5 14:35:21 2018 -0800 - - Fix empty string be interpreted as 0, causing plot of point at 0,0 - -commit 08a9280ab19199fe0e46a64e1281a576c2219b38 -Merge: 5d71606b1 b05e4086a -Author: Steve Hillier -Date: Tue Dec 11 12:26:50 2018 -0800 - - Merge branch 'release/1.46.2' into steve/kc - -commit b05e4086a0f736bb5954c06b9ac654244108be55 -Merge: f0c86290d b491552b8 -Author: Sybrand Strauss -Date: Tue Dec 11 12:17:46 2018 -0800 - - Merge pull request #1060 from bcgov/BDD_Readme_Updates - - BDD - Readme updates - -commit 5d71606b1825f8e55c64ae8aa335b2eb07fd1db6 -Merge: 2a96d57de f0c86290d -Author: Steve Hillier -Date: Tue Dec 11 12:13:22 2018 -0800 - - Merge branch 'release/1.46.2' into steve/kc - -commit b491552b8b7a8bd7e05f4c31b02caa086de179b5 -Merge: 7d52a2947 f0c86290d -Author: Sybrand Strauss -Date: Tue Dec 11 11:29:32 2018 -0800 - - Merge branch 'release/1.46.2' into BDD_Readme_Updates - -commit 2a96d57de2a1a20cacfe94794a28598e43a4f88c -Author: Steve Hillier -Date: Tue Dec 11 11:28:07 2018 -0800 - - fix token refreshing - -commit f0c86290d9f96c65923dc10fc570487f632e6dc0 -Merge: 758fb5321 c432df151 -Author: Sybrand Strauss -Date: Tue Dec 11 11:20:33 2018 -0800 - - Merge pull request #1063 from bcgov/feature/1106_geographic_coordinates - - Adding coordinate_aquisition_code - -commit c432df1511cf2170ca4c454d5cb403fd7c8cd1bd -Author: Sybrand Strauss -Date: Mon Dec 3 08:55:41 2018 -0800 - - Adding coordinate_aquisition_code (to edit only, default to H in construction) and tests - Added post_migrate step to keep well_tag_number_sequence up to date - Handle delayed response from api/v1/wells - Added "loading" display on submission screen for well edit - Fixed marker bug (don't plot marker if map is not yet loaded) - Fixed save button going active due to data load. - -commit 7d52a29479ebf7a69a2e8c38261c050de4cd744f -Author: Nick Phura -Date: Mon Dec 10 17:14:50 2018 -0800 - - Readme updates. - -commit 7a98c8306892f40f248e792064134b0cf8171c29 -Author: Steve Hillier -Date: Mon Dec 10 17:00:14 2018 -0800 - - add new fields to well/submission models - -commit 758fb53213c33368cdfafe8b7983a8ffc0a07c54 -Merge: 1495dc64c e56d94503 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Dec 10 16:18:44 2018 -0800 - - Merge pull request #1058 from bcgov/1393_aquiferLink - - [1393] Updated aquifer link in well details page - -commit e56d9450338a729628ef5d2b6b070f6b45a8feae -Author: Derek Roberts -Date: Mon Dec 10 13:51:59 2018 -0800 - - Updated aquifer link in well details page - -commit c5480b377e24418685e62a96ceed885760ad44a4 -Author: Steve Hillier -Date: Thu Dec 6 11:54:22 2018 -0800 - - factor out testing data into test file - -commit feb1d0edfc0a5b5d9632951c1b83c56e5b5dda25 -Author: Steve Hillier -Date: Wed Dec 5 17:31:51 2018 -0800 - - adding well class edit fields - -commit f27a6649f474abc1c8607f3fca420c32d487ca85 -Author: Steve Hillier -Date: Wed Dec 5 15:20:29 2018 -0800 - - add well completion to the staff edit screen - -commit 99f39b6e7e1ab61bc4155812d8ac5a6ac49ff83e -Author: Steve Hillier -Date: Wed Dec 5 14:55:15 2018 -0800 - - clean up whitespace - -commit 7a8415fc78b181a0dd614b19c37badab833ef44e -Author: Steve Hillier -Date: Wed Dec 5 14:53:19 2018 -0800 - - enable staff edits for sets on frontend - -commit 623530e9fe489ec1d2d4776bd28ec1e8f0d82dea -Author: Steve Hillier -Date: Wed Dec 5 14:41:45 2018 -0800 - - staff edits replace sets instead of merging them - -commit 3a76635233f4f85c2f3bde2575d9bfb0c3cfaafd -Author: Steve Hillier -Date: Wed Dec 5 13:27:52 2018 -0800 - - add lithology moisture codes - -commit 1f7e9600f7951cf098f441416d0ba81a4f3d44a9 -Author: Steve Hillier -Date: Wed Dec 5 12:04:59 2018 -0800 - - all lithology fields working - -commit 0a8fb88a9ae6b10fa05a1769db454dbee5fdd71d -Author: Steve Hillier -Date: Tue Dec 4 17:35:07 2018 -0800 - - temp fix: looping request - -commit ecf689a0f88f6ee852430c350aa374f2c070d264 -Author: Steve Hillier -Date: Tue Dec 4 17:34:03 2018 -0800 - - update SPA (registries applicationEdit needs work) - -commit b9c4d12ed4f74e25244d7f0ddea86dffacd3f9a5 -Merge: 69ba7760e 1495dc64c -Author: Steve Hillier -Date: Tue Dec 4 16:22:30 2018 -0800 - - merging upstream branch - -commit f0590e571c94ae3a9c6ad13f5a76116d898e4768 -Author: Steve Hillier -Date: Tue Dec 4 16:12:58 2018 -0800 - - update soil list - -commit 7ce3e5b3f3584dcec892544cd2d66f21709a75e0 -Merge: b6c2fea78 1495dc64c -Author: Steve Hillier -Date: Tue Dec 4 14:45:35 2018 -0800 - - Merge branch 'release/1.46.2' into steve/lithprototype - -commit b6c2fea7843234a1b6308df4e6ddae312b64b9c9 -Author: Steve Hillier -Date: Tue Dec 4 14:39:17 2018 -0800 - - working lithology client-side parser - -commit 1495dc64c683d0d8351e674d7236f5f9891a0a24 -Merge: 57eeb7c10 f8fe116f3 -Author: Sybrand Strauss -Date: Tue Dec 4 14:09:55 2018 -0800 - - Merge pull request #1051 from bcgov/fix/migrations - - Fixed migration conflict - -commit f8fe116f377bee8f2f472be2e8288f2dbf402d93 -Author: Sybrand Strauss -Date: Tue Dec 4 13:47:34 2018 -0800 - - Fixed migration conflict - -commit 57eeb7c10a5e57524ceb25662162e20139fac30c -Merge: 9d7772111 468ffe980 -Author: Sybrand Strauss -Date: Tue Dec 4 13:21:46 2018 -0800 - - Merge pull request #1050 from bcgov/feature/1105_well_location - - [1105] Edit Well Location - -commit 468ffe9805c6b87382939fffa68e8c964791d697 -Merge: 9e3a62a5e 9d7772111 -Author: Sybrand Strauss -Date: Tue Dec 4 13:02:49 2018 -0800 - - Merge branch 'release/1.46.2' into feature/1105_well_location - -commit 9d777211194396d59c7c9ac28fdd01bee7b2c85f -Merge: d55f19954 7c0076821 -Author: Steve Hillier -Date: Tue Dec 4 12:59:15 2018 -0800 - - Merge pull request #1038 from bcgov/steve/django2.1 - - [1091] Django version upgrade (2.1) - -commit 9e3a62a5e38bc8ec6dca951a98a8c7cee23dc96b -Author: Sybrand Strauss -Date: Mon Dec 3 08:55:41 2018 -0800 - - Ensure all map coordinate fields are loaded, added tests. - -commit 7c0076821bfa33e064f1438b68e9dc6989bc2b4f -Author: Steve Hillier -Date: Tue Dec 4 12:00:09 2018 -0800 - - add back a test for unauthorized users accessing survey_admin - -commit 8845987c6b27ff5a638800394021b9cc879c97a4 -Author: Steve Hillier -Date: Tue Dec 4 11:45:57 2018 -0800 - - adding parsing function to Lithology class - -commit 21279c37fe37aafa04b416cfe5dfabe2b520eb92 -Merge: cfcdcf9cb d55f19954 -Author: Sybrand Strauss -Date: Tue Dec 4 10:54:21 2018 -0800 - - Merge branch 'release/1.46.2' into steve/django2.1 - -commit d55f199542dad2976c19f74605320d9b76782caf -Merge: 0cbd7f702 64bb26348 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Dec 4 10:34:29 2018 -0800 - - Merge pull request #1045 from bcgov/release/1.46.1 - - Release 1.46.1 - -commit 03192ed8afa5261cb4c8d0697a5ecf1cdbcaf7bd -Author: Steve Hillier -Date: Tue Dec 4 09:20:27 2018 -0800 - - scrap lithology backend service - -commit 0be390ed72fa43288c06bebc8a0fbf90c7d89ba3 -Author: Steve Hillier -Date: Mon Dec 3 14:02:28 2018 -0800 - - start of JS code for client-side soil description handling - -commit d7eac066b6c2bd3956ab16419c6e0e9b79eeb116 -Author: Steve Hillier -Date: Mon Dec 3 14:02:12 2018 -0800 - - rpc function for parsing soil description - -commit 64bb26348aad5c262f917f66f61a8abd56a2ddc6 -Merge: ebe151515 a062167f0 -Author: Sybrand Strauss -Date: Mon Dec 3 11:10:30 2018 -0800 - - Merge pull request #1048 from bcgov/feature/1424_google_analytics - - [1424] Added ga, using description - -commit a062167f096ae9df3df02fb6ef3b588789b11755 -Author: Sybrand Strauss -Date: Fri Nov 30 12:09:12 2018 -0800 - - Added ga, using description - -commit f8f4a8eea93ee933ba53653300bab25800b344bd -Author: Steve Hillier -Date: Fri Nov 30 17:10:50 2018 -0800 - - add lithology service (just a prototype/poc) - -commit ebe15151559f1323565c5eeddde40c61e3d06097 -Merge: 0cbd7f702 bcab576c3 -Author: Sybrand Strauss -Date: Fri Nov 30 13:08:15 2018 -0800 - - Merge pull request #1035 from bcgov/steve/edit-loc - - add edit components - -commit 0cbd7f70263f7dfe07e7cc4fee87f9f4324ab1b0 -Merge: 611a24f30 b739dafc1 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Nov 30 13:05:29 2018 -0800 - - Merge pull request #1043 from bcgov/release/1.46.0 - - Release/1.46.0 - -commit b739dafc177f96232fdfd1b6b4471d8ce016ba6e -Merge: b8eaeace7 f07f4086c -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Nov 30 12:21:43 2018 -0800 - - Merge pull request #1042 from bcgov/task/1414_stageRetries - - [1414] Stage Wrapper (incl. Retries, Reporting) - -commit f07f4086c9fee038807864a0802aa3e37ac76bee -Author: Derek Roberts -Date: Fri Nov 30 11:54:18 2018 -0800 - - Add output for Load Fixtures - -commit b8eaeace7a2839356ae9486f679b0e1e8f3c5d5c -Merge: a9d2dbb8a d8b5f5450 -Author: Steve Hillier -Date: Fri Nov 30 10:22:18 2018 -0800 - - Merge pull request #1044 from bcgov/fix/owner_tell_max_length - - Increase length of field to match source data - -commit d8b5f545043090bc0c1328be930287fda21b61b1 -Author: Sybrand Strauss -Date: Fri Nov 30 10:17:47 2018 -0800 - - Increase length of field to match source data - -commit a9d2dbb8a2effd8a86f59eabf22f05e6073dd6ba -Author: Sybrand Strauss -Date: Fri Nov 30 09:08:08 2018 -0800 - - Whitespace - -commit cfcdcf9cb031a9e790f919b791e2418c4fe805eb -Author: Steve Hillier -Date: Thu Nov 29 15:22:34 2018 -0800 - - remove interactive=false - -commit 611a24f305d34a37acca61d323604a0e241679b7 -Merge: 7074a25ef 129af4df1 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 29 12:06:26 2018 -0800 - - Merge pull request #1023 from bcgov/release/1.45.0 - - Release 1.45.0 - -commit f842b302b7c2cf902ed03184f0360126444fd997 -Author: Derek Roberts -Date: Thu Nov 29 12:01:07 2018 -0800 - - Comment out Slack reporting - -commit a235afac0e9bd1e7d98bcdaaacf12f58701a97d4 -Author: Derek Roberts -Date: Thu Nov 29 12:00:54 2018 -0800 - - Reformat state reporting names - -commit 9762f3b07169ea89ac4493c19b723637b3c17268 -Author: Steve Hillier -Date: Thu Nov 29 11:53:48 2018 -0800 - - add an atomic=True flag for migrations not run with postgres - -commit 9bdcda04bda0edab08ee02a34bd50347f1eb13cd -Author: Derek Roberts -Date: Thu Nov 29 10:42:19 2018 -0800 - - Cleanup, comments - -commit 129af4df114e0789820d5dc42b0128d61efd1ccf -Merge: 49954d8ff b1f6d467a -Author: Sybrand Strauss -Date: Thu Nov 29 09:36:37 2018 -0800 - - Merge pull request #1040 from bcgov/feature/zip_compression - - Added comression to zip file - -commit 49954d8ffaf2c5b90c9654ec783e4d7f27665e82 -Merge: 1364be50a c96a9e6ea -Author: Sybrand Strauss -Date: Thu Nov 29 09:33:37 2018 -0800 - - Merge pull request #1039 from bcgov/fix/replication_phone_fail - - Increased field size to accomodate bad source data - -commit 68a546c6b9237aa8b485afec9337ef6238847bfc -Author: Derek Roberts -Date: Wed Nov 28 15:59:20 2018 -0800 - - Move dev fixtures into separate stage - -commit 180ff2c19dfda6a9fd0e89bbb7fd359947e4fed2 -Author: Derek Roberts -Date: Wed Nov 28 15:52:17 2018 -0800 - - Add and use createDeploymentStatus function - -commit 5f38e5f2783bd205081b47be5012e58561c4c11a -Author: Derek Roberts -Date: Wed Nov 28 15:02:39 2018 -0800 - - Apply openshift wrapper to all steps, +cleanup/tabs - -commit 0018e3d44d3b6aa183158934d446941bf7499638 -Author: Derek Roberts -Date: Wed Nov 28 11:43:40 2018 -0800 - - OpenShift wrapper (script wrapper, withCluster, withProject) - -commit 8895972daf8b2e58f9a232992d4b449ed2967b70 -Author: Derek Roberts -Date: Wed Nov 28 10:47:04 2018 -0800 - - Moved script step inside wrapper - -commit af31b1a6bf66fc7df42a547c3e34099bc46b93ae -Author: Derek Roberts -Date: Wed Nov 28 10:24:57 2018 -0800 - - Jenkinsfile + stage wrapper and helper functions - -commit 699e6efb67b421b7b1610e442072855489519628 -Author: Derek Roberts -Date: Wed Nov 28 09:26:50 2018 -0800 - - Rough stage wrapper - -commit 1364be50addbd92ef604457415dde0cbeb4e78c1 -Merge: 06e23d706 d57ec5cb0 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Nov 28 10:22:02 2018 -0800 - - Merge pull request #1028 from bcgov/task/1329_bdd - - [1329] Functional Testing (BDD Stack) - -commit d57ec5cb0dd605d44a80129cd8c545b14dc8842f -Author: Derek Roberts -Date: Tue Nov 27 16:35:24 2018 -0800 - - Removed bddstack Dockerfile, replaced by yaml - -commit e8b2ed2af06dfab458d41fe5dfbbb0c1863dc0e9 -Author: Derek Roberts -Date: Tue Nov 27 16:33:31 2018 -0800 - - Comments, cleanup and removal of extra imagestream - -commit abcf59e701e08140b2d1a5f87b240d560a24d22c -Author: Derek Roberts -Date: Tue Nov 27 15:46:46 2018 -0800 - - Add imagestreams to yaml - -commit 32ff21d65e82a91896503105bcb394eea07000c8 -Author: Derek Roberts -Date: Tue Nov 27 14:52:10 2018 -0800 - - Reenable build-time tests, comment out functional tests in Jenkinsfile - -commit fd9f3ba5115787afbf4b7e5040793ccc23ec81d3 -Author: Derek Roberts -Date: Tue Nov 27 14:13:58 2018 -0800 - - Added OPENSHIFT_JENKINS_JVM_ARCH to bc - -commit c30aa28da41ab4103b9c2f632ed170dff55b215a -Author: Derek Roberts -Date: Tue Nov 27 10:45:40 2018 -0800 - - build.gradle - chromeDriverVersion 2.44 - -commit 2b35c9156251abd6b9e5f01d9d234af3d3c52cba -Author: Derek Roberts -Date: Mon Nov 26 21:56:31 2018 -0800 - - Shorten bdd names, catch for functional tests - -commit b57840141f48bafaf165e1ba6a69a678cc31db8c -Author: Derek Roberts -Date: Mon Nov 26 21:51:47 2018 -0800 - - Typo - -commit 97f4a987d387a80e10f26d50dc522aa55b4fbd91 -Author: Derek Roberts -Date: Mon Nov 26 17:22:13 2018 -0800 - - Added stacktrade to gradle - -commit 620a1fe0b58effe212c5f06323bf70788be42e88 -Author: Derek Roberts -Date: Mon Nov 26 16:37:21 2018 -0800 - - Bdd container name back to jnlp - -commit 0cc02dd9efbe577676358b84d63696b39f9922fb -Author: Derek Roberts -Date: Mon Nov 26 16:36:37 2018 -0800 - - Simplified bdd names, labels - -commit f7f57c4acf12d4d22861e7dd600d4a505bb53a3f -Author: Derek Roberts -Date: Mon Nov 26 13:54:26 2018 -0800 - - Functional tests' chromeDriver upped to 2.42 for Chrome 70 support - -commit 0e1fbcd9525b26bb620a2b22c193a5ff09bddfd7 -Author: Derek Roberts -Date: Sat Nov 24 13:58:05 2018 -0800 - - Added vars (baseurl, gradle home) to functional tests - -commit 31a26aeadc972ec46bc2a73423759054d89d912a -Author: Derek Roberts -Date: Fri Nov 23 16:45:24 2018 -0800 - - Commented out tests from build assemble, moving later - -commit 232b521b61f13809db056e2a674292c1fb247b5f -Author: Derek Roberts -Date: Fri Nov 23 15:46:22 2018 -0800 - - Revise bddstack name - -commit b261f43b84f05dd0f266e84d2d619a1812550790 -Author: Derek Roberts -Date: Fri Nov 23 15:15:42 2018 -0800 - - Switching bddstack image name to something more unique - -commit be8b4cc8fe51da63405b3b376d64d2c795978814 -Author: Derek Roberts -Date: Fri Nov 23 15:08:39 2018 -0800 - - Update BDD image with tag - -commit 4b6beac50d036494b6fc0cbf387e19e42bc623ca -Author: Derek Roberts -Date: Fri Nov 23 10:56:21 2018 -0800 - - Added Chrome version output to inline Dockerfile - -commit 5766e5a7c9652d4ced21ce4e4732e968ee3c1bbf -Author: Derek Roberts -Date: Thu Nov 22 17:40:24 2018 -0800 - - Use exact file name, no wildcard - -commit c56c048762be7c39f5fe81213c6e3d55ccded9f1 -Author: Derek Roberts -Date: Thu Nov 22 16:22:38 2018 -0800 - - Docker rm cleanup - -commit cea40d85b0265eb8424617cefbfa80a3b05ec92c -Author: Derek Roberts -Date: Thu Nov 22 16:18:20 2018 -0800 - - Pointed Dockerfile to specific Chrome version - -commit 306ff9a12035043a8b5b7c0e2a2235699ffb33ce -Author: Derek Roberts -Date: Thu Nov 22 16:13:22 2018 -0800 - - Pointed build to specific Chrome version - -commit 4f82542a72daf879782a67ff1c6e5b322f58b0dc -Author: Derek Roberts -Date: Thu Nov 22 15:36:56 2018 -0800 - - Revise Jenkinsfile to use new bddstack docker build - -commit ee1cd76185e046a144d91d95310ddb785996d6bc -Author: Derek Roberts -Date: Fri Nov 23 12:08:14 2018 -0800 - - bddstack.bc.json to build from embedded Dockerfile - -commit 15ce8bbfbff895c53816b19b2c15e93447150cf7 -Author: Derek Roberts -Date: Thu Nov 22 15:19:55 2018 -0800 - - Update Chrome in Dockerfile - -commit 81c2c2d037dd68126ae95709fced1eeefeed48e8 -Author: Derek Roberts -Date: Thu Nov 22 12:37:10 2018 -0800 - - Renamed db backup cronjob for consistency - -commit 6c8184f99e4fcbd392a7a2f5df2fb090d5496758 -Author: Derek Roberts -Date: Tue Nov 20 17:25:56 2018 -0800 - - Renamed caddy bc and dc to match convention - -commit 27a6a916a151dbf6de5e3c253a6afbb41136739e -Author: Derek Roberts -Date: Tue Nov 20 17:19:51 2018 -0800 - - +BDDStack Dockerfile - -commit 2c39e9aa13f968772f0f09334ffb96bf2e9b3f94 -Author: Derek Roberts -Date: Tue Nov 20 16:20:50 2018 -0800 - - Matched BDD label and node names, set in TOOLS project - -commit 75800b48d984c9c7d155ad967fbe874a0ef45bb8 -Author: Derek Roberts -Date: Tue Nov 20 12:17:21 2018 -0800 - - Functional tests - lock resources, cut down verbosity - -commit 1c8d42facd09140b18ad2a3718b2a358f4042be6 -Author: Derek Roberts -Date: Tue Nov 20 12:02:36 2018 -0800 - - Reordering, spacing - -commit 6b536b87c2d228fdd010e252d94c3296435715d8 -Author: Derek Roberts -Date: Tue Nov 20 10:20:42 2018 -0800 - - Jenkinsfile + functional tests (bdd stack) - -commit b1f6d467ad47e70333ea899ae47297f5f2ddf249 -Author: Sybrand Strauss -Date: Tue Nov 27 15:11:52 2018 -0800 - - Changed compression type - -commit 5f4fca26916da92a0b20290f6c883fe189ecf1e3 -Author: Sybrand Strauss -Date: Tue Nov 27 14:32:38 2018 -0800 - - Added comression to zip file - -commit 0fa044b4206884ab4c62754de8b8090551ace247 -Author: Steve Hillier -Date: Tue Nov 27 12:57:39 2018 -0800 - - remove django-test-utils (incompatible with django 2) - -commit 06e23d706778eca40d89895834fe51005064112d -Merge: ecc508f63 6fdeb1701 -Author: Sybrand Strauss -Date: Tue Nov 27 12:49:43 2018 -0800 - - Merge pull request #1037 from bcgov/feature/1402_excel_bold - - [1402] Excel export - added some styling to improve readability - -commit c96a9e6eaef1a45e497074aea2bf5807568cbf5e -Author: Sybrand Strauss -Date: Tue Nov 27 12:45:26 2018 -0800 - - Increased field size to accomodate bad source data - -commit 83ebfe1ff774f8d5fb5ae610590ca8fca1c87100 -Author: Steve Hillier -Date: Mon Nov 26 18:30:23 2018 -0800 - - add migration for on_delete changes - -commit 5d6c90fdb9d77e564755bc27716cb6ccb4b7d8e1 -Author: Steve Hillier -Date: Mon Nov 26 18:26:33 2018 -0800 - - running npm audit - -commit 0d952ac9358dfbda0e4aef8d131648d254c7c5f8 -Author: Steve Hillier -Date: Mon Nov 26 18:26:28 2018 -0800 - - update django version - -commit 6fdeb1701be9669b3be5b6245610661247229a5a -Merge: ce65b121f ecc508f63 -Author: Sybrand Strauss -Date: Mon Nov 26 17:23:35 2018 -0800 - - Merge branch 'release/1.45.0' into feature/1402_excel_bold - -commit ce65b121f66dadc67d4af0495787dff68bf69d62 -Author: Sybrand Strauss -Date: Mon Nov 26 17:22:11 2018 -0800 - - Increased column with based on heading length - -commit ecc508f639c499ea1c9a53f65b5fb4c2a3a15522 -Merge: 944e5ba34 a864f54d9 -Author: Sybrand Strauss -Date: Mon Nov 26 16:09:25 2018 -0800 - - Merge pull request #1034 from bcgov/feature/1402_excel_filter - - [1402 ] Export - filtering and crash - -commit a864f54d975775dea360fb05f258cc27a6212401 -Author: Sybrand Strauss -Date: Mon Nov 26 15:51:10 2018 -0800 - - Changed to run on on minute 0 - -commit de85cd60695fcb42c5806311917e28a77fcee846 -Author: Sybrand Strauss -Date: Mon Nov 26 15:34:48 2018 -0800 - - Fixed requirement - -commit 6978266ee6a4b2320373617b5b1ed50d1f83231d -Author: Sybrand Strauss -Date: Mon Nov 26 15:33:09 2018 -0800 - - Modified cron to not allow concurrent runs, and added a default filter for excel - -commit bcab576c392cdc2f5ffdd5a90c3fbae3815729c3 -Author: Steve Hillier -Date: Mon Nov 26 14:31:40 2018 -0800 - - add remaining simple edit components (not involving sets) - -commit 57d12c42941e0afb07ac46fb51f8316d6c5a0cea -Author: Sybrand Strauss -Date: Mon Nov 26 14:17:16 2018 -0800 - - openpyxl seems to cause pod to crash - maybe too much memory? - -commit 944e5ba346c19fab589baf601ab2da73b66e73db -Merge: 818bdca1b 472f336f5 -Author: Sybrand Strauss -Date: Mon Nov 26 13:36:46 2018 -0800 - - Merge pull request #1031 from bcgov/feature/1402_data_dump - - [1402] data dump - -commit 472f336f5db32ead27b6f4e171c6b8f782da8a02 -Author: Sybrand Strauss -Date: Mon Nov 26 13:15:57 2018 -0800 - - Fixed excel export (no more warnings), removed redundant code - -commit 69ba7760e07d2059ee4a078512f77e380c121773 -Author: Steve Hillier -Date: Mon Nov 26 11:06:44 2018 -0800 - - fix wells fixture name - -commit 24d69b7b59021c85f84866699ee843fed4e20040 -Author: Steve Hillier -Date: Mon Nov 26 10:34:23 2018 -0800 - - add lithology to alteration report - -commit f5dfb79702ffdecdc793b431d9b118e8c0296170 -Merge: 2c75745c7 818bdca1b -Author: Steve Hillier -Date: Mon Nov 26 10:32:43 2018 -0800 - - Merge branch 'release/1.45.0' into steve/lithprototype - -commit 818bdca1b7baeda084474be0e6bed1527b580de4 -Merge: 0be7075c5 a6fe6e288 -Author: Steve Hillier -Date: Mon Nov 26 10:17:23 2018 -0800 - - Merge pull request #1025 from bcgov/steve/edit-owner - - [1103] Submissions - Staff edit well owner - -commit 0be7075c5b41d2bf36cd13d1b08d8ac0a1bdd20c -Merge: 5e9b06de7 5fb234ff9 -Author: Ryan Barber -Date: Thu Nov 22 22:42:26 2018 -0800 - - Merge pull request #1032 from bcgov/task/aquifer-fixes - - Various Fixes to Aquifer work - -commit a6fe6e2885d5c8c67a05d782b60b3098717b124b -Author: Steve Hillier -Date: Thu Nov 22 15:22:44 2018 -0800 - - hold off updating empty string data - -commit 2c75745c7a77d5f3306eef90ed9c768068912255 -Author: Steve Hillier -Date: Thu Nov 22 15:12:05 2018 -0800 - - updated preview - -commit e2e9915cec9556564e51e0e6d79eb6bec8f64c30 -Author: Sybrand Strauss -Date: Thu Nov 22 14:58:06 2018 -0800 - - Removed errant - - -commit 39dc1aa94370674d64e7cc59da1e8d789a45fe28 -Author: Sybrand Strauss -Date: Thu Nov 22 14:42:01 2018 -0800 - - Cron changed to run at 11UTC, and be created in test and prod - -commit 5fb234ff95d9f9f30c96d4a77d54e2778d1450dc -Author: Ryan Barber -Date: Thu Nov 22 14:28:11 2018 -0800 - - Test - -commit e7a70a33a041cfdd1918c5ae4f9f06ff9a970ddf -Author: Sybrand Strauss -Date: Thu Nov 22 14:15:09 2018 -0800 - - Added missing $ - -commit 0d1557ad5b0b26564410c10ac6d6243350a3638b -Author: Ryan Barber -Date: Thu Nov 22 13:57:04 2018 -0800 - - Add exclamation icon and always display result count - -commit 163a202cf8f437e4958023dd18c5bb683a8ff663 -Author: Sybrand Strauss -Date: Thu Nov 22 13:49:07 2018 -0800 - - Created generic version - -commit 2454bcf4730f7d1667077cb9273a82f020637c3a -Author: Steve Hillier -Date: Thu Nov 22 13:41:17 2018 -0800 - - add lithology to submissions - -commit e85a204751e5c4736db85962592993a3de1939f0 -Author: Sybrand Strauss -Date: Thu Nov 22 13:24:06 2018 -0800 - - Created job for dev,test and prod - -commit 212921dd8d04394b24a2f9b99952748922d8e53f -Author: Sybrand Strauss -Date: Thu Nov 22 13:07:59 2018 -0800 - - Working example of a dev cronjob - -commit 71e49754d318b898fe4df7dc059e90a9bdd032d2 -Author: Sybrand Strauss -Date: Thu Nov 22 12:29:04 2018 -0800 - - Changed docker name - -commit 7c9f3b17b5b4401e698fd1db5e5ebc451bc016ea -Author: Sybrand Strauss -Date: Thu Nov 22 12:24:30 2018 -0800 - - Added cronjob - -commit ed9b28f4c74892ffd27a14efeaf5c470959a6cc5 -Author: Ryan Barber -Date: Wed Nov 21 16:16:02 2018 -0800 - - updated snapshots - -commit 87430c302f0511a16184c3723d90c318a61531a7 -Author: Ryan Barber -Date: Wed Nov 21 16:15:54 2018 -0800 - - lint - -commit ab107d42ecd70d2d683343b14b89c59ffcfc1424 -Author: Ryan Barber -Date: Wed Nov 21 16:05:42 2018 -0800 - - reorder aquifer name and number on form - -commit d16996566a467a562e8c803d134ce2d808dd1633 -Author: Ryan Barber -Date: Wed Nov 21 16:04:54 2018 -0800 - - Add printing margins to prevent header cuttoff in chrome - -commit 5e9b06de7ddfd33f4d3cdf4a96f5dc1e64363cec -Merge: cd16cbc9e abfeaff29 -Author: Steve Hillier -Date: Wed Nov 21 15:34:44 2018 -0800 - - Merge pull request #1029 from bcgov/steve/regsearch - - add extra check for registry status - -commit cd16cbc9e3d1535a681ec6e0516c139bcf6825c9 -Merge: 23f8a27ee e873f2327 -Author: Steve Hillier -Date: Wed Nov 21 15:33:35 2018 -0800 - - Merge pull request #1030 from bcgov/BDD_Updated-Flow-Specs - - BDD - Update flow specs + general improvements. - -commit fcb9ed24b398502cdd440d0a878599a2688518bd -Author: Sybrand Strauss -Date: Wed Nov 21 12:32:02 2018 -0800 - - Added secret key mapping - -commit a7811a5cdea3bb58d2d978c9f451a63d30a6e6f7 -Author: Ryan Barber -Date: Wed Nov 21 12:09:38 2018 -0800 - - Allow blank as option on aquifer fields - -commit 1e5f7e364cfb04250065f56a9e87b87669ec6751 -Author: Ryan Barber -Date: Wed Nov 21 11:53:32 2018 -0800 - - Added 'At least one search field is required' error - -commit bddb5e8b62fa0c5db77be41f60fe8e1354f7ada3 -Author: Sybrand Strauss -Date: Wed Nov 21 11:40:44 2018 -0800 - - Switched to using minio in dev, and s3 settings - -commit 8221dd9164e435b72faff5d2177855390bd12533 -Author: Steve Hillier -Date: Wed Nov 21 11:26:20 2018 -0800 - - remove print statement - -commit a2f73e4fbcfdb50fb92fdc0e9f49b4801dafaa33 -Author: Ryan Barber -Date: Wed Nov 21 11:25:24 2018 -0800 - - Added 'Showing x of y' text - -commit 240f6d266b879ecdf09a61c0ae6b5d6eaf69df30 -Author: Sybrand Strauss -Date: Wed Nov 21 08:54:24 2018 -0800 - - Added S3_WELL_EXPORT_BUCKET to backend.dc - -commit ca379a194419c894321575f0084fb9876c01cb6a -Author: Sybrand Strauss -Date: Wed Nov 21 08:46:57 2018 -0800 - - Added logging to export - -commit c849d9c1869f2388db8a9b53fcf40c2da266fe18 -Author: Sybrand Strauss -Date: Wed Nov 21 08:35:28 2018 -0800 - - Added a view to list files - -commit b598d7478886a7f9714848ac9433451aa84a3773 -Author: Sybrand Strauss -Date: Tue Nov 20 15:24:04 2018 -0800 - - CSV export in 10 seconds on local machine - -commit 68981e13751d5ef694b50d4bb457fbc54a054b6f -Author: Sybrand Strauss -Date: Tue Nov 20 14:43:14 2018 -0800 - - Simple, fast, export - -commit abfeaff294f28adba5d711f28ca5dc3b765439b0 -Author: Steve Hillier -Date: Tue Nov 20 14:28:25 2018 -0800 - - add test case for somebody active for activity, removed for another - -commit e873f2327a227e9febb43023c4fb0207acda43d4 -Author: Nick Phura -Date: Tue Nov 20 13:50:34 2018 -0800 - - BDD - Update flow specs + general improvements. - -commit 9c4be14049ec1078af5375d88f65aa0351c78a7a -Author: Steve Hillier -Date: Tue Nov 20 13:43:00 2018 -0800 - - add extra check for current registry status - -commit 8b2a3c110a5e5f6b4d6e8ac9fe9d8b57e273966d -Author: Sybrand Strauss -Date: Tue Nov 20 13:28:07 2018 -0800 - - Having to switch to raw sql, and csv (django taking too long, and excel being generated is corrupt) - -commit 23f8a27ee1da1673fb8522056ca1d0168fd051c2 -Merge: 8ae5496ee 883274910 -Author: Steve Hillier -Date: Tue Nov 20 10:54:52 2018 -0800 - - Merge pull request #1024 from bcgov/steve/aqdocs - - [1264] Aquifer documentation (pdf files) - -commit 8ae5496ee8c9328f426a639a5ba7f9c0a733f94f -Merge: 4abd04740 b832aeeb7 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Nov 19 16:56:49 2018 -0800 - - Merge pull request #1026 from bcgov/task/replicationFix - - Removed echos and pushed TEST run earlier - -commit b832aeeb7056e418508c90bb599b109c0e77feb7 -Author: Derek Roberts -Date: Mon Nov 19 16:55:41 2018 -0800 - - Removed echos and pushed TEST run earlier - -commit 4abd047402ff545afcdf348b29c770ecd6335fc1 -Merge: 9df5fe1fd d24bb9ca9 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Nov 19 16:37:01 2018 -0800 - - Merge pull request #1022 from bcgov/task/declarative - - Declarative Replication Cronjob - -commit d24bb9ca9af5f47b3bad6706a2b5976ef71cadd2 -Author: Derek Roberts -Date: Mon Nov 19 15:57:06 2018 -0800 - - Separate replication scripts for TEST and PROD - -commit 167d443d29d7de5a7e2f5a6027981a05d0364faa -Author: Derek Roberts -Date: Mon Nov 19 15:52:38 2018 -0800 - - Notify on more outcomes, cleanup/simplification - -commit 7878fb83f2042267f85f0d47239c0bf03b6d2a2f -Author: Derek Roberts -Date: Mon Nov 19 15:10:30 2018 -0800 - - oc-dump.sh - fix for message w/o params - -commit 3214a8117dbc37b10d4f289c779e1c9cff3e8873 -Author: Derek Roberts -Date: Mon Nov 19 13:53:59 2018 -0800 - - Finished checks, point to test, cleanup - -commit fce2abd9be0e620e5528201dda0604d1e81fb25a -Author: Steve Hillier -Date: Mon Nov 19 13:00:00 2018 -0800 - - update stacker to differentiate null and blank data - -commit c7a53d56e7ef06e4cb21d8771cf12ae8e7911eaa -Author: Derek Roberts -Date: Mon Nov 19 10:13:39 2018 -0800 - - Move remaining steps over - -commit 883274910ba15aa06ba6aa9f1fdcb8ec6eb77ac6 -Author: Steve Hillier -Date: Mon Nov 19 09:43:16 2018 -0800 - - update tests for new component - -commit 09557863bb322026cae86b8c835bbf195d01f6cb -Author: Steve Hillier -Date: Mon Nov 19 09:32:00 2018 -0800 - - add method of drilling to edit screen - -commit 44d4275b3347ecb63658934c44f8f5f5b4a6003b -Author: Steve Hillier -Date: Fri Nov 16 15:50:48 2018 -0800 - - edit well owner - -commit 1df89d1ef637fb35b2352e12a9b2a67a7da44723 -Author: Steve Hillier -Date: Fri Nov 16 15:50:31 2018 -0800 - - adding new database fields for well owners - -commit 05f1e213be23b8dc93defa7df31eb0b8c148cec9 -Author: Sybrand Strauss -Date: Fri Nov 16 15:26:41 2018 -0800 - - Export working, but slow. - -commit 9df5fe1fd05f388480aff5abcacd8c06e1c252b4 -Merge: 8b1a83a10 c68a007bc -Author: Gary Wong -Date: Fri Nov 16 13:05:41 2018 -0800 - - Merge pull request #1020 from bcgov/task/1420_update_metadata - - Updated metadata from Sharepoint site - -commit be5da82af4144b70a5b14db607b3c3e8a6c9c05c -Merge: 28899e3a0 8b1a83a10 -Author: Steve Hillier -Date: Fri Nov 16 12:34:41 2018 -0800 - - merge release 1.45 branch - -commit 28899e3a0364d9bed45d05524ddb585a1563a1dd -Author: Steve Hillier -Date: Fri Nov 16 12:33:00 2018 -0800 - - add documents to aquifers - -commit c68a007bcc6d47e1993a55288369cc6d4d9f9173 -Author: Gary Wong (BC Gov) -Date: Fri Nov 16 11:50:10 2018 -0800 - - fixed embedded quotes. - -commit c4110e27422feb98e2bbad47232dd4eed09c565d -Author: Sybrand Strauss -Date: Fri Nov 16 11:10:52 2018 -0800 - - Export well tab - -commit ad90df8b6672bf2562da11a89103d3f775732d57 -Author: Derek Roberts -Date: Thu Nov 15 17:35:40 2018 -0800 - - Added db check and step conditions - -commit 8b1a83a104fce123f9c415f17ec6abbd09f72d56 -Merge: fcfd4f408 c1ce29ec2 -Author: Steve Hillier -Date: Thu Nov 15 16:09:02 2018 -0800 - - Merge pull request #1021 from bcgov/steve/swaggerfix - - fix for Swagger endpoint - -commit c1ce29ec269185cb78a33770ccd940f87d7b3a6c -Author: Steve Hillier -Date: Thu Nov 15 15:51:40 2018 -0800 - - fix check for method arg - -commit fcfd4f40858f7378489778920964a22a6627026b -Merge: 7074a25ef 65d193172 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 15 14:15:02 2018 -0800 - - Merge pull request #1012 from bcgov/task/1367_replicationTimeout - - [1367] More Resilient Db Replication Cronjob - -commit 4167aaa8ea2a871f958eced3aed96cc2dbe96f56 -Author: Derek Roberts -Date: Thu Nov 15 13:47:50 2018 -0800 - - +replication.groovy - WIP declarative replication cronjob - -commit 8886241e4e7eb982aeee825fdd2e618357c676bd -Author: Steve Hillier -Date: Thu Nov 15 09:10:24 2018 -0800 - - use get method to get activity from kwargs - -commit 2b82c8adbaf1d2b0c7902fd22feaf699fad40997 -Author: Steve Hillier -Date: Thu Nov 15 08:45:39 2018 -0800 - - fix for Swagger endpoint - -commit 749d3a92a5e833f57e0b0c56d6b98babc8c3a39a -Author: Gary Wong (BC Gov) -Date: Wed Nov 14 18:45:21 2018 -0800 - - Updated metadata from https://spc-env.gov.bc.ca/WISP/GWELLS%20Project%20Documents/Forms/AllItems.aspx?RootFolder=%2fWISP%2fGWELLS%20Project%20Documents%2f04%5fDesign%2fMetadata&FolderCTID=0x012000806475E12D813B49B480EA91F6C59353 - -commit 7074a25ef42fa1007b9ac8e40c67aad9bfbf4f1f -Merge: 48f784bb0 c719d9f33 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Nov 14 16:27:47 2018 -0800 - - Merge pull request #1014 from bcgov/release/1.44.1 - - Release 1.44.1 - -commit 2522731f2a26dccb0fd0277726d7084272f51b36 -Author: Derek Roberts -Date: Wed Nov 14 16:22:17 2018 -0800 - - Stages and declarative steps - -commit c719d9f332a5413c68b878cd3a385a50d1fd0e5d -Merge: 85cb5ac2e 298b45299 -Author: Sybrand Strauss -Date: Wed Nov 14 10:52:01 2018 -0800 - - Merge pull request #1019 from bcgov/fix/aquifer_test - - Removed known id - -commit 298b4529963b137ab15baf8ce1186f4a680bc7bc -Author: Sybrand Strauss -Date: Wed Nov 14 10:08:24 2018 -0800 - - Removed known id - -commit 65d193172227b30406ffa80c6c1a3a85123a6d3f -Author: Derek Roberts -Date: Tue Nov 13 17:04:51 2018 -0800 - - Cleanup - -commit 879929719a2b8f09a00ded7a6e3afb2513c86679 -Author: Derek Roberts -Date: Fri Nov 9 11:02:41 2018 -0800 - - pg_replicate + resource wait - -commit 85cb5ac2e9c1626e521bca8feac1970a46252ba2 -Merge: 7f4e9ba34 c5328fd02 -Author: Steve Hillier -Date: Tue Nov 13 12:59:49 2018 -0800 - - Merge pull request #1018 from bcgov/steve/alerticon - - [1227] change error alert to exclamation mark icon - -commit 7f4e9ba345980996d84f931051ffa8f8d588bc8d -Merge: 080df86d1 90c5beb4e -Author: Steve Hillier -Date: Tue Nov 13 12:59:33 2018 -0800 - - Merge pull request #1017 from bcgov/fix/survey_width - - [1397] Increased width of survey - -commit 90c5beb4e696113f726f5301d38c010396a2d07f -Author: Steve Hillier -Date: Tue Nov 13 11:23:22 2018 -0800 - - Update app/frontend/src/aquifers/components/Search.vue - - Co-Authored-By: Sybrand - -commit c5328fd02c91dcbab15fac2ac963644f5c084acd -Author: Steve Hillier -Date: Tue Nov 13 10:11:29 2018 -0800 - - change error alert to exclamation mark icon - -commit 080df86d198c0c869e4be4ceec1c275233d4b5b6 -Merge: cb64abbad 5cd4ec476 -Author: Sybrand Strauss -Date: Fri Nov 9 17:23:45 2018 -0800 - - Merge pull request #1016 from bcgov/task/1322_BDD_Submissions - - 1322 - BDD Submissions Test - -commit 5cd4ec476bb4b26b5ff53d4d03227a303b620da0 -Author: Sybrand Strauss -Date: Fri Nov 9 17:06:17 2018 -0800 - - Updating tests to not rely on pre-loaded guids - -commit 5a0ab4c9082c136262ca9c7bd47921e3bad7c2d5 -Author: Nick Phura -Date: Fri Nov 9 16:37:35 2018 -0800 - - Fix wellsearch.json file name. - -commit 3c48945d38a2cf87b0225c8d5fd7cfecfc7f0ac3 -Author: Sybrand Strauss -Date: Fri Nov 9 16:23:04 2018 -0800 - - Increased width - -commit 4258fe0c24161311137970bedc84bcf7bb49d5ca -Author: Nick Phura -Date: Tue Oct 30 10:27:49 2018 -0700 - - 1322 - BDD Submissions Test - Update jenkinsfile to use new, smaller fixtures. - -commit cb64abbad2af3de331cb9fd5c37228687c5bcdb8 -Merge: 7bfc9b491 b57300893 -Author: Sybrand Strauss -Date: Fri Nov 9 15:39:29 2018 -0800 - - Merge pull request #1013 from bcgov/feature/survey_page_for_aquifers - - Add aquifer survey - -commit b573008931143580235b80975d88846a1db7af9f -Author: Sybrand Strauss -Date: Fri Nov 9 15:14:26 2018 -0800 - - Updated snapshot and moved survey up - -commit bd6eabe5b33bccfc998ff2a5163f9465cb212935 -Author: Sybrand Strauss -Date: Fri Nov 9 14:32:41 2018 -0800 - - Fixed unit test failures - -commit 31a68a9cae262bbe9f953189802437b369870d47 -Merge: cfc89f35b 7bfc9b491 -Author: Sybrand Strauss -Date: Fri Nov 9 14:13:10 2018 -0800 - - Merge branch 'release/1.44.1' into feature/survey_page_for_aquifers - -commit 7bfc9b491c503fde2c70e6f19d4a740752c28bbc -Merge: 48f784bb0 3d554c387 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Nov 9 13:44:51 2018 -0800 - - Merge pull request #1015 from bcgov/task/1336_BDD_AquiferData_View - - Add aquifers search page and tests. - -commit cfc89f35b96d04556279f89a9251597fc8fbf8f6 -Author: Sybrand Strauss -Date: Fri Nov 9 12:56:08 2018 -0800 - - Add aquifer survey - -commit 3d554c38736e291f5e895c2c661a45c3fe18d6a8 -Author: Nick Phura -Date: Thu Oct 25 12:05:56 2018 -0700 - - Add aquifers search page and tests. - Add ID's to aquifers search page. - Add .env support for the functional test gradle build. - Trivial test comment update. - Update unit tests. - -commit 48f784bb0ce407a3475c5010d9e34e2c9c832399 -Merge: 827ddf89c 773d3aa4b -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 8 15:52:02 2018 -0800 - - Merge pull request #1004 from bcgov/release/1.44.0 - - Release 1.44.0 - -commit 773d3aa4bcdc7d891f2ab1d29389bffb41df265d -Merge: 20ae98ef6 4c043cf49 -Author: Sybrand Strauss -Date: Thu Nov 8 14:46:02 2018 -0800 - - Merge pull request #1010 from bcgov/feature/1104_edit_person_responsible_tests - - [1104] edit person responsible, additional tests - -commit 4c043cf495d8f83dc99317f93d5077f9f51092e0 -Author: Sybrand Strauss -Date: Thu Nov 8 14:22:29 2018 -0800 - - Fixed api test - -commit 20ae98ef60e43c78ab74367a49c81a90101e77da -Merge: 429ceb5c9 d68783781 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 8 12:52:11 2018 -0800 - - Merge pull request #1011 from bcgov/task/1377_newPipelineScriptsJobs - - [1377] New Pipeline Jobs and Scripts - Cleanup - -commit d68783781a664b12eed04dc950bc50fc5b182710 -Author: Derek Roberts -Date: Thu Nov 8 12:43:35 2018 -0800 - - Cleanup - -commit 429ceb5c9a2a35e144cc9eb898e506276062da91 -Merge: f30042f25 50e0894b6 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 8 12:41:32 2018 -0800 - - Merge pull request #1008 from bcgov/task/1377_newPipelineScriptsJobs - - [1377] New Pipeline Jobs and Scripts - -commit 50e0894b697cfb65bd2356a0d12747bcad8afbb6 -Author: Derek Roberts -Date: Thu Nov 8 12:18:00 2018 -0800 - - pg_replicate.groovy - update for new pipeline DCs - -commit ef938fd83e26bb724055e7c7845914774a350e02 -Author: Derek Roberts -Date: Thu Nov 8 12:16:19 2018 -0800 - - oc-restore.sh - action on commands in db-drops.sql - -commit 3b8ed0c3e57b06c00170359136550ea6eaa3ae2e -Author: Derek Roberts -Date: Thu Nov 8 12:09:12 2018 -0800 - - +db-drops.sql - sql commands consumed by oc-restore.sh - -commit 8c0c99e8346353c7217b326bc6b1b9355bdbe944 -Author: Sybrand Strauss -Date: Thu Nov 8 12:07:29 2018 -0800 - - Fixed a bug on the stacking, added some tests for it - -commit f30042f2553b91095b8fcafbb5f109b83c121608 -Merge: a2243bb21 bc0d236c2 -Author: Sybrand Strauss -Date: Thu Nov 8 08:20:58 2018 -0800 - - Merge pull request #1009 from bcgov/fix/aquifer - - Changed around aquifer retrieve - was failing on clean database - -commit bc0d236c2d228da42178b8bc89de91ec0bcec57c -Author: Sybrand Strauss -Date: Thu Nov 8 07:55:45 2018 -0800 - - Changed around aquifer retrieve - was failing on clean database - -commit 67ea1379d61a7dc2c9f33c1be22bfb1ea607d09d -Author: Sybrand Strauss -Date: Thu Nov 8 07:46:59 2018 -0800 - - Busy implementing tests - -commit f7b735426d10d0a191d3d4b176e39875f5d1871a -Author: Derek Roberts -Date: Wed Nov 7 17:05:20 2018 -0800 - - Cleanup - -commit b0218f095d633ab817e963a2f6f5235d9cd0e171 -Author: Derek Roberts -Date: Wed Nov 7 16:50:23 2018 -0800 - - Switch from hourly to daily backups - -commit dd166106c5f50fbd8fba6f93171edf6b07aac05a -Author: Derek Roberts -Date: Wed Nov 7 16:53:45 2018 -0800 - - Cronjob - use improved backup command with correct user - -commit 3151bfac2a0942df0ee082b8f49ac06c1ea6a108 -Author: Derek Roberts -Date: Wed Nov 7 16:12:40 2018 -0800 - - Make cronjob script readable, unicode character codes - -commit fe8ddd218be7c6553907391d3ed200eb83e146e4 -Author: Steve Hillier -Date: Wed Nov 7 15:29:48 2018 -0800 - - finish rest of well detail page - -commit 424596acd2f9ad2b5153424212c88854fef21716 -Author: Derek Roberts -Date: Wed Nov 7 15:15:00 2018 -0800 - - Revised cronjob for new prod name - -commit a2243bb21dbc249679663fbdca4f4456cb9c5972 -Merge: 3e8223309 1ab961ce1 -Author: Steve Hillier -Date: Wed Nov 7 15:14:25 2018 -0800 - - Merge pull request #993 from bcgov/task/415-epicaquiferdata-creating-an-aquifer-8 - - [415] Create a new Aquifer - -commit 99518e854dbc0e1f11acbb848e9e3c429e6928b7 -Author: Derek Roberts -Date: Tue Nov 6 16:56:48 2018 -0800 - - Temporarily point at old route's DC (until phased out) - -commit 35bbef872db620618a54ab6e6f56d96b20f3ff76 -Author: Derek Roberts -Date: Tue Nov 6 16:42:07 2018 -0800 - - pg_replicate + .groovy extension - -commit fa1f405e15fb7eb01d407fa7f14c46320e0e7623 -Author: Derek Roberts -Date: Tue Nov 6 16:01:46 2018 -0800 - - pg_replicate - stop disabling logging - -commit e84a34187d65e76dbb4a26ddbc44487ac98fb474 -Author: Derek Roberts -Date: Tue Nov 6 16:00:36 2018 -0800 - - pg_replicate - update dc/pod names - -commit 05d5489102306026c9e1c6be28d1b79c8c105ad9 -Author: Derek Roberts -Date: Tue Nov 6 15:58:07 2018 -0800 - - oc-dump.sh - dump as non-privileged, not postgres user - -commit d47033bcee7433eeeb38a8d8874c1481bb0cf161 -Author: Derek Roberts -Date: Mon Nov 5 15:41:44 2018 -0800 - - oc-restore.sh - more flexible grep, specify namespace - -commit 39d2573413657b5a236b7ef70ac36c6e83e6c0ce -Author: Derek Roberts -Date: Mon Nov 5 15:36:52 2018 -0800 - - oc-restore.sh - accept different dc targets as well as projects - -commit 3eff5a18401aaa4d8692b1d7a31708670ba0542a -Author: Derek Roberts -Date: Mon Nov 5 15:26:51 2018 -0800 - - oc-restore.sh - default to keeping app online - -commit f3368d264dc12e84aec3887060f8dbcd5daea674 -Author: Derek Roberts -Date: Mon Nov 5 15:18:11 2018 -0800 - - Swapped .pgCustom for .dump in .gitignore - -commit 745b39688261da4dd7e928138f0e8f67c29dd626 -Author: Derek Roberts -Date: Mon Nov 5 14:57:52 2018 -0800 - - oc-dump.sh - use file output instead of pipe for saving dumps - -commit df8a33327424c76c3fac95aba73521a536de4aa1 -Author: Derek Roberts -Date: Mon Nov 5 14:17:49 2018 -0800 - - oc-dump.sh - use .dump extension instead of .pgCustom - -commit e0579bcf9f65ed9df7451e006710d5a57c01b068 -Author: Derek Roberts -Date: Mon Nov 5 14:17:18 2018 -0800 - - oc-dump.sh - accept different dc targets as well as projects - -commit 3e82233094ee8bf502eb5c9da8b90afe4be645fe -Merge: 9ed3ced66 ce864e448 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Nov 7 14:04:22 2018 -0800 - - Merge pull request #1007 from bcgov/task/1385_newRoutesII - - [1385] Update BASEURL with TEST_HOST for API tests - -commit 9ed3ced6668521f0a7902f279f1bff7352811d13 -Merge: 219236fd5 21834430d -Author: Sybrand Strauss -Date: Wed Nov 7 13:46:49 2018 -0800 - - Merge pull request #1005 from bcgov/feature/1104_edit_person_responsible_loadexisting - - [1104] Edit person responsible - -commit 21834430def92b87e625354b7e914bb5ff394bee -Author: Sybrand Strauss -Date: Wed Nov 7 10:05:45 2018 -0800 - - Removed two tests that are better suited to python unit tests - -commit 1ab961ce194ec655ffb90aaa20eb7816b76587d8 -Author: Ryan Barber -Date: Wed Nov 7 09:42:38 2018 -0800 - - add Authentication step to aquifer api tests - -commit b3c6a5ecec59479d9e55680582465b77a15a9496 -Author: Sybrand Strauss -Date: Wed Nov 7 09:29:28 2018 -0800 - - Changed error message to match - -commit 26f16c6bcdfcc517c6b448610fdf10bdf2e900d1 -Author: Sybrand Strauss -Date: Wed Nov 7 09:20:32 2018 -0800 - - Added licenses, changed v-if for form components, changed tests - -commit d0322c46153aff30a7a97729207ea036313bb290 -Author: Ryan Barber -Date: Wed Nov 7 08:25:04 2018 -0800 - - Updated edit button to similar style - -commit 855f847a834d72248812c6c83aa35699629d0c99 -Author: Ryan Barber -Date: Wed Nov 7 08:19:18 2018 -0800 - - licenses! - -commit 62c6ddd16e298cb95369315d4b9e9613db15d9fb -Author: Ryan Barber -Date: Wed Nov 7 07:45:35 2018 -0800 - - Added API patch test - -commit ce864e44811028fcb299f20cb72a6008b4bff854 -Author: Derek Roberts -Date: Tue Nov 6 17:35:26 2018 -0800 - - Updated BASEURL with TEST_HOST for API tests - -commit 3630a25c52688fb2558d74cfe1debb20fd377fdd -Merge: 87a7acd31 219236fd5 -Author: Sybrand Strauss -Date: Tue Nov 6 15:55:13 2018 -0800 - - Merge branch 'release/1.44.0' into feature/1104_edit_person_responsible_loadexisting - -commit 87a7acd3141c1e2cad7b02687a4cb32a8f1a07d2 -Author: Sybrand Strauss -Date: Tue Nov 6 15:51:15 2018 -0800 - - Changing tests - -commit 6fc5579bc83d162ef34bea10b31249259fe6f129 -Merge: eebbebc01 219236fd5 -Author: Steve Hillier -Date: Tue Nov 6 15:13:52 2018 -0800 - - merge release/1.44.0 - -commit 197e2a5360927fed6ca736ef489b3968137ea32e -Author: Sybrand Strauss -Date: Tue Nov 6 15:10:24 2018 -0800 - - Fixed auto check of "same as person responsible for drilling", moved tests - -commit 219236fd5aafe783ec22b517c08e4bab9ae96eef -Merge: 6a278c954 f201490ed -Author: Steve Hillier -Date: Tue Nov 6 14:57:06 2018 -0800 - - Merge pull request #1003 from bcgov/steve/aquifer-ga - - [1370] add analytics event to aquifer search - -commit 6a278c954f809d00247f7ee6928dd78e3f538290 -Merge: 0164d94c0 527aa7f26 -Author: Steve Hillier -Date: Tue Nov 6 14:56:13 2018 -0800 - - Merge pull request #990 from bcgov/steve/confirm-msg - - [1227] update success and fail messages for submitting reports - -commit 0164d94c0ffd2089715f2daee18f6f9a73eb35a8 -Merge: 3d858d14b aec2da344 -Author: Steve Hillier -Date: Tue Nov 6 14:54:24 2018 -0800 - - Merge pull request #1002 from bcgov/steve/kc - - update Keycloak tokens - -commit 2f850c959eeee18f8d042be1940c472366506897 -Author: Sybrand Strauss -Date: Tue Nov 6 14:13:02 2018 -0800 - - Change save button - -commit 3d858d14bd064ab2871f1c6f6165eaa0585689b8 -Merge: 2b14964b3 f9c45f674 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Nov 6 11:24:47 2018 -0800 - - Merge pull request #1001 from bcgov/bugfix/casing_materials - - Populate casings.casing_code - -commit f201490ed175bb4fb488fe44ef65460eba8e5df3 -Author: Steve Hillier -Date: Tue Nov 6 10:26:33 2018 -0800 - - add analytics event to aquifer search - -commit 2b14964b3a1fcc0e27a49b2cb06310c6d5fc6b19 -Merge: 631bf5cc2 b71dcdca9 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Nov 6 09:32:00 2018 -0800 - - Merge pull request #999 from bcgov/task/1385_newRoutes - - [1385] New TEST and PROD routes - -commit bbca68eab18cd46c8f423ecb9cc64d393c82a944 -Author: Ryan Barber -Date: Tue Nov 6 08:22:37 2018 -0800 - - Added API create test - -commit 1971b4907d53d9b0e982ba1ce06e2c9119dce792 -Author: Ryan Barber -Date: Tue Nov 6 07:17:35 2018 -0800 - - Cleaned up View/Edit tests - -commit 45f1a15755bf9cac8da5fd2cb7836180a77eb306 -Author: Sybrand Strauss -Date: Mon Nov 5 19:21:50 2018 -0800 - - Updated api tests - -commit 9f129e1d0ba00d81e6bdff3ea25bdaf9ed9aeb6e -Merge: 8c5ee6df8 631bf5cc2 -Author: Sybrand Strauss -Date: Mon Nov 5 19:08:17 2018 -0800 - - Merge branch 'release/1.44.0' into feature/1104_edit_person_responsible_loadexisting - -commit 8c5ee6df841efd48e9aca7429d5b03c80fad754f -Author: Sybrand Strauss -Date: Mon Nov 5 19:06:07 2018 -0800 - - Edit working, needs a lot of unit testing - -commit 631bf5cc2ed0ee7c06e1a30a44bcae046afebbcb -Merge: f1275abf1 585667a4b -Author: Sybrand Strauss -Date: Mon Nov 5 18:25:52 2018 -0800 - - Merge pull request #992 from bcgov/fix/1338_submission_various_issues - - [1338] submission various issues - -commit 585667a4b427e4a718b8bca830390ac8d99d9929 -Merge: b40580965 f1275abf1 -Author: Sybrand Strauss -Date: Mon Nov 5 17:56:52 2018 -0800 - - Merge branch 'release/1.44.0' into fix/1338_submission_various_issues - -commit b71dcdca9173bce66709c4ca33d141a28d2f66c5 -Author: Derek Roberts -Date: Mon Nov 5 16:23:35 2018 -0800 - - Removed vars from hostnames - -commit a0dcee93d23c7b0f0f7cfb3ca9b2c8245d826823 -Author: Derek Roberts -Date: Mon Nov 5 16:20:25 2018 -0800 - - Missed quotes - -commit aec2da344fd7b576e8778a24433d6e1b794610d6 -Author: Steve Hillier -Date: Mon Nov 5 16:13:11 2018 -0800 - - change the time passed to updateToken() - -commit 430e6ea535493eca2722a1bc5e6827ee4c9f7b0f -Author: Steve Hillier -Date: Mon Nov 5 16:03:17 2018 -0800 - - update token when token expires and when loading stored tokens - -commit 7bc78984f3d770fe66d335c16eff5c50d9f31490 -Author: Sybrand Strauss -Date: Mon Nov 5 15:19:21 2018 -0800 - - Submission edit working - no testing yet - -commit c6c887b0e12ca854be0f5985ae11ef9419042228 -Author: Ryan Barber -Date: Mon Nov 5 15:13:43 2018 -0800 - - Make Add new Aquifer button primary - -commit bae46bd2194a73f03dc8d8c94b2416b9bdc64f52 -Author: Ryan Barber -Date: Mon Nov 5 15:13:27 2018 -0800 - - fix make fixtures - -commit f9c45f674af4bc23d74e192a1642fdb301d20465 -Author: Gary Wong (BC Gov) -Date: Mon Nov 5 15:06:37 2018 -0800 - - Populate casings.casing_code - -commit 367a55a533824c63fdf9da5361ae00eb44c238da -Author: Ryan Barber -Date: Mon Nov 5 14:49:12 2018 -0800 - - Reload aquifer after edit - -commit 615dcf84e8fdbb9baf87490a5b6de6b64da7a7df -Author: Ryan Barber -Date: Mon Nov 5 14:46:16 2018 -0800 - - Removed unused bits - -commit 0d7e53c815f2e5a697c802160bf4693ff8c1879b -Author: Ryan Barber -Date: Mon Nov 5 14:46:06 2018 -0800 - - Swap buttons on Aquifer form - -commit 527aa7f26267923c3c9939a6b7e776f5dd4f0e16 -Author: Steve Hillier -Date: Mon Nov 5 14:20:30 2018 -0800 - - update style of submission success/fail messages - -commit 0057799b25f0f28ddd6561caeaa8891a539f7431 -Author: Steve Hillier -Date: Mon Nov 5 14:20:03 2018 -0800 - - add submissions fixtures to docker-compose - -commit f1275abf11170ec4ebc0f8bc4dcc1b41ee5d5cb3 -Merge: 70c39ca96 ff3314697 -Author: Steve Hillier -Date: Mon Nov 5 14:14:49 2018 -0800 - - Merge pull request #997 from bcgov/steve/cleanup - - [1218] Clean up pipeline/environment resources after pull request merged - -commit 14caea099ba38dfaf620385bc334ad275e7b10f0 -Author: Derek Roberts -Date: Mon Nov 5 11:45:24 2018 -0800 - - Process db before app in PROD - -commit d3a3c2e4204d2b3be860a477a9ccb554962fd875 -Author: Derek Roberts -Date: Mon Nov 5 11:41:25 2018 -0800 - - Moved hostnames to config section, hard code consistent parts (for now) - -commit 316c42af0a0bf1a98c7dee03fdf23ac73b2ee623 -Author: Steve Hillier -Date: Mon Nov 5 11:24:14 2018 -0800 - - update preview after form refactor - -commit b32e70ba3465b23930e64f602f92f2aa29f764eb -Merge: b8e6c3055 70c39ca96 -Author: Steve Hillier -Date: Mon Nov 5 11:10:23 2018 -0800 - - merge upstream 1.44.0 - -commit d5d1c5e7f65568e211069b999761b8f53583dde0 -Author: Derek Roberts -Date: Mon Nov 5 10:55:54 2018 -0800 - - Updated new TEST route - -commit 70c39ca96a736b50c7165e1cf48fb53402052a8e -Merge: ebb46cfcf cca2a04bc -Author: Steve Hillier -Date: Mon Nov 5 10:47:54 2018 -0800 - - Merge pull request #998 from bcgov/feature/1104_edit_person_responsible - - [1104] Re-factor: form and preview split apart - -commit 831872ec04ab7d84f5da3b74b1d5a268d704be24 -Author: Sybrand Strauss -Date: Thu Nov 1 13:26:16 2018 -0700 - - Fixed raw sql to only run with postgresql - -commit 3ae4a4df7aa5ee62cec06d69bf6cfac5f2c8b781 -Author: Sybrand Strauss -Date: Fri Nov 2 14:43:25 2018 -0700 - - Person responsible now being returned on well detail - -commit 0ed4fc38f269f8852137efc437e1b22359596093 -Author: Sybrand Strauss -Date: Fri Nov 2 12:34:51 2018 -0700 - - Removed comment - -commit 9d86a7a379beca427f526972d3805abd4fbd89d6 -Author: Ryan Barber -Date: Fri Nov 2 12:09:36 2018 -0700 - - update specs - -commit 569f573090d616214c7a06ac7998eaca30fa02d8 -Author: Ryan Barber -Date: Fri Nov 2 12:02:38 2018 -0700 - - lint - -commit 36a65836ae660008215b628bf71bd256c1a263fb -Author: Ryan Barber -Date: Fri Nov 2 12:02:28 2018 -0700 - - Move buttons to Form and improve consistancy - -commit 9cf5537c5737f55bd6eac71d8f65fb4a044d096b -Author: Ryan Barber -Date: Fri Nov 2 12:01:54 2018 -0700 - - Add tabindex to form - -commit 661786827a824cf62e74e6ebd797f4ac8a5638dd -Author: Ryan Barber -Date: Fri Nov 2 11:01:24 2018 -0700 - - Store aquiferCodes in vuex to improve editing experience, preload codeTables on app initialization - -commit 2117df644cdc6962e782b6f0943f7d1f84ade0dd -Author: Ryan Barber -Date: Fri Nov 2 10:59:51 2018 -0700 - - Merge Edit and View components to improve editing experience - -commit 771f9aee35dc82b396dd0d9828d3f43afd77fccd -Author: Ryan Barber -Date: Fri Nov 2 10:56:37 2018 -0700 - - Enable caching on aquifer code responses - -commit 46096bb4890bd261eeb6d0e171a9bbb46b2a31aa -Author: Ryan Barber -Date: Thu Nov 1 09:21:50 2018 -0700 - - Stub some tests out for review - -commit c57653ef1689615c4efe79e731b4aaba72e2ac90 -Author: Sybrand Strauss -Date: Thu Nov 1 07:59:47 2018 -0700 - - Alter aquifer sequence in migration - -commit 5c1c95b5d7d977e3ee9ba682bb29a01c32bb7ad0 -Author: Ryan Barber -Date: Wed Oct 31 16:45:12 2018 -0700 - - New Aquifer component - -commit 5f5cedeee9504352060ab31dce15f2290c5f630e -Author: Ryan Barber -Date: Wed Oct 31 16:44:43 2018 -0700 - - Link to New Aquifer - -commit 66940c4f36711889060a2e2025fe3fca782f6120 -Author: Ryan Barber -Date: Wed Oct 31 16:25:31 2018 -0700 - - Migrate Aquifer model - - Change the aquifer_id field from PositiveIntegerField to AutoField. This - allows aquifer_id to be sequentially assigned on create. - -commit 128b2e1d1cc716d5138cd028d416f2ec08cacfb9 -Author: Ryan Barber -Date: Wed Oct 31 15:22:53 2018 -0700 - - Make aquifer form to reusable component - -commit b249ebb08929edc8feb2235fe916c80a417375fd -Author: Ryan Barber -Date: Wed Oct 31 15:22:26 2018 -0700 - - Enable create for aquifer endpoint - -commit cca2a04bcde7dce09f13e79328ca1b915704ce2c -Author: Sybrand Strauss -Date: Fri Nov 2 09:24:01 2018 -0700 - - Re-factor: form and preview split apart - -commit b40580965fd0194f4035ac0e159f0605e1cdf503 -Author: Sybrand Strauss -Date: Fri Nov 2 07:59:22 2018 -0700 - - Fixed tests - -commit b8e6c30559a7c95a95fcb2c1f607a13d7a682bf3 -Author: Steve Hillier -Date: Thu Nov 1 16:55:55 2018 -0700 - - move submit error message to top of page - -commit ebb46cfcfd2bcddcb10fc2e24914909f8e005d50 -Merge: 0bf70f3b8 47f47314a -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 1 16:45:55 2018 -0700 - - Merge pull request #994 from bcgov/bugfix/link_to_last_known_aquifer - - [1332] Bugfix/link to last known aquifer - -commit 0bf70f3b8ea6c5d71647e3428b56a38fe65f97f6 -Merge: 51114512a e2b78f13f -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 1 16:39:17 2018 -0700 - - Merge pull request #969 from bcgov/task/1297_NewFixtureData - - 1297_NewFixtureData - -commit b6235de1b71625e75a7f67b7769d3855f835ab75 -Author: Steve Hillier -Date: Thu Nov 1 16:27:33 2018 -0700 - - add a check mark to success - -commit ff3314697c1aa16d8333647633436c029434351a -Author: Steve Hillier -Date: Thu Nov 1 16:07:00 2018 -0700 - - increase time for oc commands to execute before they are killed - -commit 90cdf3fac02d87a7c19d1440020f039cbdfee0b7 -Merge: bf1f73856 51114512a -Author: Steve Hillier -Date: Thu Nov 1 15:41:59 2018 -0700 - - fix merge conflicts - -commit bf1f73856e39b3ad251bbbe837db61114f702208 -Author: Steve Hillier -Date: Thu Nov 1 15:16:25 2018 -0700 - - lock preview screen after submission success - -commit f31784f4a7a21c154b9f4f155f2d47ea34f8d488 -Author: Steve Hillier -Date: Thu Nov 1 15:02:12 2018 -0700 - - oc commands have to be run separately to target different labels - -commit 66d0dadae7c66120dfbca00e4ee7b92d80be86b2 -Author: Steve Hillier -Date: Thu Nov 1 14:53:23 2018 -0700 - - submit success message - -commit b73f2677fff5b3c68835647d3d81d2231a6aae73 -Author: Sybrand Strauss -Date: Thu Nov 1 14:39:33 2018 -0700 - - Created more items for closure - -commit 2393c395caa5a92342a135299fde0edac1e0a946 -Author: Steve Hillier -Date: Thu Nov 1 14:20:30 2018 -0700 - - clean up selectors - -commit e5c1667f7b85bdfa8389cf5bb150b9ec3b74a38d -Merge: 65132857c 51114512a -Author: Sybrand Strauss -Date: Thu Nov 1 14:02:36 2018 -0700 - - Merge branch 'release/1.44.0' into fix/1338_submission_various_issues - -commit 51114512a68dd04f4dee7a181a28e1eea623567f -Merge: 827ddf89c 33d3cda95 -Author: Sybrand Strauss -Date: Thu Nov 1 13:59:50 2018 -0700 - - Merge pull request #991 from bcgov/feature/1096-edit-page-jump-links - - [1096] Edit page jump links - -commit f034bccdc893e4b6981a4bbfd5be49e71ce71efc -Author: Steve Hillier -Date: Thu Nov 1 13:58:37 2018 -0700 - - add a cleanup script triggered by webhook - -commit 827ddf89c789f089ada5260cfad2e2bfa6bee0ae (tag: v1.43.0) -Merge: 52e4e983a bd1467951 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 1 13:37:53 2018 -0700 - - Merge pull request #977 from bcgov/release/1.43.0 - - Release 1.43.0 - -commit bd14679513cdc5d8eba8dd4d20b0fbb9585e4134 -Merge: 66fa15f8f c04369d2e -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 1 12:10:18 2018 -0700 - - Merge pull request #996 from bcgov/task/1386_stopTestFixtures - - [1386] Stop loading fixtures in TEST - -commit c04369d2e5ea98bb556a878f417e5b261efdf857 -Author: Derek Roberts -Date: Thu Nov 1 11:25:29 2018 -0700 - - Stop loading fixtures in TEST - -commit 66fa15f8fed9898be8754619955e2d51a7994d3b -Merge: 5521293a1 a1263ccbf -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Nov 1 10:35:15 2018 -0700 - - Merge pull request #995 from bcgov/task/db_juggling - - [1288] Image Rollback and Increase DB Size - -commit a1263ccbfcde47457185536dfa13538fb89ac205 -Author: Derek Roberts -Date: Thu Nov 1 09:32:16 2018 -0700 - - Up new PROD db from 2 to 20 GB - -commit 29dd74aea65563c1ba2d3b2a45d2f9b139ecf666 -Author: Derek Roberts -Date: Thu Nov 1 09:13:25 2018 -0700 - - Dial psql version back down to 9.5 - -commit 47f47314a40cdd9868585f6e1b1ad594478cc205 -Merge: e892ef469 5521293a1 -Author: Gary Wong (BC Gov) -Date: Wed Oct 31 19:26:29 2018 -0700 - - Merge branch 'release/1.43.0' of github.com:bcgov/gwells into bugfix/link_to_last_known_aquifer - -commit 33d3cda953d749e25d678cc470e1fa50e134b79c -Author: Sybrand Strauss -Date: Wed Oct 31 16:11:49 2018 -0700 - - Added userRoles getters to unit tests - -commit 65132857cb834a573357b25a800d2ac45bc7267d -Author: Sybrand Strauss -Date: Wed Oct 31 15:58:02 2018 -0700 - - Removed staff edit - -commit 752d3ea3caacd6dff833a160fae7548de167d408 -Merge: 3ecd623ca 5521293a1 -Author: Sybrand Strauss -Date: Wed Oct 31 15:54:39 2018 -0700 - - Merge branch 'release/1.43.0' into fix/1338_submission_various_issues - -commit 803f2eb32ec04e0e4b453d53cf3423590eb4890d -Author: Sybrand Strauss -Date: Wed Oct 31 15:51:30 2018 -0700 - - Changed to well edit page as per PO. - -commit 799166a77313e2ab779c67fbc1d66d6d617f79ce -Author: Sybrand Strauss -Date: Wed Oct 31 15:27:09 2018 -0700 - - Fixed preview issue - -commit fc85863238c20d088c697fcb8ed5efcfcfb1d2d6 -Author: Sybrand Strauss -Date: Wed Oct 31 15:11:26 2018 -0700 - - Fixing styling after merge - -commit 4e65f2dd2cebc1bee11d5cc34b6d0254bc04cff1 -Merge: 8fc97739c 1ff43d853 -Author: Sybrand Strauss -Date: Wed Oct 31 15:01:34 2018 -0700 - - Merge branch 'release/1.43.0' into feature/1096-edit-page-jump-links - -commit c2299ebb543884a06c57fc27125c7cd931f10b1f -Author: Steve Hillier -Date: Wed Oct 31 13:59:39 2018 -0700 - - update success and fail messages for submitting reports - -commit 5521293a1d61a2f6c501f1e04c4694be87fde6ba -Merge: 1ff43d853 93a054a01 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Oct 31 10:32:54 2018 -0700 - - Merge pull request #988 from bcgov/task/1288_newPipelineTransition - - [1288] New Pipeline Testing - -commit 93a054a017ff4875160dfec60f5e9641ccb0c930 -Author: Derek Roberts -Date: Wed Oct 31 09:48:02 2018 -0700 - - Comment for outside script acceptance in Jenkins - -commit 2a2495c8386a8a031037ae2d3e437b4fb75e2584 -Author: Derek Roberts -Date: Mon Oct 29 20:49:02 2018 -0700 - - Replaced var LABEL_APPVER with NAME_SUFFIX for consistency - -commit 5e0800f19dc3dd12d602cb843ee459db6e4342b7 -Author: Derek Roberts -Date: Mon Oct 29 20:44:47 2018 -0700 - - Retag in TEST - -commit 79a746e0cd7db89f6d1f3193173f3127c858e405 -Author: Derek Roberts -Date: Mon Oct 29 20:08:38 2018 -0700 - - Dropped Jenkins shared library remnant - -commit d08b18b8655f36d2c51ffe987096c1dfaaa75c45 -Author: Derek Roberts -Date: Mon Oct 29 20:06:00 2018 -0700 - - Moved TEST/staging db back to 5 GB from 1 - -commit 8bc9e8a7a267e680ea9ccbfd4dbb772963e37bc7 -Author: Derek Roberts -Date: Mon Oct 29 17:41:55 2018 -0700 - - One more BUILD_ENV_NAME - -commit 2b0f1594827f92c01397b5f6b99f1b4ead339230 -Author: Derek Roberts -Date: Mon Oct 29 17:40:45 2018 -0700 - - Removed unconsumed var BUILD_ENV_NAME - -commit e892ef46989741c61f98dcea7f036265fb5baeef -Author: Gary Wong (BC Gov) -Date: Tue Oct 30 22:53:50 2018 -0700 - - Instead of choosing a random among the duplicate aquifer_id's, select the last edited/created one for each well. - -commit eebbebc017b0b1e9c277b32559862c75fa87f229 -Author: Sybrand Strauss -Date: Tue Oct 30 19:36:23 2018 -0700 - - Added some code for geolocation - -commit 3ecd623caf8c0f0b0a5fda5ba2e8440a232b9c11 -Author: Sybrand Strauss -Date: Tue Oct 30 18:43:42 2018 -0700 - - Fixed row count issue by forcing created to run on components - -commit e2b78f13fe45f0396f7b6df94a6efb8e38aa48ba -Author: Nick Phura -Date: Tue Oct 30 18:20:54 2018 -0700 - - Update for new keycloak ID - -commit 668e532b8b053d2e91e879a7682311b1334c821e -Merge: c838f23dd 1ff43d853 -Author: Sybrand Strauss -Date: Tue Oct 30 18:13:34 2018 -0700 - - Merge branch 'release/1.43.0' into fix/1338_submission_various_issues - -commit d66daa0a560cb1c192c15a9f9d0da65c5436ff1c -Author: Nick Phura -Date: Tue Oct 23 13:48:37 2018 -0700 - - Rename old registries/wellsearch fixtures from .json to _large.json - Add new registries/wellsearch fixtures with reduced data/size. - - Rename original aquifers.json to aquifers_large.json. - Add new reduced aquifers.json with fixtures to match the reduced wellsearch.json. - - Rename old registries/wellsearch fixtures from .json to _large.json - Add new registries/wellsearch fixtures with reduced data/size. - - Rename original aquifers.json to aquifers_large.json. - Add new reduced aquifers.json with fixtures to match the reduced wellsearch.json. - - Temporarily use 'large' fixtures in jenkinsfile. - -commit 1ff43d8530123a665d0fafe2c8691d421686565c -Merge: 0945accc1 24bfdee20 -Author: Sybrand Strauss -Date: Tue Oct 30 18:02:03 2018 -0700 - - Merge pull request #978 from bcgov/steve/formpreview - - [358] Submission preview form - -commit 24bfdee20cd43248e148a5e36bb7226add64a455 -Author: Steve Hillier -Date: Tue Oct 30 17:51:51 2018 -0700 - - factored coord conversion methods out to a mixin file - -commit 8fc97739cad387e27a7b7adedb0c59337eac259f -Author: Sybrand Strauss -Date: Tue Oct 30 17:46:08 2018 -0700 - - Added jump links - -commit ff0e4368f6fd06a623046b047634d9017ae5e4fc -Author: Sybrand Strauss -Date: Tue Oct 30 17:23:08 2018 -0700 - - Adding id's for anchor links - -commit 713bd1405069db9849c5f50e378c792f9b23970b -Merge: 290850879 0945accc1 -Author: Sybrand Strauss -Date: Tue Oct 30 17:00:42 2018 -0700 - - Merge branch 'release/1.43.0' into feature/1096-edit-page-jump-links - -commit 0945accc1c86f5b070a75810ab3ae8054edfcabc -Merge: 34f610854 c8a53d2bf -Author: Steve Hillier -Date: Tue Oct 30 16:57:35 2018 -0700 - - Merge pull request #989 from bcgov/task/subtype-description - - Use __str__ for subtype description because it includes the code - -commit c8a53d2bff8acebdb67c0ebe879a53ffa352e169 -Author: Ryan Barber -Date: Tue Oct 30 16:51:52 2018 -0700 - - Use __str__ for subtype description because it includes the code - -commit 34f61085430d0081965f1b2c08cc6f524fb63dcd -Merge: 814a8cabd 7b60f3f6f -Author: Steve Hillier -Date: Tue Oct 30 16:51:10 2018 -0700 - - Merge pull request #979 from bcgov/task/1342-tweaks-2 - - [1342] Tweaks - -commit 290850879510bc3b41e636028f9fdc424d2aaf6e -Author: Sybrand Strauss -Date: Tue Oct 30 16:31:40 2018 -0700 - - Adding anchors - -commit 7b60f3f6f12593c70d18b82acc510387d0db994d -Author: Ryan Barber -Date: Tue Oct 30 15:11:10 2018 -0700 - - cleanup - -commit 8dbbcb69913733e0b1782688c36f3af6f7d0ace9 -Author: Ryan Barber -Date: Fri Oct 26 12:39:02 2018 -0700 - - Tweaks - - - don't query with no params - - currentPage is correct after navigation - - use registery style sort markers - -commit 5041998a4613099c084c1c672cc60cc38899bb1c -Author: Ryan Barber -Date: Fri Oct 26 11:34:44 2018 -0700 - - tests - -commit d3d83546f97f864a5adc60659217441cff17b927 -Author: Ryan Barber -Date: Fri Oct 26 10:48:37 2018 -0700 - - Aquifer search ordering - -commit a65e2795857eaf15ea2e8df79fa9ae8c3301d5ec -Author: Ryan Barber -Date: Thu Oct 25 15:43:49 2018 -0700 - - lint - -commit 7aecf512bad60ea391ff43f480e96ba42dedb391 -Author: Ryan Barber -Date: Thu Oct 25 13:17:48 2018 -0700 - - Use individual function lodash imports - -commit dd903d1ea59b5e6171a69ee797ebe97303c94b2f -Author: Ryan Barber -Date: Wed Oct 24 15:05:52 2018 -0700 - - Use node:8.9.4 in docker image - - - rebuild package-lock.json with production version of npm/node - -commit b939693eef43488263eff6bb83cc8bb2cfa71403 -Author: Ryan Barber -Date: Tue Oct 23 14:28:53 2018 -0700 - - Add pagination to search - - - reactive query params on Search page means search and pagination - persists with navigation - - added lodash - -commit 1867077b354fcc3073d911e9452ce312703590c0 -Author: Ryan Barber -Date: Tue Oct 23 11:54:19 2018 -0700 - - Search table improvements - - - Removed Publication Status - it's doesn't exist in the data and it - casued the table to be wider then the layout - - Made link always display underline. This is fighting against - Bootstrap. - - Turned on table striping to make it look more like the Registry table - -commit eef455ff474beb19d4b0d338c0bdfafbaad219dc -Author: Ryan Barber -Date: Tue Oct 23 10:27:02 2018 -0700 - - Export subtype_description with code and description - -commit 2484d33c86397b6d5547bfc8cefea93ac82ad149 -Author: Steve Hillier -Date: Tue Oct 30 12:12:17 2018 -0700 - - change back to original name - -commit b0f4e5cac6a96d5f9dcdb785afde4df31a9d42bc -Author: Steve Hillier -Date: Tue Oct 30 12:08:37 2018 -0700 - - clean up unused code - -commit 69d44c7860486e60197ffb01cc503737b3f06e34 -Author: Steve Hillier -Date: Tue Oct 30 10:26:45 2018 -0700 - - remove unused component - -commit f925d23c9b55638649dd354af9a7a1b1743a501f -Author: Steve Hillier -Date: Tue Oct 30 10:26:20 2018 -0700 - - switch to the same map as well detail and submission page - -commit e90cbfc2ce28cbe025bf7f414a69a51d5fc95fc0 -Merge: 864ba8594 af9310b8b -Author: Steve Hillier -Date: Tue Oct 30 10:20:52 2018 -0700 - - merge release/1.43.0 to get map changes - -commit 814a8cabdba01d6dc19ad61a4ed0eb89a86c262e -Merge: af9310b8b c0112bee8 -Author: Sybrand Strauss -Date: Tue Oct 30 09:22:41 2018 -0700 - - Merge pull request #987 from bcgov/fix/1368_number_fields - - [1368] Changed lat/long to "text" input fields - -commit 8ac1b7d84022f5b1266068905fb964496b3b6d4d -Author: Sybrand Strauss -Date: Mon Oct 29 18:49:37 2018 -0700 - - Starting to add in map - -commit 2a3d6905f61d1fcdd18e7d6facbc442b45712434 -Author: Sybrand Strauss -Date: Mon Oct 29 18:12:42 2018 -0700 - - Starting to add in staff_edit specific stuff - -commit 507c4d03e20e77e90dec4e6d82f0fa2a3cdc6fef -Merge: 9efe67764 af9310b8b -Author: Sybrand Strauss -Date: Mon Oct 29 17:40:21 2018 -0700 - - Merge branch 'release/1.43.0' into feature/1096-edit-page-jump-links - -commit c838f23ddfc27892563ecc9b1ad7e23d3acaccd4 -Author: Sybrand Strauss -Date: Mon Oct 29 17:39:36 2018 -0700 - - Handling 500 error different from 400 - -commit c0112bee835fa77908b96b4919d8b66fb50dd789 -Author: Sybrand Strauss -Date: Mon Oct 29 17:07:19 2018 -0700 - - Changed from number to text input field to work-around different browsers issues implementing the number field - -commit af9310b8b18daf2d55d9a970d9c0635cfe421fc5 -Merge: 5d94c8986 e4e118a66 -Author: Sybrand Strauss -Date: Mon Oct 29 17:02:41 2018 -0700 - - Merge pull request #986 from bcgov/fix/1315_broken_website_link - - [1315] Fixed links - -commit e4e118a66774ba9ddcd4ae034aba5c0c113a89f9 -Author: Sybrand Strauss -Date: Mon Oct 29 16:38:38 2018 -0700 - - Fixed links - -commit 5d94c898670bcc7e21bdf80a0cf062e8e74f946c -Merge: 2901f1e6a 142875338 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Oct 29 13:39:01 2018 -0700 - - Merge pull request #974 from bcgov/feature/1148_submission_map_clean - - [1148] Submission Map - -commit 2901f1e6aba21c234f6d91d1f3756b030ff8e38a -Merge: eb77d784b 72a201d0d -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Oct 29 13:24:38 2018 -0700 - - Merge pull request #984 from bcgov/fix/truncate_aquifers - - Cleared aquifer table prior to db_replicate_step2() - -commit 142875338b389f0b5e334266d1adf4a2b6c9172f -Author: Sybrand Strauss -Date: Mon Oct 29 12:42:18 2018 -0700 - - Forcing longitude to display positive, but store negative. - -commit 72a201d0d811fb220c3a4aaee8cdb7f6fb27691b -Author: Gary Wong (BC Gov) -Date: Fri Oct 26 17:59:53 2018 -0700 - - Cleared aquifer table prior to db_replicate_step2() - -commit 864ba85943350e22fb0b449d67751337abdf60f0 -Author: Steve Hillier -Date: Mon Oct 29 11:57:45 2018 -0700 - - fixes based on feedback - -commit 0f717a7bccb207760de12c846639cb2998b3c670 -Merge: 82c07a11a eb77d784b -Author: Steve Hillier -Date: Mon Oct 29 11:01:24 2018 -0700 - - Merge branch 'release/1.43.0' into steve/formpreview - -commit 846326727bac73f5c92c98110ec1ea95340260c5 -Merge: 90e298639 eb77d784b -Author: Sybrand Strauss -Date: Mon Oct 29 10:30:12 2018 -0700 - - Merge branch 'release/1.43.0' into feature/1148_submission_map_clean - -commit eb77d784bbcf7d9d551f1f836ea414d41d9c2ef9 -Merge: 994d1dcb4 70218444c -Author: Steve Hillier -Date: Mon Oct 29 08:52:19 2018 -0700 - - Merge pull request #983 from bcgov/task/1362_ghNotifications - - [1362] Jenkins-to-GitHub Push Notifications - -commit 8acd9cad1360227366d40c8efd27b21a03931256 -Author: Steve Hillier -Date: Sun Oct 28 00:12:47 2018 -0700 - - fix typo in bc - -commit 53198320eeee917568e6f0308d1de605f06947ef -Author: Steve Hillier -Date: Sun Oct 28 00:08:06 2018 -0700 - - update configs - -commit d02a779bdb4c7404ab5ff43f1e62a7bb8c84903a -Author: Steve Hillier -Date: Sat Oct 27 23:35:55 2018 -0700 - - corrections to directories - -commit 3f272d23ebea5ee185bc88b61b3c3d5259c3094b -Author: Steve Hillier -Date: Sat Oct 27 23:26:02 2018 -0700 - - fixed incorrect imagestream name - -commit 81b6dd43f72cd659cdd90aaf9aa1d367273573cf -Author: Steve Hillier -Date: Sat Oct 27 23:19:28 2018 -0700 - - fix typo in path - -commit b8c4e25a7e12febec704c4f7ce1b27da725437b5 -Author: Steve Hillier -Date: Sat Oct 27 21:29:36 2018 -0700 - - update webpack config for building one app - -commit 95010f36c98648b03b8dc95cf2ce0b423027d914 -Author: Steve Hillier -Date: Sat Oct 27 21:24:21 2018 -0700 - - fix tests in new app structure - -commit 327ed90a9fb9f930fb60a54362baef92e413309c -Author: Steve Hillier -Date: Sat Oct 27 20:55:59 2018 -0700 - - set up for serving static files - -commit c01331f2420126006a587e3549ceb9de0afc85ad -Author: Steve Hillier -Date: Sat Oct 27 15:55:19 2018 -0700 - - working well search - -commit 70218444cebd2ead2b8b819907d406d457a05e40 -Author: Derek Roberts -Date: Fri Oct 26 19:47:02 2018 -0700 - - Temp import move - -commit dc603320505533f418abc24c56c3c79336003fbf -Author: Derek Roberts -Date: Fri Oct 26 19:44:55 2018 -0700 - - Prev build cleanup with timeout - -commit 84512ab132c6f3866a92b9352214c65d5a565389 -Author: Derek Roberts -Date: Fri Oct 26 18:12:00 2018 -0700 - - Moved GitHubHelper to src, for Jenkins pipeline library - -commit 10403350b6546a8860681f6c220156b3b3916d0e -Author: Derek Roberts -Date: Fri Oct 26 17:28:00 2018 -0700 - - Source local file instead of shared library - -commit 3114b6da78a3f0b0499c597d25c2ba19f80a5227 -Author: Derek Roberts -Date: Fri Oct 26 17:23:53 2018 -0700 - - Copied GitHubHelper.groovy from shared library - -commit dcaf4613138cf782c08cab9b1b83f8fd76e797fd -Author: Steve Hillier -Date: Fri Oct 26 12:36:30 2018 -0700 - - notifications for test and prod - -commit cdeecf890b5e32506fc4774c238fad672aff1868 -Author: Steve Hillier -Date: Fri Oct 26 10:17:21 2018 -0700 - - temporarily remove commit status updates - -commit f156efc51706692760004eca99adb790a65f623a -Author: Steve Hillier -Date: Fri Oct 26 08:11:06 2018 -0700 - - test github statuses - -commit c20dd48e376c3b080da22b68cbc23fa06341b34d -Author: Steve Hillier -Date: Fri Oct 26 07:29:08 2018 -0700 - - fix incorrect curl args - -commit 21144fd33b0010c890942b44168e68053c5c7f83 -Author: Steve Hillier -Date: Thu Oct 25 23:35:23 2018 -0700 - - wrap script in sh () - -commit 1e6cabc92e2615d4da9ef0ebc4d491d24d43a304 -Author: Steve Hillier -Date: Thu Oct 25 23:17:05 2018 -0700 - - add notifications to pipeline - -commit dfa26fbfb1f976c1e6cfda59d74ed2b6fbd34413 -Author: Steve Hillier -Date: Thu Oct 25 18:57:40 2018 -0700 - - remove abort function - -commit 03e39f994e273060a8df76984b7d446c81859307 -Author: Steve Hillier -Date: Thu Oct 25 18:55:04 2018 -0700 - - add echo to help debug start of pipeline fail - -commit 7c529b754f98b6a9a35c78bfc99ec415af7ca546 -Author: Steve Hillier -Date: Thu Oct 25 18:43:16 2018 -0700 - - get secret from tools project - -commit c3c6949791dd6b46aff1dfbcd3afc864c91e0255 -Author: Steve Hillier -Date: Thu Oct 25 16:36:22 2018 -0700 - - move import to top - -commit a87945a41e396625d89bf290e50fb4e3b13e8ff9 -Author: Steve Hillier -Date: Thu Oct 25 16:35:07 2018 -0700 - - import Json library - -commit 9a8e0067d36098f9bb6e91787aaab33793d2c0cf -Author: Steve Hillier -Date: Thu Oct 25 16:30:13 2018 -0700 - - fix library - -commit ecb0547203c5ea2a98c0b9565f4f2cbaad69717e -Author: Steve Hillier -Date: Thu Oct 25 16:28:44 2018 -0700 - - test slack connection - -commit 994d1dcb431c59009e939d0a264b6b0f2cecf6ed -Merge: 93e1a3cb8 cb0873713 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Sat Oct 27 02:47:12 2018 -0700 - - Merge pull request #985 from bcgov/task/1361_psqlImg - - [1361] Replication and Db Image to 9.6 - -commit 516450e665a4557e6e49b8ac23c10b3ebb5e49ca -Author: Steve Hillier -Date: Sat Oct 27 00:12:34 2018 -0700 - - add base to router - -commit 5cf1382b98cfd18411374f7f668eb3eb8f09fd0e -Author: Steve Hillier -Date: Sat Oct 27 00:00:30 2018 -0700 - - refactor webapp into single page app - -commit cb0873713de6db37377eff7c47e7007c56f4da3a -Author: Derek Roberts -Date: Fri Oct 26 17:00:36 2018 -0700 - - Changed psql version in dc - -commit f1fd931da5dfbb5b70e1d42993d9923bdcf57877 -Author: Derek Roberts -Date: Fri Oct 26 12:37:07 2018 -0700 - - Bumped Postgres image to 9.6 - -commit 93e1a3cb8d202552ef3e864f715055206be5b846 -Merge: ab78e0c74 7187b979d -Author: Steve Hillier -Date: Fri Oct 26 18:53:05 2018 -0700 - - Merge pull request #982 from bcgov/task/1288_newPipelineTransition - - [1288] New Pipeline Transition - -commit 7187b979d66d36d4df135e1314531d7879a1511a -Author: Derek Roberts -Date: Fri Oct 26 16:59:01 2018 -0700 - - Move new prod to actual prod project - -commit 82c07a11ad1f36abd1aa37c8f04313b45144dbd0 -Author: Steve Hillier -Date: Fri Oct 26 15:52:42 2018 -0700 - - add missing fields - -commit ab78e0c74998264bb51f099f587ff31244c96162 -Author: Derek Roberts -Date: Fri Oct 26 14:12:16 2018 -0700 - - Re-add fixtures for TEST - -commit 83db92e7e15439618ed4013fc4e32e043c41bfa8 -Author: Steve Hillier -Date: Fri Oct 26 13:35:34 2018 -0700 - - correctly filter out "expired" driller records - -commit b0e6bc5921ad994c0fa5062c85f590811cf08cc3 -Author: Steve Hillier -Date: Thu Oct 25 15:55:13 2018 -0700 - - add store into test that calls getters - -commit acfc2eeff595b6f6ac3106fc5c016b5d80a6bafe -Merge: 63cabd5d3 61d9f81d4 -Author: Steve Hillier -Date: Thu Oct 25 15:43:14 2018 -0700 - - Merge branch 'release/1.43.0' into steve/formpreview - -commit 63cabd5d37d32daa9507502e6d214cb11a7a17a6 -Merge: c3359d85c 2c8f72ab3 -Author: Steve Hillier -Date: Thu Oct 25 15:36:06 2018 -0700 - - Merge branch 'release/1.43.0' into steve/formpreview - -commit 61d9f81d4cf74442f6fc3a7f4e7c2b75f9bf16c9 -Merge: 2c8f72ab3 327f42dfb -Author: Steve Hillier -Date: Thu Oct 25 15:33:18 2018 -0700 - - Merge pull request #976 from bcgov/task/1119-AquiferEditing - - Task/1119 aquifer editing - -commit 90e298639532bf5c7afa77e3a11ee92c7c8bcf77 -Author: Sybrand Strauss -Date: Thu Oct 25 14:47:22 2018 -0700 - - Change to always representing west as a positive longitude number (also added some bounds that come for free with using a number field) - -commit 327f42dfba06b0965e0c0b1344358f486004baf7 -Author: Ryan Barber -Date: Thu Oct 25 14:05:21 2018 -0700 - - quality_concert strikes again - -commit 8b37dbe0217faa98352736dd3858504adff8edbb -Author: Ryan Barber -Date: Mon Oct 22 09:30:56 2018 -0700 - - Edit component with tests - -commit 142969331275a5eb94ab90707b3c440d3218ea7d -Author: Ryan Barber -Date: Mon Oct 22 07:21:42 2018 -0700 - - Fix for lint - -commit 6f6a5b7dbb13ffb73e8b86088b12f49b7f3a85f9 -Author: Ryan Barber -Date: Mon Oct 22 07:21:26 2018 -0700 - - Rename Retrieve to View - -commit 540a77f760ef77da099d3719ca82119111370a0c -Author: Ryan Barber -Date: Fri Oct 19 11:04:03 2018 -0700 - - Aquifer frontend authentication - - - adds SSO env variables to docker-compose - - adds aquifer object to auth store - - adds authentication and config to aquifers/main.js - -commit 8d59c38b87ec371cd31a75c09e4bac7a95496a7c -Author: Ryan Barber -Date: Tue Oct 9 14:03:45 2018 -0700 - - Added Aquifer Code APIs and added description fields to Aquifer serializer - -commit c3359d85c924d687aac278c5d405064da6a976a8 -Author: Steve Hillier -Date: Thu Oct 25 13:50:01 2018 -0700 - - add location description to preview - -commit 2c8f72ab3850b6186fe6f368b72c197b5d61e765 -Merge: e368b72f5 007a4a17a -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Oct 25 13:09:06 2018 -0700 - - Merge pull request #971 from bcgov/task/1288_newPipeline - - [1288] New pipeline - -commit 007a4a17a97f3ff3aca612bdea6be834bbac0ae1 -Author: Derek Roberts -Date: Thu Oct 25 12:37:40 2018 -0700 - - Re-enable master check for TEST and PROD steps - -commit 6bb74e4d108500b0c0edc4f9e2f10a2b58cee65c -Author: Derek Roberts -Date: Thu Oct 25 12:03:19 2018 -0700 - - Removed quotes from num to make int - -commit 30d5a8c4a17dec235256bd2b928f37d1cd3d545d -Author: Steve Hillier -Date: Wed Oct 24 16:53:30 2018 -0700 - - add a deadline to jenkins pods - -commit 15129433df5a3e572e70637b9917a38a2bf3d012 -Author: Steve Hillier -Date: Thu Oct 25 09:05:59 2018 -0700 - - use PR tag to deploy to prod (test tag could be a bottleneck) - -commit fa234eb8be9085207cca4cb5b2992917274ab3bb -Author: Sybrand Strauss -Date: Thu Oct 25 09:31:31 2018 -0700 - - Changed unit tests (values to be numeric, and reduced accuracy) - -commit f476b80251c8ca4d90cf0e471216f0d62bb6a21f -Author: Sybrand Strauss -Date: Thu Oct 25 09:04:31 2018 -0700 - - Added Submission Map - Squashed commit of the following: - - commit 42fdb981f1819750bc13a8b24c09d1323740a024 - Author: Sybrand Strauss - Date: Thu Oct 25 08:52:28 2018 -0700 - - Added comments - - commit a2b548ba064d7d9e5e309eccd4ec13a1184b43eb - Author: Sybrand Strauss - Date: Thu Oct 25 08:41:15 2018 -0700 - - Reverted for to load all components, added workaround for map failing to load correctly in built asset. - - commit 242e72508fcfae4e62e6417de92f779a65e4064d - Author: Sybrand Strauss - Date: Thu Oct 25 08:29:33 2018 -0700 - - Removed some redundant code - - commit cf4d6268403012cabf3d12cfee798128b2796d3d - Merge: 3766dd57 e368b72f - Author: Sybrand Strauss - Date: Wed Oct 24 15:01:37 2018 -0700 - - Merge branch 'release/1.43.0' into feature/1148_submission_map - - commit 3766dd579bce1ee71f8ae8c1702a99f2f06290e8 - Author: Sybrand Strauss - Date: Wed Oct 24 14:58:00 2018 -0700 - - Removed input type number specific code - - commit 854fb7aa27373998caa368d2d969fd0089d1e163 - Author: Sybrand Strauss - Date: Wed Oct 24 13:28:56 2018 -0700 - - Some refinements - - commit 6ddd319f9cabb9e85f9b45a9406ed3e3c87f50d2 - Author: Sybrand Strauss - Date: Wed Oct 24 11:29:25 2018 -0700 - - Feedback between map and input boxes working (validation is incomplete) - - commit 74a3221759914800b941a16b1883dafe153ab2b6 - Author: Sybrand Strauss - Date: Mon Oct 22 17:42:50 2018 -0700 - - Adding leaflet - - commit 1dbc3d3e5dd07e85a9d72a51760e3e6ecb1feeb0 - Author: Sybrand Strauss - Date: Mon Oct 22 14:15:44 2018 -0700 - - Trying to get map to work - - commit 5923e242863e9f39323a5c04e67c752a52b83c50 - Author: Sybrand Strauss - Date: Mon Oct 22 12:15:49 2018 -0700 - - Ignoring some bash files - - commit 11ea58501b57bf7733a9e5b8677887fcb7e6fe80 - Author: Sybrand Strauss - Date: Mon Oct 22 12:15:35 2018 -0700 - - Experimenting with map - - commit b7f31f19643fc9301cf0862ebf05df7b5c68dc72 - Author: Sybrand Strauss - Date: Mon Oct 22 12:13:12 2018 -0700 - - Busy experimenting with map - - commit 7771e2c593880d681a3218ec80a59b092e3acfe8 - Author: Sybrand Strauss - Date: Mon Oct 22 09:28:58 2018 -0700 - - Adding performance check - -commit 387dcafc54667836caf9ae5bd91c6369613a47c4 -Author: Derek Roberts -Date: Wed Oct 24 22:07:46 2018 -0700 - - Stopped running fixtures on staging - -commit 88857cb9496c71100763fe74e5976cd5986ce6b7 -Author: Derek Roberts -Date: Wed Oct 24 17:50:38 2018 -0700 - - Script cleanup - -commit 94f4d71d56c4d02e5f4991a65fd2fc680ad568be -Author: Derek Roberts -Date: Wed Oct 24 17:49:15 2018 -0700 - - Script cleanup - -commit 91696f089ed9b32e68257c05c59798b3c4942985 -Author: Derek Roberts -Date: Wed Oct 24 17:33:49 2018 -0700 - - Rename TEST and PROD deployments - -commit 7ae35354b7a8ebd3bd193da3c46e288f41890ad9 -Author: Derek Roberts -Date: Wed Oct 24 11:49:32 2018 -0700 - - Reordering and echos - -commit 1911077044b09e20854d841c02589e72e9219e37 -Author: Steve Hillier -Date: Wed Oct 24 14:15:50 2018 -0700 - - add a link to the well detail page after a successful submission - -commit 5c9610a7d83e8ea6d6f0fd6bb4aa3053235de73a -Author: Steve Hillier -Date: Wed Oct 24 13:35:42 2018 -0700 - - cosmetic changes to tables - -commit 916f310478a47ae5a0ae193dac98d99e37e5089e -Author: Steve Hillier -Date: Wed Oct 24 13:20:12 2018 -0700 - - convert codes to descriptions on preview page - -commit 8254a8b223c7943529b3d17dfdc57deb1908e3dc -Merge: b2b1d8d1b e368b72f5 -Author: Steve Hillier -Date: Wed Oct 24 12:06:46 2018 -0700 - - merge upstream release branch 1.43.0 - -commit b2b1d8d1b08b1cb6dc2f00b2b10d7cf31e3f0b0e -Author: Steve Hillier -Date: Wed Oct 24 11:58:25 2018 -0700 - - users should go straight to preview after completing form - -commit 33f89825bc2044adf5da7a9cf1d9ae224f8e80e9 -Author: Derek Roberts -Date: Mon Oct 22 16:43:35 2018 -0700 - - Dev build echo - -commit 0e48e924c546250e62bd5c36aedd82f3a75bf5ad -Author: Derek Roberts -Date: Fri Oct 19 18:05:56 2018 -0700 - - Comments and oc commands, some reordering - -commit e4d9673503cb0984eba7b360e9243010af981dce -Author: Derek Roberts -Date: Fri Oct 19 12:27:03 2018 -0700 - - Removed unconsumed var from Jenkinsfile - -commit 31029a415e9f2ec000f2eaac9f05d89c530cbe81 -Author: Derek Roberts -Date: Fri Oct 19 12:04:37 2018 -0700 - - Removed unconsumed fields, slight reorder - -commit 6b4a88bff147a705ae14497af66d6f5b928d6d8f -Author: Steve Hillier -Date: Tue Oct 23 16:27:18 2018 -0700 - - change name of the trial test/prod environments - -commit bdfdf641a73bc6303002679a794474b4989e5e5f -Author: Steve Hillier -Date: Tue Oct 23 12:17:14 2018 -0700 - - adjust db image tagging - -commit e368b72f57165d5e9022875e45279835847d05c6 -Merge: 30db4b3ae 8af656743 -Author: Steve Hillier -Date: Tue Oct 23 09:17:49 2018 -0700 - - Merge pull request #962 from bcgov/task/1119-AquiferEditingAPI - - Aquifer Update API - -commit c2dc55f9bc27221f3d01f0bcdabe7f5aab0b0722 -Author: Steve Hillier -Date: Mon Oct 22 21:36:16 2018 -0700 - - remove duplicate detagging - -commit 8af656743f96e7446084b0579ab352b3a00efe46 -Author: Ryan Barber -Date: Mon Oct 22 09:33:37 2018 -0700 - - Removed bad route - -commit 7357c840e65c853a84778a3637ff83a4cf52261f -Author: Sybrand Strauss -Date: Fri Oct 19 10:24:16 2018 -0700 - - Added script to run aquifer tests locally - -commit 372f475357e1ede4dfa05354819007e034227ed0 -Author: Ryan Barber -Date: Fri Oct 19 11:22:18 2018 -0700 - - Adds -p flag to not raise error if .pip exists - -commit 2a127899c1b77098d7a6426042facf4c75e67ada -Author: Ryan Barber -Date: Fri Oct 19 10:16:07 2018 -0700 - - Remove migration - -commit c1d4aae990d41021859073910f364857f505ee26 -Author: Ryan Barber -Date: Fri Oct 19 10:00:30 2018 -0700 - - Add test to validate AQUIFERS_EDIT_ROLE on aquifer-retrieve-update endpoint - -commit 7c10b57904295f7f646831779ef0b22aa7b3e65d -Author: Ryan Barber -Date: Fri Oct 19 08:47:11 2018 -0700 - - Cache pip downloads - -commit 11659e828a4e6cd6bdea287bf97d578ac6c115ca -Author: Ryan Barber -Date: Fri Oct 19 08:45:38 2018 -0700 - - Added Aquifer Codes to Postman - -commit c596162f5cee3c32b95f38c272726138039c765f -Author: Ryan Barber -Date: Mon Oct 15 21:09:47 2018 -0700 - - Updated roles based on Sybrand's feedback - -commit 33ed33c5d44b0e89dde4589d746ba15353ab5933 -Author: Ryan Barber -Date: Mon Oct 15 00:07:40 2018 -0700 - - Add HasAquiferEditRoleOrReadOnly permission class - -commit 15b7f84a11da44da968908bd66f139a6abbae2b2 -Author: Steve Hillier -Date: Wed Oct 10 15:54:32 2018 -0700 - - add aquifers groups/roles - -commit e8ea7fb1b26a802e790cc2eb47fc787ffe506d89 -Author: Ryan Barber -Date: Tue Oct 9 14:03:45 2018 -0700 - - Added Aquifer Code APIs and added description fields to Aquifer serializer - -commit e044389cc1eff9580de169f16a59cd2f74352c6f -Author: Steve Hillier -Date: Mon Oct 22 21:07:05 2018 -0700 - - increase number of pods needed to move onto fixtures - -commit 88b90210f1c5b1bd5e16ccb0ff92cd254527ca1c -Author: Steve Hillier -Date: Mon Oct 22 17:27:45 2018 -0700 - - fix tagging of prod images - -commit 30db4b3ae377669b3b598c9d4d22b5fbff2082ab -Author: Sybrand Strauss -Date: Mon Oct 22 14:17:05 2018 -0700 - - Fix typo on model - -commit 36b22288d3135abac89f5f698be95d03022f6e22 -Author: Steve Hillier -Date: Mon Oct 22 16:27:53 2018 -0700 - - add prod deployment - -commit c7008beb25ed62b3ed21cb61fd8e3df463e93652 -Merge: 3d1e8a1f6 f641a3e2f -Author: Steve Hillier -Date: Mon Oct 22 15:56:40 2018 -0700 - - Merge branch 'release/1.42.0' into steve/formpreview - -commit 3d1e8a1f6dc354918c4a56b8d7e19afdda64bbef -Author: Steve Hillier -Date: Mon Oct 22 15:56:16 2018 -0700 - - remove console.log - -commit 9a8f44a97418bff175a70c23b8f477bddc753f2f -Author: Steve Hillier -Date: Mon Oct 22 14:42:11 2018 -0700 - - add first unit tests for preview - -commit c2904869e628857bb79457a4935589268bdf9ba8 -Author: Steve Hillier -Date: Mon Oct 22 14:41:46 2018 -0700 - - avoid errors from importing png file during test runs - -commit f641a3e2fc7006a5f4bdf35ff23e58aa3265f74b -Author: Sybrand Strauss -Date: Mon Oct 22 14:17:05 2018 -0700 - - Fix typo on model - -commit 076cf9a60aa998dca7b5d5fdbd8ae1171fd003e3 -Author: Steve Hillier -Date: Mon Oct 22 13:29:52 2018 -0700 - - refactor blank row filtering so submission form can use it too - -commit eb385d7a49d03bbb0dce5a3c824fe36f9d93984f -Author: Steve Hillier -Date: Mon Oct 22 13:14:47 2018 -0700 - - working decommission preview - -commit dd3cf0f9b7d4ceba4fe56e56d03d13caa42bd7f4 -Author: Steve Hillier -Date: Mon Oct 22 09:51:27 2018 -0700 - - start of decommission preview sections - -commit 60ec2439dbf53b8ff847b193fa60c6d2ebcf5d73 -Author: Steve Hillier -Date: Fri Oct 19 16:59:34 2018 -0700 - - tidy up preview for construction/alteration - -commit 9b4ca0c0e53ea646fea5537ee9fb75a6eea887c7 -Merge: 55aca9c14 11df7c4d5 -Author: Steve Hillier -Date: Fri Oct 19 15:13:54 2018 -0700 - - merge upstream - -commit 55aca9c14f8dd682b45b430ac28f54b0ddf598c7 -Author: Steve Hillier -Date: Fri Oct 19 14:56:51 2018 -0700 - - fix tables on preview form - -commit 11df7c4d56e6aa03977f6bc8bef070dfc7018c7b -Merge: 1eab71954 250490ef4 -Author: Sybrand Strauss -Date: Fri Oct 19 14:08:45 2018 -0700 - - Merge pull request #963 from bcgov/fix/revert_conundrum_2 - - Fix/revert conundrum 2 (the return of the revert) - -commit 250490ef4f89f78eebf646dfe9cdb93d6160fee5 -Author: Nick Phura -Date: Fri Oct 19 13:51:38 2018 -0700 - - Remove flaky tests and related utility methods. - -commit a59eb0367c72e68f944c3a34ee96311f4ef632b7 -Author: Sybrand Strauss -Date: Fri Oct 19 13:31:20 2018 -0700 - - Fix quality_concern - -commit 9659083d681928b5c4cae3bed8dfb519114064ce -Author: Ryan Barber -Date: Tue Oct 2 07:38:36 2018 -0700 - - Added retrieve endpoint + postman test - -commit 9db88bcc9bcad9be9daf9ce6ca750c0b0d5c60d6 -Author: Ryan Barber -Date: Tue Oct 2 07:40:06 2018 -0700 - - Add aquifers ot webpack.dev-watch.conf - -commit 1c16e3c31268a0ca97e77ef14b6d0a7de1bb234e -Author: Ryan Barber -Date: Tue Oct 2 22:20:10 2018 -0700 - - Added quality_concern to serializer - -commit 535442f3698a6410f2e8f813db66bb17dcd179d0 -Author: Ryan Barber -Date: Tue Oct 2 22:21:38 2018 -0700 - - Simplify Search, add link to Retrieve view - -commit bb5a20368bda6d668d88e29bf3592756d5c9cf7d -Author: Ryan Barber -Date: Tue Oct 2 22:23:19 2018 -0700 - - Added Retrieve component and routes - -commit e5d16e0fd80cc013f45f2554e92bf348ebaa20bc -Author: Ryan Barber -Date: Tue Oct 2 22:24:17 2018 -0700 - - Enable DEBUG to activate CORS on localhost - -commit 6eb2d2baeea57ecb02ac0407ee8f64c1f6803867 -Author: Ryan Barber -Date: Wed Oct 3 11:31:19 2018 -0700 - - Rework Search spec - -commit a749ad9c9e729fe3c5a6cedfe29f11d4a903c26e -Author: Ryan Barber -Date: Wed Oct 3 12:17:15 2018 -0700 - - Added Retrieve component spec - -commit ef1af382db3bb4ac3fb0cbcfd53fd064fe1e5ddd -Author: Ryan Barber -Date: Sun Oct 7 17:44:04 2018 -0700 - - Lint - -commit 191c1705c38cd5d6ac0b985e2d152af8574def91 -Author: Ryan Barber -Date: Sun Oct 7 17:51:24 2018 -0700 - - Make font-awesome work - -commit 3168655bea5fbedfcd3d81a53252feb83fa2953e -Author: Ryan Barber -Date: Tue Oct 9 14:07:23 2018 -0700 - - quality_concert -> quality_concern - -commit 3d455d5af4149c76ef4fc04bad2a0f5c0d633d28 -Author: Nick Phura -Date: Mon Sep 24 16:59:23 2018 -0700 - - Initial BDD uplift of pages and specs. - Add new workflow specs. - Add/update some IDs. - Add apache license blurbs. - -commit e6f70ca299ab3b5d6051b260aee811ec173afbdb -Author: Sybrand Strauss -Date: Wed Oct 10 10:17:14 2018 -0700 - - Added test usernames - -commit 2af273916e3ce7b7a4552cc87e164de291de4f42 -Author: Sybrand Strauss -Date: Wed Oct 10 10:19:22 2018 -0700 - - Added in .envrc - -commit 9347afaca9e31b378b14cefc40ea0cab16ae5f6f -Author: Sybrand Strauss -Date: Wed Oct 10 10:20:46 2018 -0700 - - Remove .envrc from gitignore - -commit 7342d2239c251d80cfdc48c48acf8b47f0ae29b7 -Author: Sybrand Strauss -Date: Wed Oct 10 10:22:57 2018 -0700 - - Changed name of secret env file - -commit ba77043c63d20ad341b6fafd0893f90c3cbe8ba0 -Author: Ryan Barber -Date: Wed Oct 10 17:07:22 2018 -0700 - - Fixed location description in View - -commit 1c4b868e76a628c988bc190384b52e48e3349e35 -Author: Ryan Barber -Date: Wed Oct 10 18:17:36 2018 -0700 - - Various fixes - - - use styling from Well page for print icon - - fix missing attributes (location description, material) - - added border to bottom of header - -commit 44bf6db264967b03624dd1e03619fd355de49089 -Author: Ryan Barber -Date: Wed Oct 10 18:33:03 2018 -0700 - - Updated Aquifer SPA meta data - -commit 645235b82d374cea80cc11404e283a51f8d493a3 -Author: Sybrand Strauss -Date: Thu Oct 11 13:27:03 2018 -0700 - - Timeout tweaks - -commit 254438a2d7c23a3b440f7e5300924dcae6b6a034 -Author: Nick Phura -Date: Thu Oct 11 14:10:59 2018 -0700 - - Remove unstable present/notPresent tests and util methods. - -commit 73d6aaefd28a1bc463485238cc29328781daee1f -Author: Steve Hillier -Date: Fri Oct 19 12:20:24 2018 -0700 - - add a route for preview - -commit 1eab7195405896941d5b69a3c9fe4fad5c6a3f8e -Merge: 549afda48 e5aa530d3 -Author: Sybrand Strauss -Date: Fri Oct 19 10:02:16 2018 -0700 - - Merge pull request #960 from bcgov/feature/1299_bug_fix - - ETL Script fix due to legal_pid datatype. - -commit 549afda485474fd0f44e17aad21b7b684658d0d0 -Merge: f7aa79a56 9ac4eaa9f -Author: Steve Hillier -Date: Fri Oct 19 09:57:57 2018 -0700 - - Merge pull request #961 from bcgov/fix/aquifer-search-ie - - Add babel-polyfill to aquifers SPA - -commit 9ac4eaa9f0ac2b2cbc0e899327edb9ce667e1636 -Author: Ryan Barber -Date: Thu Oct 18 21:05:52 2018 -0700 - - Add babel-polyfill to aquifers SPA - -commit c190eb564fd9d794f47d0349ed984748599ab17e -Author: Steve Hillier -Date: Thu Oct 18 17:44:11 2018 -0700 - - filter casing sets - -commit f7aa79a56ae688e92e95d2f3c82d1b3dfa9b77ec -Merge: a9315b14f 02a6b4be9 -Author: Steve Hillier -Date: Thu Oct 18 15:42:49 2018 -0700 - - Merge pull request #950 from bcgov/sybrand/polish - - [1321] Additional Unit Tests / Changes to Permissions - -commit e5aa530d3b6e389082214b19706959178c2cc735 -Author: Gary Wong (BC Gov) -Date: Thu Oct 18 12:27:15 2018 -0700 - - ETL Script fix due to legal_pid datatype. - -commit 02a6b4be9194b8bf7f6a2fef4e2c0badd3885ccd -Merge: 9d64f32de a9315b14f -Author: Sybrand Strauss -Date: Thu Oct 18 11:43:15 2018 -0700 - - Merge branch 'release/1.42.0' into sybrand/polish - -commit a9315b14fcdefaf15845673266bb719d4a0dbb45 -Merge: cbed8b5f5 3d1d86c21 -Author: Steve Hillier -Date: Thu Oct 18 09:43:48 2018 -0700 - - Merge pull request #949 from bcgov/steve/polish - - [1321] Well status, accessibility improvements and tests for submissions - -commit 3d1d86c2130e7403ada4cb413f79da3eaca5ae3e -Merge: 2ec4f8b9b cbed8b5f5 -Author: Steve Hillier -Date: Thu Oct 18 09:29:32 2018 -0700 - - merge release branch - -commit cbed8b5f5f6c036cbe0302cc0038010ad58dd156 -Merge: 1d5dc5c57 e7b87009d -Author: Sybrand Strauss -Date: Thu Oct 18 08:44:50 2018 -0700 - - Merge pull request #959 from bcgov/fix/revert_conundrum - - Fix/revert conundrum - -commit e7b87009da5afc4bd7a6fe97199f52af79cfe1cc -Author: Sybrand Strauss -Date: Fri Oct 12 13:00:48 2018 -0700 - - Removed fieldset composition - -commit 544e6ded2273dcd06842cd60f7e2ced18b442c34 -Author: Sybrand Strauss -Date: Thu Oct 11 09:21:25 2018 -0700 - - Updated vue to use appropriate endpoints for submissions (endpoints loaded from options) - -commit bff4bbd626f282343d8d7cf366852f5163b89181 -Author: Sybrand Strauss -Date: Wed Oct 10 15:00:19 2018 -0700 - - All tests pass - -commit 37ab976af6e0b9444004686cef12e84edfc2efb0 -Author: Sybrand Strauss -Date: Wed Oct 10 14:56:36 2018 -0700 - - Fixing bugs relating to stacking - -commit 7e412073dfbff3291d34eab2fa9cbe565dfecdc6 -Author: Sybrand Strauss -Date: Wed Oct 10 13:52:40 2018 -0700 - - Updated tests - -commit 9737598ea094c8503af6b073f0103cefc6803fb5 -Author: Sybrand Strauss -Date: Wed Oct 10 13:50:07 2018 -0700 - - Updated serializer - -commit 38fbd8f2c63563b225a3e34e1fcbf7cda7c30f35 -Author: Sybrand Strauss -Date: Wed Oct 10 12:05:59 2018 -0700 - - Different serializers for different objects - -commit 47fe09fd5e16948cfe086cea33fd72c9e0003e70 -Author: Sybrand Strauss -Date: Wed Oct 10 08:17:25 2018 -0700 - - Modifying serializers for distinct endpoints - -commit cb5a2f6a6eb79bd83796047036a6bfa6f4a37601 -Author: Sybrand Strauss -Date: Wed Oct 3 15:01:40 2018 -0700 - - Getting individual submissions - -commit 1575db9fd247ad6a2f9e72264d0c3e31fb424469 -Author: Sybrand Strauss -Date: Wed Oct 3 14:09:25 2018 -0700 - - Changed serializer to work with decomission - -commit 7092128d82517610df0f722f1c76d03c244d521a -Author: Sybrand Strauss -Date: Wed Oct 3 12:22:24 2018 -0700 - - Adding distinct endpoints for different kinds of submissions - -commit ab1082551d9f1fa41396935889ab4c9e41ff09ef -Author: Sybrand Strauss -Date: Tue Oct 2 16:32:20 2018 -0700 - - Busy adding endpoints - -commit 6ece7eb37a3f5c49b006ee9d7740f8b0f19e6d32 -Author: Steve Hillier -Date: Wed Oct 17 17:05:34 2018 -0700 - - fix preview map - -commit 2ec4f8b9b3dfa4675d3300b8739afb3eaf9d74e0 -Merge: 7643421cd 1d5dc5c57 -Author: Steve Hillier -Date: Wed Oct 17 14:18:11 2018 -0700 - - merge upstream changes - -commit c70179993d50dc91f326d9db449ccd6012d72422 -Author: Steve Hillier -Date: Wed Oct 17 14:15:17 2018 -0700 - - update marker - -commit f649e129b1ad895ff64353f2b5caf6b94c33db6f -Merge: 1128ab114 1d5dc5c57 -Author: Derek Roberts -Date: Wed Oct 17 14:10:01 2018 -0700 - - Merge conflict - -commit 9d64f32de130037598e764f161c58d7e7bd16339 -Merge: 7e7279a1f 7643421cd -Author: Sybrand Strauss -Date: Wed Oct 17 12:54:45 2018 -0700 - - Merge branch 'steve/polish' into sybrand/polish - -commit 9efe6776454abfe4480d737bc269bb47b26cca43 -Author: Sybrand Strauss -Date: Wed Oct 17 12:54:11 2018 -0700 - - Starting working on ticket, but it's been re-prioritized - -commit 1d5dc5c577c5f98f63bfcda72d67479829dcb2c6 -Merge: 3d347eb6f 8ddeb6ddd -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Oct 17 10:13:44 2018 -0700 - - Merge pull request #953 from bcgov/task/1312_tagFix - - [1312] Tag Patch - -commit 3d347eb6f4d4876d913b60369a4443795ba99b2f -Merge: 32b1ddc87 abee08623 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Oct 17 10:10:57 2018 -0700 - - Merge pull request #955 from bcgov/task/1303-glusterfiledb - - [1303] Postgresql - gluster file db - -commit 7e7279a1f890d337460b1838d66d2a279078229b -Author: Sybrand Strauss -Date: Wed Oct 17 08:35:03 2018 -0700 - - Group together for accessibility - -commit abee0862344878bd4e47a366de70247501125cfa -Author: Derek Roberts -Date: Tue Oct 16 15:26:38 2018 -0700 - - Postgres - switch to Gluster File Db - -commit 8ddeb6ddd09a95bcd3f1311c285e4a1c3c39066d -Author: Derek Roberts -Date: Tue Oct 16 14:01:11 2018 -0700 - - Removed extra quote - -commit 4436f18fef42d0ff50a26c8668b2d896e90177a7 -Author: Derek Roberts -Date: Tue Oct 16 13:56:18 2018 -0700 - - Tag workaround - -commit 32b1ddc879d0542faaeb367bec649b59a51a9395 -Merge: 21b791813 f530cf793 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Oct 16 15:11:12 2018 -0700 - - Merge pull request #954 from bcgov/task/1310_dcFixtures - - [1310] Fixtures in Makefile - -commit f530cf7933f678e0747f4a7a53bfa960949212ce -Author: Derek Roberts -Date: Tue Oct 16 15:04:59 2018 -0700 - - Makefile - message on fixture fail - -commit aeabe597bb426cd15b85e0c51e30269b468b1d14 -Author: Derek Roberts -Date: Fri Sep 28 12:36:45 2018 -0700 - - Makefile + 'make fixtures' - -commit fe87a8e1803c1ccd370cf632d582573cdd414074 -Author: Derek Roberts -Date: Fri Sep 28 12:28:36 2018 -0700 - - Daemonized docker-compose, added 'make down' to remove - -commit 7643421cd63481de5a8980cd468b55d3b482e940 -Author: Steve Hillier -Date: Tue Oct 16 12:39:31 2018 -0700 - - use subclass_guid for subclass property - -commit 21b791813abcbb6b9e87edbe1aced365b12fcadf -Merge: 12995da38 21059945f -Author: Sybrand Strauss -Date: Tue Oct 16 12:34:39 2018 -0700 - - Merge pull request #938 from bcgov/steve/aquifers-link - - [1277] use a flag to enable Aquifers link - -commit 21059945f950ca86768d2cc20f92aff440bf6554 -Merge: 1d7ec6315 12995da38 -Author: Sybrand Strauss -Date: Tue Oct 16 12:33:48 2018 -0700 - - Merge branch 'release/1.42.0' into steve/aquifers-link - -commit 12995da38516ede8856b69a39cbb6d6fdf3fa3dd -Merge: 52e4e983a caa9c7c3b -Author: Sybrand Strauss -Date: Tue Oct 16 12:25:00 2018 -0700 - - Merge pull request #945 from bcgov/task/functional_tests_env_vars - - Added secrets for functional tests to Jenkins - -commit a0ff305407b6345db2b2690a4f01d2b1109686d7 -Author: Steve Hillier -Date: Tue Oct 16 12:16:49 2018 -0700 - - add a map - -commit 5f6abaf8435c14eb203a00cd291a2471a8709a0b -Author: Sybrand Strauss -Date: Tue Oct 16 11:51:18 2018 -0700 - - Fixed unit test - -commit 1d7ec6315a132c15a445e8e90a54054466403929 -Author: Steve Hillier -Date: Tue Oct 9 12:54:35 2018 -0700 - - add aquifers flag to deployment config - -commit 50542a3d3fce0e07f691fdf7141eabe3be2ab529 -Author: Steve Hillier -Date: Tue Oct 9 11:00:37 2018 -0700 - - remove extra 'beforeEach' code - -commit 7a011264a01392f7a4c6a0b81bad3c53a4911787 -Author: Steve Hillier -Date: Tue Oct 9 10:58:21 2018 -0700 - - add unit tests for 'show' computed feature - -commit e0e89285dc2ecfe6b5ede19c216f0fe6a21e64d6 -Author: Steve Hillier -Date: Tue Oct 9 10:18:25 2018 -0700 - - use a flag to enable Aquifers link - -commit dfad5d82aa2ff7c69335e9b0cb6d3d40fc272e20 -Author: Sybrand Strauss -Date: Tue Oct 16 11:21:21 2018 -0700 - - Changed formatting and text of wizard/flat selection - -commit 52e4e983a6e1ac40f6bf82903c13bd52e8040f61 -Merge: 59efda5a5 7877cb6bd -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Oct 16 11:18:31 2018 -0700 - - Merge pull request #934 from bcgov/release/1.41.0 - - Merged PR-934 - -commit bc9d178b66ff0804ad23d6f16880aec78bed43f0 -Merge: e5ee69e3f 1d2cbda18 -Author: Sybrand Strauss -Date: Tue Oct 16 10:29:04 2018 -0700 - - Merge branch 'steve/polish' into sybrand/polish - -commit 2f79911626e80527004132be841cd2b1ef0d1cd4 -Author: Steve Hillier -Date: Mon Oct 15 17:12:00 2018 -0700 - - construction/alteration report preview - -commit e5ee69e3f3d7e7070bd51b28a46a80550d29fde0 -Author: Sybrand Strauss -Date: Mon Oct 15 14:51:21 2018 -0700 - - Changed wording on form load/save - -commit 4237bf5f3ed9ec0a59954d1d1f58f814fa723a9e -Author: Sybrand Strauss -Date: Mon Oct 15 14:20:03 2018 -0700 - - Modified some tests - -commit 833283e33838d2aa1b469d0e326c9b8d63aa348e -Author: Sybrand Strauss -Date: Mon Oct 15 13:35:19 2018 -0700 - - Added more tests - -commit 1d2cbda18a6e6a16ab21b2a159952568e2058299 -Author: Steve Hillier -Date: Mon Oct 15 13:21:53 2018 -0700 - - add code tables fixture to tests - -commit 0c5eec17dd5992c1cca7b79fb132d164ffa5c6bf -Author: Steve Hillier -Date: Mon Oct 15 13:03:38 2018 -0700 - - better way to generate unique id for login button - -commit f3585ed93085ca892ffc0249aa2039190d0d6806 -Author: Sybrand Strauss -Date: Mon Oct 15 12:36:29 2018 -0700 - - Simplify permissions somewhat - -commit 8f3c0c91ac66045c148476a84238bb83c8e8c370 -Merge: fbec6c6a8 2123798ed -Author: Steve Hillier -Date: Mon Oct 15 12:35:16 2018 -0700 - - merge upstream into old branch - -commit b2698a9d73b1b0ab43821d58fbdb6540036b3035 -Author: Steve Hillier -Date: Mon Oct 15 12:22:38 2018 -0700 - - remove unused code - -commit e5f531e3faeb4883837e77d4c9aed437dfa45d11 -Merge: c3aa416c5 2123798ed -Author: Steve Hillier -Date: Mon Oct 15 12:21:15 2018 -0700 - - Merge remote-tracking branch 'origin/release/1.42.0' into steve/polish - -commit c3aa416c5de2b2c345d86050309a63a668da7d0a -Author: Steve Hillier -Date: Mon Oct 15 12:17:18 2018 -0700 - - more submissions frontend tests and component cleanup - -commit 9b714543d7928900380e554694573045d7bf9130 -Author: Sybrand Strauss -Date: Mon Oct 15 11:31:11 2018 -0700 - - Go back to auto-creating groups - -commit 7e8e3d6b33d888e9f25441f8d27246efa893bd6a -Author: Sybrand Strauss -Date: Mon Oct 15 09:10:30 2018 -0700 - - Fixed role bug, and changed all other role related code to use singular role rather than collection - -commit 2123798edf3e6069da9cb5aabc73a578154cd512 -Merge: 7a2d58b57 bbeb804de -Author: Sybrand Strauss -Date: Fri Oct 12 13:50:04 2018 -0700 - - Merge pull request #947 from bcgov/feature/360_well_alteration - - Feature/360 well alteration - -commit 7877cb6bdf2f34f20942a90879f32cb08f3bcd2b -Merge: 2e638fae7 ba69c9a26 -Author: Sybrand Strauss -Date: Fri Oct 12 13:48:48 2018 -0700 - - Merge pull request #946 from bcgov/revert-941-feature/360_well_alteration - - Revert "Feature/360 well alteration" - -commit ba69c9a26dc8a0c2272b52a99aea52881b0c9b52 -Author: Sybrand Strauss -Date: Fri Oct 12 13:46:55 2018 -0700 - - Revert "Feature/360 well alteration" - -commit 2e638fae76b25da076a02c295f63136d446bfdb6 -Merge: 585bf33e0 bbeb804de -Author: Sybrand Strauss -Date: Fri Oct 12 13:45:20 2018 -0700 - - Merge pull request #941 from bcgov/feature/360_well_alteration - - Feature/360 well alteration - -commit bbeb804de172c41a63e725290ebdb8f785109604 -Author: Sybrand Strauss -Date: Fri Oct 12 13:00:48 2018 -0700 - - Removed fieldset composition - -commit 676a80ee5976e000e5314911ff2be198c00dad59 -Merge: d771e643d 7a2d58b57 -Author: Sybrand Strauss -Date: Fri Oct 12 11:03:36 2018 -0700 - - Merge branch 'release/1.42.0' into feature/360_well_alteration - -commit caa9c7c3babc6c5bc1979d815a7f2015eb754904 -Author: Sybrand Strauss -Date: Fri Oct 12 10:51:04 2018 -0700 - - Fixed typo - -commit 431a8dec7f56874a6d6499fe22ddb9aa39a744f2 -Author: Sybrand Strauss -Date: Fri Oct 12 10:32:52 2018 -0700 - - Added secrets for functional tests to jenkins - -commit 7a2d58b5795aad80b3f1e1ba62b15e9194f31465 -Merge: cbc1eae43 b567ba8e5 -Author: Sybrand Strauss -Date: Fri Oct 12 08:32:26 2018 -0700 - - Merge pull request #940 from bcgov/task/1298_initialBDDStackUplift - - task/1298_initialBDDStackUplift - -commit 1128ab114a8814eec8ee1c3f2b9058e690d6f8d9 -Author: Steve Hillier -Date: Fri Oct 12 08:16:05 2018 -0700 - - load fixtures in test environment - -commit 3b5fd691744f0609f85134b96033c1bfb7cbfde7 -Author: Steve -Date: Thu Oct 11 23:15:11 2018 -0700 - - fix api test baseurl for test deployment - -commit bf8381fbc1300ffe1e568fd6c0342538e6c53fd9 -Author: Steve Hillier -Date: Thu Oct 11 22:40:44 2018 -0700 - - fix typo in pod selector - -commit aac710296efb7e671ec4ec0ddba3e745ff307bbb -Author: Steve Hillier -Date: Thu Oct 11 22:19:03 2018 -0700 - - add wait after deploying to test - -commit 6c2c2b579277e4ea42a90dc352afd08fa34ef034 -Author: Steve Hillier -Date: Thu Oct 11 21:34:58 2018 -0700 - - add api tests to test pipeline - -commit 45f1b2b6b1b43470456a3417872f96a48e97f488 -Author: Steve Hillier -Date: Thu Oct 11 17:13:55 2018 -0700 - - add api tests - -commit 67bb3dbe7682e12286066ec703bf5fdd660e5fdc -Merge: c3842209b cbc1eae43 -Author: Steve Hillier -Date: Thu Oct 11 15:49:12 2018 -0700 - - Merge branch 'release/1.42.0' into steve/polish - -commit cbc1eae43135325e2e04c48bdd597928e66e9660 -Merge: 585bf33e0 186d90d97 -Author: Steve Hillier -Date: Thu Oct 11 15:12:06 2018 -0700 - - Merge pull request #939 from bcgov/task/416-ViewAnAquifer - - View an Aquifer - -commit b567ba8e5bb3898c60fdf9405abbd7d3e9c2d69a -Author: Nick Phura -Date: Thu Oct 11 14:10:59 2018 -0700 - - Remove unstable present/notPresent tests and util methods. - -commit fbad6b61dc431565531425d503e34bbb593c7746 -Author: Sybrand Strauss -Date: Thu Oct 11 13:27:03 2018 -0700 - - Timeout tweaks - -commit c3842209b00ec0912c8066d4ea1af5d8fa5d6393 -Merge: d508edbb9 d771e643d -Author: Steve Hillier -Date: Thu Oct 11 12:29:42 2018 -0700 - - Merge branch 'feature/360_well_alteration' into steve/polish - -commit d771e643d3e3a042167a244e6b15af80c60665b3 -Author: Sybrand Strauss -Date: Thu Oct 11 09:21:25 2018 -0700 - - Updated vue to use appropriate endpoints for submissions (endpoints loaded from options) - -commit 186d90d9797093df8665f6fa5af43eeb8a069ba9 -Author: Ryan Barber -Date: Wed Oct 10 18:33:03 2018 -0700 - - Updated Aquifer SPA meta data - -commit 799eddd60fe1ad2dfb9c0bc02222f9d9f504b3a8 -Author: Ryan Barber -Date: Wed Oct 10 18:17:36 2018 -0700 - - Various fixes - - - use styling from Well page for print icon - - fix missing attributes (location description, material) - - added border to bottom of header - -commit 85ee02c1c7a4ab86b64948a2fe3452a4ae6ca10f -Author: Ryan Barber -Date: Wed Oct 10 17:07:22 2018 -0700 - - Fixed location description in View - -commit d508edbb9b5f88b0c1489c765e9ee45160929363 -Author: Steve Hillier -Date: Wed Oct 10 16:48:29 2018 -0700 - - move Activity Type selection out of the well type step - -commit 10901b9d072cb28c462905efb46f35bdfb02639e -Author: Steve Hillier -Date: Wed Oct 10 15:34:26 2018 -0700 - - fixes for accessibility - -commit 319d045af569b9126c2cc99317b23e51c3dbf1f2 -Author: Steve Hillier -Date: Wed Oct 10 15:34:19 2018 -0700 - - fix up well_status - -commit f0c93cf8eb4432962762a120eae1245096f51498 -Author: Sybrand Strauss -Date: Wed Oct 10 15:00:19 2018 -0700 - - All tests pass - -commit c242ac369b0319c1e5d3ce6abadcb8dee44faa81 -Author: Sybrand Strauss -Date: Wed Oct 10 14:56:36 2018 -0700 - - Fixing bugs relating to stacking - -commit a9a3052fa59282d3ed69e3f9dc542bfd14eb9423 -Author: Steve Hillier -Date: Wed Oct 10 14:25:31 2018 -0700 - - Add a well_status based on current submission type - -commit 4c15b29f38beafc8000ef3d198c5f0ac900a9ca7 -Merge: 211564a4a 585bf33e0 -Author: Sybrand Strauss -Date: Wed Oct 10 13:56:01 2018 -0700 - - Merge branch 'release/1.41.0' into feature/360_well_alteration - -commit 211564a4af72a5256d2317bc60a270158cdb22da -Author: Sybrand Strauss -Date: Wed Oct 10 13:52:40 2018 -0700 - - Updated tests - -commit a0c1911531c28e22ac63d933809d0f6a48bccab3 -Author: Sybrand Strauss -Date: Wed Oct 10 13:50:07 2018 -0700 - - Updated serializer - -commit a5e5d0f0b3d29effa15eaa559d1d3dd18b9602bd -Author: Sybrand Strauss -Date: Wed Oct 10 12:05:59 2018 -0700 - - Different serializers for different objects - -commit 67bce456a88247edb6843cd5cefa83efed59ce4f -Author: Sybrand Strauss -Date: Wed Oct 10 10:22:57 2018 -0700 - - Changed name of secret env file - -commit b2469b8a2912b58e6e889af41b9e994b60f36133 -Author: Sybrand Strauss -Date: Wed Oct 10 10:20:46 2018 -0700 - - Remove .envrc from gitignore - -commit 5b36989a6490283d556b5b0f0a314320757d6854 -Author: Sybrand Strauss -Date: Wed Oct 10 10:19:22 2018 -0700 - - Added in .envrc - -commit 63f262db39ebaf393275fc6990f7d50b11e08b2e -Author: Sybrand Strauss -Date: Wed Oct 10 10:17:14 2018 -0700 - - Added test usernames - -commit 43174bd124458afde227a756a91854d5f11f177e -Author: Sybrand Strauss -Date: Wed Oct 10 08:17:25 2018 -0700 - - Modifying serializers for distinct endpoints - -commit fbec6c6a808c17d933ad9abc06cf81acee0968bc -Author: Steve Hillier -Date: Tue Oct 9 17:11:20 2018 -0700 - - well location laid out - -commit 19131fb9c0c7cf119c5afc2fd6ca3b4fa174377e -Author: Nick Phura -Date: Mon Sep 24 16:59:23 2018 -0700 - - Initial BDD uplift of pages and specs. - Add new workflow specs. - Add/update some IDs. - Add apache license blurbs. - -commit c924c6c128328b9d6dcc1ba6b458ba764ec89658 -Author: Steve Hillier -Date: Tue Oct 9 14:07:39 2018 -0700 - - preview: start of Well Summary section - -commit 28e2d70b5c0ba99d363a120a993a7301905f2238 -Author: Ryan Barber -Date: Tue Oct 9 14:07:23 2018 -0700 - - quality_concert -> quality_concern - -commit 6e8c394b42e9ff3cef0c3717af415acae9437860 -Author: Ryan Barber -Date: Sun Oct 7 17:51:24 2018 -0700 - - Make font-awesome work - -commit b28dd0b8da98fb0ae654832fd4e29a53ff7f7bd5 -Author: Ryan Barber -Date: Sun Oct 7 17:44:04 2018 -0700 - - Lint - -commit e5db723bdbef182be8cdbeb7927acf04b3d8d2fd -Author: Ryan Barber -Date: Wed Oct 3 12:17:15 2018 -0700 - - Added Retrieve component spec - -commit 5ae73cf3eb4a40ed0442e0dddbe3317dbc65187b -Author: Ryan Barber -Date: Wed Oct 3 11:31:19 2018 -0700 - - Rework Search spec - -commit f3f8c6afb39a44728ea5ff58a7984955d9db811c -Author: Ryan Barber -Date: Tue Oct 2 22:24:17 2018 -0700 - - Enable DEBUG to activate CORS on localhost - -commit d4b1fa671f2fd374a83d7c2b28078ddd86ba7f71 -Author: Ryan Barber -Date: Tue Oct 2 22:23:19 2018 -0700 - - Added Retrieve component and routes - -commit 84ccde7a0d5fd2cafac56fa965544c84e62333cf -Author: Ryan Barber -Date: Tue Oct 2 22:21:38 2018 -0700 - - Simplify Search, add link to Retrieve view - -commit 398f3270964f2a6ffcc15a5babd22c742bbe1d94 -Author: Ryan Barber -Date: Tue Oct 2 22:20:10 2018 -0700 - - Added quality_concern to serializer - -commit 98bf47917aaa10989b7237b0863d4b5042130f19 -Author: Ryan Barber -Date: Tue Oct 2 07:40:06 2018 -0700 - - Add aquifers ot webpack.dev-watch.conf - -commit 0d2abb1ff505e076de35fda4c1d88d8438f00bd5 -Author: Ryan Barber -Date: Tue Oct 2 07:38:36 2018 -0700 - - Added retrieve endpoint + postman test - -commit f6406adba4afeb8c5a84164c9bc60fdf60f76df2 -Author: Steve Hillier -Date: Tue Oct 9 12:53:26 2018 -0700 - - start preview feature - -commit 585bf33e02ea762f7adc08ba8032d0b8ce6cab2d -Merge: 396aad7a0 2a03aca4d -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Oct 9 10:24:00 2018 -0700 - - Merge pull request #920 from bcgov/task/idpHintEnhancement - - Merged PR-920 - -commit a81ef722dc038df9947fa1eb2bb7c60ef36cd6c7 -Author: Steve Hillier -Date: Sat Oct 6 18:55:57 2018 -0700 - - fix typo in database image tag - -commit 919f47a2fd34da8aa43f178a75ae2238f21fb499 -Author: Steve Hillier -Date: Sat Oct 6 15:41:55 2018 -0700 - - full dev/test pipeline - -commit 07c942617a9eb9a053146a1181514b0d9575b527 -Author: Steve Hillier -Date: Fri Oct 5 17:09:09 2018 -0700 - - working test deployment - -commit 396aad7a035636ea31a245de130fcdfe3faa2ce7 -Merge: 91a915d0e 2c4f13517 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Oct 5 16:10:52 2018 -0700 - - Merge pull request #929 from bcgov/feature/1245_aquifers_migrate - - Merged PR-929 - -commit 70c5c567379e635ef560b948710f9e6854c8549e -Author: Steve Hillier -Date: Fri Oct 5 14:21:29 2018 -0700 - - fix up exec script - -commit 68dc31fa185ccc3acda61209848c725e52975cda -Author: Steve Hillier -Date: Fri Oct 5 14:15:28 2018 -0700 - - load fixtures - -commit 2c4f13517fcd1ee0077189791e9002c899a613f1 -Merge: 4a889e3a9 91a915d0e -Author: Gary Wong (BC Gov) -Date: Fri Oct 5 14:14:34 2018 -0700 - - Merge branch 'release/1.41.0' of github.com:bcgov/gwells into feature/1245_aquifers_migrate - -commit 91a915d0e99fa77383edfc1fcd6950b417b9a1a5 -Merge: 109eb7dac 7ef538e06 -Author: Steve Hillier -Date: Fri Oct 5 14:12:38 2018 -0700 - - Merge pull request #937 from bcgov/fix/closuretests - - fix failing frontend unit test - -commit 0a01127dcf2cceeb2cf7454a14422b0bb701d3a3 -Author: Steve Hillier -Date: Fri Oct 5 13:35:13 2018 -0700 - - add in API tests - -commit 7ef538e06deac69b163244588286b667965bb970 -Author: Steve Hillier -Date: Fri Oct 5 12:59:42 2018 -0700 - - fix unit test to reflect correct number of starting rows - -commit 297b2a6eb0ba3faccc66fbdcecae33dcab64343c -Author: Steve Hillier -Date: Fri Oct 5 12:43:58 2018 -0700 - - remove extra build step - -commit 7be6b9e4a6de0435212a99610267764e1f94a612 -Author: Steve Hillier -Date: Fri Oct 5 10:52:20 2018 -0700 - - label dc - -commit ab66128a30a77ed70e63afa5046fa54782a7b5ee -Author: Steve Hillier -Date: Fri Oct 5 10:51:11 2018 -0700 - - remove python-runtime image - -commit 4a889e3a99a1ac5fdc7a747efbd1befb465e1a28 -Author: Gary Wong (BC Gov) -Date: Fri Oct 5 10:02:40 2018 -0700 - - Removed incorrect alpha characters from legal_pid attribute in .json file - -commit 03ef524024242d0ae163736ccabcc05af7a6f811 -Merge: 54243eb6d 109eb7dac -Author: Gary Wong (BC Gov) -Date: Fri Oct 5 09:52:27 2018 -0700 - - Merge branch 'release/1.41.0' of github.com:bcgov/gwells into feature/1245_aquifers_migrate - -commit 654d240fb15bf16dcd012d5b5e5881c2537f641d -Author: Steve Hillier -Date: Fri Oct 5 08:24:52 2018 -0700 - - remove package installs from Dockerfile - -commit fb7183a7ac03cad2dfe6b8ec9d47bc58c87589bc -Author: Steve Hillier -Date: Fri Oct 5 08:17:01 2018 -0700 - - put node modules install back in assemble script - -commit b633c2c1f08e701beceb2d4c600dae9d767c848e -Author: Steve Hillier -Date: Thu Oct 4 23:02:52 2018 -0700 - - reference different base image - -commit 59b0d8182c169ba2115d144b734e001a80efb99b -Author: Steve Hillier -Date: Thu Oct 4 22:57:31 2018 -0700 - - fix add commands - -commit 0642ef9b6e081bc794de0226068ccd5ebd12db41 -Author: Steve Hillier -Date: Thu Oct 4 22:56:37 2018 -0700 - - try different path to file - -commit f85b2b5263941bbcec9673be9c10845a25646203 -Author: Steve Hillier -Date: Thu Oct 4 22:38:35 2018 -0700 - - checking files in container... - -commit d53ca8bd68145e53897cea86914be71e77e9603b -Author: Steve Hillier -Date: Thu Oct 4 22:34:51 2018 -0700 - - try different path to requirements.txt - -commit 8fbb45a0a8d15816237e8a1600e5e70de7143d9d -Author: Steve Hillier -Date: Thu Oct 4 22:30:48 2018 -0700 - - try caching build deps - -commit 2478031439779487e8944b1cb088094b29747f6f -Author: Steve Hillier -Date: Thu Oct 4 21:46:30 2018 -0700 - - add copying of secrets/configs to pipeline - -commit 4477075b2eb5bb57e2fea557902be73e4d263151 -Author: Steve Hillier -Date: Thu Oct 4 15:51:19 2018 -0700 - - update template objects - -commit b5c5871807ed2dbf1385af00c29a8b57b2610494 -Author: Steve Hillier -Date: Thu Oct 4 12:25:56 2018 -0700 - - add tagging to kick off deployment - -commit 97f2591e86e458bd9de0f1d24526fe7c3930e762 -Author: Steve Hillier -Date: Thu Oct 4 09:38:37 2018 -0700 - - change the way app images are tagged (when built) - -commit e27866d12b2943593289ae0f312191cdac2cb6a5 -Author: Steve Hillier -Date: Wed Oct 3 22:48:15 2018 -0700 - - fix deployment config name - -commit 7ea4b349d6a962455f775520e5f33a4acb3edd33 -Author: Steve Hillier -Date: Wed Oct 3 22:34:47 2018 -0700 - - add missing label parameter - -commit b1174b57e9027512c4fcc79b67b5816236fb73ee -Author: Steve Hillier -Date: Wed Oct 3 22:21:41 2018 -0700 - - change labels - -commit 269533423ec03e9c6d0c3e8ce2d7a8d7811ad2c4 -Author: Steve Hillier -Date: Wed Oct 3 21:49:25 2018 -0700 - - change source ref to point at PR - -commit c979ec67a7d793c7c22b1cf7f4c8f34780428fef -Author: Steve Hillier -Date: Wed Oct 3 21:36:31 2018 -0700 - - add missing env name - -commit 391563a6d17c092a3de4c2d5ecbcfa14ce6da491 -Author: Steve Hillier -Date: Wed Oct 3 17:57:05 2018 -0700 - - update Jenkinsfile (build templates now working) - -commit f6c74296f012809894ab0535f8d016b18cbe78c3 -Author: Steve Hillier -Date: Wed Oct 3 17:42:57 2018 -0700 - - change git ref - -commit 40ea2d97d737df1739226687e1ad20bbcb4dee4d -Author: Steve Hillier -Date: Wed Oct 3 17:11:21 2018 -0700 - - change repo reference - -commit 9cee35457f596522237a701323592de83f763a3e -Author: Steve Hillier -Date: Wed Oct 3 16:03:06 2018 -0700 - - fix git reference - -commit e7c242694b7998f244f9d0fc3388e30b60ab8b29 -Author: Steve Hillier -Date: Wed Oct 3 15:58:47 2018 -0700 - - add more labels to base images - -commit c69ac23c73e8b0b8e8a7257b844c07479ca5cfb3 -Author: Steve Hillier -Date: Wed Oct 3 15:47:30 2018 -0700 - - add label to bc - -commit 65a5f3295af0fa0bbd3e19b25e5dc3c07cc349f0 -Author: Steve Hillier -Date: Wed Oct 3 15:45:42 2018 -0700 - - fix labels - -commit 0dde8e24073ee785baa5773f0c451a513c64a67f -Author: Steve Hillier -Date: Wed Oct 3 15:26:13 2018 -0700 - - add labels to resources - -commit 81b370a06268f8a7e5f381d0b64afac78ea9a420 -Author: Sybrand Strauss -Date: Wed Oct 3 15:01:40 2018 -0700 - - Getting individual submissions - -commit ab1e3b74243b9e0f13704403feda67b380f39954 -Author: Steve Hillier -Date: Wed Oct 3 14:37:44 2018 -0700 - - add project name into jenkinsfile (temporarily hardcoded) - -commit d58ae69df8e8e9db3f0eda86cdf3387685397845 -Author: Steve Hillier -Date: Wed Oct 3 14:30:47 2018 -0700 - - updates to db deployment - -commit 09e755490d765e6baac8b265b9e8d907b4c42b37 -Author: Steve Hillier -Date: Wed Oct 3 14:11:47 2018 -0700 - - basic Jenkinsfile - -commit 830d8994295b7b2100b3e443dfac0e544ad9757d -Author: Sybrand Strauss -Date: Wed Oct 3 14:09:25 2018 -0700 - - Changed serializer to work with decomission - -commit 2a03aca4d919ba91853f2ee9fa3ad310b7d09350 -Author: Nick Phura -Date: Wed Oct 3 13:13:51 2018 -0700 - - Update "idir" default - -commit 749181ac27583900af94feca848f3039d7c69bcc -Author: Nick Phura -Date: Wed Oct 3 13:08:03 2018 -0700 - - Add "idir" as default value. - -commit e153c7fd5d97e2122657b739139e359f130d1414 -Merge: 2a8b63767 109eb7dac -Author: Sybrand Strauss -Date: Wed Oct 3 12:38:46 2018 -0700 - - Merge branch 'release/1.41.0' into feature/360_well_alteration - -commit 2a8b6376751e0027df5ad93ee2932b78436845d0 -Author: Sybrand Strauss -Date: Wed Oct 3 12:22:24 2018 -0700 - - Adding distinct endpoints for different kinds of submissions - -commit 109eb7dac585bca7e66a39381d91478e505581e3 -Merge: 942855cbe 8662ceef8 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Oct 3 12:08:08 2018 -0700 - - Merge pull request #914 from bcgov/feat/decom - - Merged PR-914 - -commit 54243eb6d7c8471c5429a39b67871284074bb097 -Author: Gary Wong (BC Gov) -Date: Wed Oct 3 11:27:25 2018 -0700 - - Rename Aquifers.quality_concert to Aquifers.quality_concern. - -commit f3d4ce12d4c5e752d505a783904e129579cbca86 -Merge: 050725f91 942855cbe -Author: Gary Wong (BC Gov) -Date: Wed Oct 3 11:03:42 2018 -0700 - - Merge branch 'release/1.41.0' into feature/1245_aquifers_migrate - -commit a08e6065edede184292b112c312f7ef99eac434c -Merge: 851259ad6 942855cbe -Author: Sybrand Strauss -Date: Tue Oct 2 16:43:26 2018 -0700 - - Merge branch 'release/1.41.0' into feature/360_well_alteration - -commit 942855cbe7acb12fc73c76d5e2bc5df5d8b051c5 -Merge: 5d312ab1c 59efda5a5 -Author: Sybrand Strauss -Date: Tue Oct 2 16:33:23 2018 -0700 - - Merge branch 'master' into release/1.41.0 - -commit 851259ad603b071be7c8ff53b2dea3a1bba1c33c -Author: Sybrand Strauss -Date: Tue Oct 2 16:32:20 2018 -0700 - - Busy adding endpoints - -commit 5d312ab1c28449355540cdab45fe026f873676fc -Merge: 7857bef8b 835f5c28e -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Oct 2 12:47:54 2018 -0700 - - Merge pull request #932 from bcgov/bugfix/1243_submission_various - - Merged PR-932 - -commit 050725f91e872f73182d4f815680732d6bc1bffe -Merge: 6c5dffcca 7857bef8b -Author: Gary Wong (BC Gov) -Date: Tue Oct 2 11:08:40 2018 -0700 - - Merge branch 'release/1.41.0' of github.com:bcgov/gwells into feature/1245_aquifers_migrate - -commit 8662ceef8bbb2486f9661ff634002ff9daa9c191 -Author: Steve Hillier -Date: Tue Oct 2 10:59:42 2018 -0700 - - fix up stacking of decommission reports - -commit 8f438374bc1f782ed8e22354b638715886fb078d -Author: Steve Hillier -Date: Tue Oct 2 10:37:55 2018 -0700 - - remove fields from component - -commit 7b8d6f2fbbe3b86ce9eb8dba43c68010ab3580b4 -Author: Steve Hillier -Date: Tue Oct 2 10:37:14 2018 -0700 - - allow re-loading of components when switching between report types - -commit b14b90c0173a4a42ffcd522a08b6dde5f77612b3 -Merge: f2236fe97 835f5c28e -Author: Steve Hillier -Date: Tue Oct 2 10:10:49 2018 -0700 - - Merge branch 'bugfix/1243_submission_various' into feat/decom - -commit f2236fe97207a765dcd3e35f4a33069fbf354452 -Author: Steve Hillier -Date: Tue Oct 2 10:10:19 2018 -0700 - - remove fields and start decommission info at 6 rows - -commit 835f5c28e0c6b2ef2efcc9741004fdd59498d958 -Author: Sybrand Strauss -Date: Tue Oct 2 09:23:54 2018 -0700 - - Attempt to force re-build - -commit 4c059f9b7bf188131780e8b19d2185c75b6656be -Author: Steve Hillier -Date: Mon Oct 1 16:23:27 2018 -0700 - - select decommission material with dropdown - -commit 0ddf6ea2202ddc481e1e7e4d2cc838900a1449df -Author: Sybrand Strauss -Date: Mon Oct 1 15:20:55 2018 -0700 - - Changed ft. to ft, and added * to postal code - -commit 1afbc073ab13694077bcf883d3e29cebb0d82b19 -Author: Steve Hillier -Date: Mon Oct 1 14:21:31 2018 -0700 - - bug fixes for decommission submissions - -commit d9720080ef5d6deda49709086bcb8f04d02238f4 -Merge: 9795c4c70 7857bef8b -Author: Sybrand Strauss -Date: Mon Oct 1 14:00:44 2018 -0700 - - Merge branch 'release/1.41.0' into bugfix/1243_submission_various - -commit 18a8407ceb48feb1f66d0a3f41eafa768d5c568e -Merge: 9c3472e0d 9795c4c70 -Author: Steve Hillier -Date: Mon Oct 1 13:14:48 2018 -0700 - - merge upstream model changes - -commit 7857bef8be1e20cccfe3a14468a249904a2d9c8a -Merge: e74089efd 7c82441f2 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Oct 1 13:11:24 2018 -0700 - - Merge pull request #926 from bcgov/task/850-SearchForAnAquifer - - Merged PR-926 - -commit 9795c4c70e50f4e1c527cbed17db390c6928d88d -Author: Sybrand Strauss -Date: Mon Oct 1 13:06:59 2018 -0700 - - Fixed fixture - -commit 9c3472e0deb67bd0863ca0de70afc9628e4fe3e8 -Author: Steve Hillier -Date: Mon Oct 1 13:03:21 2018 -0700 - - layout fixes - -commit 5465201dc234f10ddc934fa225f9e7a3377d2e24 -Author: Sybrand Strauss -Date: Mon Oct 1 12:59:30 2018 -0700 - - Added tests - -commit 209cc1164a7dc54a597aeeb74e834c17335bad12 -Author: Sybrand Strauss -Date: Mon Oct 1 12:55:23 2018 -0700 - - Fixed set name, changed migration - -commit dad995607423daa4d761bdb1f2170f0c23e9b105 -Author: Steve Hillier -Date: Mon Oct 1 12:39:31 2018 -0700 - - fix migration conflict - -commit 7c82441f24eb1a6435397f03d77cd8a86f3c70ee -Author: Ryan Barber -Date: Mon Oct 1 12:37:50 2018 -0700 - - Fixed label spelling - -commit 7ab1dcc2536afcefb4021cfe8470d5ccc67e15e2 -Author: Sybrand Strauss -Date: Mon Oct 1 12:36:32 2018 -0700 - - Updating fixtures - -commit a6dba732710dd1cd152103a164478921ea066695 -Author: Sybrand Strauss -Date: Mon Oct 1 12:09:23 2018 -0700 - - Moving files and remove console.log - -commit f1fbe8de27101e8b8af39d4ab1c4ea9421afea23 -Author: Sybrand Strauss -Date: Mon Oct 1 12:04:15 2018 -0700 - - Moving content to old filenamne - -commit 796671a1f8c7dd8112684da0d22b20d73440f57a -Author: Sybrand Strauss -Date: Mon Oct 1 12:02:23 2018 -0700 - - Moving file - -commit 78483b1f7ed48fe584b1bfac33f2c8223cecd61e -Author: Sybrand Strauss -Date: Mon Oct 1 12:01:51 2018 -0700 - - Put casing changes into original - -commit 1d7431287517e255761e46d391854ebef05caf4a -Author: Ryan Barber -Date: Mon Oct 1 11:53:16 2018 -0700 - - Updated aquifers link - - - hide the link based on data.show - - correct id name - -commit 5a233575097a26f00d56bd4935bcfef93a2b70ca -Author: Ryan Barber -Date: Mon Oct 1 11:52:46 2018 -0700 - - Added npm run watch-all-test - -commit 18a76bcffb4c813d082fd31e776084fbd475cb5a -Author: Ryan Barber -Date: Mon Oct 1 11:51:24 2018 -0700 - - Revert "jest --watchAll for docker environment" - - This reverts commit e7db15efa401c1eac856fbe353a376c932ce1c88. - -commit 3f1396b26fe87609efdacdbc38961c67d7a5cf7a -Merge: bb2154fa3 3136ec300 -Author: Steve Hillier -Date: Mon Oct 1 11:49:24 2018 -0700 - - merging upstream changes - -commit 3136ec300932d0398deb9b2857f4beab2c558cdd -Author: Sybrand Strauss -Date: Mon Oct 1 11:46:31 2018 -0700 - - Added defaults back in for unit tests - -commit 8de4ec9bd8d8a678bca9e732bdceaeaa2bcd37f6 -Author: Sybrand Strauss -Date: Mon Oct 1 11:18:51 2018 -0700 - - Renamed test files, fixed migration step - -commit e7db15efa401c1eac856fbe353a376c932ce1c88 -Author: Ryan Barber -Date: Mon Oct 1 10:00:48 2018 -0700 - - jest --watchAll for docker environment - - jest --watch fails in the docker environment because it doesn't know about the git repo - - > --watch is not supported without git/hg, please use --watchAll - -commit cc6eed0734dae8590861ed9b6e9876bb0e83f709 -Author: Ryan Barber -Date: Mon Oct 1 09:58:41 2018 -0700 - - Fix __str__ method for Aquifers model - -commit e66e55ff60956ec2fcdec9845444c114fc0aecd0 -Author: Sybrand Strauss -Date: Mon Oct 1 09:43:43 2018 -0700 - - Fixed formatting issue - -commit ce14764849ee0c2fc20ce96c010dd1974e4c4860 -Author: Sybrand Strauss -Date: Mon Oct 1 09:38:24 2018 -0700 - - Added error messages for required fields - -commit b1e163952491777c68e5ddd3db83e96624314ccb -Author: Sybrand Strauss -Date: Mon Oct 1 09:22:40 2018 -0700 - - Merge conflict - -commit bedf2e83da740eb4fcc225166f5cf3e0534f0089 -Author: Sybrand Strauss -Date: Mon Oct 1 09:12:32 2018 -0700 - - Changed TZ to match what gary is entering - -commit 27d8f5726adf898742ea67f0988dd87b679b326f -Author: Sybrand Strauss -Date: Mon Oct 1 09:10:55 2018 -0700 - - Updated migrations to match current release branch - -commit 96b7aacf233b1ed49bc52b0f2f36ac1acd86c80e -Author: Ryan Barber -Date: Mon Oct 1 09:06:38 2018 -0700 - - Added tests for aquifers/components/Search.vue - -commit afb3013ddfa438fa47b0877f9838d26f4e0398b3 -Merge: 0be9fbb33 e74089efd -Author: Sybrand Strauss -Date: Mon Oct 1 08:54:10 2018 -0700 - - Merge branch 'release/1.41.0' into bugfix/1243_submission_various - -commit 78d7f4684845dd26ae833ba1f465c9da091cb249 -Author: Ryan Barber -Date: Sun Sep 30 19:42:53 2018 -0700 - - Applied common button styles - -commit acf8e3683a7b3f3442cbd5c5a7ef40463380ea05 -Author: Ryan Barber -Date: Sun Sep 30 19:26:09 2018 -0700 - - Use foreign key descriptions in search results - -commit 6c5dffcca695a3cfd52c0460f5762fb98453c29a -Author: Gary Wong (BC Gov) -Date: Fri Sep 28 15:37:11 2018 -0700 - - Refactored table alias to match other usages. - -commit c2e46e83e2e7850ff5785744620e3b7acde1440d -Merge: 6d8777272 e74089efd -Author: Gary Wong (BC Gov) -Date: Fri Sep 28 11:19:48 2018 -0700 - - Merge branch 'release/1.41.0' of github.com:bcgov/gwells into feature/1245_aquifers_migrate - -commit 6d8777272babd7fef897f70bbc7f6c78d87f85ee -Author: Gary Wong (BC Gov) -Date: Fri Sep 28 11:17:54 2018 -0700 - - Fixed 'naive datatype' issue when loaddata - -commit c967753e8f6d78f019c4af048f9fb2b9f93fa26b -Author: Ryan Barber -Date: Thu Sep 27 15:29:28 2018 -0700 - - Forgot a comma! - -commit cf400d64386e629c1c647d821b5fcb5d1d20ac52 -Author: Ryan Barber -Date: Thu Sep 27 12:58:23 2018 -0700 - - Added aquifers home view - -commit 7dc21eb82438d2588d0e08781f19d5b302f04432 -Author: Ryan Barber -Date: Thu Sep 27 11:12:26 2018 -0700 - - Added aquifers frontend with list/search - -commit 5595a14623d285c4a3b02bfcdc97a0882a468c99 -Author: Ryan Barber -Date: Thu Sep 27 11:01:56 2018 -0700 - - Added aquifer list API endpoint - -commit f1b55f1ba524619076df5cf8cbb46374baf909d8 -Author: Ryan Barber -Date: Wed Sep 26 15:26:12 2018 -0700 - - Added Aquifers link to Header component - -commit e74089efd36fbe1df68e479299d66fbfb10ec6ca -Merge: a190b0202 7b51700c6 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Sep 28 11:07:17 2018 -0700 - - Merge pull request #928 from bcgov/feature/1245_aquifers_migrate - - Merged PR-928 - -commit 7b51700c6836d3f08ad20d15539b262e1935ec66 -Author: Gary Wong (BC Gov) -Date: Fri Sep 28 10:32:44 2018 -0700 - - Created sample Aquifers test data, without related data. Also fixed avi<=>aquifer_vulnerability_code mixup. - -commit bb2154fa34de54b38711eba4eb519ed031952acf -Author: Steve Hillier -Date: Thu Sep 27 17:30:45 2018 -0700 - - fix import - -commit 9c5b3e4fd70907a7f24a1e98ea7129abe594b4a8 -Author: Steve Hillier -Date: Thu Sep 27 17:28:39 2018 -0700 - - add decommission information - -commit a190b02020ca7bafd531dca8543e2ca39968842b -Merge: 70c0ce1e5 d91e7e9d8 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 27 17:01:02 2018 -0700 - - Merge pull request #923 from bcgov/task/1291_docker-compose - - Merged PR-923 - -commit d91e7e9d8901b1b6a871c4a96d0a320a9b6958df -Author: Derek Roberts -Date: Wed Sep 26 23:20:53 2018 -0700 - - Nuke testing db with 'make db-clean' - -commit 4d92876f84ece87209fcf1d4cdddacd234e7cda0 -Author: Derek Roberts -Date: Wed Sep 26 22:56:53 2018 -0700 - - Keep node_modules in container only, do not sync back - -commit 36f9d63189f5af9a4ff160cb8149c95a8166961b -Author: Derek Roberts -Date: Wed Sep 26 18:12:30 2018 -0700 - - More cleanup, moved psql-dev under ./tmp - -commit 7ac918b607ff63cd9a4c553c3b124f147d178ecc -Author: Derek Roberts -Date: Wed Sep 26 17:50:45 2018 -0700 - - File, folder and path cleanup - - Dockerfile cleanup, moved docker-images under ./openshift - -commit 898b3f9a50de6597e062358d192a338f1b82aef4 -Author: Derek Roberts -Date: Wed Sep 26 17:40:12 2018 -0700 - - Persist dc db in ./database/psql-dev, exclude w/ .gitignore - -commit 8a4982753263de3f91fa5ece24eb211ae7d713ea -Author: Derek Roberts -Date: Wed Sep 26 17:05:33 2018 -0700 - - OS X Setup and Readme replaced by Makefile and Docker Compose - -commit 46bec3abb32840324ad305e3e385dcce7f6bb1a0 -Author: Derek Roberts -Date: Wed Sep 26 17:05:00 2018 -0700 - - Updated README for docker compose / make - -commit f6fbf94ebaf0e2055dc95e78185fe37c2a050e42 -Author: Derek Roberts -Date: Wed Sep 26 15:40:10 2018 -0700 - - Added Makefile for convenient docker compose runs and stops - -commit 69d36d2ba635d6b437136d60cb6ab528df443a14 -Author: Derek Roberts -Date: Wed Sep 26 14:46:20 2018 -0700 - - Use NPM_CMD= to change npm run <...> in webapp - - Remove useless var - -commit 590bc657f23dc9c930b2915af1b410bb10f110ff -Author: Derek Roberts -Date: Wed Sep 26 14:44:12 2018 -0700 - - Jenkinsfile cleanup - -commit 9979b56b12facf75ec99e3e01512778c9963f05c -Author: Derek Roberts -Date: Wed Sep 26 11:18:59 2018 -0700 - - dc change session cookie flags to false - -commit d8f323c5209a51c2ba8a76c1a4a05a386c80b315 -Author: Derek Roberts -Date: Wed Sep 26 11:17:25 2018 -0700 - - dc use images, not Dockerfiles, use shared volumes - -commit 4774dd50763350358c655459847bc94e7c847b35 -Author: Derek Roberts -Date: Tue Sep 25 16:36:59 2018 -0700 - - Removed api/Dockerfile, using external image - -commit ed94a55ece3b6254a92eb9ff437433fe9598fb5c -Author: Derek Roberts -Date: Tue Sep 25 15:47:45 2018 -0700 - - Removed webapp/Docker, using external image - -commit 107d6e01466783d1807a82c0ea5520b2bec6900a -Author: Derek Roberts -Date: Tue Sep 25 15:35:32 2018 -0700 - - Moved .dockerignore to new context - -commit dbdda948432f3b8cdd105ad18439f835b7800cc0 -Author: Derek Roberts -Date: Tue Sep 25 15:34:49 2018 -0700 - - Removed db/Dockerfile, using external image - -commit e49347ed188d102d60ca4486d60dea163a9a8726 -Author: Steve Hillier -Date: Tue Sep 25 11:35:06 2018 -0700 - - move context dir up one level - -commit f38e965cddd90547e3ffd4bce60207866ff85e74 -Author: Steve Hillier -Date: Mon Sep 24 10:24:22 2018 -0700 - - update paths - -commit 2cc28dd3be993e3c3a2dd3b2b71959acad273e05 -Author: Steve Hillier -Date: Thu Jul 19 15:15:37 2018 -0700 - - add readme section for using docker-compose - -commit 67a6a21d3c2542dab9b580d4575a191282a88071 -Author: Steve Hillier -Date: Thu Jul 19 14:43:31 2018 -0700 - - use postgres version 9.5 - -commit f37a69dc486c7a51c6281ff514efb64ec80d7a2c -Author: Steve Hillier -Date: Thu Jul 19 09:19:23 2018 -0700 - - fix python version to 3.6 - -commit c934debd583b89724cce244dbd11f4de4c355c44 -Author: Steve Hillier -Date: Mon Jul 2 21:17:00 2018 -0700 - - remove unused dockerfile - -commit 40b9233d1cc32851bde7d01b99bc858368671c5b -Author: Steve Hillier -Date: Mon Jul 2 21:08:04 2018 -0700 - - containerized local dev environment - -commit 70c0ce1e51f80f00186a0aff9e28059a5ca0774c -Merge: 1a7d4360b 5277571fa -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 27 15:06:13 2018 -0700 - - Merge pull request #921 from bcgov/feature/1245_aquifers_migrate - - Merged PR-921 - -commit 0be9fbb33514b24732ce8892c73bd43329eab84f -Author: Sybrand Strauss -Date: Thu Sep 27 14:55:45 2018 -0700 - - Removed empty whitespace - -commit fcae434d523111a19f1815fb8b47cbfd2062f099 -Author: Sybrand Strauss -Date: Thu Sep 27 14:55:08 2018 -0700 - - Made some required fields to stop empty sets from being created - -commit 59efda5a5cda56f81a1cf7e5633eb632d874cad0 -Merge: c09681824 d7c5b2617 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 27 14:31:59 2018 -0700 - - Merge pull request #927 from bcgov/stephenhillier-patch-1 - - Merged PR-927 - -commit 5277571fa27943b4d73276bc1f5b12d535033cb9 -Author: Sybrand Strauss -Date: Thu Sep 27 13:35:54 2018 -0700 - - Fixed pep8 issues - -commit 4ac1059b3f915d40271b6d2223c66680104d885c -Author: Sybrand Strauss -Date: Thu Sep 27 13:27:14 2018 -0700 - - Added comment - -commit e6e4926ea49002b654594e2d21783eb1cacba811 -Author: Sybrand Strauss -Date: Thu Sep 27 13:25:18 2018 -0700 - - Resolving various conflicts - -commit d7c5b26179f4074061f6a50dfcb9b2b758c86a5d -Author: Steve Hillier -Date: Thu Sep 27 12:32:36 2018 -0700 - - Update README.md - -commit 2a95171b3da7cc25c680a057d2fce92fdeccc26c -Merge: 46df931b9 1a7d4360b -Author: Sybrand Strauss -Date: Thu Sep 27 11:39:57 2018 -0700 - - Merge branch 'release/1.41.0' into feature/1245_aquifers_migrate - -commit 1a7d4360b29e03b4e9d5b245fa30ff4a4c50f5d5 -Merge: a198f38b3 32453c91a -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 27 11:31:16 2018 -0700 - - Merge pull request #925 from bcgov/fix/resolve_hotfix_migration_conflict - - Merged PR-925 - -commit 07a7dc0a04ff58ad1d147e6db6f4894d0e376cf1 -Author: Sybrand Strauss -Date: Thu Sep 27 11:12:28 2018 -0700 - - Reducing number of migrations - -commit c09681824f79a2eb27076448a5dfa3bc516f1b37 -Merge: 0b5e6e192 04fb30b2d -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 27 10:57:26 2018 -0700 - - Merge pull request #924 from bcgov/hotfix/rebuild - - Merged PR-924 - -commit bbdbaecc95775ad4b2934f6d3084573bb8fed9bf -Author: Steve Hillier -Date: Thu Sep 27 10:55:37 2018 -0700 - - finish off Closure Description submission form - -commit 46df931b95787675f9d5ba73cef3b82a93d7c461 -Author: Gary Wong (BC Gov) -Date: Thu Sep 27 10:41:59 2018 -0700 - - With correction to AVI/Vulnerability - -commit 32453c91ab92782866e73a4ef0f3ec1182578075 -Author: Sybrand Strauss -Date: Thu Sep 27 10:07:06 2018 -0700 - - Renamed and modified migrations to work with hotfix 0017_auto_20180926_2104 - -commit 86f2735cf8141219c8b0c1d0fd8ae4935ca30971 -Merge: c14869f14 a198f38b3 -Author: Sybrand Strauss -Date: Thu Sep 27 09:00:05 2018 -0700 - - Merge branch 'release/1.41.0' into fix/resolve_hotfix_migration_conflict - -commit 04fb30b2db05524173a6e3a813b3b9b932a32404 -Author: Sybrand Strauss -Date: Thu Sep 27 07:58:21 2018 -0700 - - Remove whitespace to force rebuild - -commit 10a83af79fb90ad2603f831e61a34e35a7fb5e6c -Author: Sybrand Strauss -Date: Thu Sep 27 07:56:29 2018 -0700 - - Busy tinkering with models - -commit 0b5e6e1921715d90340c3e311eaf361a73a38d82 -Merge: 2b347a840 c14869f14 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 26 23:24:42 2018 -0700 - - Merge pull request #922 from bcgov/hotfix/ems_id_fix - - Merged PR-922 - -commit 09d9246d615e0f9d5e6f48320b0788b19609039f -Author: Gary Wong (BC Gov) -Date: Wed Sep 26 17:00:32 2018 -0700 - - Fixed typo. - -commit 4a07eed1af55bfccb66137d3119a70437c8dd4bc -Author: Gary Wong (BC Gov) -Date: Wed Sep 26 16:55:16 2018 -0700 - - Inclusion of Test fixture for Aquifers. - -commit ab7b4dfef5513b35f911099996835412c30bd0fa -Author: Sybrand Strauss -Date: Wed Sep 26 14:13:28 2018 -0700 - - Added SSO_IDP_HINT to backend.dc.json - -commit 8ba0b5aeebe95f665e61ddebc42bdeafb47eced8 -Author: Sybrand Strauss -Date: Wed Sep 26 14:10:05 2018 -0700 - - Changing how default 3 sets are created - -commit c14869f1431e3fb71ee2aa72cb6d75005f1edd5d -Author: Gary Wong (BC Gov) -Date: Wed Sep 26 14:06:25 2018 -0700 - - Added generated migration step from 'manage.py makemigrations' - -commit 54a9a36a150e48a607af5d45f77a416964cfb855 -Author: Gary Wong (BC Gov) -Date: Wed Sep 26 14:01:03 2018 -0700 - - Make EMS_ID column nullable. - -commit 5e8ea3c6ee793c17c9b14a8af81ea1e8e895d39c -Author: Gary Wong (BC Gov) -Date: Wed Sep 26 11:38:32 2018 -0700 - - Pushing out again to force DB changes. - -commit 09391720dd686cc35b052267848dead9972bd2e2 -Author: Nick Phura -Date: Wed Sep 26 11:32:02 2018 -0700 - - Add new config/environment variable to control keycloak hint. Allows alternatives to idir. - -commit 4e117ba154a8c8650bccc27fc5e9a42a57658c9c -Author: Steve Hillier -Date: Wed Sep 26 11:22:30 2018 -0700 - - convert to custom form-input components - -commit 794503461fb91be11a9b9569001cc63537f96b43 -Author: Sybrand Strauss -Date: Wed Sep 26 10:13:42 2018 -0700 - - Renaming well - -commit e3ec769862e5d7cfcde17803cc70dfe4f151f32c -Author: Sybrand Strauss -Date: Wed Sep 26 10:13:10 2018 -0700 - - Another way of showing default 3 - -commit adad4f86106e0cb61c48323ed3105253be6176da -Author: Sybrand Strauss -Date: Wed Sep 26 08:57:58 2018 -0700 - - Various fixes - -commit a198f38b329df4e8f958eeff27359061aecc1ed5 -Merge: 39493f928 090f1ec4b -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Sep 25 20:19:07 2018 -0700 - - Merge pull request #919 from bcgov/feature/1245_aquifers_migrate - - Merged PR-919 - -commit 936dff4f79fac2da236bf4d68c7b6eafadbe19ef -Author: Sybrand Strauss -Date: Tue Sep 25 18:04:18 2018 -0700 - - Changed from localhost to 127.... - -commit 91004b77a4ad761dd7dd0c93bbcd6f837c756d02 -Author: Sybrand Strauss -Date: Tue Sep 25 17:51:14 2018 -0700 - - Change pid to integer - -commit 9a1b0b19b699ac48ea376c58b94bf03f30706d02 -Author: Sybrand Strauss -Date: Tue Sep 25 17:47:21 2018 -0700 - - Various changes to fixtures to match new models - -commit 090f1ec4b422f4086921d0af3399d5dc2184dc9a -Author: Gary Wong (BC Gov) -Date: Tue Sep 25 17:22:25 2018 -0700 - - Added in hydraulic_property load for Aquifers CodeWithUs. - -commit 80331214943073feb053d80a71246c031349a2b5 -Author: Gary Wong (BC Gov) -Date: Tue Sep 25 16:48:59 2018 -0700 - - Fixed newline error. - -commit 87905cc9a0911e379f3ebc9fe2fd55384e228fb3 -Author: Gary Wong (BC Gov) -Date: Tue Sep 25 16:30:43 2018 -0700 - - Fixed newline error. - -commit 6a57a9b70a71ae6aedbfb4bcb3997bc31998d813 -Author: Gary Wong (BC Gov) -Date: Tue Sep 25 16:29:22 2018 -0700 - - Fixed newline error. - -commit 32e227c6c3d11d44fc1ffd50a88c9a47258a7bba -Author: Gary Wong (BC Gov) -Date: Tue Sep 25 16:13:15 2018 -0700 - - Moving creation of xform_aquifer to be prior to reference in the stored procedure. - -commit cae2cd3c0ab64d6cf3aee521f97c1165f77234d7 -Author: Steve Hillier -Date: Tue Sep 25 14:54:07 2018 -0700 - - add row adding method - -commit 8aabdacc9dbf8c56a1dd0607efde98793c5fb334 -Author: Steve Hillier -Date: Tue Sep 25 13:35:47 2018 -0700 - - decommission api fields and options - -commit 372d5f87702264aa10a059028cb95abd14c7f183 -Author: Sybrand Strauss -Date: Tue Sep 25 13:32:38 2018 -0700 - - Added warning message for row removal (screen, casings, lithology, liner) - -commit 622692c9112213b443b471c3a4c3bb9d1eddd73a -Author: Sybrand Strauss -Date: Tue Sep 25 12:06:07 2018 -0700 - - Busy adding warning dialogs - -commit 6639986d669064f0b4fe2bec3196da6e8099a177 -Author: Gary Wong (BC Gov) -Date: Tue Sep 25 12:02:05 2018 -0700 - - Fixed order of dependencies (xform_aquifers table should be created before the load from this table). - -commit 7354e19ed30ad6a8ebbf38f0fba6a8d597890e27 -Author: Gary Wong (BC Gov) -Date: Tue Sep 25 11:20:55 2018 -0700 - - Integrated with manual spreadsheet from P.O., linking mapping_year to aquifer. - -commit bef18841f35898e38a4ad73e15f1a5b68090ba43 -Author: Steve Hillier -Date: Tue Sep 25 10:28:41 2018 -0700 - - basic decommission info screen - -commit 1c7682d9845f75bab0752608763687588a282133 -Author: Gary Wong (BC Gov) -Date: Mon Sep 24 17:09:35 2018 -0700 - - Added sample data text fixture. - -commit c85393983f4347356a73a0af157688c6d7ea0aa7 -Author: Gary Wong (BC Gov) -Date: Mon Sep 24 16:45:01 2018 -0700 - - Updated several columns to be nullable, as per discussion with P.O. - -commit 6aa33c52ad212d3e03eae57e290f03ade925433f -Merge: fed197b81 d16d74d0f -Author: Steve Hillier -Date: Mon Sep 24 14:39:41 2018 -0700 - - Merge from issues branch - -commit d16d74d0fbb22b42a754e6b7bdd2a8fc7416be2c -Author: Sybrand Strauss -Date: Mon Sep 24 14:37:54 2018 -0700 - - Moved steel pulled out to different column - -commit fed197b81727b9da4a39ac4b858b15c59064159d -Author: Steve Hillier -Date: Mon Sep 24 14:18:56 2018 -0700 - - remove lithology from decomission reports - -commit 2630255929915abca63d78fc0e6fe8171d687fa0 -Author: Sybrand Strauss -Date: Mon Sep 24 12:50:35 2018 -0700 - - Fixed some other spacing issues on multi-line entry - -commit d8c43866076cdca0d0689cd0a46f8339881035d7 -Author: Sybrand Strauss -Date: Mon Sep 24 12:13:25 2018 -0700 - - Modify spacing to match lithology - -commit 51a62f259a5daaaae3fe4e8b47d1a856b11d76f8 -Author: Sybrand Strauss -Date: Mon Sep 24 11:07:12 2018 -0700 - - Create method of drilling screen and move field there - -commit 81994df26ecd3b9a2974f51cd815a0f50a96b5e9 -Author: Steve Hillier -Date: Mon Sep 24 10:55:31 2018 -0700 - - update unit tests - -commit 39493f928b17187c2e6613e227df50e0902c51aa -Merge: 7391f4e2c f246b8153 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Sep 24 10:35:13 2018 -0700 - - Merge pull request #915 from bcgov/feature/1245_aquifers_codes - - Merged PR-915 - -commit f246b8153f5bd680245b9a7f1d761287d3f19b76 -Author: Gary Wong (BC Gov) -Date: Mon Sep 24 10:10:11 2018 -0700 - - Added timezone information to date columns, to avoid annoying warning about 'Naive datetime'. - -commit 2df5ea24e2142532a255091868292e797ce61fa2 -Author: Gary Wong (BC Gov) -Date: Fri Sep 21 17:39:10 2018 -0700 - - Added code table population as part of migrations. - -commit 9cccb43789b1b6a3e20de48ca050ea91df11a756 -Author: Steve Hillier -Date: Fri Sep 21 14:40:21 2018 -0700 - - support for decommission view - -commit 8140faefe942688d5378c35d8a471c09ed39d7b5 -Author: Sybrand Strauss -Date: Fri Sep 21 12:29:44 2018 -0700 - - Checkbox for owner address - -commit 8b60ff36a9c886b3e240dad5362167c8d4a46ea3 -Author: Sybrand Strauss -Date: Thu Sep 20 14:20:34 2018 -0700 - - Changed Type to WellType, fixed wizard numbering - -commit 164af56ad7267305ab8a6a8b57022787f72b6382 -Author: Sybrand Strauss -Date: Thu Sep 20 14:16:15 2018 -0700 - - Person responsible for work - -commit 7fb7b48a86a6ccf30e37c245b2fc814d51ba95fc -Author: Sybrand Strauss -Date: Thu Sep 20 13:51:27 2018 -0700 - - Removed numbering - -commit 7391f4e2c775d32c1d8ee8065375b36ae36c27cf -Merge: 2b347a840 e72aca325 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 20 13:16:20 2018 -0700 - - Merge pull request #912 from bcgov/task/1273_dbBkCronjobTemplate - - Merged PR-912 - -commit afd4c438760f2894c54a7bfc7daf3a5b14830b10 -Merge: e436dfabb 4e1f7f5ad -Author: Sybrand Strauss -Date: Thu Sep 20 12:53:28 2018 -0700 - - Merge branch 'release/1.40.1' into bugfix/1243_submission_various - -commit e72aca32513944a07a89379d588a20881c8c1106 -Author: Derek Roberts -Date: Wed Sep 19 23:31:00 2018 -0700 - - Deleted old templates - -commit 765e4e480af8a0f41ffb09d4972e0e547aa73023 -Author: Derek Roberts -Date: Wed Sep 19 23:30:23 2018 -0700 - - Moved caddy templates - -commit 5f0cd4546ebeb77f48d069f32a0dfe0ad034c73d -Author: Derek Roberts -Date: Wed Sep 19 23:29:56 2018 -0700 - - Exported template for hourly psql backup cronjob - -commit 2b347a840214079fa2cb3b2e45fa31f974226af2 -Merge: bdbc0b59b 4e1f7f5ad -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 20 09:59:45 2018 -0700 - - Merge pull request #911 from bcgov/release/1.40.1 - - Merged PR-911 - -commit 4e1f7f5adaa7d48a70d7fbb368c3c7e008b9bc04 -Author: Sybrand Strauss -Date: Thu Sep 20 08:25:54 2018 -0700 - - Upgrade to resolve security vulnerability - -commit e436dfabbd91bdd6aab660237fca234c1402cd77 -Author: Sybrand Strauss -Date: Thu Sep 20 08:17:33 2018 -0700 - - Changing button colours - -commit 467a9d7600d33efe8998a85a5b869b2b5289de53 -Merge: 768b8f7eb bd1b34917 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 19 23:20:50 2018 -0700 - - Merge pull request #898 from bcgov/fasttests - - Merged PR-898 - -commit bd1b34917289d8b00e23ec7ff7cf4d10a855bbc1 -Author: Derek Roberts -Date: Wed Sep 19 14:39:47 2018 -0700 - - Wrap unit tests for python in function - - +echos - - Finish up python unit test function - -commit 49bcbb5d6069791a2de5dd3091cc8ba50b0c9231 -Author: Derek Roberts -Date: Fri Sep 14 16:02:29 2018 -0700 - - 'false' is not an integer - - Text tweaks - -commit 260f4bd20e56c30051c9fbd871ad0732c4331a2c -Author: Derek Roberts -Date: Fri Sep 14 15:03:00 2018 -0700 - - Temporarily proceed even when functional tests fail (will be addressed) - -commit af99061e49e15bdf2251479079d604a74915acc4 -Author: Derek Roberts -Date: Fri Sep 14 10:32:29 2018 -0700 - - Output cleanup - -commit b45904fc3bf2873dbe1c2c6a84ee869a87c1bff4 -Author: Derek Roberts -Date: Fri Sep 14 10:19:56 2018 -0700 - - Functional tests - wait for deployment - -commit bf1b60f44690d42ddbd96bb8629b9dbef80f1efa -Author: Derek Roberts -Date: Fri Sep 14 10:09:17 2018 -0700 - - Re-enable all functional tests - -commit e615bc9cdccd5cfc2e0edcb755e34e2379d79580 -Author: Derek Roberts -Date: Fri Sep 14 09:43:32 2018 -0700 - - Move unit tests back out of build stage, but keep code in comments - -commit 114985e784ff234032d6b7ab8f47765663efdc6f -Author: Derek Roberts -Date: Fri Sep 14 09:40:06 2018 -0700 - - Use isEnabled more - -commit 45530a5ec11284dc5dd839b47c1857903ae38afa -Author: Derek Roberts -Date: Thu Sep 13 16:53:08 2018 -0700 - - Proper handling for extra case of Unit Tests w/o SonarCube - -commit a7b6e23898b52e6d3afc142a3cb99373182ee578 -Author: Derek Roberts -Date: Thu Sep 13 16:39:35 2018 -0700 - - Stage true|false check in function - -commit d3a8e3fbd1a6ba6120c47d830eea69ee67d02f11 -Author: Derek Roberts -Date: Thu Sep 13 13:38:40 2018 -0700 - - Uncomment unit tests, fix disabling - -commit d68e954b69f2f915537954bbf1f15a10235a23a5 -Author: Steve Hillier -Date: Wed Aug 29 10:39:10 2018 -0700 - - add runInBand to test flags - -commit 844611dbafb1c14d16f83857fe40d78bb780358e -Author: Steve Hillier -Date: Wed Aug 29 09:42:49 2018 -0700 - - fix directory to run tests from - -commit 453f4fa7d53f28670fc12b3049b89a0a02d8ae6a -Author: Steve Hillier -Date: Wed Aug 29 09:35:29 2018 -0700 - - move unit tests to build stage - -commit 768b8f7eb9453c6e9d5e5a52528a96e1f514f411 -Merge: 5ec229a39 e7295b459 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 19 15:00:05 2018 -0700 - - Merge pull request #909 from bcgov/form_cleanup - - Merged PR-909 - -commit 5ec229a39f13478c8ae341f3383d04dee170f567 -Merge: 809bcbd19 1ceaeb422 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 19 14:56:25 2018 -0700 - - Merge pull request #907 from bcgov/feat/contactinfo - - Merged PR-907 - -commit 809bcbd195670aba16f3836ebc63d97ca351ed0f -Merge: f262141d9 be68e4b23 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 19 14:04:19 2018 -0700 - - Merge pull request #910 from bcgov/bugfix/well_display - - Merged PR-910 - -commit 1ceaeb42245d3ab4690e142268a662903fcf647e -Author: Steve Hillier -Date: Wed Sep 19 11:43:32 2018 -0700 - - Removed fallback on individual tel number - -commit be68e4b239ca2c9922ca1c31ed6b145d64c14206 -Author: Sybrand Strauss -Date: Wed Sep 19 11:35:53 2018 -0700 - - Fixed migration conflict, fixed well display - -commit f262141d9e04969ac50cf4794ad08951d361fbae -Merge: a5ea6651b 47f02b2c0 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 19 09:59:13 2018 -0700 - - Merge pull request #905 from bcgov/feature/1245_aquifers_app - - Merged PR-905 - -commit a5ea6651baa339f626808dd8cceb6d8b3e0673ab -Merge: 58b662c10 ddc6c6b68 -Author: Sybrand Strauss -Date: Tue Sep 18 16:53:25 2018 -0700 - - Merge pull request #906 from bcgov/feature/1155_step_8_liner - - [1155] Liner - -commit 47f02b2c0cfbe936f3e83abcb825779e31edc944 -Author: Gary Wong (BC Gov) -Date: Tue Sep 18 16:50:00 2018 -0700 - - Attributes reviewed by Lindsay. - -commit ddc6c6b68d705d0f545354eba6b1152cfecd7f22 -Author: Sybrand Strauss -Date: Tue Sep 18 15:49:41 2018 -0700 - - Changed FormInput to allow for non-string values on "loaded". (Was causing errors with numbers) - -commit 3c68f8db623b0ed917ac390e477be4f1a985ada1 -Author: Sybrand Strauss -Date: Tue Sep 18 12:59:39 2018 -0700 - - Changed api tests to match /wells/, changed jenkins to not run migrations and fixtures in one go - -commit ad2df8c7a4c614965420234400d84c26ae22f39b -Author: Sybrand Strauss -Date: Tue Sep 18 12:52:55 2018 -0700 - - Added review comments - -commit f3a20a1e1237207498062323ecf3e8c7dcc31e87 -Author: Steve Hillier -Date: Tue Sep 18 12:36:41 2018 -0700 - - prevent contact info from wrapping - -commit 27215a865c4352eb977a756d0d133a24ef34e437 -Author: Steve Hillier -Date: Tue Sep 18 12:24:24 2018 -0700 - - add labels to each contact item - -commit e7295b45960b50877805f1104556bd7112b922d1 -Author: Steve Hillier -Date: Tue Sep 18 12:21:49 2018 -0700 - - clean up blank strings before submit - -commit 87ee29ca1ed7c630d130b46bf0d09f3c7d51ee84 -Author: Steve Hillier -Date: Tue Sep 18 10:27:24 2018 -0700 - - fix typo in email field - -commit ad5381cf7bbebbf878bee4de148f74643c9fc56e -Author: Steve Hillier -Date: Tue Sep 18 10:24:15 2018 -0700 - - change search to use company contact details - -commit 8630e73dfaa6c1f7619066c52daf5d2a558b8a1c -Merge: 423b40810 58b662c10 -Author: Gary Wong (BC Gov) -Date: Mon Sep 17 17:21:54 2018 -0700 - - Merging in from Stephen's changes on release branch. - -commit 423b408108636a3fa84bedc8a7c380148072eea3 -Author: Gary Wong (BC Gov) -Date: Mon Sep 17 17:06:46 2018 -0700 - - Removed migration files in preparation for merging in updated release/1.40.1 branch from Steve - -commit 0d856d3d918d3f6574eb9e08191ef6b2a57cade4 -Author: Gary Wong (BC Gov) -Date: Mon Sep 17 16:57:37 2018 -0700 - - One .. last.. typo.. of Vulnerblity - -commit f31441af49c2b523b3019ef1c0f0636f53be2e89 -Author: Gary Wong (BC Gov) -Date: Mon Sep 17 16:54:55 2018 -0700 - - Fixes as per PR review at https://github.com/bcgov/gwells/pull/905#pullrequestreview-156074617 - -commit 311fbb38d5ca1d1e9dd447e7de0f2a3e1441527a -Author: Sybrand Strauss -Date: Mon Sep 17 14:47:07 2018 -0700 - - Migrations and api tests - -commit ff3ca06aa13dae36ed92f4459bdf05012f6f43b8 -Merge: 6f0967144 58b662c10 -Author: Sybrand Strauss -Date: Mon Sep 17 14:27:28 2018 -0700 - - Merge branch 'release/1.40.1' into feature/1155_step_8_liner - -commit 6f096714417c717c7301de83fc42389990da7482 -Author: Sybrand Strauss -Date: Mon Sep 17 13:48:07 2018 -0700 - - Generalized stacking code, added api tests - -commit 58b662c10532292d478f0b147e955075f57090b5 -Merge: bdbc0b59b 2be3c23a5 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Sep 17 13:12:41 2018 -0700 - - Merge pull request #904 from bcgov/feat/step13 - - Merged PR-904 - -commit 9c162030bb43f25404a76e36b48dbef2dd99cb91 -Author: Gary Wong (BC Gov) -Date: Mon Sep 17 12:01:02 2018 -0700 - - All tables and attributes added; ready for review. - -commit 47e4f164cfb11d15b95ab9d64428a6882f9f8bc2 -Author: Gary Wong (BC Gov) -Date: Mon Sep 17 11:20:35 2018 -0700 - - Completed all attribution. - -commit 2be3c23a53cb3ef0c306fc6e141d0b0baab59731 -Author: Steve Hillier -Date: Mon Sep 17 10:37:04 2018 -0700 - - change WaterQualityCharacteristic model to use a code pk instead of uuid - -commit 40333656ffbfe39a28ada9da659cc702acb6e61c -Author: Gary Wong (BC Gov) -Date: Fri Sep 14 19:02:31 2018 -0700 - - Additional attributes as per P.O. - -commit 02cf9f7e81067a0cb15fdb2913aeab326365cd9d -Author: Sybrand Strauss -Date: Fri Sep 14 15:03:39 2018 -0700 - - Busy implementing perforations serializing and stacking - -commit fadaa7c4e7ea8509f97f2e44ea85f4b3c7723edb -Author: Steve Hillier -Date: Thu Sep 13 16:16:17 2018 -0700 - - load water quality codes using fixtures - -commit 4aa15552b4e9235188d975ad71034bcb486ff416 -Author: Sybrand Strauss -Date: Thu Sep 13 10:02:26 2018 -0700 - - Busy resolving serializer issues - -commit e19935e0a976749b696d75d896e7932b78f63bbd -Author: Gary Wong (BC Gov) -Date: Wed Sep 12 17:02:08 2018 -0700 - - Started new 'aquifers' app, and added FK from existing 'wells' table. - -commit 88b4d4d0d3133d19ae55c2b1780ab47e5c46e85a -Author: Steve Hillier -Date: Wed Sep 12 15:21:22 2018 -0700 - - adjust number of steps in form wizard - -commit 3f45d7964b1c15822a6e049946779d026b3fe272 -Author: Steve Hillier -Date: Wed Sep 12 15:05:41 2018 -0700 - - add step 15: comments - -commit 6927c7107a58fb0b9eeb5069eba5677aae5c9a29 -Author: Steve Hillier -Date: Wed Sep 12 14:07:19 2018 -0700 - - add submission step: well completion data - -commit d09a32de397f27e54abb7c4d86454914e44104c7 -Author: Steve Hillier -Date: Wed Sep 12 13:07:22 2018 -0700 - - fix typo in fixtures file - -commit a0aae2483a88ae84d0b584c610a6cbac72132549 -Author: Steve Hillier -Date: Wed Sep 12 12:06:16 2018 -0700 - - add codes for water quality - -commit a8d6abd869fc30d395ffafec9eea566f58fb840c -Author: Steve Hillier -Date: Wed Sep 12 12:00:40 2018 -0700 - - add new code tables to admin console - -commit eca1a6b47919c7d5fa9568d950642eb6db32e631 -Author: Steve Hillier -Date: Wed Sep 12 10:33:33 2018 -0700 - - add submission step: water quality details - -commit 69f9a2091eb20ba2ce082016619d6344c356d32d -Author: Steve Hillier -Date: Wed Sep 12 10:33:14 2018 -0700 - - upgrade vue-select version - -commit ed6adedbc73b46cf303851a755aea9f59f09d7f9 -Merge: 09a482a30 d796f4414 -Author: Sybrand Strauss -Date: Mon Sep 10 09:41:26 2018 -0700 - - Merge branch 'release/1.40.0' into feature/1155_step_8_liner - -commit bdbc0b59beaf48a902cb23548c8d86986a40cc94 -Merge: d796f4414 c5d05b406 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 6 15:54:46 2018 -0700 - - Merge pull request #903 from bcgov/release/1.40.0 - - Merged PR-903 - -commit c5d05b406df572c51ed0f5bc4ada1d062c8b2942 -Merge: d796f4414 7eb27c14a -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Sep 6 12:14:44 2018 -0700 - - Merge pull request #890 from bcgov/feature/1236_roundtrip_metadata - - Merged PR-890 - -commit d796f4414a620f50c42fde8fc2a645a5ec345fbf -Merge: 847baa41f ab6446732 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 5 17:24:31 2018 -0700 - - Merge pull request #896 from bcgov/release/1.39.0 - - Merged PR-896 - -commit ab6446732d024665370860fd8209b4660dfffa58 -Merge: 6c43f76fa 3e48761fb -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 5 15:28:51 2018 -0700 - - Merge pull request #901 from bcgov/feat/step10 - - Merged PR-901 - -commit 3e48761fbbccbd525369850330462521bca01f2d -Author: Derek Roberts -Date: Wed Sep 5 14:46:11 2018 -0700 - - Added default value loading - -commit 6c43f76fa8265a7061532e55a741be5aeaf69091 -Merge: 22620d9f0 776737620 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 5 13:25:48 2018 -0700 - - Merge pull request #895 from bcgov/feat/step10 - - Merged PR-895 - -commit 22620d9f07cb572a34de404b3dcdf6ee09375fc3 -Merge: 3a5436007 3d0079133 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 5 13:12:54 2018 -0700 - - Merge pull request #897 from bcgov/data_entry_flag - - Merged PR-897 - -commit 776737620d7f257d126c8fa16aa010cb22952062 -Author: Derek Roberts -Date: Wed Sep 5 13:01:48 2018 -0700 - - Added serializer to views.py - -commit fecc2d39ba84fd6d00f2617b977c0f0735d2ed5f -Author: Derek Roberts -Date: Wed Sep 5 12:57:42 2018 -0700 - - Added another serializer - -commit 9c665115be17d5eeb81519f9f256ead53350fa94 -Author: Derek Roberts -Date: Wed Sep 5 12:00:37 2018 -0700 - - Tweaks on other forms - -commit 28f62e36c7e72a0541b8ac2bfdc2f8de50e129a8 -Author: Derek Roberts -Date: Wed Sep 5 11:58:11 2018 -0700 - - Finally figured out v-models - -commit ce2c78e30e9822c211adaef0aa933b943cf9b1a9 -Author: Derek Roberts -Date: Wed Sep 5 11:47:05 2018 -0700 - - Further corrections - -commit bd286056744f208c09fb126eb599a07cafbf3033 -Author: Derek Roberts -Date: Tue Sep 4 11:33:29 2018 -0700 - - Vue files corrected using GitHub review comments - -commit f6438b6a08dd8fe1e17fd5e4206d8da2ebe55dd5 -Author: Derek Roberts -Date: Mon Aug 27 17:44:10 2018 -0700 - - Add submissions step 10 and serializer to views.py - -commit 1accf66765bfb9c0e17ec29be5cf8edd234e8ed3 -Author: Derek Roberts -Date: Mon Aug 27 17:43:15 2018 -0700 - - Submissions step 10 serializer - -commit 478a35d9e5bdf78c47582fabd97d6d1d98f142a8 -Author: Derek Roberts -Date: Mon Aug 27 17:42:25 2018 -0700 - - Add step 10 to SubmissionsHome.vue - -commit 6172631a8be181927d2166a4ed51cf08f583cd2d -Author: Derek Roberts -Date: Mon Aug 27 17:41:14 2018 -0700 - - Vue template for submissions step 10: fiter pack - -commit 5a50fbe5e6e1de05ee5021a0342596f1ac11fcc2 -Author: Derek Roberts -Date: Mon Aug 27 17:24:00 2018 -0700 - - setup_osx.sh - simple django secret key for testing - -commit cb12625e99d60ec0c82bf9bc3a6a646ae8c70f24 -Author: Derek Roberts -Date: Mon Aug 27 17:23:18 2018 -0700 - - setup_osx.sh - added option to load fixtures - -commit 148d52893d41874ce7d3e491ca7b30c6c6cc7a44 -Author: Derek Roberts -Date: Mon Aug 27 17:21:21 2018 -0700 - - setup_osx.sh - fixed postactivate vars - -commit 3a54360075a9041b391a60d936b0c4d588ff71a9 -Merge: 8ef0bb2d6 4b6cba2df -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Sep 5 12:29:52 2018 -0700 - - Merge pull request #894 from bcgov/feat/step9 - - Merged PR-894 - -commit 4b6cba2dfc06a4761f8f77b04086b238c55d6bd3 -Author: Steve Hillier -Date: Thu Aug 30 11:14:53 2018 -0700 - - add units - -commit 5e8b6da83a1eefe8da21e5aa4f62c46ee542d121 -Author: Steve Hillier -Date: Thu Aug 30 11:13:33 2018 -0700 - - add step 12 (yield) - -commit 13c7b976699b9d9b740f1476440f3b89a1ffa889 -Author: Steve Hillier -Date: Wed Aug 29 16:16:55 2018 -0700 - - fix layout - -commit d47e2168704215bdf54711fd134ef5d2574586fd -Author: Steve Hillier -Date: Wed Aug 29 15:56:52 2018 -0700 - - add step 11 (well development) - -commit 8a85e7447d9efaf24dac951a2e8e31d4bf5f17a6 -Author: Steve Hillier -Date: Wed Aug 29 14:05:58 2018 -0700 - - fixes to form - -commit e921f2b7748a62f6db1e741d20e74ee93a9e8b88 -Author: Steve Hillier -Date: Wed Aug 29 13:50:40 2018 -0700 - - allow creation of screens - -commit 40bfb4126df3bec5ddef04eda55916fa0c8daa4e -Author: Steve Hillier -Date: Tue Aug 28 16:29:31 2018 -0700 - - add list of suggested values to form field - -commit a56968911ec64a2420d96eb5ee6bab4972faa9a6 -Author: Steve Hillier -Date: Tue Aug 28 14:46:22 2018 -0700 - - add tests for basic step 9 functions - -commit 5c0785c936b85ebe9baf9ef576d64f7ecbead9c1 -Author: Steve Hillier -Date: Tue Aug 28 14:43:31 2018 -0700 - - add step 9 with dropdowns populated by api - -commit 825e573b72de8825bf24ad4d5682db8bf118400b -Author: Steve Hillier -Date: Tue Aug 28 14:43:18 2018 -0700 - - fixes to layout of rows - -commit 3d00791330ee841e5051033c307f04e958760785 -Author: Steve Hillier -Date: Tue Aug 28 11:54:13 2018 -0700 - - better use of data entry flag - -commit 409fd571c855dfc657fced984b794272412949f6 -Merge: 3cc2ea798 8ef0bb2d6 -Author: Steve Hillier -Date: Tue Aug 28 11:41:57 2018 -0700 - - merge upstream and fix conflicts - -commit 8ef0bb2d65169bc8471c2bfa3c37d6cb95d8a096 -Merge: f433f6a2d b606d002f -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Aug 28 10:20:18 2018 -0700 - - Merge pull request #891 from bcgov/feat/subm-step5 - - Merged PR-891 - -commit b606d002f04571a7a429d7d1ceb6017209d5319c -Author: Steve Hillier -Date: Mon Aug 27 16:36:14 2018 -0700 - - update title of Step 7 - -commit 7b4470f9ac533d2a619f85671a39e406723d815c -Merge: 8fadf3611 f433f6a2d -Author: Steve Hillier -Date: Mon Aug 27 15:02:15 2018 -0700 - - Merge branch 'release/1.39.0' of github.com:bcgov/gwells into feat/subm-step5 - -commit f433f6a2d9cd63090303025ce2c72ca81fb6e283 -Merge: 847baa41f 88ad831e7 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Aug 27 15:00:50 2018 -0700 - - Merge pull request #893 from bcgov/jenkins-watcher - - Merged PR-893 - -commit 3cc2ea7984da775d6d331ac7e81d5acbdf3ae6d8 -Author: Steve Hillier -Date: Mon Aug 27 12:38:53 2018 -0700 - - example of one form input (with data from DB/API) - -commit 88ad831e7db121c7e17b6472cb7801631470008e -Author: Steve Hillier -Date: Mon Aug 27 10:24:04 2018 -0700 - - declare projectName in every block its used in (to be refined) - -commit 5d263715b695fc21e48ad3bcfdfa9e5c68f988d7 -Author: Steve Hillier -Date: Fri Aug 24 16:58:29 2018 -0700 - - move variable declarations - -commit 8e70794a4e7f60d71dc2b5b650ba1cb009b427c8 -Author: Steve Hillier -Date: Fri Aug 24 12:40:06 2018 -0700 - - add start of step9 - -commit 9427695b50674bde32eaec87e2443b2a0e0e14c9 -Author: Steve Hillier -Date: Fri Aug 24 10:48:03 2018 -0700 - - switch pod selector to only look for pods of the current deployment - -commit 8fadf3611e1dc874bc8d3fbf0d8a3a555597a3a9 -Author: Steve Hillier -Date: Fri Aug 24 10:18:14 2018 -0700 - - remove type number from method of drilling input - -commit c91633990374d9b7a41284d979dbd12754ad6136 -Author: Steve Hillier -Date: Thu Aug 23 17:13:57 2018 -0700 - - add watch for pod readiness before loading fixtures and running tests - -commit ead4093ab6d5face9f356530c37c641eed0e1558 -Author: Steve Hillier -Date: Thu Aug 23 14:25:53 2018 -0700 - - finish up backfill inputs - -commit 021a59124f3d42b8b4bffe9ff43d56765550beea -Author: Steve Hillier -Date: Thu Aug 23 14:02:28 2018 -0700 - - clean up unused code - -commit e5f3d655fc5425a5b9f9ba7927891bc0e900e31f -Author: Steve Hillier -Date: Thu Aug 23 13:05:56 2018 -0700 - - remove console.log - -commit 5176f31777109d93ed51b72a47388eb26d36624e -Merge: 1f6cf389c 847baa41f -Author: Steve Hillier -Date: Thu Aug 23 13:05:30 2018 -0700 - - fix conflicts and merge in upstream changes - -commit 1f6cf389ca2e59fe2df238bf6a15bb7b12e8101a -Author: Steve Hillier -Date: Thu Aug 23 13:01:16 2018 -0700 - - refactor to use watchers - -commit 847baa41f19396eaa0d67d712a83dd1e30a35d19 -Merge: 902303469 e83d49122 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 22 15:40:49 2018 -0700 - - Merge pull request #884 from bcgov/release/1.38.2 - - Merged PR-884 - -commit e83d4912231e759ad7df3dd4d28267f37111e804 -Merge: 49908362f fdf7b9c78 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 22 14:16:57 2018 -0700 - - Merge pull request #889 from bcgov/collab/1.38.2 - - Merged PR-889 - -commit 7eb27c14a2764ad8177a0e078919a25e176045e2 -Author: Gary Wong (BC Gov) -Date: Wed Aug 22 14:09:29 2018 -0700 - - Test feasibility of Excel -> SQL -> Database -> SchemaSpy for Table/Column metadata. - - NOTE: To help, Excel VBA can be used, for example: - - ``` - Sub export_metadata() - ' - ' export_metadata Macro - ' Export comments to SQL ready format. - - On Error Resume Next - ' Remove "Table" column - Columns("B").EntireColumn.Delete - ' Remove COMMENTS columns - Columns("I").EntireColumn.Delete - ' Remove extraneous column type/size/optional/default metadata - Columns("C:G").EntireColumn.Delete - - ' Remove rows w/o description metadata - Columns("C").SpecialCells(xlBlanks).EntireRow.Delete - ' Doublequote single quotes to escape it' - Columns("C").Replace "'", "''" - - End Sub - ``` - -commit 09a482a308c6075ef6710e539855420d03c2a882 -Author: Sybrand Strauss -Date: Wed Aug 22 13:31:55 2018 -0700 - - Busy implementing step 8 - -commit fdf7b9c781afdc17bc4dfd31280c158a1687f855 -Author: Derek Roberts -Date: Wed Aug 22 13:24:33 2018 -0700 - - Well Summary: renamed Quick Links to Sections - -commit 49908362f0275d02cd4ed0a89205f669a43eb706 -Merge: ceb78eb6a 0bcccf159 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 22 13:14:36 2018 -0700 - - Merge pull request #888 from bcgov/collab/1.38.2 - - Merged PR-888 - -commit 0bcccf15911824ef1c084e6eaa5a2f7709f08ee5 -Author: Derek Roberts -Date: Wed Aug 22 12:18:10 2018 -0700 - - Comment out word-break for Chrome link wrap problems - - Removed commented-out code/bloat - -commit ceb78eb6a14e21bdd317b9e5262c65cf3ab7fabf -Merge: 961fdd0d6 d936b27a2 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Aug 21 10:55:49 2018 -0700 - - Merge pull request #886 from bcgov/feature/509_step_6_casings - - Merged PR-886 - -commit 961fdd0d6ae87bb98db36cc2125949937dc697ef -Merge: 452e4a50d f87402422 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Aug 20 21:33:56 2018 -0700 - - Merge pull request #882 from bcgov/collab/1.38.2 - - Merged PR-882 - -commit 09f57e886c2296f5364008ac344035ba1c12dfe0 -Author: Steve Hillier -Date: Mon Aug 20 17:19:54 2018 -0700 - - use watchers for converting coordinates - -commit f87402422acf27d9c017a4f0345ce45312a5637c -Author: Derek Roberts -Date: Mon Aug 20 16:15:20 2018 -0700 - - Renamed link from Well Completion Data to add 'and Artesian Flow' - -commit 4c832171f5731cea55602a9b26142fe7abaad112 -Merge: b38866000 452e4a50d -Author: Steve Hillier -Date: Mon Aug 20 16:12:41 2018 -0700 - - Merge branch 'release/1.38.2' into collab/1.38.2 - -commit d936b27a2c8e753d694f0dede58c7dbd97df346b -Author: Sybrand Strauss -Date: Mon Aug 20 11:19:29 2018 -0700 - - Wrapped all stacking code and serializers in atomic commit blocks - -commit 8b9ab3fce3c19d7cc05bd948b9fcf46c74ed1d15 -Merge: f3745f03d 452e4a50d -Author: Sybrand Strauss -Date: Mon Aug 20 10:41:11 2018 -0700 - - Merge branch 'release/1.38.2' into feature/509_step_6_casings - -commit 452e4a50d11a4fdfa090a16c0b1768acee5936f1 -Merge: 32da2337b 5dd67cad2 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Aug 20 10:39:19 2018 -0700 - - Merge pull request #881 from bcgov/bug/wells_viewer_role_not_working_test - - Merged PR-881 - -commit 5dd67cad2e265b10c713216f94070788f0e8afb7 -Author: Sybrand Strauss -Date: Fri Aug 17 17:31:10 2018 -0700 - - Changed how groups/roles relate, relying more on keycloak groups - -commit 855e2ba15c11274b7d836edaa7aad6f7c77ae639 -Author: Sybrand Strauss -Date: Fri Aug 17 16:33:22 2018 -0700 - - Added (positive) test cases to cover all permissions - -commit c47522f2ba1564dff5609012a852dff6e7cff483 -Merge: 86af3b5fd 32da2337b -Author: Sybrand Strauss -Date: Fri Aug 17 15:48:30 2018 -0700 - - Merge branch 'release/1.38.2' into bug/wells_viewer_role_not_working_test - -commit f3745f03dbb4445f41d5e4ac57704e51a619720a -Author: Sybrand Strauss -Date: Fri Aug 17 15:06:35 2018 -0700 - - Updated models, expanded tests, fixed some stacking edge cases - -commit 66e9f736b117b5eb48b638edcf5481120aeae81d -Merge: f838d9f25 32da2337b -Author: Sybrand Strauss -Date: Fri Aug 17 09:07:19 2018 -0700 - - Merge branch 'release/1.38.2' into feature/509_step_6_casings - -commit 32da2337be21a8c52fb96d41f481cd420b0111ec -Merge: 50ea76967 8e4312fb1 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Aug 17 09:03:24 2018 -0700 - - Merge pull request #887 from bcgov/1179_optResourcesPatch - - Merged PR-887 - -commit 8e4312fb12aa1c6287fa7c2c9662c8f294425f74 -Author: Derek Roberts -Date: Thu Aug 16 22:59:44 2018 -0700 - - 10s wait for pods to start - -commit 50ea76967af32c820e91a74ec259d36300f32a34 -Merge: 66681fb63 551f7d355 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Aug 16 22:47:00 2018 -0700 - - Merge pull request #885 from bcgov/1179_optResourcesPatch - - Merged PR-885 - -commit 551f7d3551c33d75aae5154510bb154ad2d75b38 -Author: Derek Roberts -Date: Thu Aug 16 22:26:19 2018 -0700 - - Python unit tests run early if ZAP disabled - -commit e8704e3ac1f4ea2cfec095bbb521e29667210239 -Author: Derek Roberts -Date: Thu Aug 16 20:16:36 2018 -0700 - - TEST/PROD deploy and smoke test (exec on isDesployed) in parallel - -commit bbf609c74f180353012db95aa2a3b9a6111ec61a -Author: Derek Roberts -Date: Thu Aug 16 17:38:24 2018 -0700 - - Cleanup and reordering - -commit f35d6d253b899bf9239ff5dafb60ed65c26e1653 -Author: Derek Roberts -Date: Thu Aug 16 17:18:41 2018 -0700 - - Cleanup and move BASEURL var - -commit 67dc5dd08738db4f877610e02ea70a581b9c0aaf -Author: Steve Hillier -Date: Thu Aug 16 17:07:13 2018 -0700 - - fix typo - -commit a196608ff4bc53f69f814665915141ad0297d1d7 -Author: Steve Hillier -Date: Thu Aug 16 17:07:05 2018 -0700 - - add proj4js to project - -commit a413b3d633efef73e364e4f6c2b8a97757a5d125 -Author: Steve Hillier -Date: Thu Aug 16 17:06:50 2018 -0700 - - add more codes to options endpoint - -commit f838d9f251e5e40cafc8cfa18973767195f567d1 -Author: Sybrand Strauss -Date: Thu Aug 16 16:32:06 2018 -0700 - - Fixed fixtures to match new structure - -commit 6f17457233d9ce157e82d53512a1da8986d9a4b7 -Author: Derek Roberts -Date: Thu Aug 16 16:10:11 2018 -0700 - - isDeployed wait in API tests, comments - -commit 4101d01e880659f7ffce16785e62c35e8e433193 -Author: Derek Roberts -Date: Thu Aug 16 15:54:18 2018 -0700 - - Var isUnitTested to start code quality, to top parallel - -commit 9ded428b97351ebee2e6ee2379d79dc4a4a5e342 -Author: Derek Roberts -Date: Thu Aug 16 15:44:14 2018 -0700 - - Moved API and func tests to top parallel branch - -commit 89181844d10a2b854de5bd905c23bcaffa305267 -Author: Derek Roberts -Date: Thu Aug 16 15:34:29 2018 -0700 - - Var isDeployed to start ZAP scan - -commit 76c2f78cb6da036e1e4938f5598329399dcc3f80 -Author: Derek Roberts -Date: Thu Aug 16 15:26:16 2018 -0700 - - Var isFixtured to start API and func tests - -commit 1f7261b246e093d557517f8cc056aa1bb3115570 -Author: Sybrand Strauss -Date: Thu Aug 16 10:30:44 2018 -0700 - - Basic working example - -commit 8f78e768d1fabc50d40d52968921a318cd07e0e7 -Author: Derek Roberts -Date: Thu Aug 16 10:21:32 2018 -0700 - - Fix - prompt/re-approve for DEV - -commit 1aa2b8ebac72f8e655cd3933cc44812e808f82e8 -Merge: fbfca1b64 66681fb63 -Author: Sybrand Strauss -Date: Thu Aug 16 09:28:36 2018 -0700 - - Merge branch 'release/1.38.2' into feature/509_step_6_casings - -commit 66681fb63207cdc2be6ed83f9489b541e1f361e9 -Merge: 902303469 e0cf34c5e -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 15 22:12:43 2018 -0700 - - Merge pull request #883 from bcgov/task/1179_optResources - - Merged PR-883 - -commit fbfca1b643d31dc9c8d716951cfdb6d6558e5e98 -Author: Sybrand Strauss -Date: Wed Aug 15 17:46:08 2018 -0700 - - Added casings to test - -commit 9e021ea63ffe8d1f0f7e24494ebb114cab429245 -Author: Sybrand Strauss -Date: Wed Aug 15 17:38:10 2018 -0700 - - Stacking casings, stacking with serializers, modifications to model - -commit e0cf34c5e1adeafe015acb05c50f09a5672b82bf -Author: Derek Roberts -Date: Wed Aug 15 15:12:43 2018 -0700 - - Adjusted resources - -commit 8a59f6c881f9e03a3a3f1797b7f7e1db38cfd222 -Author: Derek Roberts -Date: Wed Aug 15 14:33:37 2018 -0700 - - Set requests and limits to same - -commit 77b35fe5a036121ff591cf5f6d01dea616ffb8f6 -Author: Derek Roberts -Date: Wed Aug 15 14:33:22 2018 -0700 - - Load fixtures in branch for label - -commit d20bf33fc2237aef14db868e70f47503e931bd9e -Author: Derek Roberts -Date: Wed Aug 15 12:11:54 2018 -0700 - - Removed duplicate vars - -commit 645b2dc4e123bad1b3e8a538695b5821c81ea7b4 -Author: Derek Roberts -Date: Wed Aug 15 11:55:39 2018 -0700 - - Skip unit test stash if not being consumed - -commit 75b2106fb6fe7c81a25b47a05465ad1219c90873 -Author: Derek Roberts -Date: Wed Aug 15 10:38:14 2018 -0700 - - Full parallel to api tests - -commit 5bd0ec6c8a2d15b4921626a197cbd112b11348b6 -Author: Steve Hillier -Date: Wed Aug 15 14:09:13 2018 -0700 - - add unit tests for form methods - -commit 09b6eefa39bdc5b566091a909ce53d7405bb2d87 -Author: Steve Hillier -Date: Wed Aug 15 14:09:07 2018 -0700 - - add backfill step - -commit 134850f6d4a1ef62baee79bff785c248109afc1a -Author: Steve Hillier -Date: Wed Aug 15 14:08:57 2018 -0700 - - add lithology step - -commit 3be33c70489fcde9baee8e120138f515f8d1b7c3 -Author: Derek Roberts -Date: Wed Aug 15 10:07:58 2018 -0700 - - New parallel block after fixtures - -commit b38866000818c5152dfd9af06fb5f8b10476fcc2 -Author: Steve Hillier -Date: Tue Aug 14 17:54:29 2018 -0700 - - minor updates - -commit 701ea93da8a5e3d613bdd6dd8e3e743467807aae -Author: Sybrand Strauss -Date: Tue Aug 14 16:27:33 2018 -0700 - - Basic UI is working, with minimal validation - -commit 2d605a34c40ca063cd7fdaaf202de524ed2495e1 -Author: Derek Roberts -Date: Tue Aug 14 13:47:32 2018 -0700 - - Moved ZAP parallel to build and unit tests - -commit 66aa8b28ee3a9b7b6dfc55001d1ff2e3b8bce531 -Author: Derek Roberts -Date: Tue Aug 14 13:45:20 2018 -0700 - - Moved code quality to right after unit tests - -commit fa8653a3185726ec6c643d5ca207e7d86e546162 -Author: Derek Roberts -Date: Tue Aug 14 13:21:54 2018 -0700 - - API tests after fixtures, parallel to unit tests - -commit 7fd84f5fc8f5752baf4721bceb5cf61c122e4fca -Author: Derek Roberts -Date: Tue Aug 14 10:57:55 2018 -0700 - - Move load fixtures into parallel block after deployment - -commit 3d91e5aeb711c6a5ab24eef4c88d6c3bbe40aa38 -Author: Derek Roberts -Date: Mon Aug 13 23:31:52 2018 -0700 - - Code quality, load fixtures and ZAP in parallel - -commit 6a0388a6a4cdf76591a1acc05e3b567d389b8083 -Author: Derek Roberts -Date: Mon Aug 13 22:33:45 2018 -0700 - - Stages in parallel - -commit 01375d5e9ca0f8d55fc48e49c6fddcd3c7af99a1 -Author: Derek Roberts -Date: Mon Aug 13 21:41:38 2018 -0700 - - Moved readiness and deployment in parallel with unit tests - -commit 013e6e25e837ab19f75fbe6da570dfc7116cfcb1 -Author: Derek Roberts -Date: Mon Aug 13 21:30:06 2018 -0700 - - backend.dc fix - -commit fe08c542fbc39aa83354a1bce79d9fc1ba48502d -Author: Derek Roberts -Date: Mon Aug 13 21:07:32 2018 -0700 - - Restored migrate in Load Fixtures - -commit 0ea869c2243caf565a4e3ad1f2db4a15bf6d46fe -Author: Derek Roberts -Date: Mon Aug 13 21:07:11 2018 -0700 - - Moved timestamps into _stage wrapper - -commit 810d027e362e3e9a9bc84a980b18bbef5aafdeb6 -Author: Derek Roberts -Date: Mon Aug 13 20:46:10 2018 -0700 - - Moved cp and stash commands into respective unit test branch/parallel - -commit 0bb03d37d17c8d9946dde5cb26930b0f6077b729 -Author: Derek Roberts -Date: Mon Aug 13 20:39:46 2018 -0700 - - Run python and node unit tests in parallel - -commit b4e0b7757cc96be7d1228b985b5b863f5f5cf61e -Author: Derek Roberts -Date: Mon Aug 13 20:29:34 2018 -0700 - - Increased allocations to primary containers - -commit 002b5f057b48452fd6d2b0ec57c16ee8159ad0ca -Author: Derek Roberts -Date: Mon Aug 13 20:27:03 2018 -0700 - - Disable resume for when Jenkins gets restarted - -commit f60d4260d2a09b2ba84585914b814d911d733404 -Author: Derek Roberts -Date: Mon Aug 13 20:24:08 2018 -0700 - - Use SQLite for python unit tests in DEV - -commit c0ea0c2f97c00ac62517d5b9388d64f48321259e -Author: Derek Roberts -Date: Mon Aug 13 20:22:43 2018 -0700 - - Removed subshell - -commit 63f0cb23620ed13209410f5b80cbbb9c612a1bcb -Author: Derek Roberts -Date: Mon Aug 13 20:20:20 2018 -0700 - - Reduce CPU allocation for unit tests - -commit 153649e212f9bee3b567486e33be6aeca566e49e -Author: Derek Roberts -Date: Mon Aug 13 20:13:50 2018 -0700 - - Remove migrate from Load Fixtures - -commit b5fdb06f47a78cd626cbc49f03bae2ca4344e83b -Merge: 746d2886d 4359a13fe -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Aug 14 15:01:03 2018 -0700 - - Merge pull request #877 from bcgov/collab/1.38.0 - - [650] epicwellsummary jump links 3 - -commit 746d2886d58b8c59cbbcfcd8acbd6bc6f2b449b3 -Merge: 5a105620e 5d0d1e53b -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Aug 14 15:00:33 2018 -0700 - - Merge pull request #871 from bcgov/collab/1.37.1 - - Collab/1.38.2 - -commit 5d0d1e53b85138915631d7476640b71bf58a67d1 -Merge: 50fd469ac 902303469 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Aug 14 15:00:14 2018 -0700 - - Merge branch 'release/1.38.2' into collab/1.37.1 - -commit 5a105620ef2d99b3f4c583898edc15aa1e55e1c3 -Merge: 902303469 f477be3ab -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Aug 14 14:59:38 2018 -0700 - - Merge pull request #855 from cedar-technologies/doc/updateToNewDirectoryStructure - - [doc] update with new directory structure - -commit e5abfdf63b1da227cc01c76b1a9bded3d67d1c66 -Author: Sybrand Strauss -Date: Tue Aug 14 13:50:36 2018 -0700 - - Updating data - -commit 9023034698a9c25e5a49193242678c1aee3c6f4d -Merge: 44852323a 3cc90755d -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Aug 14 13:48:28 2018 -0700 - - Merge pull request #880 from bcgov/release/1.38.1 - - Merged PR-880 - -commit 86af3b5fd6ff620f0f76c5040f25c85122dc9b98 -Author: Sybrand Strauss -Date: Tue Aug 14 13:24:33 2018 -0700 - - Removed gwells_admin check for wells.view, wrote unit test to check permission mapping - -commit 3cc90755d54e9a872995d7ed41871209a9567671 -Merge: 44852323a 71b5aa987 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Aug 14 12:42:50 2018 -0700 - - Merge pull request #879 from bcgov/bug/wells_viewer_role_not_working - - Merged PR-879 - -commit 71b5aa9872d96cfdf51d979e5d009e662d0ab0e5 -Merge: 5b0c4ee4c 44852323a -Author: Sybrand Strauss -Date: Tue Aug 14 12:24:24 2018 -0700 - - Merge branch 'release/1.38.1' into bug/wells_viewer_role_not_working - -commit 44852323a688e6049dbffeed77ef6344ecd88989 -Merge: e6adbd153 93eb0de19 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Aug 14 12:21:41 2018 -0700 - - Merge pull request #878 from bcgov/release/1.38.0 - - Merged PR-878 - -commit 5b0c4ee4c644d24412b77bfcbd98d45423f7ed73 -Author: Sybrand Strauss -Date: Tue Aug 14 11:35:46 2018 -0700 - - Added check for wells_viewer - -commit 50fd469ac3c9c7ceebcaf0694677a1570051a3b3 -Merge: 6fd14cd74 93eb0de19 -Author: Steve Hillier -Date: Tue Aug 14 11:19:58 2018 -0700 - - Merge branch 'release/1.38.0' into collab/1.37.1 - -commit 72a6c3173c9daf9aae266f06ddd039b6502715fe -Author: Sybrand Strauss -Date: Tue Aug 14 11:03:48 2018 -0700 - - Busy implementing casings - -commit 4359a13fea92c5b1b710f70aa12c720f5cdadc80 -Merge: 93eb0de19 3079b17fd -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Aug 13 23:35:47 2018 -0700 - - Merge pull request #876 from cedar-technologies/task/650_epicwellsummary_jump_links_3 - - [650] epicwellsummary jump links 3 - -commit 3079b17fda13cd59606da309fb0aa0aa7734f2ba -Author: cedar-technologies -Date: Mon Aug 13 23:10:37 2018 -0700 - - format class for jump_links - -commit 0ccc967a5abd6eefb6a9a249957bb65a79b1bd4c -Author: cedar-technologies -Date: Mon Aug 13 23:05:36 2018 -0700 - - add new quick links section on well detail - -commit 93eb0de19705c2e4a94fa40fbf8285f98c4facca -Merge: e6adbd153 e9d3c0a2d -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Aug 13 17:19:24 2018 -0700 - - Merge pull request #872 from bcgov/feat/subm-step3 - - Merged PR-872 - -commit e9d3c0a2d951f49b4a8d32dcd3946656d35f6472 -Author: Steve Hillier -Date: Mon Aug 13 14:30:28 2018 -0700 - - add drilling method section - -commit 616f3409be744772441a13e759603f125795d64f -Author: Steve Hillier -Date: Mon Aug 13 14:30:21 2018 -0700 - - basic error messages - -commit 29db2736e282ef2e0ea5adff2ae6c8794dfad13d -Merge: 02e895052 e6adbd153 -Author: Steve Hillier -Date: Mon Aug 13 13:04:58 2018 -0700 - - Merge branch 'release/1.38.0' into feat/subm-step3 - -commit 02e895052b37bed673cd28784d625c1badcb6d56 -Author: Steve Hillier -Date: Mon Aug 13 12:40:36 2018 -0700 - - remove prepend/append (not compatible with other form features) - -commit c461e6da927e43e08ed688d806a9a40f31b33e5a -Author: Steve Hillier -Date: Mon Aug 13 12:36:58 2018 -0700 - - clean up form titles - -commit e4b7067a034bfec6dcbca6aef36c51c817c56978 -Author: Steve Hillier -Date: Mon Aug 13 12:36:38 2018 -0700 - - get land district codes from API - -commit e7926f4a9a9ea9a0fb760a6f60b6ecf7c1dd8bd6 -Author: Steve Hillier -Date: Mon Aug 13 12:36:12 2018 -0700 - - basic deg/min/sec conversion - -commit 780ba5b69063882c85de89dae2e399c5fc826b2d -Merge: e2b2efb4f e6adbd153 -Author: Sybrand Strauss -Date: Mon Aug 13 12:30:05 2018 -0700 - - Merge branch 'release/1.38.0' into feature/509_step_6_casings - -commit e6adbd1537e0e6bcba1d940662b87aa333801fa3 -Merge: 2d500660b aaccaa095 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Aug 13 11:40:40 2018 -0700 - - Merge pull request #853 from bcgov/release/1.37.1 - - Merged PR-853 - -commit aaccaa095e2669527cea4281d978e8786b85f379 -Merge: 384875f7e cf29bb7fa -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Aug 10 16:40:23 2018 -0700 - - Merge pull request #870 from bcgov/bug/unit_test_warnings - - Merged PR-870 - -commit b3efcca693abe04b0e433ca8fa2ba46da124bbd1 -Author: Steve Hillier -Date: Fri Aug 10 16:39:48 2018 -0700 - - add utm coord input - -commit cf29bb7fa9533eefcc8a7f8aa333248897785503 -Merge: ef77c42fb 384875f7e -Author: Steve Hillier -Date: Fri Aug 10 14:44:27 2018 -0700 - - Merge branch 'release/1.37.1' into bug/unit_test_warnings - -commit 6fd14cd7496923ee247e81ed3feff0bb10a100f3 -Merge: 384875f7e 15cbd7f6f -Author: Steve Hillier -Date: Fri Aug 10 14:30:29 2018 -0700 - - Merge pull request #868 from cedar-technologies/task/946_registrySearchTablePagination - - [947] epicregistry-jump-after-next-button-selected-1 - -commit 384875f7ea7817fd7e19acaca09e49888160f12a -Merge: 64c322350 1aed03ba0 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Aug 10 14:22:47 2018 -0700 - - Merge pull request #867 from bcgov/bugfix/hide_data_entry - - Merged PR-867 - -commit ef77c42fbf4387bce0b37d9b7484fb5d3679ea33 -Author: Steve Hillier -Date: Fri Aug 10 14:00:36 2018 -0700 - - fix warnings in jest unit tests - -commit 668b63bfb1c75e7796edb5eb665340c12021482d -Author: Steve Hillier -Date: Fri Aug 10 13:31:27 2018 -0700 - - input for degrees/minutes/seconds (needs refinement) - -commit 15cbd7f6f216789968da46ab1bd439160510c1f5 -Author: cedar-technologies -Date: Fri Aug 10 00:24:20 2018 -0700 - - update behavior on previous/next button + refactoring - -commit 1aed03ba08adbe5f9646d5645bed793b05a16435 -Author: Sybrand Strauss -Date: Thu Aug 9 18:19:54 2018 -0700 - - Changed to use config maps for env. variables - -commit ad5cb6af6efa2038a5b4553d5995daf3debb4404 -Author: Sybrand Strauss -Date: Thu Aug 9 17:35:45 2018 -0700 - - Changed ENABLE_DATA_ENTRY: 'False' by default - -commit a68e96f4ce0222e5d82b45bf5878a616ef80c4ca -Author: Sybrand Strauss -Date: Thu Aug 9 16:08:23 2018 -0700 - - Moved fetch_config to app level - -commit 7a0d1c39305fda5a9620667056997a15572519c0 -Author: Sybrand Strauss -Date: Thu Aug 9 15:11:49 2018 -0700 - - Removed constant - -commit 28c575b9f07491244a725b2a3e419b219293b555 -Author: Sybrand Strauss -Date: Thu Aug 9 15:03:54 2018 -0700 - - Added config endpoint and pointed vue to it - -commit 27980b0831533bdc9773dc65cc24549e7928b8e7 -Merge: 504ceb140 64c322350 -Author: Steve Hillier -Date: Thu Aug 9 14:27:32 2018 -0700 - - fixed merge conflict - -commit 504ceb140569e1693066ceb6a5cc5644c1a4696d -Author: Steve Hillier -Date: Thu Aug 9 14:13:57 2018 -0700 - - add coordinates input - -commit 71fb25407846034eae8edbb0cb6f6dc216e6c823 -Author: Sybrand Strauss -Date: Thu Aug 9 11:53:56 2018 -0700 - - Fix showing of Submit Report - it should only show when data entry is enabled - -commit e2b2efb4fe9b62b3c9a69c6cf773c5004a3308c2 -Author: Sybrand Strauss -Date: Thu Aug 9 11:51:47 2018 -0700 - - Minor changes to direnv - -commit 64c322350b0b93cd7ce3d9c8757608f347b64d7f -Merge: 5f08d59b1 f5f293b8f -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 8 18:33:57 2018 -0700 - - Merge pull request #864 from bcgov/feature/1175_roles - - Merged PR-864 - -commit f5f293b8f76a4be64afc6366b8799ba7ad0957ed -Merge: f8f2eef4b 5f08d59b1 -Author: Sybrand Strauss -Date: Wed Aug 8 17:51:40 2018 -0700 - - Merge branch 'release/1.37.1' into feature/1175_roles - -commit 5f08d59b19c88f76b4caeb9ce2ed120c49ff5208 -Merge: f232bb3c6 5f66eeb22 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 8 17:40:15 2018 -0700 - - Merge pull request #863 from bcgov/feat/subm-step1 - - Merged PR-863 - -commit f8f2eef4b78d0fc85f5f90c176f518f052d2e69a -Author: Sybrand Strauss -Date: Wed Aug 8 16:39:20 2018 -0700 - - Wrapped unit test in timestamp - -commit 5f66eeb22221214d8e1af3cbea76beed2486dcf3 -Author: Steve Hillier -Date: Wed Aug 8 15:32:46 2018 -0700 - - change image used for api tests - -commit 71081bbb75dc1059f472076ae92024b6c7324aeb -Merge: 1727df240 f232bb3c6 -Author: Sybrand Strauss -Date: Wed Aug 8 13:41:18 2018 -0700 - - Merge branch 'release/1.37.1' into feature/1175_roles - -commit 1727df240d09d8ed849d4734524a27bc5991a4ca -Author: Sybrand Strauss -Date: Wed Aug 8 13:39:58 2018 -0700 - - Trying different image for jenkinds - -commit f477be3aba585309f541b66170dbc31a9e9ce34c -Author: cedar-technologies -Date: Tue Aug 7 22:15:23 2018 -0700 - - Changed cmd block with cd to location - -commit 345fb32610ccd1adf01f8212615bc6a8435d8736 -Author: Sybrand Strauss -Date: Tue Aug 7 14:29:53 2018 -0700 - - Assigning permissions to groups as part of migration. - -commit 7b9e7966fda55ee32bef2c6fe2a12610d2182980 -Author: Steve Hillier -Date: Tue Aug 7 14:24:26 2018 -0700 - - use different node image for api tests - -commit 168dcae9ae03ad961f3f3f930574f2557fab3e76 -Author: Steve Hillier -Date: Tue Aug 7 13:50:49 2018 -0700 - - fix test that was missing router stub - -commit 564a461684876a62cefa3e80d26f40196dd9bd30 -Author: Steve Hillier -Date: Tue Aug 7 13:46:59 2018 -0700 - - finish rest of forms for well location submission step - -commit d054a653700b8e47b11932d94b076414037787b9 -Author: Steve Hillier -Date: Tue Aug 7 13:13:14 2018 -0700 - - move migration file - -commit 2fed56c0116ed811cdfac7ff69158bce382f175b -Merge: d9dfdd253 f232bb3c6 -Author: Steve Hillier -Date: Tue Aug 7 13:09:38 2018 -0700 - - Merge branch 'release/1.37.1' of github.com:bcgov/gwells into feat/subm-step1 - -commit eab0ec2d3e1c0c7a00154be6aae5dfe0a9a51cfb -Author: Steve Hillier -Date: Tue Aug 7 13:08:54 2018 -0700 - - add legal description fields - -commit 2076496fe907665bfd4cb7ddbf3b87f37c248c0e -Merge: 17de8f8f5 f232bb3c6 -Author: Steve Hillier -Date: Tue Aug 7 10:38:53 2018 -0700 - - Merge branch 'release/1.37.1' of github.com:bcgov/gwells into feat/subm-step3 - -commit 17de8f8f5cdabc571d4b86ddaaab6e1f060891e7 -Author: Steve Hillier -Date: Tue Aug 7 10:38:17 2018 -0700 - - add basic step 3 of submissions form (location) - -commit 0a7520085cd0e367a83fe34e7d3e70f68a65b621 -Author: cedar-technologies -Date: Sun Aug 5 15:32:14 2018 -0700 - - update setup documentation to match the change in the directory structure. - -commit f232bb3c64953ee59d86b50fca49d656c89b6d23 -Merge: ecdab45e7 94398fc85 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Aug 3 10:48:01 2018 -0700 - - Merge pull request #854 from bcgov/task/upgrade_cryptography - - Merged PR-854 - -commit 94398fc854d544774ca6855e78b4b6f0e067f7c7 -Author: Steve Hillier -Date: Fri Aug 3 10:00:25 2018 -0700 - - upgrade cryptography to 2.3 - -commit b69aa66c12596ffbc2eaede3b420e97185f2a519 -Merge: 3b48f2168 ecdab45e7 -Author: Sybrand Strauss -Date: Fri Aug 3 09:20:55 2018 -0700 - - Merge branch 'release/1.37.1' into feature/1175_roles - -commit ecdab45e7d04b04dcbbbd6bf63edfaf1580f7bfd -Merge: 5f623d4a3 47b198949 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Aug 3 09:01:15 2018 -0700 - - Merge pull request #849 from bcgov/refactor/app - - Merged PR-849 - -commit 47b198949f1961ee196ba9369faf0702f7447e4b -Merge: 6ca51686c 5f623d4a3 -Author: Sybrand Strauss -Date: Thu Aug 2 16:47:29 2018 -0700 - - Merge branch 'release/1.37.1' into refactor/app - -commit 3b48f216886353184c5937af0e1401ab58244819 -Merge: c1e2f55c7 5f623d4a3 -Author: Sybrand Strauss -Date: Thu Aug 2 16:33:09 2018 -0700 - - Merge branch 'release/1.37.1' into feature/1175_roles - -commit 6ca51686cd1f648d0c623fee11e40f8a55d2e667 -Author: Sybrand Strauss -Date: Thu Aug 2 16:22:36 2018 -0700 - - Added back in app_module and app_home - -commit f4b54c8dedc3a914187c9653d61d246173e86a67 -Author: Sybrand Strauss -Date: Thu Aug 2 15:59:28 2018 -0700 - - Added single quotes - -commit b1f7b2d0fe607180a51d3fbc18d5436ded616be2 -Author: Sybrand Strauss -Date: Thu Aug 2 15:58:48 2018 -0700 - - Corrected cfg location - -commit f2e7db952833f1c34fce47f81416881cf6fd25d0 -Author: Sybrand Strauss -Date: Thu Aug 2 15:57:20 2018 -0700 - - Trying with different config - -commit d9dfdd253cdd33989893cd7ab9cc170097065479 -Author: Steve Hillier -Date: Thu Aug 2 15:39:46 2018 -0700 - - fixed merge conflict - -commit 5a3c37a9b524ec67285ba2b14cc0f27fb8b22e28 -Author: Sybrand Strauss -Date: Thu Aug 2 15:29:02 2018 -0700 - - Trying to launch using script - -commit 7452a41a646194df2728c081119fbe13031403bf -Merge: 435777338 5f623d4a3 -Author: Steve Hillier -Date: Thu Aug 2 15:09:36 2018 -0700 - - Merge branch 'release/1.37.1' into feat/subm-step1 - -commit e618ee35aa31045d24043e1f7237fb7526d84665 -Author: Sybrand Strauss -Date: Thu Aug 2 12:32:37 2018 -0700 - - Trying to fix launch - -commit 52a761e10be24710a0284c01633073dc9632e035 -Author: Sybrand Strauss -Date: Thu Aug 2 12:15:56 2018 -0700 - - Adding a sleep - -commit 5f623d4a321f80f2fa02f62f7a207977c1b41b67 -Merge: 2098560f0 477d82412 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Aug 2 12:02:26 2018 -0700 - - Merge pull request #850 from cedar-technologies/doc/pullRequestNamingConvention - - Merged PR-850 - -commit 39ded293fc9a3057a9174f9291818c29a0d36032 -Author: Sybrand Strauss -Date: Thu Aug 2 11:53:36 2018 -0700 - - Figuring out the app module - -commit 6835481b82396a548af90c63fe6671c6251ea45a -Author: Sybrand Strauss -Date: Thu Aug 2 11:35:15 2018 -0700 - - Trying to specify module - -commit fbbc280e558e4671d3592ed3fd88b6d889804729 -Author: Sybrand Strauss -Date: Thu Aug 2 11:11:41 2018 -0700 - - Removed path from app_config - -commit 477d82412deb22fd026073ab17a5e392af0987fa -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Aug 2 11:01:37 2018 -0700 - - Typo - -commit 1a2972a65f73340967229c0b9eabc0a0ee4e62fd -Author: Sybrand Strauss -Date: Thu Aug 2 10:52:27 2018 -0700 - - Added in APP_HOME - -commit fc7c393c32258a5111fb43384bce662426445ff6 -Author: Sybrand Strauss -Date: Thu Aug 2 10:13:28 2018 -0700 - - Changed gunicorn location - -commit 5121c47dfef06c4d60fa8c364ee7639770f4e688 -Author: Sybrand Strauss -Date: Thu Aug 2 09:34:23 2018 -0700 - - cd $APP_ROOT/src/ -> cd $APP_ROOT/src/backend/ - -commit 87bfa6b7fe769b0a3dfe188c1ebe567ab99c76c9 -Author: cedar-technologies -Date: Wed Aug 1 21:57:02 2018 -0700 - - add instruction for pull request naming convention - -commit 2098560f0e42a409c9c0176b45900c90ae11cd3e -Merge: 2d500660b 7653aa3ed -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 1 17:53:27 2018 -0700 - - Merge pull request #845 from cedar-technologies/doc/correctionFileName - - Merged PR-845 - -commit 7653aa3ed47699473922e2b497dc58d24a203c7a -Merge: 60ef33cfe 2d500660b -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Aug 1 17:12:38 2018 -0700 - - Merge branch 'release/1.37.1' into doc/correctionFileName - -commit 2d500660b36af8d52bd49faba7446ea703e397d2 -Merge: abec87250 d815b89e4 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 1 16:59:25 2018 -0700 - - Merge pull request #838 from bcgov/release/1.37.0 - - Merged PR-838 - -commit 4357773388c6e38ba986b36b1727b32963d9b16b -Merge: c2e5e8a80 d815b89e4 -Author: Steve Hillier -Date: Wed Aug 1 14:59:01 2018 -0700 - - Merge branch 'release/1.37.0' into feat/subm-step1 - -commit c1b9f9702cb5fe792eeb23a90cda4b24edc32e24 -Author: Sybrand Strauss -Date: Wed Aug 1 14:27:47 2018 -0700 - - Moved view - -commit e36b20d437706a5e2a29f59ffae47ca17b7312e7 -Merge: 8595fff46 d815b89e4 -Author: Sybrand Strauss -Date: Wed Aug 1 14:26:34 2018 -0700 - - Merge branch 'release/1.37.0' into refactor/app - -commit 8595fff46d92a68c8171f92a0dba35cd424e2e8b -Author: Sybrand Strauss -Date: Wed Aug 1 14:22:43 2018 -0700 - - Fixed build - -commit 2fc413f93b43a54677df70887b4dffd0a600c7b7 -Merge: 3b4658be6 199dc446a -Author: Sybrand Strauss -Date: Wed Aug 1 14:09:00 2018 -0700 - - Merge branch 'release/1.37.0' into refactor/app - -commit d815b89e4cc4e84d112d14d810d753f5fa46fcc0 -Merge: 199dc446a 2b1b9d5db -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Aug 1 13:50:54 2018 -0700 - - Merge pull request #847 from bcgov/kcprod - - Merged PR-847 - -commit c1e2f55c7dd4d8110fed62c334c33959cdb702a0 -Author: Sybrand Strauss -Date: Wed Aug 1 13:16:02 2018 -0700 - - Roles and auth for submissions - -commit 2b1b9d5db1741eb6b91f2329e1846163a8f1fe12 -Author: Steve Hillier -Date: Wed Aug 1 11:46:47 2018 -0700 - - configure base url env variable for keycloak settings - -commit b15616e85d50720df806954ea2a5fe422d52ac0d -Author: Steve Hillier -Date: Wed Aug 1 11:03:16 2018 -0700 - - get keycloak config from env variables - -commit 60ef33cfe34e440d68a3092b46c42180363ac929 -Author: cedar-technologies -Date: Tue Jul 31 23:17:42 2018 -0700 - - correct typo in loaddata cmd - -commit 199dc446a13244078a3c15621201af4311427525 -Merge: c62675e85 9d3db0d06 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Jul 31 16:08:04 2018 -0700 - - Merge pull request #843 from bcgov/feature/1130_well_stack - - Merged PR-843 - -commit 9d3db0d06b6a43382cfc47c9ef1e75892058e8ce -Author: Sybrand Strauss -Date: Tue Jul 31 15:30:34 2018 -0700 - - Using serializers for well stacking - -commit c62675e851341688ee3c9b5eb5d3689c65962c6f -Merge: b713d8069 2798a5c8d -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Jul 31 15:05:44 2018 -0700 - - Merge pull request #841 from bcgov/feat/whitenoise - - Merged PR-841 - -commit 2798a5c8d823d1173c1903d013b36197ca50638f -Merge: 24495a660 b713d8069 -Author: Steve Hillier -Date: Tue Jul 31 14:17:37 2018 -0700 - - Merge branch 'release/1.37.0' of github.com:bcgov/gwells into feat/whitenoise - -commit b713d8069ed110d1c4f47dfae30a50336c8b7bf7 -Merge: f4305cf86 c9be4bde2 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Jul 31 13:09:21 2018 -0700 - - Merge pull request #840 from bcgov/feature/1146_edit_on_well_summary - - Merged PR-840 - -commit c9be4bde2255c2eea6e9e95e3ca621a377a4e76f -Author: Sybrand Strauss -Date: Tue Jul 31 11:37:28 2018 -0700 - - Changed settings - webpack only builds assets once, for production, so some settings can't be in there. - -commit 09e0115d1be69f2b1be9548cfb2cde8bb56111be -Author: Sybrand Strauss -Date: Tue Jul 31 10:26:54 2018 -0700 - - Added debugging info - -commit d09631f223138091309f8b735a1ea2cbdb8fccc3 -Author: Sybrand Strauss -Date: Tue Jul 31 09:22:30 2018 -0700 - - Fixed env variable loading & usage - -commit f6c5c20b06ce038ddacf3e2ed3c06238a647540b -Author: Sybrand Strauss -Date: Mon Jul 30 18:21:08 2018 -0700 - - Change to load data entry from env - -commit 89f22a710b3ab80c7ef81fd937a5103304cd2c1d -Author: Sybrand Strauss -Date: Mon Jul 30 17:56:27 2018 -0700 - - By default, enable data entry on dev - -commit adb142788be0d50cd7d7b9f59073e084fe79d119 -Author: Sybrand Strauss -Date: Mon Jul 30 17:55:29 2018 -0700 - - Updated env variable checking - -commit c2e5e8a8068e23e1eb98d6898dddace5fd5142c1 -Author: Steve Hillier -Date: Mon Jul 30 17:02:09 2018 -0700 - - change submission form to allow links from a well page - -commit 4d9da46d010f888901e87dcf9d2408e81891e110 -Author: Sybrand Strauss -Date: Mon Jul 30 16:57:17 2018 -0700 - - Avoiding load of vue in prod, and switched to using common auth - -commit 1cc1f07d94ff58794c16a4b621ffd723e04a16e2 -Author: Sybrand Strauss -Date: Mon Jul 30 16:19:14 2018 -0700 - - Removed comment - -commit dc339bb10a49b8f448f3e7e1b8dd49a2de1ac646 -Author: Sybrand Strauss -Date: Mon Jul 30 16:17:15 2018 -0700 - - Added edit button to summary screen - -commit 18ba10c5a7de59874dd3ca5552f4ce48af2e8068 -Author: Steve Hillier -Date: Mon Jul 30 12:57:57 2018 -0700 - - start of set of functions for input validation (open to feedback) - -commit 77d90a44dd6de0c466bec1ff5430f616fe19b703 -Author: Steve Hillier -Date: Mon Jul 30 11:54:51 2018 -0700 - - remove dead code - -commit ee173120f5a19bcdf0f0b3adf65012325267803e -Merge: 3e0de72fa f4305cf86 -Author: Steve Hillier -Date: Mon Jul 30 11:40:15 2018 -0700 - - Merge branch 'release/1.37.0' of github.com:bcgov/gwells into feat/subm-step1 - -commit f4305cf86b5120dd59f0fbfd05b29c67da6e464c -Merge: abec87250 c9cbc7350 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Jul 30 10:32:31 2018 -0700 - - Merge pull request #837 from bcgov/feat/1192_new_accreditation - - Merged PR-837 - -commit c9cbc7350244d3e1ad2aa22ccd6904d0b6236a80 -Merge: 227230844 abec87250 -Author: Sybrand Strauss -Date: Mon Jul 30 10:09:55 2018 -0700 - - Merge branch 'release/1.37.0' into feat/1192_new_accreditation - -commit abec8725004af566a8d335326a4e398c0aa4f3ad -Merge: aa44333d9 c682cd2f7 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Jul 30 10:04:21 2018 -0700 - - Merge pull request #832 from bcgov/release/1.36.0 - - Merged PR-832 - -commit c4030e9767f67f3ab3d003fc49410a7ed91a95a8 -Author: Sybrand Strauss -Date: Mon Jul 30 09:59:04 2018 -0700 - - Busy implementing button - -commit 2272308440e64717648a28150d2c533c5f4b0ff5 -Author: Gary Wong (BC Gov) -Date: Fri Jul 27 17:10:24 2018 -0700 - - [1192] Update Registries fixture to have new Accreditation. - -commit 24495a660944c7b058b47bfdb2a6fdcc7b37b17c -Author: Steve Hillier -Date: Fri Jul 27 16:36:24 2018 -0700 - - configure django to use whitenoise for static file serving - -commit c682cd2f767cca98265d86be4dfd480d2f1c41c2 -Merge: be36320e5 6419e75d5 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Jul 27 15:33:22 2018 -0700 - - Merge pull request #833 from bcgov/task/931_upVers - - Merged PR-833 - -commit 3e0de72fac497fe151c5e68f4aee090f7dcbce0c -Author: Steve Hillier -Date: Fri Jul 27 14:54:53 2018 -0700 - - minor changes to bring form in line with tickets - -commit 6419e75d57a64ecfcf962835718ac9ec6a0e10ec -Author: Derek Roberts -Date: Thu Jul 26 16:38:00 2018 -0700 - - setup_osx.sh - update npm to 8.11.3 - -commit 729d71c6de46bc7f4b45309cf704c313c8ef78e8 -Author: Derek Roberts -Date: Tue Jul 24 16:00:09 2018 -0700 - - Updated python images - -commit 55e6c81660d9b7b948bc0e2a16f1aa76043ade7f -Author: Derek Roberts -Date: Tue Jul 24 12:31:40 2018 -0700 - - Create fresh static files every run - -commit bbecd94f8d5861718bcf0c3bd86df1f7d9ab2270 -Author: Derek Roberts -Date: Tue Jul 24 11:58:02 2018 -0700 - - Point README to Python 3.6.6 - -commit d3db46cf7a847a4695c8ed7330fc737f7d376ff7 -Author: Derek Roberts -Date: Mon Jul 23 12:36:04 2018 -0700 - - +Check for static files, don't always recreate - -commit 0c7d086f1ad2fdfb1627b8e4e17b317965711a7b -Author: Derek Roberts -Date: Mon Jul 23 12:35:30 2018 -0700 - - Temporarily get Python from d/l, brew not offering 3.6.6 - -commit b7931b6b7b93115cf657868f4555b1d98fed3d35 -Author: Derek Roberts -Date: Mon Jul 23 12:05:19 2018 -0700 - - Added any path for node_modules to .gitignore - -commit be36320e5139e638de4f1160da774587ee3068c8 -Merge: 099b2918e dbba54d67 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Jul 27 12:16:34 2018 -0700 - - Merge pull request #834 from bcgov/bug_fix/cleanup_GW_personal_gitignore - - Merged PR-834 - -commit dbba54d67216f28650bc2df0e6b9abf4e02c6d90 -Author: Gary Wong (BC Gov) -Date: Thu Jul 26 19:09:38 2018 -0700 - - Removed my local gitignores that should not have been in global gitignore. - -commit 099b2918e6725a7b68ae1982f86d2b7f3a4446b9 -Merge: 76da04f0d 4fe701100 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Jul 26 17:30:48 2018 -0700 - - Merge pull request #820 from bcgov/bug/1180_minio_url_clean - - Merged PR-820 - -commit 7429bb51da641f4b57f0ae2fc4c28e0dce15b104 -Author: Steve Hillier -Date: Thu Jul 26 17:09:11 2018 -0700 - - rest of step 1 fields with codes populated from api - -commit 4fe701100a473dc7c107df0345233fdc33368a91 -Author: Sybrand Strauss -Date: Thu Jul 26 17:04:27 2018 -0700 - - Reverting changes - -commit aff5d39c487df92dc59586cdf5298b8720903faf -Author: Sybrand Strauss -Date: Thu Jul 26 16:51:34 2018 -0700 - - Removed database drop - it's just too complicated. - -commit 78bfba9777b2eb226fe945cb48155b22be6a6dd9 -Author: Sybrand Strauss -Date: Thu Jul 26 14:33:53 2018 -0700 - - Added field for internal minio url - -commit 537146ddc64b67c8425eadedbefc3d49f71e297d -Merge: f2120d180 76da04f0d -Author: Sybrand Strauss -Date: Thu Jul 26 12:45:49 2018 -0700 - - Merge branch 'release/1.36.0' into bug/1180_minio_url_clean - -commit 76da04f0d42f653576b10867ec0119593e90482c -Merge: aa44333d9 ed94c3435 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Jul 26 09:15:37 2018 -0700 - - Merge pull request #827 from bcgov/feat/1173-constr - - Merged PR-827 - -commit ed94c3435e8cbe097c813571d20e22feab352348 -Author: Sybrand Strauss -Date: Wed Jul 25 17:40:56 2018 -0700 - - Changed how db is cleared - -commit 5407bd91dbf2c40b75e0a0f72452772036690121 -Author: Sybrand Strauss -Date: Wed Jul 25 13:57:36 2018 -0700 - - Fixed referenc - -commit 457b97fd2c3c53303a20b880d7c00116d794f613 -Merge: 8c1c68754 534a0ce4f -Author: Sybrand Strauss -Date: Wed Jul 25 09:47:21 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit 8c1c687548f7825c81fbabd6e75383b05e6d2dbd -Author: Sybrand Strauss -Date: Wed Jul 25 09:47:04 2018 -0700 - - Fixed dependancy on subimssions migration - -commit 534a0ce4f8f35eb5e37ccd226d2106a4e8859c5c -Merge: 99efbac53 b51206e00 -Author: Steve Hillier -Date: Tue Jul 24 17:08:29 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit 99efbac53eaabf17c152e8a450058da61bee4f69 -Author: Steve Hillier -Date: Tue Jul 24 17:08:17 2018 -0700 - - fix well tag number field name - -commit b51206e009316fbb31fabebf716aaf1a7f3e45fc -Merge: 38380585b 29a22302a -Author: Sybrand Strauss -Date: Tue Jul 24 16:56:57 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit 38380585bae234dd8f122cd91f221055860fdce5 -Author: Sybrand Strauss -Date: Tue Jul 24 16:56:42 2018 -0700 - - Updated fixtures - -commit 29a22302a4f2c7af62c6246724126ef6ea2b8169 -Merge: 6f6d16f4c a5cca770c -Author: Steve Hillier -Date: Tue Jul 24 16:24:53 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit 6f6d16f4c3826d00e334259d9e14fcea3f793506 -Author: Steve Hillier -Date: Tue Jul 24 16:24:41 2018 -0700 - - additional step 1 form fields - -commit a5cca770ca934c49837479363f049748486d19ce -Author: Sybrand Strauss -Date: Tue Jul 24 14:36:57 2018 -0700 - - Removed wizard_codes.json from loaddata - -commit 6e8c9f1705198f65ea7d86accf9836febc90d59f -Author: Sybrand Strauss -Date: Tue Jul 24 14:13:54 2018 -0700 - - Removed comments - -commit 5088d483d6a451a2a7cb5c01691e4ba7bdd3eb00 -Author: Sybrand Strauss -Date: Tue Jul 24 13:53:49 2018 -0700 - - Migrations placting WellActivityCode in the correct place, with data - -commit a626ae8d2bfc76001f89ac6d95c8a9772ba12f43 -Author: Sybrand Strauss -Date: Tue Jul 24 13:52:47 2018 -0700 - - Migrations to place wellactivitycode in the correct app - -commit 78839acc848052f85ea184474bc7179ef70d81c1 -Merge: 87094c6d9 0119a3f2b -Author: Sybrand Strauss -Date: Tue Jul 24 13:13:50 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit 87094c6d92ce324ac82079e9f7fd4ab7c80741f9 -Author: Sybrand Strauss -Date: Tue Jul 24 13:11:57 2018 -0700 - - Re-factoring models to closer match current layout - -commit 0119a3f2b120d0c0d1db56727f57f1fcdc48f657 -Author: Steve Hillier -Date: Tue Jul 24 11:22:53 2018 -0700 - - load submission codes before api tests - -commit 0bfae14654ee23f1279a05f8c71efd309793ff9e -Merge: dd55487f6 89a5e122e -Author: Sybrand Strauss -Date: Mon Jul 23 17:14:02 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit dd55487f6efcaf316bad4758de5148b16398f73b -Author: Sybrand Strauss -Date: Mon Jul 23 17:13:45 2018 -0700 - - Removed some redundant logging - -commit a946e0a0cbff98df1270c80c1aae02aa04da03fd -Author: Sybrand Strauss -Date: Mon Jul 23 17:12:08 2018 -0700 - - Removed old migration - -commit 9e2b6df1e46a65275bedc4cee8c4dd1a950376e6 -Author: Sybrand Strauss -Date: Mon Jul 23 17:11:29 2018 -0700 - - Bogus file - -commit 12ff01feb56a321a1deb193dc2c2c27698ab6192 -Merge: 256b46bc3 20c75219e -Author: Sybrand Strauss -Date: Mon Jul 23 17:10:10 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit 256b46bc37e1630cb965bf845dd0074922a40ee4 -Author: Sybrand Strauss -Date: Mon Jul 23 17:09:36 2018 -0700 - - Rolled up some migrations - -commit 89a5e122eb2db1e54f8ccc0518d35b365d264416 -Author: Steve Hillier -Date: Mon Jul 23 17:04:14 2018 -0700 - - fix entry point to documents - -commit 20c75219e4749e675f184da55415e51d55f63ae5 -Author: Steve Hillier -Date: Mon Jul 23 16:43:45 2018 -0700 - - clean up unused component - -commit ff3cdb9ea712acb7399a4b0efffec42947d41e29 -Author: Steve Hillier -Date: Mon Jul 23 16:41:21 2018 -0700 - - fix form step number logic - -commit c8f9a506f8d174716cae85b11031084e5122775b -Author: Steve Hillier -Date: Mon Jul 23 16:31:17 2018 -0700 - - add search for well tag number input - -commit 6dfad16e482ff24249a011c8176f48a979f7ef4d -Merge: 7dada9499 56da35410 -Author: Sybrand Strauss -Date: Mon Jul 23 15:48:09 2018 -0700 - - Merge pull request #823 from bcgov/feature/1173-well-stack - - Feature/1173 well stack - -commit 56da354107ec85325d8ee3b6958f02000273b727 -Author: Sybrand Strauss -Date: Mon Jul 23 15:37:40 2018 -0700 - - Moved ordering - -commit 897bd074757fbd1922d7c2be7967623ec4aff61f -Author: Sybrand Strauss -Date: Mon Jul 23 15:16:08 2018 -0700 - - Revert to upstream - -commit 7dada9499b665756350581b904df3be271f7f938 -Author: Steve Hillier -Date: Mon Jul 23 15:09:49 2018 -0700 - - use data from api for populating province options - -commit 524e9f2c4ea4bd97339cf5c347f788d75bf62a24 -Merge: cf9d4e63e e93416292 -Author: Sybrand Strauss -Date: Mon Jul 23 15:09:27 2018 -0700 - - Merge branch 'feat/1173-constr' into feature/1173-well-stack - -commit e93416292cca635fdce3b625174b3b88c654c963 -Merge: 7b6feb36f ad757c3a5 -Author: Sybrand Strauss -Date: Mon Jul 23 15:06:53 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit cf9d4e63ef30a52ea552f3bb2ea36f82a51eb98e -Author: Sybrand Strauss -Date: Mon Jul 23 15:04:27 2018 -0700 - - Migration for stacking - -commit bd38b9ef183b15b8761a99e0c6589342600715db -Author: Sybrand Strauss -Date: Mon Jul 23 15:03:44 2018 -0700 - - Adding in stacking prototype - -commit 6f87499ad940f2fd0da6fbace1bc80dd4e310c11 -Author: Steve Hillier -Date: Mon Jul 23 15:00:54 2018 -0700 - - beginning of wizard input mode - -commit ad757c3a520c346f55d0314db2d95a693ec477be -Merge: e0ea1c14f aa44333d9 -Author: Steve Hillier -Date: Mon Jul 23 13:43:36 2018 -0700 - - Merge branch 'release/1.36.0' into feat/1173-constr - -commit e0ea1c14f309ffc8fc6b0962683ede0885fff0c2 -Author: Steve Hillier -Date: Mon Jul 23 13:42:12 2018 -0700 - - simple test for submissions form page - -commit fbbe7ead01a2d5e8b95d55df07b5e3761f31d999 -Author: Steve Hillier -Date: Mon Jul 23 12:56:26 2018 -0700 - - add basic tests for FormInput component - -commit f8ef07dd6e52330193310c0f6ea99595075c9839 -Author: Steve Hillier -Date: Mon Jul 23 12:43:41 2018 -0700 - - local form data save/loading - -commit f2120d180ca684b9ae0ae33a4f03474b59bb269a -Author: Sybrand Strauss -Date: Fri Jul 20 12:49:45 2018 -0700 - - Added S3_PRIVATE_EXTERNAL_HOST - -commit 60c908b225c957a0eca06052e458d2428a9c8045 -Author: Sybrand Strauss -Date: Fri Jul 20 09:06:42 2018 -0700 - - Busy implementing basic stacking code - -commit d7d7fb584419589ed135f956c12c866f5ddfbbf3 -Author: Steve Hillier -Date: Thu Jul 19 17:04:12 2018 -0700 - - Basic activity submission with all required form fields - -commit 2a7648d453614936959b75a51def2a3722228561 -Author: Steve Hillier -Date: Wed Jul 18 17:33:20 2018 -0700 - - hook up form to API - -commit 3b4658be6b09b84800e2b15919ca53f71cc18f4a -Author: Sybrand Strauss -Date: Wed Jul 18 15:49:06 2018 -0700 - - Update reference to xml output - -commit c3525c1947dc14da8845e5e88d05de7c8d39eded -Author: Sybrand Strauss -Date: Wed Jul 18 15:31:26 2018 -0700 - - Added up to date package-log, updated .envrc with new node version, fix serializer dependancy - -commit a2ae04d2a981d86a58cf022895d6768b596ec093 -Author: Sybrand Strauss -Date: Wed Jul 18 14:54:30 2018 -0700 - - Updated jenkins to point to backend - -commit c4850108e3e211a6488f7e55603210cd1e9ec03a -Author: Sybrand Strauss -Date: Wed Jul 18 14:34:34 2018 -0700 - - Moving to backend directory before running pip install - -commit 521d475d3f3b1389d3374807bf9cc306b208211f -Author: Sybrand Strauss -Date: Wed Jul 18 13:52:12 2018 -0700 - - Changing source of staticfiles - -commit 2c91aac22351da735750ed37ed1500b33ff6b9bf -Author: Sybrand Strauss -Date: Wed Jul 18 13:47:41 2018 -0700 - - Add chdir to backend and back to app root - -commit ca8084ad7121729506d28a9739a7573c1dd8443c -Author: Sybrand Strauss -Date: Wed Jul 18 13:34:01 2018 -0700 - - Go to backend directory - -commit daf62cb6ffafe456f7970dfa88f40995ae55716b -Merge: 73997c28c aa44333d9 -Author: Sybrand Strauss -Date: Wed Jul 18 12:15:55 2018 -0700 - - Merge branch 'release/1.36.0' into refactor/app - -commit 259c0d1b5635e6790bc892ec785868c917e50d19 -Merge: 6fda1c3bc aa44333d9 -Author: Sybrand Strauss -Date: Wed Jul 18 11:57:08 2018 -0700 - - Merge branch 'release/1.36.0' into bug/1180_minio_url_clean - -commit 6fda1c3bc3dcb7ffc8b08892d6340685af4d9b77 -Author: Sybrand Strauss -Date: Wed Jul 18 11:52:14 2018 -0700 - - Removed unused import - -commit 7b6feb36f45925aa888ea955807942be649aa13c -Merge: f3ca9dbc6 b863bddba -Author: Sybrand Strauss -Date: Wed Jul 18 10:08:13 2018 -0700 - - Merge branch 'feat/1173-constr' of github.com:bcgov/gwells into feat/1173-constr - -commit f3ca9dbc6213642e04d8a5362c16f44c3341dcf3 -Author: Sybrand Strauss -Date: Wed Jul 18 10:06:52 2018 -0700 - - renaming documents and adding entry points back - -commit aa44333d90977c46041f03e33c34c3c01b9437f5 (tag: v1.35.0) -Merge: 7151cc445 707dc7483 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Jul 17 17:39:30 2018 -0700 - - Merge pull request #812 from bcgov/release/1.35.0 - - Merged PR-812 - -commit b863bddba80e3ad2faf3aca2a868a5df23f28fd9 -Author: Steve Hillier -Date: Tue Jul 17 17:17:23 2018 -0700 - - add a simple well owner form component with reusable input box component - -commit 052ffc1e43377c0491fab5cbb17775c21e0b5166 -Author: Steve Hillier -Date: Tue Jul 17 17:16:44 2018 -0700 - - add reusable bindings for form inputs in "wizard" components - -commit d9269d0ac7ab61ea5eb1e6cba61636692f93cc29 -Author: Steve Hillier -Date: Tue Jul 17 17:15:58 2018 -0700 - - fix path to base template - -commit 6543daefd645822f1c13af2ca1b82d07cfd2a1e6 -Author: Sybrand Strauss -Date: Tue Jul 17 15:22:01 2018 -0700 - - Changed tests to use mocks, removed some redundant checks, generating external url - -commit f8e968ab044bc61c23c3838dcb700c385a8225f8 -Author: Steve Hillier -Date: Tue Jul 17 13:27:06 2018 -0700 - - switch to Redoc for API documentation - -commit aa819aca87811d428b10deec223cf5cb2c8fd4f5 -Author: Steve Hillier -Date: Tue Jul 17 13:25:04 2018 -0700 - - refactor store to use a common module for auth and roles - -commit 707dc7483761722044bb8f84faab94ad03c0d615 -Merge: 6de9c1ced 6638b5e5d -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Tue Jul 17 12:33:00 2018 -0700 - - Merge pull request #800 from bcgov/task/rhelUp - - Merged PR-800 - -commit 6638b5e5d6a5b3c72c47a39e0dc56615a3dedcf9 -Author: Derek Roberts -Date: Tue Jul 17 12:04:39 2018 -0700 - - package.json now expecting node 6+ - -commit 289dba112a9a6972297e089bc46ae3d206d94d52 -Author: Derek Roberts -Date: Tue Jul 17 11:03:08 2018 -0700 - - oc-dump.sh - DB_NAME var replaced with db's env var - -commit fcc8d6a98c1d5d6954758766a3d639421bd7287b -Author: Derek Roberts -Date: Tue Jul 17 09:43:40 2018 -0700 - - oc-dump.sh + container vars - -commit 3fd8406681017a1b8ed8abe41632cfd03f3e91b4 -Author: Derek Roberts -Date: Tue Jul 17 09:09:29 2018 -0700 - - Removed unused buildconfigs - -commit 3fa7e9ff6fec05d6b12393dd72a659e5b7c1b1de -Author: Steve Hillier -Date: Mon Jul 16 17:13:55 2018 -0700 - - change order of modules - -commit 216257d6fe96de6349081a9cb44a1c9476cee34c -Author: Steve Hillier -Date: Mon Jul 16 17:10:40 2018 -0700 - - refactor common code for registries/submissions html pages - -commit 4807c39772eb51e595af1bba9a3e00d4bc7ea990 -Author: Steve Hillier -Date: Mon Jul 16 16:00:58 2018 -0700 - - fix Swagger documentation - -commit f0c1150154a91ad9cbec93ef1bd5fcb5938ce4d2 -Author: Derek Roberts -Date: Mon Jul 16 14:38:14 2018 -0700 - - Comment cleanup - -commit c9a8feff82312b022ddfb0c01f7be59e5747f6be -Author: Derek Roberts -Date: Fri Jul 13 17:33:12 2018 -0700 - - Updated tag to 3.6 - -commit d02e72e9c1ac81abcf68487d978417b799b95193 -Author: Derek Roberts -Date: Fri Jul 13 17:10:54 2018 -0700 - - Cheesy test - -commit eb389b7ceaefb18bc1a4ec8f328c9bf7b15cfcb4 -Author: Derek Roberts -Date: Thu Jul 12 15:09:35 2018 -0700 - - Another python version change - -commit de15451bc0dadc69fc3df3b3a5b62dd264e348b0 -Author: Derek Roberts -Date: Thu Jul 12 10:58:31 2018 -0700 - - Changed Python release from 3.5 to 3.6 in Dockerfiles - -commit 06ec1f8ee09cf17b6ad774fd5fddee9694db59ac -Author: Derek Roberts -Date: Fri Jul 6 00:28:39 2018 -0700 - - Updated imagestream tag to 3.6 - -commit 0c1d69a5b59f4142bf203cc7e05e4a4ac7c3a6a7 -Author: Derek Roberts -Date: Fri Jul 6 00:03:36 2018 -0700 - - Updated package for node >= 8.9, npm >= 5.6 - -commit 9ed9a93badd1b6479a67fe5b82601490dce94906 -Author: Derek Roberts -Date: Fri Jul 6 00:02:39 2018 -0700 - - Updated Python Dockerfile to 3.6 (w/ node 8.9.4, npm 5.6.0) - -commit 6de9c1ced80f8f88eb486f7bc081a8b810e65e5d -Merge: 0e83d1787 c2d2e0a03 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon Jul 16 13:52:30 2018 -0700 - - Merge pull request #818 from bcgov/task/1186_testDbEmpty - - Merged PR-818 - -commit aa6455e40409cafae1a8100982a9caf8a957c201 -Author: Steve Hillier -Date: Mon Jul 16 13:00:23 2018 -0700 - - add lodash.debounce package - -commit 21f1483552f5df8db501e1c6e4124566a4ce209c -Author: Steve Hillier -Date: Mon Jul 16 12:31:12 2018 -0700 - - add URL and template for loading submissions app - -commit e9db9f8cdd16d92a24797bbf61dc0f5f3310e87b -Author: Steve Hillier -Date: Mon Jul 16 12:30:55 2018 -0700 - - separate wells and submissions API tests - -commit c2d2e0a0382a26c380b50b707f5bc4c14be61efa -Author: Derek Roberts -Date: Mon Jul 16 12:17:25 2018 -0700 - - Removed SET UNLOGGED statements - causing well table to empty - -commit be451a7671b048c0fe769efed0c9b81cc63b74cf -Author: Steve Hillier -Date: Mon Jul 16 11:49:18 2018 -0700 - - refactor submissions into own Django app folder - -commit 06a750a9a27358632b0e1b416bb4a9de9d0c6806 -Author: Steve Hillier -Date: Mon Jul 16 11:48:59 2018 -0700 - - enable submissions link (frontend only for now) - -commit 651e0379b13164eba6cc5c8a610fdd66ee0afd71 -Author: Steve Hillier -Date: Mon Jul 16 10:16:54 2018 -0700 - - switch to safer permission class for read-only endpoints - -commit 3d631d18741c663eb9050b100459dcd8aaa9fe95 -Author: Steve Hillier -Date: Fri Jul 13 17:06:07 2018 -0700 - - add search for driller names - -commit aa6f746f21b11ddc381b42252c137e37d9fa67d7 -Author: Steve Hillier -Date: Fri Jul 13 16:32:27 2018 -0700 - - simple form layout - -commit f5404cab73228f36861b49bed949c25081f1b5b9 -Author: Steve Hillier -Date: Fri Jul 13 15:54:33 2018 -0700 - - header display improvements - -commit e39adf532a23040de692c5ab5da110daea21536f -Author: Steve Hillier -Date: Fri Jul 13 15:27:44 2018 -0700 - - allow authenticating and storing credentials in multiple stores - -commit 0e83d1787c4f9a9c0a86b0487fea9e33896346b9 -Merge: 4cdf97bee 997cb9552 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri Jul 13 15:05:55 2018 -0700 - - Merge pull request #817 from bcgov/ocDumpUpdate - - Merged PR-817 - -commit 997cb9552bf9132cb6fb8f960238a69088cb746a -Author: Derek Roberts -Date: Fri Jul 13 14:17:08 2018 -0700 - - oc-dump.sh updated for new pod names - -commit 07fee67ba7061ff85c0c4e9b2d1fd7efb2f1aa32 -Author: Steve Hillier -Date: Fri Jul 13 14:16:08 2018 -0700 - - start activity submissions app - -commit f12d4b0e2504cadec3d2f8dece1bd22f3ac38ca2 -Author: Steve Hillier -Date: Fri Jul 13 11:19:33 2018 -0700 - - re-add required owner address fields - -commit 4cdf97bee309da7f6a455bae14b2d31a6f4d4fdf -Author: Sybrand Strauss -Date: Thu Jul 12 16:43:46 2018 -0700 - - Bug/error log (#815) - - Merged PR-815 - -commit 48cdd55da825ae587041fa5a9ae8c621b1464a6a -Author: Steve Hillier -Date: Thu Jul 12 16:38:02 2018 -0700 - - Wells API (#816) - - Merged PR-816 - -commit 9caec8830ddbefeb0189ed840956cc12780b4f7a -Merge: 2553ef3c6 070d4925d -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Jul 12 14:42:31 2018 -0700 - - Merge pull request #814 from bcgov/cleanup - - Merged PR-814 - -commit 070d4925deaf771368c9a779b3905cf901fe3a00 -Author: Sybrand Strauss -Date: Thu Jul 12 14:08:11 2018 -0700 - - Minor migration for orderign - -commit 63e252f7c9fd4c5b47c4b6f7071375d92f1914f3 -Merge: ab17526ba 675883a06 -Author: Sybrand Strauss -Date: Thu Jul 12 14:06:12 2018 -0700 - - Merge branch 'cleanup' of github.com:bcgov/gwells into cleanup - -commit ab17526baee4e65093e247396270ba0eed250918 -Author: Sybrand Strauss -Date: Thu Jul 12 14:05:54 2018 -0700 - - Removed well.py again - -commit 675883a060268dfc70779bdd8bbcc675d834e49d -Author: Steve Hillier -Date: Thu Jul 12 13:48:35 2018 -0700 - - remove auto-squash - -commit d0142105944cf4da34d3282395fb07b3e5d6966d -Author: Sybrand Strauss -Date: Thu Jul 12 13:19:50 2018 -0700 - - Moved ordering to model - -commit 064dbb4fdda9214e7db495081ffa2bcbba1fa526 -Author: Sybrand Strauss -Date: Thu Jul 12 12:16:52 2018 -0700 - - Added comment for order reason - -commit cc52412387d60d285618659bab7f904225d162d3 -Author: Sybrand Strauss -Date: Thu Jul 12 12:15:23 2018 -0700 - - Fixed unit test bug (order of applications was coming back inconsistently) - -commit 73997c28c3800925090122f4fe22cc5e4caaad6a -Merge: ea3e8c5a9 bbb34ee8c -Author: Sybrand Strauss -Date: Thu Jul 12 09:03:35 2018 -0700 - - Merge branch 'refactor/app' of github.com:bcgov/gwells into refactor/app - -commit ea3e8c5a9447acbfd107289216bb0755a47b76d7 -Author: Sybrand Strauss -Date: Tue Jul 10 18:04:23 2018 -0700 - - Moving references from /app to /app/backend - -commit b1e6e03f085ee9d738f32f8362330818a43846f2 -Author: Sybrand Strauss -Date: Tue Jul 10 18:00:20 2018 -0700 - - Moved django application into backend folder - -commit a23a0c37624a4be024b4d05e83f8c1ce46827435 -Author: Derek Roberts -Date: Wed Jul 11 13:55:15 2018 -0700 - - Removed temporary gwells-deploy.sh running stage - -commit 2553ef3c6b561ed667ac2bbb3806b5c3d9cab48b -Author: garywong-bc -Date: Wed Jul 11 13:52:06 2018 -0700 - - Additional index to support default order by. (#813) - - Merged PR-813 - -commit c24c12417639b15bb7d19573a7f1d8a16eabe8a6 -Author: garywong-bc -Date: Wed Jul 11 12:03:12 2018 -0700 - - Replaced cert_no of grand-parent with N/A (#811) - - Merged PR-811 - -commit ff23695bd4c242fb27f159331fdcbcd4f5c3e8fd -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jul 11 11:17:22 2018 -0700 - - [1084] Post deploy and migrate (#806) - - Merged PR-806 - -commit bbb34ee8c036ac9804ee756f605d10c09da479c0 -Author: Sybrand Strauss -Date: Tue Jul 10 18:04:23 2018 -0700 - - Moving references from /app to /app/backend - -commit 50553ba567295d99e5710060ad23de8633d39fcd -Author: Sybrand Strauss -Date: Tue Jul 10 18:00:20 2018 -0700 - - Moved django application into backend folder - -commit a286e64c0f7d4a1cb7ed0dc144debd116c5c12a9 -Author: Sybrand Strauss -Date: Tue Jul 10 12:43:55 2018 -0700 - - [1063] Document storage [2nd PR] (#803) - - Merged PR-803 - -commit e8f41a55def4e68f84fde3179ed5171ac67698d2 -Author: Steve Hillier -Date: Mon Jul 9 15:37:45 2018 -0700 - - replace .html() with .text() (#801) - - Merged PR-801 - -commit ca7c6d7f8256a5bd0161b87c4688b17c37bdc1a0 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Jul 5 18:14:47 2018 -0700 - - [1149] Script Updates (#797) - - Merged PR-797 - -commit 06b58beabfa164c7fec0fa024bbae2dd9f35d1be -Author: Steve Hillier -Date: Thu Jul 5 16:20:51 2018 -0700 - - [1092] remove deprecated ContactInfo model (#796) - - Merged PR-796 - -commit 4b9d4c6d5bc4b19c5351f68983a84d9fdb0c48e5 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jul 4 17:42:12 2018 -0700 - - [1144] DB Replication and Error Handling (#790) - - Merged PR-790 - -commit 59a8179ade854a94481a8cad5b2a727798b3f129 -Author: garywong-bc -Date: Wed Jul 4 15:14:08 2018 -0700 - - Remove erroneous registries.qualification entry that included a PUMP_INSTALLER qualification for WATER well driller. Separated out code tables from non-code tables in the two .json files (#794) - - Merged PR-794 - -commit 718e82a0d0c0010f9b973a628a25b9b6f0627fda -Author: Steve Hillier -Date: Wed Jul 4 10:58:10 2018 -0700 - - [1135] printing in IE (#791) - - Merged PR-791 - -commit c5d0e1b797ed9ff036c181c9aec9756b548eb99a -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Sat Jun 30 12:08:38 2018 -0700 - - [1144] Wells-GWells Replication Error Handling (#784) - - Merged PR-784 - -commit 4ea029fa984341b779550fffbf0dcb4582e46b74 -Author: garywong-bc -Date: Fri Jun 29 13:18:01 2018 -0700 - - Disable logging for tables solely populated from WELLS replication. Lower logging options during WELL replication. (#785) - - Merged PR-785 - -commit e11ab3b6777f4cf64a0575b3abddd5b28179cc63 -Author: Sybrand Strauss -Date: Thu Jun 28 18:14:55 2018 -0700 - - [1038] Investigate wells submission (#781) - - Merged PR-781 - -commit f5faad3dec10b979060d8ca6fd865f17c74a0c2e -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jun 27 18:02:03 2018 -0700 - - [1136] Wells to GWells Replication (#782) - - Merged PR-782 - -commit 7151cc445a5c2f6c6eb43c551acc4b86a588c787 -Merge: a6a68837e ad0bebbb3 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Jun 27 13:30:24 2018 -0700 - - Merge pull request #779 from bcgov/release/1.34.1 - - Merged PR-779 - -commit ad0bebbb3ed881613afc91eb5807461cbe5822dd -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Jun 26 17:26:15 2018 -0700 - - Bumped TEST pgsql PVC from 1 to 5 GB (#780) - - Merged PR-780 - -commit 5127a9a45fc4e02c4c19c5bf16a2d94fcf55efd2 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Jun 26 15:31:42 2018 -0700 - - [1136] Wells Replication Cronjob (#778) - - Merged PR-778 - -commit eddb440149e6d5e0ed0a39d7da5e1833292d6f8c -Author: Steve Hillier -Date: Tue Jun 26 10:03:56 2018 -0700 - - remove references to drill for pump classifications (#773) - - Merged PR-773 - -commit a3288182a689435a64a7c966924815778b8a4c58 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Jun 26 10:01:37 2018 -0700 - - [1131] Jenkinsfile Comments and Soft Refactor (#776) - - Merged PR-776 - -commit 531bf44d8d6b4af3193c5ae44ca94140df3d3321 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Jun 26 09:58:08 2018 -0700 - - [1123] Update Install Script for NVM/Version +Updates (#775) - - Merged PR-775 - -commit 4ff76147e83801a0e245c30739bd8b509121c9ea -Author: garywong-bc -Date: Fri Jun 22 17:04:18 2018 -0700 - - Bug/1120 Licence Spelling (#771) - - Merged PR-771 - -commit 6569cd7fc24fb2aa585db348c93d592084e092b0 -Author: Sybrand Strauss -Date: Fri Jun 22 11:12:36 2018 -0700 - - [1041] update registration status (#770) - - Merged PR-770 - -commit b111983b869c722bb15b6e4a44f60f98899edc3f -Author: garywong-bc -Date: Thu Jun 21 18:57:11 2018 -0700 - - Bug/1000 exempted well driller (#769) - - Merged PR-769 - -commit 14513b35d076ce9b169d7fb12dd3d7451244c130 -Author: Sybrand Strauss -Date: Thu Jun 21 18:20:10 2018 -0700 - - [1065] Try again: Remove redundant fields and tables from model (#767) - - Merged PR-767 - -commit b5fc8f8ba60a3a43dfe5aa5cc7f5ae1c4d3b7223 -Author: Steve Hillier -Date: Thu Jun 21 13:54:54 2018 -0700 - - [976, 1077] bugs: well detail map alignment, and enable google analytics (#766) - - Merged PR-766 - -commit f3d54668efa1afd298842542eb71f9587880711f -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu Jun 21 09:08:12 2018 -0700 - - [998] Add ZAP security scan back into Jenkinsfile (then disable) (#762) - - Merged PR-762 - -commit ecb9016762722bf39a45b4cdff5b05aedae7d8d6 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jun 20 18:29:25 2018 -0700 - - Unit Test slave RAM upped from 2 to 2.5 Gi (#764) - - Merged PR-764 - -commit f6a1a10202aff245c8c428d3ee89599b9fa5e6dd -Author: Steve Hillier -Date: Wed Jun 20 13:04:03 2018 -0700 - - [1070] Enable history tracking for data entry/edit (#755) - - Merged PR-755 - -commit 751faca40f96070f1c33d05b88fa950c74bc6899 -Author: Steve Hillier -Date: Wed Jun 20 11:30:53 2018 -0700 - - [1090] Add missing col under row in classification detail page (#759) - - Merged PR-759 - -commit 1bd51da5f59c4721941bab800c6d405ea35775d8 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Jun 19 12:49:47 2018 -0700 - - Temporarily disable functional tests (#758) - - Merged PR-758 - -commit 1b9f89b9a72edd321767c21b5ae379a12b0e887a -Author: Steve Hillier -Date: Mon Jun 18 17:03:41 2018 -0700 - - [1086] Fix display of contact info if contact_detail table is empty (#751) - - Merged PR-751 - -commit 29a06c4dd550bd9914e40dac2a752438e517f10c -Author: Steve Hillier -Date: Mon Jun 18 11:17:09 2018 -0700 - - [1036] display certificate name in cert authority column (#736) - - Merged PR-736 - -commit 4bd8d2f874d84b47ee389f1157dc87dd96f70887 -Author: garywong-bc -Date: Mon Jun 18 10:15:40 2018 -0700 - - Feature/955 oracle fdw postgresql logging (#753) - - Merged PR-753 - -commit 377ff5998f5808cf99e2669de842c2eedcb11a64 -Author: Sybrand Strauss -Date: Fri Jun 15 12:58:15 2018 -0700 - - [1028] Edit Adjudication - Removal from register (#748) - - Merged PR-748 - -commit a6a68837eba532beb8168e3e73fe42caa173ed7d (tag: v1.34.0) -Merge: 549625a2b fcc886f1a -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu Jun 14 09:28:38 2018 -0700 - - Merge pull request #746 from bcgov/release/1.34.0 - - Merged PR-746 - -commit fcc886f1a09bf9fa3d1b4f42ed72d6fb601d92ec -Author: Sybrand Strauss -Date: Wed Jun 13 18:29:56 2018 -0700 - - Added missing line - -commit 8532555c338badd49a5639a7b64dc3280c6755b4 -Author: Sybrand Strauss -Date: Wed Jun 13 18:19:13 2018 -0700 - - Fix to not import models - -commit e51cf78e4c790fd87331dcce4a2a4a28595ec098 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jun 13 17:26:56 2018 -0700 - - HotFix: disable SonarQube - -commit 8854e172b8515ccbb2806bbd02e1a0a4ff8f16bf -Merge: 549625a2b 8ffa7676a -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jun 13 15:12:35 2018 -0700 - - Merge pull request #742 from stephenhillier/pipeline-tests - - [1037] Fix for Python unit tests and false positive pipeline status at test stage - -commit 8ffa7676ada79333be67e1d4939412ad3759b8a2 -Author: Steve Hillier -Date: Wed Jun 13 15:08:54 2018 -0700 - - fix set command arguments - -commit 549625a2ba42d20aeb2a030150ce7b5a7c76417d -Merge: cb47ec1d0 f7bf40bc7 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed Jun 13 14:22:30 2018 -0700 - - Merge pull request #739 from bcgov/release/1.33.0 - - Merged PR-739 - -commit 5bda04d07a8e35d28107017f62c5958860d4ea1b -Author: Steve Hillier -Date: Wed Jun 13 14:14:36 2018 -0700 - - add set -e on bash script that runs test - -commit 7d3d06450436314fdaa529bdd34f0e243a3d2267 -Author: Steve Hillier -Date: Wed Jun 13 14:11:12 2018 -0700 - - remove NOSE_PROCESSES env variable (disable parallel testing) - -commit f7bf40bc7693ef653d43964c508acc9d9465c8c8 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed Jun 13 13:27:23 2018 -0700 - - Git remote fix and adjustment for new app paths (#740) - - Merged PR-740 - -commit 11d36f45e2131434b78a0ed1717933f2ad49ee42 -Author: Sybrand Strauss -Date: Tue Jun 12 12:05:41 2018 -0700 - - [585] EPIC#Registry | Edit Adjudication (2) (#738) - - Merged PR-738 - -commit 372b0ede1e66ed49cbc12b27cdef6dacf993922d -Merge: 77f1b4bfb 900abb5a1 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Jun 11 11:50:09 2018 -0700 - - Merge pull request #731 from stephenhillier/prov-options - - [995] Load province/state codes into web app from database - -commit 77f1b4bfb962f896c392e2360124755275a48cfa -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri Jun 8 21:59:10 2018 -0700 - - [999] Reenable SonarQube (#729) - - Merged PR-729 - -commit f91471f21321e8d44a0159a0afe4d83bd76e1c72 -Author: garywong-bc -Date: Fri Jun 8 17:36:02 2018 -0700 - - [1043] Added additional provinces and U.S. states (#735) - - Merged PR-735 - -commit a5e467a56e07f515b02db3aece26c466ca0a24df -Merge: 9f92f0a69 72c550c7a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Jun 8 07:51:32 2018 -0700 - - Merge pull request #730 from bcgov/readme-edits - - Remove 'special files' section and fix broken link - -commit 900abb5a18d5ecef86dc6d48db572a5389f83d86 -Author: Steve Hillier -Date: Thu Jun 7 16:22:21 2018 -0700 - - fetch province codes from DB for display in forms - -commit 9f92f0a69ba1d0d070ed2f32652ca9d417cc5ef1 -Author: Steve Hillier -Date: Thu Jun 7 16:22:07 2018 -0700 - - bring vue-test-utils up to date and run npm audit fix (#725) - - Merged PR-725 - -commit 463d3228a23fe0d3caef7ff28c10750581a74f22 -Author: garywong-bc -Date: Thu Jun 7 15:46:07 2018 -0700 - - Updated Fixture names. (#724) - - Merged PR-724 - -commit 72c550c7aff8a2c1a0aebb2a6b3a8ac28444cae8 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Jun 7 15:34:31 2018 -0700 - - Remove 'special files' section and fix broken link - -commit c6bcb6c321c1950a3d6e6e3a4b55f78e23443424 -Author: Steve Hillier -Date: Thu Jun 7 15:23:50 2018 -0700 - - add missing col inside row (#726) - - Merged PR-726 - -commit c7d681f3137412ac5ce4c2a21a15ebbc5edb4b93 -Author: Steve Hillier -Date: Wed Jun 6 13:39:29 2018 -0700 - - [861] Auth by SSO-assigned roles (#707) - - Merged PR-707 - -commit b3f85de57883b6aea4471247ccb2a5b431c32a71 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Jun 5 18:15:07 2018 -0700 - - Pipeline abort on mid-cycle fail (Deploy - DEV) (#721) - - Merged PR-721 - -commit e58680fc4b3510774d13ad4536247eab1549429c -Author: Sybrand Strauss -Date: Mon Jun 4 18:34:55 2018 -0700 - - [978] Edit Classification and Qualification (#717) - - Merged PR-717 - -commit fda3b78f6de222c7a44813f2ca434d8b77326343 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Jun 4 16:46:51 2018 -0700 - - [1005] Pipeline retry on functional tests (#715) - - Merged PR-715 - -commit 5468d0be8c5f5bffc78c80bec48392d843deb988 -Author: garywong-bc -Date: Mon Jun 4 11:39:30 2018 -0700 - - First pass at cleaning up obsolete CSV and DB sql scripts. (#716) - - Merged PR-716 - -commit cb47ec1d0c31b6f1586843e491f7cb5f1b98d61a -Merge: f9468548c 74545ea4e -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed May 30 15:07:58 2018 -0700 - - Merge pull request #698 from bcgov/release/1.32.0 - - Merged PR-698 - -commit 74545ea4e1518c286d20f643bbe594e5c3e751f6 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Wed May 30 12:12:30 2018 -0700 - - Feature/pipeline/mid hook command (#714) - - Merged PR-714 - -commit b7e25dde2ff624c1ce3753664c95f6a413c351e8 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Tue May 29 17:27:32 2018 -0700 - - Update Jenkinsfile (#711) - - Merged PR-711 - -commit f3006d6c2c622c79869a9a1ffbe87cc9dc19db8c -Author: garywong-bc -Date: Tue May 29 11:23:33 2018 -0700 - - Convert CSV to JSON (#710) - - Merged PR-710 - -commit 24e70c482e6cb5f02695215305bf06134c097082 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri May 25 16:29:51 2018 -0700 - - Jenkinsfile - test@gwells-test.pathfinder.gov.bc.ca (#708) - - Merged PR-708 - -commit b06266ff92a8617d3342c96d9dec93979300731b -Author: Sybrand Strauss -Date: Fri May 25 11:32:00 2018 -0700 - - [981] Proof of age (#706) - - Merged PR-706 - -commit 7990bd4fc3e8e2f36e4b77c3cd680c6460aeea70 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Fri May 25 10:36:02 2018 -0700 - - CONTRIBUTING.md (#705) - - Merged PR-705 - -commit 8db91fc284e0b6c03665a9503c459e7ea6cf957a -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Thu May 24 13:12:36 2018 -0700 - - Squash commits (#704) - - Merged PR-704 - -commit 24fda2e622944be996cac4eab3f0cef47a440421 -Merge: 695f185ca 4fcc198d8 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu May 24 12:41:05 2018 -0700 - - Merge pull request #702 from DerekRoberts/timeoutRevert - - Merged PR-702 - -commit 4fcc198d87045da550791c40cd66c671063ad46c -Author: Derek Roberts -Date: Thu May 24 11:29:18 2018 -0700 - - GebConfig.groovy - revert/reduce timeout from 20 to 5 - -commit 695f185ca3433c6499ff556e5892a02bd62b07fc -Merge: 4411ea6ff f558c86f3 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu May 24 10:27:57 2018 -0700 - - Merge pull request #693 from garywong-bc/release/1.32.0-GW - - Merged PR-693 - -commit f558c86f3c456b26a3a810375d82824538a1752a -Merge: 6984c3971 4411ea6ff -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu May 24 09:46:19 2018 -0700 - - Merge branch 'release/1.32.0' into release/1.32.0-GW - -commit 4411ea6ff6e1292b44216201ef6f1db7db236194 -Merge: a67027b35 40ec7796e -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed May 23 17:38:06 2018 -0700 - - Merge pull request #699 from Sybrand/feature/addNewApplicant_PRComments - - Merged PR-699 - -commit 40ec7796ed1f840926bf1952aec68af1673f30f7 -Author: Sybrand Strauss -Date: Wed May 23 16:29:44 2018 -0700 - - Changed placement of adjudication - -commit db55cedb09d1c6946d410a66395dc4aa78fc0a4f -Author: Sybrand Strauss -Date: Wed May 23 15:49:32 2018 -0700 - - Pushing timeout back to 20 - trying to figure out why testing is failing - -commit 0654d4c8affcf3dbc72af9fc079016ca8c6d5340 -Author: Sybrand Strauss -Date: Wed May 23 15:15:24 2018 -0700 - - Upgraded to using latest version of chrome and selenium - -commit fd164d3ed830d5efdc48d089fbd98725f63dc6cd -Author: Sybrand Strauss -Date: Wed May 23 14:05:10 2018 -0700 - - Fixed unit test - -commit d9117ff02b6ec6cb3cac61d55dced57ff95d36b8 -Author: Sybrand Strauss -Date: Wed May 23 14:04:04 2018 -0700 - - Changed , to & - -commit 20b2eab9e731c00e0442cadcb6437a70f19d659d -Author: Sybrand Strauss -Date: Wed May 23 13:57:45 2018 -0700 - - Split classification & qualifications from adjudication - -commit 070f3e46970e0aabd941078136eac8583735ceed -Author: Sybrand Strauss -Date: Wed May 23 13:14:19 2018 -0700 - - Bolded subheadings - -commit 01f890a66532e468d6a05d824cc4844b3267dc14 -Author: Sybrand Strauss -Date: Wed May 23 11:01:59 2018 -0700 - - Changed labeling to improve accessibility - -commit 7ec1bb2c7188801ccd794b2f0a2d51f22c1aa99e -Merge: 67fd2df20 a67027b35 -Author: Sybrand Strauss -Date: Wed May 23 10:45:35 2018 -0700 - - Merge branch 'release/1.32.0' into feature/addNewApplicant_PRComments - -commit 67fd2df20e0b42ecf029682c257d44228ea7b83e -Author: Sybrand Strauss -Date: Wed May 23 10:37:53 2018 -0700 - - Fixed syntax error in test - -commit a67027b35eff1289ebd516fe1190ec3ebb2bd811 -Merge: 3c183fca9 e77edb693 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Wed May 23 09:33:42 2018 -0700 - - Merge pull request #696 from stephenhillier/companies - - Merged PR-696 - -commit 63b1b90c2e1f0b4b2e1a1df0f59d14daec0286da -Author: Sybrand Strauss -Date: Tue May 22 19:29:02 2018 -0700 - - Added functional test stubs - -commit 2c803e9fb6e1dcee0ac6fda1ae99bd05d4b09eb9 -Author: Sybrand Strauss -Date: Tue May 22 19:09:21 2018 -0700 - - Incorporating changes from code review and adressing some accesibility issues - -commit e77edb693bdf8b28536aae351a5007480945bb1f -Author: Steve Hillier -Date: Mon May 14 15:58:48 2018 -0700 - - Add company edit page - - add company array to data - - add query to API - - remove pagination from organization list - - add form fields for editing company info - - Add company edit page - - working company edit form - - added some simple validation - - add count of registrants to company details - - add organization notes - - all organization requests are now offlimits to anon users - - note sorting - - add organization notes - - fix notes sorting - - fix note filtering - - login button functional test - - add comments - - prevent deleting companies with registrants - - add a delete button for empty companies - - rename references to deprecated 'shallow' to 'shallowMount' - - ignore functional test that cannot pass on dev instance - - add hint for deleting companies that have people in them - - add ApiService import back in - - add email field to company create/edit - - add comments - - add test descriptions - - update api tests - - Fixes for PR#696 comments - - remove staff count from organization list serializer (poor performance) - - add api tests from PR#689 - - fix staff count on organization edit screen - - change buttons to be more consistent - -commit 6984c3971d9f582effcbc753a8bfe43036bd0cef -Author: Gary Wong (BC Gov) -Date: Tue May 15 11:27:21 2018 -0700 - - Added new auto-creation of superuser as part of post-deploy.py and also start of code tables as fixtures. - - initial .py script, copied from createtestuser.py - - Added automatic creation of admin user, using ENV variables. - - Documented temporary manual steps to copy of registries .csv files - - Started moving of CSV to JSON (for code tables). - - Added Registries codetables, as fixture. - -commit 3c183fca95e13e1a8037a6131b62079f0949f48d -Merge: e9348a946 9aac39063 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Sat May 19 00:19:03 2018 -0700 - - Merge pull request #694 from DerekRoberts/db-scripts - - Merged PR-694 - -commit 9aac39063147e1c9d636e9523968ca9df056b165 -Author: Derek Roberts -Date: Thu Apr 26 16:12:16 2018 -0700 - - Complete scripts and update for new pipeline - - Complete and upgrade scripts for new pipeline - - +database/pvc-dump.sh - script to dump db into pvc - - Jenkinsfile-scripts - updated run back up and handle cleanup - - Jenkinsfile-scripts -> /scripts/Jenkinsfiles/cron-pg_dump - - +database/local-dump.sh - backup for postgresql container - - cron-pg_dump + save DB to var - - cron-pg_dump + var for project - - cron-pg_dump + comments - - cron-pg_dump - removed dir change, simpler - - cron-pg_dump -> pg_dump - - +scripts/Jenkinsfiles/db_vacuum-replicate - cronjob - - dp_dump - updated cron schedule - - pg_dump - ensure target is running - - oc-dump.sh - removed unused var - - oc-restore.sh - db restore script started from oc-dump.sh - - oc-restore.sh + check input file exists and is non-empty - - oc-dump.sh - extend sleep from 3 to 5 seconds - - oc-restore.sh + rsync restore file over - - oc-dump.sh - switched from gzip to pg custom format - - scripts/Jenkinsfiles/pg_dump - switched from gzip to pg custom format - - .gitignore + .pgCustom for postgres custom dump format - - oc-dump&pg_dump - switched date formats to avoid colons - - pvc-dump.sh - same as last few - - oc-restore.sh - finished! pg custom format restore - - db_vacuum-replicate - move WELL_COUNT to Groovy var - - db_vacuum-replicate -> pg_replicate - - pg_replicate - updated for new pgsql pod name - - pg_dump - updated for new pgsql pod name - - pg_replicate - rename vars for consistency - - pg_replicate - updated for new pgsql pod name - - pg_replicate - compare int, wrap sh in block - - pg_replicate - remove echos, wrap-up - -commit e9348a946c2355c5559a7c9d74a835b8b10d07de -Merge: f9468548c e36fb4d11 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Fri May 18 16:49:56 2018 -0700 - - Merge pull request #689 from Sybrand/feature/addNewApplicantAttemptMerge - - Merged PR-689 - -commit e36fb4d11cfa7b4c16d2cb53309bffe0c7e19091 -Merge: 3edd22e55 f9468548c -Author: Sybrand Strauss -Date: Thu May 17 17:04:51 2018 -0700 - - Merge branch 'release/1.32.0' of github.com:bcgov/gwells into feature/addNewApplicantAttemptMerge - -commit f9468548c7b8e4d0eb358b045e4f89651d5f365b -Merge: 1c2a0333d 59321762a -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Thu May 17 16:07:55 2018 -0700 - - Merge pull request #687 from bcgov/developer - - Merged PR-687 - -commit 3edd22e557756256ab4246c4a337d627bbd41c80 -Author: Sybrand Strauss -Date: Thu May 17 14:17:03 2018 -0700 - - Removed comments - -commit 6964e8b7218f022774d4b5ff737f9626a0437b4f -Author: Sybrand Strauss -Date: Thu May 17 13:41:18 2018 -0700 - - Updated unit test - -commit d4b110bf408a6ba38e7af416b649b481c8dcfa89 -Author: Sybrand Strauss -Date: Thu May 17 13:33:43 2018 -0700 - - Addressing some inconsitencies - -commit 044a2560357669a4c04d7c664208392588cfbddc -Merge: a2e80a0e5 59321762a -Author: Sybrand Strauss -Date: Thu May 17 13:28:22 2018 -0700 - - Merge branch 'developer' into feature/addNewApplicantAttemptMerge - -commit a2e80a0e54bac5f5c96f66f61fe06e91f0183e60 -Author: Sybrand Strauss -Date: Thu May 17 12:20:49 2018 -0700 - - Added some vue unit tests - -commit 614710cc42252360d7ec654d0be91ee91b43b736 -Author: Sybrand Strauss -Date: Thu May 17 11:20:33 2018 -0700 - - Changed to use store for driller options - -commit 59321762ae09dbae2dccf30c5a6e9ed9413cd21b -Author: Clecio Varjao <1348549+cvarjao@users.noreply.github.com> -Date: Mon May 14 18:41:30 2018 -0700 - - Fixing invalid memory limit - - Tweak resource request and limits for the pipeline - - Tweaking resources, re-enable stage try/catch - - Removing set build result - - Tweaking resources - - tweak concurrency - - let workers be set via environment variable - - Increase workers thread - - Increasing resources - - Fluxing DB before loading fixtures - - DIsable database flush confirmation - - Safe stage block - - Removing fixtures from TEST - - Adding ConfigMap - - Tryng Minimum CPU/Memory usage - - Fixing typo - - Adding CPU - - Adding auto scaling - - Decrease the gap between CPU request and limit - - Parallel functional tests - - Trying again - - Undo parallel tests - - Decrease waiting timeout - - Fix missing PVC for PGSQL - - Set PVC size - -commit 4e033206c6a079e3ae2d1df0c83506603b4c8846 -Author: Sybrand Strauss -Date: Wed May 16 15:53:46 2018 -0700 - - Modifications to get tests working - -commit 8542af315283942b04255029e1c003769f2a164e -Author: Sybrand Strauss -Date: Tue May 15 13:59:42 2018 -0700 - - Fixed date submission in UI - -commit ef0a6e84e2c07ce05f906245d3ff8dc95be2989b -Author: Sybrand Strauss -Date: Tue May 15 13:27:43 2018 -0700 - - Added current status - -commit abda1f1fdd7bfc0ad2cbb0d9b3889949e8002419 -Author: Clecio Varjao <1348549+cvarjao@users.noreply.github.com> -Date: Mon May 14 18:34:37 2018 -0700 - - Tweaking resource request and limit - -commit d4c48ed6c0e9e5d38d3f4df8fe4a9a3afedbe2e2 -Merge: 891796ed4 f9d373108 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon May 14 17:30:55 2018 -0700 - - Merge pull request #686 from stephenhillier/developer - - Merged PR-686 - -commit 891796ed4c68d9c3229dc26ccea035aba8df7c55 -Merge: d62d41fde 1a28393c9 -Author: bcgov-csnr-cd <30482804+bcgov-csnr-cd@users.noreply.github.com> -Date: Mon May 14 17:25:31 2018 -0700 - - Merge pull request #685 from stephenhillier/ga - - Merged PR-685 - -commit facd470682fe3e7d55132e68ee0a872d97496d7e -Author: Sybrand Strauss -Date: Mon May 14 16:55:14 2018 -0700 - - Removed redundant serializers - -commit 4cee26196c298b5a87d6d22f06ee7d969e3b9250 -Author: Sybrand Strauss -Date: Mon May 14 16:41:45 2018 -0700 - - Removed experimental code - -commit f9d3731088de1f8c3329b4c31164edd76d9421d3 -Merge: 9d85e2b5a a59e27734 -Author: Steve Hillier -Date: Mon May 14 16:24:43 2018 -0700 - - Merge branch 'developer' of github.com:stephenhillier/gwells into developer - -commit 9d85e2b5a13a33cba9a970e94630fe8f364baa7b -Author: Steve Hillier -Date: Mon May 14 15:24:19 2018 -0700 - - icon for company add/change is now different based on context - -commit 02d2a6ff1818c72578290cd7b2bc5941ee75b3f0 -Author: Steve Hillier -Date: Mon May 14 15:16:08 2018 -0700 - - display active surveys - -commit af89fda09381fb98dd9fdcfc152b118223d93a46 -Author: Steve Hillier -Date: Mon May 14 15:15:36 2018 -0700 - - add a read-only survey list API endpoint - -commit 181a05ed1972855cb14f2781ba7fc11abbec17dd -Author: Steve Hillier -Date: Mon May 14 14:21:06 2018 -0700 - - company change button shows either add or change depending on context - -commit de5d108707780c727c1c8edce28d92268a42a3fa -Author: Sybrand Strauss -Date: Mon May 14 16:18:56 2018 -0700 - - Added decent options - -commit db1b24bdc60b657c15ec6aa240835ab6c8ad371f -Author: Sybrand Strauss -Date: Mon May 14 16:11:35 2018 -0700 - - Frontend now complies with reality in database and requirements from Po - -commit 1a28393c99a153e88a9ef50ad01ec9392e6fa7f7 -Author: Steve Hillier -Date: Mon May 14 13:55:35 2018 -0700 - - add analytics with label - -commit 95b531ca02179eb9f21b41967f2cc1580af4d9f3 -Author: Steve Hillier -Date: Mon May 14 12:42:49 2018 -0700 - - add google analytics event to search button - -commit a59e27734ec5fdfd744b5bd2759629711e284958 -Author: Steve Hillier -Date: Mon May 14 15:24:19 2018 -0700 - - icon for company add/change is now different based on context - -commit cdd17da3f87eb5d9e1e9d1ba878805a0aca0d336 -Author: Steve Hillier -Date: Mon May 14 15:16:08 2018 -0700 - - display active surveys - -commit 2e0c2d6f26e4da5cad93c2cf27205fe320d0436a -Author: Steve Hillier -Date: Mon May 14 15:15:36 2018 -0700 - - add a read-only survey list API endpoint - -commit d62d41fde8edeb2c43d7aa6237c0d47047e372f8 -Author: Clecio Varjao <1348549+cvarjao@users.noreply.github.com> -Date: Mon May 14 15:13:19 2018 -0700 - - Fixing DockerRegsitry URL and LoadFixtures stage - -commit cb393715c32b1d3ce745333fc996a2e3213919b5 -Author: Steve Hillier -Date: Mon May 14 14:21:06 2018 -0700 - - company change button shows either add or change depending on context - -commit 46aa1c5dfdb3b0d8c0945a19d783d45f644865fb -Merge: 9213bf5a7 38477363e -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon May 14 13:53:19 2018 -0700 - - Add survey to Registries search page - stephenhillier/20180514 - - Add survey to Registries search page - -commit 38477363e1a04cc10474836297d46bf4c2546a95 -Author: Steve Hillier -Date: Mon May 14 11:36:45 2018 -0700 - - add hardcoded survey to search page - -commit ce24c238a0f9daeb871cb8538e6b0d3821ac74ae -Author: Steve Hillier -Date: Mon May 14 11:20:53 2018 -0700 - - add frontend build files to gitignore - -commit 9213bf5a7725db2a0398f9f7a61656204323c48c -Author: Clecio Varjao <1348549+cvarjao@users.noreply.github.com> -Date: Sat May 12 00:03:19 2018 -0700 - - Fixing Print stack trace - -commit e28ef10e928cfcaa8e0a64c6d37881187d2a7f98 -Author: Clecio Varjao <1348549+cvarjao@users.noreply.github.com> -Date: Fri May 11 23:02:32 2018 -0700 - - waitUntil should be wrapped by stage - -commit 5312a227c83ad6e5de58fb3731d4b313c3f7e050 -Author: Clécio Varjão <1348549+cvarjao@users.noreply.github.com> -Date: Fri May 11 13:13:06 2018 -0700 - - A few fixes after testing pipeline up to DEV - - Fixing source ImageStream - - Updating Docker Ref for the gwells project name - - Fixing postgresql images, removing test image - - Fixing missing mid-hook database script - - There should be only 1 frontend/main Router - -commit 566b6d5d068c1ec57413b8525fe636ee045cf25a -Author: Clecio Varjao <1348549+cvarjao@users.noreply.github.com> -Date: Fri May 11 09:00:20 2018 -0700 - - New pipeline - -commit c598d0a3553faf2e3a9351f7ecfc0a82e5617152 -Author: Clecio Varjao <1348549+cvarjao@users.noreply.github.com> -Date: Fri May 11 09:01:34 2018 -0700 - - ¡reorg! - -commit 843a742e7de2be33362cf56dc377a215748591db -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri May 11 08:40:55 2018 -0700 - - Included link to trello board. - -commit a4294f37a0a1c77ee2b09751d3e47d810bdb9ba7 -Merge: efba8cb5a 649211fac -Author: garywong-bc -Date: Thu May 10 20:09:19 2018 -0700 - - Merge pull request #681 from garywong-bc/developer - - Including new tables in reset script. - -commit 649211facb723a46fa68d24973bd14805873c77a -Author: Gary Wong (BC Gov) -Date: Thu May 10 20:08:22 2018 -0700 - - Including new tables in reset script. - -commit b08a724d0e2596ac767c42d61a4424b181ec6cd7 -Author: Sybrand Strauss -Date: Thu May 10 18:06:26 2018 -0700 - - Can create driller with application (subactivity), and OPTIONS gives possible values for primary certificate - -commit efba8cb5a770a016a220d659bae1ccd6aa77eabd -Merge: 0e220d2e4 df51a7e74 -Author: garywong-bc -Date: Thu May 10 17:13:08 2018 -0700 - - Merge pull request #680 from garywong-bc/developer - - Undoing changes to Registries "exempted" - -commit df51a7e743cc7219bbac9195542206e1b2055cd4 -Merge: 19d98d070 0e220d2e4 -Author: Gary Wong (BC Gov) -Date: Thu May 10 16:40:55 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 19d98d070fdd983a97a5086843bef79a2c9f896f -Author: Gary Wong (BC Gov) -Date: Thu May 10 16:40:40 2018 -0700 - - Revert to prior replication of legacy well drillers. - -commit 0e220d2e48717fc2f8b1ca4ad45f2770b6cf290b -Merge: 878742c59 41124177d -Author: Steve Hillier -Date: Thu May 10 16:33:33 2018 -0700 - - Merge pull request #679 from stephenhillier/developer - - Small fixes for Registries frontend - -commit 41124177d36617470144b850f88f5072f281b37e -Author: Steve Hillier -Date: Thu May 10 16:32:04 2018 -0700 - - fix test for view that anon users can no longer access - -commit 3f797470ce8001cfbbff1131de79645404b42164 -Author: Steve Hillier -Date: Thu May 10 16:23:39 2018 -0700 - - fixed telephone not being hooked up to form input object - -commit bba6fa5cafc3c5485d5c68d7dbaf6df226bb0551 -Author: Steve Hillier -Date: Thu May 10 16:20:55 2018 -0700 - - add tel, email and cell to fields that are reset when reset clicked - -commit 5e732d41c6853b474796d041b41e62536249bada -Author: Steve Hillier -Date: Thu May 10 13:15:55 2018 -0700 - - improve orm performance for Person detail requests - -commit 878742c59875ea490d95f6a2aa36f9b14ae5d9b1 -Merge: a903ab923 564120eff -Author: garywong-bc -Date: Thu May 10 13:12:45 2018 -0700 - - Merge pull request #676 from stephenhillier/developer - - Registries: create notes for person records (#803) - -commit ac2e6776eaeba94dd0614519e9a7b2e83fc67c96 -Author: Steve Hillier -Date: Thu May 10 13:01:45 2018 -0700 - - fix where browser scrolls to after adding a note - -commit a903ab92398cda37080fad555b2fcd27ad1d8eec -Merge: 0e530037f 95daf50f5 -Author: garywong-bc -Date: Thu May 10 12:49:04 2018 -0700 - - Merge pull request #678 from garywong-bc/developer - - Refactoring scripts - -commit 95daf50f59587b6a2a94fc4523afe2b2823f5423 -Merge: 0e530037f 985c8e309 -Author: Gary Wong (BC Gov) -Date: Thu May 10 12:47:34 2018 -0700 - - Merge branch 'removed-drillers' into developer - -commit 985c8e309a4f7fc04d0be3978194b563f5f211dc -Author: Gary Wong (BC Gov) -Date: Thu May 10 12:47:20 2018 -0700 - - Moved to new /scripts folder and included new 'historical' well drillers. - -commit 564120effa561fb8a39b4a80312fa3c364f091a3 -Author: Steve Hillier -Date: Thu May 10 12:21:16 2018 -0700 - - remove unused code (form feedback for notes input) - -commit de5f065b648208e022a244fc2a344d6162ccb5b5 -Author: Steve Hillier -Date: Thu May 10 12:19:58 2018 -0700 - - fix typo in PersonNote view (wrong filter field) - -commit 69f64d68e7233ad4b83135046091e78c7673fd0e -Author: Steve Hillier -Date: Thu May 10 12:19:44 2018 -0700 - - sort notes (newest first) - -commit 0e530037f71a34aec16747574b7959e8b031d87f -Merge: 8563fdeb2 c45213a83 -Author: garywong-bc -Date: Thu May 10 11:28:34 2018 -0700 - - Merge pull request #677 from garywong-bc/developer - - consolidated database/cron/scripts/*.sh to a central folder - -commit c45213a833f8beb9b22e0625bf0aaa46f8c02da4 -Author: Gary Wong (BC Gov) -Date: Thu May 10 11:25:54 2018 -0700 - - consolidated database/cron/scripts/*.sh to common openshift/scripts folder. - -commit afdb276e430e075595717ecae46e634a123f6fd4 -Merge: e527b2221 a2d740cd7 -Author: Steve Hillier -Date: Thu May 10 11:06:07 2018 -0700 - - Merge branch '803-notes' into developer - -commit a2d740cd762404844dfbe8e9d3f3227db22c2807 -Author: Steve Hillier -Date: Thu May 10 11:05:27 2018 -0700 - - add test for notes api requests - -commit e527b2221ba7ab65546ddf058170e6f74e5b8b54 -Author: Steve Hillier -Date: Thu May 10 10:58:47 2018 -0700 - - add override for select element style (prevent double dropdown icon) - -commit 7d9d192a42d8f85e1a32d6d9ef106d42da20c31f -Author: Steve Hillier -Date: Thu May 10 10:33:58 2018 -0700 - - update test (assertion was missing) - -commit 8563fdeb2b11b5daa5a2d40a72debee43f821633 -Merge: 653642822 7ddbaefad -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Thu May 10 10:21:05 2018 -0700 - - Fixtures updates, functional tests alignment - cwevans/fixtures-updates - - Fixtures updates and alignment to functional tests - -commit 6cd39d15620a54c86f31fb36a3bf6c24d85e8151 -Author: Sybrand Strauss -Date: Thu May 10 10:11:16 2018 -0700 - - Trying to figure out serializing - -commit 7ddbaefada90126ecb72335f73ee5a0237d7d651 -Author: Christian Evans -Date: Thu May 10 08:04:19 2018 -0700 - - Typo on readme - -commit 8fb37f0d5da089f33a0a3401cb09a2208f4e788a -Merge: ff7c07669 653642822 -Author: Christian Evans -Date: Thu May 10 08:03:28 2018 -0700 - - Merge remote-tracking branch 'upstream/developer' into fixtures-updates - -commit c8108dbd279839b556c3d67e7e189bc6123369e3 -Author: Steve Hillier -Date: Wed May 9 17:17:13 2018 -0700 - - removing tests that cause issues in pipeline - -commit 2d0b35fae2a3ecc92b8f263a9fc9005306d5822d -Author: Steve Hillier -Date: Wed May 9 17:16:56 2018 -0700 - - simple tests for PersonNotes component - -commit 653642822087ed4d610a701979ce7c1fa4fec4d3 -Merge: 2c239624c 1798071f9 -Author: Steve Hillier -Date: Wed May 9 16:49:53 2018 -0700 - - Merge pull request #675 from stephenhillier/developer - - remove city list api test - -commit 1798071f9b1e800484d05bfee0bc018e72768fe4 -Author: Steve Hillier -Date: Wed May 9 16:48:31 2018 -0700 - - remove city list api test - -commit a4342a82f99735388326f1052cf191f4bb3f343b -Author: Steve Hillier -Date: Wed May 9 16:45:07 2018 -0700 - - fix notes author name - -commit 95b1dd21298ec94ba6caf52909d5db2f2e90904d -Author: Steve Hillier -Date: Wed May 9 16:44:53 2018 -0700 - - add notes component to person detail screen - -commit b54b4dedef865ec3e6d64e9a519f8262bf1fe94d -Author: Steve Hillier -Date: Wed May 9 16:44:29 2018 -0700 - - show actual name for 'created_user' fields if available - -commit 0e33b9a54c417f1779c28a866887b6161815a36f -Author: Steve Hillier -Date: Wed May 9 16:43:45 2018 -0700 - - add vue-moment - -commit dbb29bde1447e7c82e604e3093726731d5d29f67 -Author: Steve Hillier -Date: Wed May 9 16:43:07 2018 -0700 - - add name field to profile - -commit 2c239624c379cb315eda0aeec15daf817a789bad -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed May 9 15:19:39 2018 -0700 - - Jenkinsfile-developer +request=lim for all memory - -commit 0bc14ef400b3e9ed90a54dc6af1558f483a5a8f9 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Wed May 9 14:56:12 2018 -0700 - - Jenkinsfile-developer +request RAM for sonarqube - -commit eebd6ec985ec22d42f2cae5748e7e21c87ebf600 -Merge: 2af59e9e7 9d0889f6f -Author: Steve Hillier -Date: Wed May 9 10:18:20 2018 -0700 - - Merge pull request #674 from stephenhillier/developer - - fix failing API test - -commit 9d0889f6fe095bdd958facbf986a46c822cb7dc6 -Author: Steve Hillier -Date: Wed May 9 10:17:28 2018 -0700 - - fix failing API test - -commit 41a1ed1a931cc72db62441aebde88cb2f6580999 -Author: Steve Hillier -Date: Wed May 9 10:14:03 2018 -0700 - - fix failing API test - -commit 9ff2fbce90c3255e60a2c29acfb9fda770b7bd09 -Author: Steve Hillier -Date: Tue May 8 17:17:23 2018 -0700 - - add PersonNote model and endpoint - -commit 8fd1cccacb3e0396ac3159dc8dd8f89a5beb6e24 -Author: Steve Hillier -Date: Tue May 8 17:17:07 2018 -0700 - - reset migrations - -commit d351fc7c50e5d23a4c17aa01007f369f8fe5739a -Author: Sybrand Strauss -Date: Tue May 8 15:03:18 2018 -0700 - - Fixed pep8 issue - -commit f2f91d3a8d24c1ada435def90ad6fae1526bc736 -Author: Sybrand Strauss -Date: Tue May 8 14:49:14 2018 -0700 - - Trying to incorporate classification, qualifications & adjudication - -commit 2af59e9e79ee02cfe377cc67cab7a468ee1e508e -Merge: c5d134782 773a1a1ac -Author: Steve Hillier -Date: Tue May 8 14:05:09 2018 -0700 - - Merge pull request #672 from stephenhillier/developer - - Fix test failing with JS syntax error - -commit 773a1a1acf0090f986b264ad80eddf191c936813 -Author: Steve Hillier -Date: Tue May 8 13:51:53 2018 -0700 - - add test back in with strict mode - -commit 14d4d10cf71f84a245ce035ea05879cb738fa5c6 -Author: Steve Hillier -Date: Tue May 8 13:41:15 2018 -0700 - - remove test with syntax issue - -commit ff7c07669a2207fd0ab6769b4ceae3332850a4ef -Author: Christian Evans -Date: Tue May 8 13:30:29 2018 -0700 - - Updated setup readme to include loading fixtures. - -commit c5d13478222ac600d15357bac19d80f10defcbae -Merge: 1c2a0333d cb627f8c2 -Author: Steve Hillier -Date: Tue May 8 11:06:39 2018 -0700 - - Merge pull request #671 from stephenhillier/developer - - Registries data entry screens - -commit cb627f8c2f35b9632d358fee8687d3b2027de1ac -Author: Steve Hillier -Date: Tue May 8 10:41:29 2018 -0700 - - removed placeholders on edit fields - -commit ca8e7569c9b87ef21b2282c85d4fb7a5f1e249c9 -Author: Steve Hillier -Date: Tue May 8 10:27:07 2018 -0700 - - update placeholder text - -commit 2ee45dbb6457e2f44c87dae1c70c2b63f3c17190 -Author: Christian Evans -Date: Tue May 8 10:20:21 2018 -0700 - - Updated fixture data to match funtional test and re-factored SearchRegistry tests. - -commit 065d1c0c8a601fe303e21f0ab7207a15f900dcec -Author: Steve Hillier -Date: Mon May 7 17:05:09 2018 -0700 - - add ORCS numbers to add applicant screen - -commit 043c6f9b05ee97848a208889f7f47436fd669329 -Author: Steve Hillier -Date: Mon May 7 16:20:38 2018 -0700 - - update API test with org name list test - -commit 801ea2af91294db46835a9db546c70152687caa5 -Author: Steve Hillier -Date: Mon May 7 16:20:21 2018 -0700 - - add subheadings to match story card - -commit 28c9ec6f14ab5bbac620acc481846352ea60b656 -Author: Sybrand Strauss -Date: Mon May 7 16:17:22 2018 -0700 - - 1st draft of classification view - -commit 1c2a0333d6ffbdfd3d90e80bdf7877372cc7dce4 -Merge: 3bb332079 de699e1b5 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon May 7 15:45:36 2018 -0700 - - Registries misc - bcgov/developer - - Registries misc - -commit 4b30524753f0e4c6fdb60902cd13dfd073f73587 -Author: Steve Hillier -Date: Mon May 7 15:38:23 2018 -0700 - - add required property to province select - -commit 67077e8d6369e0eba5d0f2f8e7513450b5068128 -Author: Steve Hillier -Date: Mon May 7 15:33:39 2018 -0700 - - display message if person isn't registered - -commit 96261bf5f7b561d488ac908c2786c32010461f76 -Author: Steve Hillier -Date: Mon May 7 15:33:14 2018 -0700 - - display api form error messages - -commit 5c26bd7c930335b115f1bfe996284419a627c45d -Author: Steve Hillier -Date: Mon May 7 15:32:37 2018 -0700 - - update models (typo in description) - -commit 016d6e028c4b490f49466088dfab8cb15c5e8b7a -Author: Steve Hillier -Date: Mon May 7 15:31:28 2018 -0700 - - improved queryset performance - -commit de699e1b54bd4852d6b3519b1e3629daf692a813 -Merge: 2c95bc6bb 44a3da23c -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon May 7 14:33:21 2018 -0700 - - skip over Registries tests temporarily - garywong-bc/developer - - skip over Registries tests temporarily - -commit 44a3da23c4659cc1b116a773a7bd125ce039b313 -Author: Gary Wong (BC Gov) -Date: Mon May 7 14:28:45 2018 -0700 - - skip over Registries tests temporarily. - -commit bf51854ce1fb39be7de534315be96d920876e6c1 -Author: Steve Hillier -Date: Mon May 7 12:36:48 2018 -0700 - - remove duplicated line - -commit 59a8c5dcc4c89fee7555442ac963b533112aa31e -Author: Steve Hillier -Date: Mon May 7 11:42:33 2018 -0700 - - add a more verbose name when picking a person's company - -commit 2c95bc6bb101569b8ebb39b5ee303434e40be235 -Merge: 12fcb85ad 591a3ea27 -Author: garywong-bc -Date: Mon May 7 11:37:48 2018 -0700 - - Merge pull request #668 from garywong-bc/developer - - Restructured Database folders - -commit 591a3ea27ad1db9ed7587f4de51f7c8a7d1a373a -Merge: 12fcb85ad 5cdf3937b -Author: Gary Wong (BC Gov) -Date: Mon May 7 11:34:56 2018 -0700 - - Merge branch 'rejig-db-folders-v2' into developer - -commit 5cdf3937b6205582d85f7ab68790e84399721ee4 -Author: Gary Wong (BC Gov) -Date: Mon May 7 11:34:39 2018 -0700 - - Restructured Database folders to have /gwells, /wellsearch in addition to current /registries. - -commit c3cb23d13b9e7a97f1f55479d0af4dacde5c03b9 -Author: Steve Hillier -Date: Mon May 7 11:23:34 2018 -0700 - - better handling of contact info (both on person table and contactinfo table) - -commit d69c087b1d1e566d697041d58ccfaafc360e11c4 -Author: Steve Hillier -Date: Mon May 7 11:22:22 2018 -0700 - - add verbose names for organization names list - -commit 12fcb85ad6e773ba4f0ad01e026f86bef09ad6fc -Merge: f5931b9e1 5a851dd62 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon May 7 10:46:48 2018 -0700 - - well_detail.html - del survey link - DerekRoberts/survey-remove - - well_detail.html - removed surveymonkey.com link and div - -commit 5a851dd62321a0ca468f92123c8986fda9c912e2 -Author: Derek Roberts -Date: Mon May 7 10:07:04 2018 -0700 - - well_detail.html - removed surveymonkey.com link and div - -commit 7587bd48f2644441a659c3df7fa0b102e5023d22 -Merge: 2d4628879 f5931b9e1 -Author: Sybrand Strauss -Date: Mon May 7 09:29:02 2018 -0700 - - Merge branch 'developer' into feature/addNewApplicant - -commit f5931b9e11b6c5beaf13e6a9a64e9fb401c6adf0 -Merge: ecb0e9821 de042e920 -Author: garywong-bc -Date: Mon May 7 09:22:35 2018 -0700 - - Merge pull request #665 from garywong-bc/developer - - Refactoring /database files and folders. - -commit de042e920857d8e6bdc8406772d2fa5d73e10ed9 -Author: Gary Wong (BC Gov) -Date: Mon May 7 09:19:57 2018 -0700 - - Refactoring /database files and folders. - -commit 8723fdbce7d417081b4b4254726ed8ba795c4b36 -Author: Steve Hillier -Date: Fri May 4 17:21:19 2018 -0700 - - fix add/update person record for new contact info model - -commit a98e86064b75816698c9ad19d3af552428d78ac6 -Author: Steve Hillier -Date: Fri May 4 17:20:52 2018 -0700 - - fix registration serializer to allow changing organization to null - -commit 201e257540d85de97002f42f23e6aa55b75efb04 -Merge: 9520d33f0 ecb0e9821 -Author: Steve Hillier -Date: Fri May 4 11:51:34 2018 -0700 - - Merge branch 'developer' of github.com:bcgov/gwells into developer - -commit ecb0e9821bda20c12cbb6e60ee37e535e21b5db9 -Author: Steve Hillier -Date: Fri May 4 11:51:07 2018 -0700 - - git remote check more flexible - -commit 2d4628879dc072ed56e0c5e393b0e44612bdd7eb -Author: Sybrand Strauss -Date: Thu May 3 16:36:17 2018 -0700 - - Busy implementing ui - -commit 9520d33f0a961e3c77e1b02e0b5e580a16df7b5c -Author: Steve Hillier -Date: Thu May 3 14:24:33 2018 -0700 - - add contact details to person table - -commit daec00e95c34a026a98359aa84501fa4fc01a32f -Merge: 4cc7e21cf 3b30392c0 -Author: garywong-bc -Date: Thu May 3 12:58:34 2018 -0700 - - Merge pull request #664 from garywong-bc/developer - - Yet more spelling errors were fixed. - -commit 3b30392c0443687c98ce407835a99e2deeb7a994 -Author: garywong-bc -Date: Thu May 3 12:58:13 2018 -0700 - - Yet more spelling errors were fixed. - -commit 4cc7e21cf92886b4f840c6b1fa4757089f48ce82 -Merge: 9626fbe43 f5b0f197e -Author: garywong-bc -Date: Thu May 3 12:54:54 2018 -0700 - - Merge pull request #663 from garywong-bc/developer - - Better documentation of Django Admin settings. - -commit f5b0f197e1feb37cd4fbb290e6df17d6fc06273f -Author: garywong-bc -Date: Thu May 3 12:53:44 2018 -0700 - - fixed spelling errors. - -commit 9996c05f7a5fd412e12b3bb5e26227350eb85828 -Author: garywong-bc -Date: Thu May 3 12:52:58 2018 -0700 - - Fixed syntax error. - -commit 7acbb9cde99f75f188fc1af6680f6aa2233d393f -Author: garywong-bc -Date: Thu May 3 12:47:35 2018 -0700 - - Updated syntax link. - -commit 8d6571dc4a3d35b27a9893c4f44552f1cabfba47 -Author: garywong-bc -Date: Thu May 3 12:45:48 2018 -0700 - - Corrected link syntax - -commit 237bdcef313757a1fee7897bb9147ffc6d8504f2 -Author: Gary Wong (BC Gov) -Date: Thu May 3 12:32:40 2018 -0700 - - Updated to include django-gwells admin instructions. - -commit e1043d0f4993a598a4a19d3af0e75cf363052bfa -Author: Sybrand Strauss -Date: Tue May 1 17:32:29 2018 -0700 - - Building up qualification view - -commit 93be9ab31afe428dafe6a70a25089edafbafc1be -Author: Steve Hillier -Date: Tue May 1 17:29:37 2018 -0700 - - add person detail editing - -commit 37fc83453c1af252609f86c3d3bb16bb892d7bdd -Author: Steve Hillier -Date: Tue May 1 17:28:19 2018 -0700 - - update to fix hot reload - -commit e9fe4d247c87debacb01985cbb44a2d3502d2c52 -Author: Steve Hillier -Date: Tue May 1 17:28:10 2018 -0700 - - add ORCS numbers to person serializer - -commit 3bb332079f3d19cfea6f7d77e2ca1522f817b9aa -Author: Steve Hillier -Date: Tue May 1 09:17:14 2018 -0700 - - turn off dev tools for npm run build - -commit 9626fbe43da6b095acc2d71130ca63a30e8f200e -Merge: 05e1bfbc0 11cdb5851 -Author: Steve Hillier -Date: Tue May 1 15:56:36 2018 -0700 - - Merge pull request #662 from stephenhillier/developer - - Update in-progress Registries data entry screens - -commit 05e1bfbc007043fb6946e67571c9e7960635afa8 -Merge: c4d1b1fe5 14ac2ef8f -Author: Steve Hillier -Date: Tue May 1 15:56:18 2018 -0700 - - Merge pull request #661 from Sybrand/github/bug/printStyles - - Removed padding on well detail page (and fixed double bootstrap load) - -commit f78b31f4207ea98562999baa8cd57a40bf92a6d4 -Merge: 76374c487 c4d1b1fe5 -Author: Sybrand Strauss -Date: Tue May 1 10:47:18 2018 -0700 - - Merge branch 'developer' into feature/addNewApplicant - -commit 14ac2ef8fe60b2e995531988427634c67fb836ad -Author: Sybrand Strauss -Date: Tue May 1 10:41:10 2018 -0700 - - Switched to using .no-gutters - -commit 11cdb58510cd1c83997a501478b2128bb0c8d530 -Author: Steve Hillier -Date: Tue May 1 09:17:14 2018 -0700 - - turn off dev tools for npm run build - -commit 76374c4872bf0a5a98f91cdff98f4cd710b8612a -Author: Sybrand Strauss -Date: Mon Apr 30 17:58:36 2018 -0700 - - Added BASEURL reference for functional tests - -commit 27f918f76634d500fe2856a61d93741a8db5e487 -Author: Steve Hillier -Date: Mon Apr 30 17:31:11 2018 -0700 - - update tests - -commit 223ca6b31ad333913518730215b256ae91f43304 -Author: Steve Hillier -Date: Mon Apr 30 17:31:02 2018 -0700 - - remove test specs for old file - -commit e1f65f3821fe461c073e7f9531671c61cfdeb62a -Author: Steve Hillier -Date: Mon Apr 30 17:25:34 2018 -0700 - - refactor for updated data model - -commit af534d248115eb4efb3430ef40c3800fffdc5c3d -Author: Steve Hillier -Date: Mon Apr 30 17:25:04 2018 -0700 - - support patch - -commit a03d26ffe3e71fb1c9376205e5887214d88caad2 -Author: Steve Hillier -Date: Mon Apr 30 17:24:46 2018 -0700 - - add a description field to a registration record activity - -commit a27c4ea8cb2a49226d29be626fa42650622743c8 -Author: Sybrand Strauss -Date: Mon Apr 30 16:34:33 2018 -0700 - - Removed padding on well detail - Removed loading of bootstrap from django template, now relying on header to load it - -commit 7ca68691f7d4b8409232dc743a4291f615be1be5 (tag: v1.30.0) -Merge: 60ea2e88e 4fedfc132 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Apr 30 14:25:10 2018 -0700 - - Merge branch 'developer' - garywong-bc/master - - Merge branch 'developer' - -commit 4fedfc132c6ea519ff27ba6b8def56083b25b416 -Merge: 805c29d0e c4d1b1fe5 -Author: Gary Wong (BC Gov) -Date: Mon Apr 30 14:21:15 2018 -0700 - - Merge branch 'developer' - -- reseting as per fixes to diff b/w master and developer - -commit bfd7f6dd6452162587ffe358afd30f1eed208221 -Author: Steve Hillier -Date: Mon Apr 30 13:41:28 2018 -0700 - - fixes to accomodate multiple organizations - -commit 60ea2e88ee2fd31e6ef055d1dc9d6c55cb789987 -Merge: 805c29d0e eff52a1c0 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Mon Apr 30 12:20:06 2018 -0700 - - Merging in all changes for Registries Search - garywong-bc/master - - Merging in all changes for Registries Search. - -commit eff52a1c01fc201b99de965f3cf7d9edcd3b4376 -Merge: 6f8c05921 805c29d0e -Author: Gary Wong (BC Gov) -Date: Mon Apr 30 12:17:37 2018 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 6f8c05921be34cc6af5772d4f19a0bd0671e1ed7 -Merge: 5d2dd8521 c4d1b1fe5 -Author: Gary Wong (BC Gov) -Date: Mon Apr 30 12:16:41 2018 -0700 - - Merge branch 'developer' - in preparation for release to PROD. - -commit 95127d2331f7f841b3c94b2895dad102da4c01d6 -Merge: 31da61618 c4d1b1fe5 -Author: Steve Hillier -Date: Mon Apr 30 09:08:16 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 31da61618788de8cd76296e52aebcca4b9422373 -Author: Steve Hillier -Date: Mon Apr 30 09:07:54 2018 -0700 - - change 'class of driller' column to not be sortable - -commit c4d1b1fe527aa088bf5b1a74267f205ee25cd4a0 -Merge: eb8e757e7 f40279fe4 -Author: garywong-bc -Date: Fri Apr 27 21:37:13 2018 -0700 - - Merge pull request #658 from garywong-bc/developer - - up'ing gunicorn workers - -commit f40279fe46f1198e3a0beef15e7c1832395b56a5 -Author: Gary Wong (BC Gov) -Date: Fri Apr 27 21:35:56 2018 -0700 - - up'ing gunicorn workers as the Code Quality check was still running after 3 hours, instead of the usual 2 minutes. - -commit eb8e757e720368dbfd41aa3fd073115dbfe92b01 -Merge: 37324a0ec 09f22aaf6 -Author: garywong-bc -Date: Fri Apr 27 17:20:50 2018 -0700 - - Merge pull request #656 from cwevans/registries-fixtures - - Registries fixtures - -commit 37324a0ecdcd63f5735eba98afb8a77257245e97 -Merge: a8d339c71 62801b666 -Author: garywong-bc -Date: Fri Apr 27 16:37:01 2018 -0700 - - Merge pull request #657 from Sybrand/bug/printStyles - - Final adjustments to well detail for view and printing - -commit 62801b666c93a9b01afdcee56dcde61e252bf82c -Author: Sybrand Strauss -Date: Fri Apr 27 16:27:14 2018 -0700 - - Final adjustments to well detail for view and printing - -commit 09f22aaf61673bae8efc198574795584e928996e -Merge: ffd98aeec a8d339c71 -Author: Christian Evans -Date: Fri Apr 27 15:33:52 2018 -0700 - - Merge remote-tracking branch 'upstream/developer' into registries-fixtures - -commit ffd98aeeced1312fd5a4aaf052167aabdd7d4f0b -Author: Christian Evans -Date: Fri Apr 27 15:32:44 2018 -0700 - - Chages to match functional tests. - -commit a8d339c713064a1f9e5497d586314e216740290f -Merge: 82573e73a e369e99ba -Author: Sybrand Strauss -Date: Fri Apr 27 15:08:05 2018 -0700 - - Merge pull request #655 from Sybrand/bug/printStyles - - Well detail / print bugs - -commit e369e99babe836986f1345023749dc5d62a98453 -Author: Sybrand Strauss -Date: Fri Apr 27 15:01:54 2018 -0700 - - Fixing up well detail css - -commit d6986831f2159bf3589e148db9139330cdca12ed -Merge: 1f63d189d 82573e73a -Author: Christian Evans -Date: Fri Apr 27 14:29:31 2018 -0700 - - Merge remote-tracking branch 'upstream/developer' into registries-fixtures - -commit 1f63d189d0187c233c873e2f94dec05917a0f6ab -Author: Christian Evans -Date: Fri Apr 27 14:28:18 2018 -0700 - - Initial commit of registries fixture updates - -commit 82573e73aab327095c8a7c3dd55361797fecbb06 -Merge: a67d65228 c14879b33 -Author: garywong-bc -Date: Fri Apr 27 14:18:34 2018 -0700 - - Merge pull request #654 from garywong-bc/developer - - reducing gunicorn workers to get pass script error 137 during deploym… - -commit c14879b3311b8d58a0166d845a1abe6ec991f322 -Author: Gary Wong (BC Gov) -Date: Fri Apr 27 14:18:07 2018 -0700 - - reducing gunicorn workers to get pass script error 137 during deployment. - -commit 6df8887882cc6519b685d75514109a11bcef13ce -Author: Sybrand Strauss -Date: Fri Apr 27 13:55:51 2018 -0700 - - Fixed: missing logo on print, missing heading on print, print button missing, to top of page showing on print, survey link showing on print screen - -commit a67d6522873f6374e20dbbddc41308cbac862a44 -Merge: 2a93726d0 28890ac3a -Author: garywong-bc -Date: Fri Apr 27 13:51:18 2018 -0700 - - Merge pull request #653 from garywong-bc/developer - - Add PUMPINST Certifying Authorities - -commit 28890ac3a0b3341454e2202235994a4f8c6cb74e -Merge: 1326e397b 2a93726d0 -Author: Gary Wong (BC Gov) -Date: Fri Apr 27 13:50:09 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 1326e397ba976fdbef38784d19b055a62813bb51 -Author: Gary Wong (BC Gov) -Date: Fri Apr 27 13:49:50 2018 -0700 - - Add PUMPINST Certifying Authorities, and also update FT test results to match updated data. - -commit 2a93726d0038311bf67046ee8d21edadf9e3309d -Merge: e888279d6 3daf4085c -Author: garywong-bc -Date: Fri Apr 27 10:20:29 2018 -0700 - - Merge pull request #652 from garywong-bc/developer - - Exception handling for Registries companies with same name but differ… - -commit 3daf4085c4db39028528d00ffa32941a95e6fb68 -Author: Gary Wong (BC Gov) -Date: Fri Apr 27 10:09:25 2018 -0700 - - Exception handling for Registries companies with same name but different addresses. - -commit e888279d6db133f3450e5d71927a6709f1c71c32 -Merge: 03c905a8a 607a3866c -Author: Sybrand Strauss -Date: Fri Apr 27 09:00:16 2018 -0700 - - Merge pull request #651 from Sybrand/developer - - Workaround for unsupported let - -commit 607a3866c808ada43f775b776ed831b73d9e3751 -Author: Sybrand Strauss -Date: Fri Apr 27 08:57:04 2018 -0700 - - Workaround for unsupported let - -commit 6a24a1cda1295dd6ad689f0ff805129261cf95ed -Merge: 80aec1c5e 03c905a8a -Author: Steve Hillier -Date: Thu Apr 26 16:52:30 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 80aec1c5e182361984b4e9f56aabfc7fd8138aa6 -Author: Steve Hillier -Date: Thu Apr 26 16:52:22 2018 -0700 - - fixed linting warnings - -commit 03c905a8a3d5c5d1c948787f42fb9929bdf17ba9 -Merge: 7606d34cb 56b417ea9 -Author: Sybrand Strauss -Date: Thu Apr 26 16:51:38 2018 -0700 - - Merge pull request #650 from Sybrand/feature/addNewApplicant - - Fixed linting issues - -commit 56b417ea9efbd72e7f38d140bb38442f82aa5493 -Author: Sybrand Strauss -Date: Thu Apr 26 16:49:39 2018 -0700 - - Fixed linting issues - -commit 7606d34cb41465448c0134f81f6a8f8fbb30771a -Merge: d1178a6fb 2f7ac3002 -Author: garywong-bc -Date: Thu Apr 26 16:39:00 2018 -0700 - - Merge pull request #649 from garywong-bc/developer - - Fixes to Registries replication. - -commit 2f7ac3002c9a2250b8ff90492a99af664fc59273 -Author: Gary Wong (BC Gov) -Date: Thu Apr 26 16:38:03 2018 -0700 - - Fixes to Registries replication. - -commit d1178a6fb091014bf9dbd826517d56122e3fb183 -Merge: 50bf491a2 44805f20f -Author: Steve Hillier -Date: Thu Apr 26 16:25:19 2018 -0700 - - Merge pull request #648 from stephenhillier/developer - - Fix organization and classifications display on Registries frontend - -commit 44805f20fbb5ffccc2f07b3949300e9c289bc5b1 -Author: Steve Hillier -Date: Thu Apr 26 16:24:51 2018 -0700 - - fix text color for logged in username - -commit 50bf491a2d1b5c0c75d363046241cce8497b81bd -Merge: 448567c12 6dd5f2658 -Author: Steve Hillier -Date: Thu Apr 26 16:13:24 2018 -0700 - - Merge pull request #647 from Sybrand/feature/applicationAdminSerializer - - Feature/application admin serializer - -commit c0dd183b4691ec328f9ef47c95dc1bde4202037f -Author: Steve Hillier -Date: Thu Apr 26 16:12:21 2018 -0700 - - fix subactivity table display for drillers - -commit 41bc774908c81d0543e2edf59d76884553d2e7b3 -Author: Steve Hillier -Date: Thu Apr 26 16:12:09 2018 -0700 - - split person's org name and address into helper components - -commit 9d9655a91954afa7cd2431f4d15e76a64157ce39 -Author: Steve Hillier -Date: Thu Apr 26 15:14:20 2018 -0700 - - fix comment in active registrations filter method - -commit 204f39be930707f929910c381d589923554ce810 -Author: Steve Hillier -Date: Thu Apr 26 15:13:37 2018 -0700 - - remove commented out code - -commit e68b4022531eaca45beb4b543e3b75613f03d209 -Author: Steve Hillier -Date: Thu Apr 26 15:13:26 2018 -0700 - - ensure that inactive registrations are not displayed for otherwise active drillers - -commit 6dd5f26580ebf1054c64f5d21fda2c6d59af30ec -Merge: 7ffb8e7ff 448567c12 -Author: Sybrand Strauss -Date: Thu Apr 26 15:12:45 2018 -0700 - - Merge branch 'developer' into feature/applicationAdminSerializer - -commit 7ffb8e7ffba446beb003e57f891b6871fcc73a86 -Author: Sybrand Strauss -Date: Thu Apr 26 15:10:44 2018 -0700 - - Fixed logging error in models and serializers, added test for RegistriesApplication - -commit 309a8133a74a52058125ea0824caa2ab0d5ead08 -Author: Steve Hillier -Date: Thu Apr 26 15:00:08 2018 -0700 - - if activity specified, filter registrants by both activity and status - -commit f05dd929ce2a8856ffc3874e23de8a88584fe1ed -Author: Steve Hillier -Date: Thu Apr 26 14:32:47 2018 -0700 - - remove status_set from public searches (current_status is enough) - -commit 448567c127176566801771ea7d1c50eb862a02cf -Merge: 6a17cfdbb a64cf9bc0 -Author: Steve Hillier -Date: Thu Apr 26 14:30:50 2018 -0700 - - Merge pull request #646 from stephenhillier/developer - - filter out applications that are not yet approved for public searches - -commit a64cf9bc088b7408d03fd00bb78f857d42d560af -Author: Steve Hillier -Date: Thu Apr 26 14:10:47 2018 -0700 - - filter out applications that are not yet approved for public searches - -commit 6a17cfdbbbdf48cf08257e1e173c523a6b9eaddd -Merge: 4c1d134dc e9e043a7c -Author: garywong-bc -Date: Thu Apr 26 12:17:01 2018 -0700 - - Merge pull request #645 from garywong-bc/developer - - Correct loading of companies attached to Register. - -commit e9e043a7c10e97ec97dcc5c8ad35048916d773cb -Author: Gary Wong (BC Gov) -Date: Thu Apr 26 12:16:01 2018 -0700 - - Correct loading of companies attached to Register. - -commit 7053f6aa1609bf7e071d74392b08e5bf0803daeb -Author: Sybrand Strauss -Date: Thu Apr 26 11:50:28 2018 -0700 - - Added in direnv .envrc helper files - -commit 4c1d134dce22a7a0f12818631bd6204c9f9e7710 -Merge: f2e8a069c f1ec4b453 -Author: garywong-bc -Date: Thu Apr 26 11:04:15 2018 -0700 - - Merge pull request #644 from stephenhillier/developer - - (Registries backend) update API for Organization model changes - -commit f1ec4b453c1124b93d841a483646b32b5d2ae88f -Author: Steve Hillier -Date: Thu Apr 26 10:56:27 2018 -0700 - - update postman tests - -commit b6d04c852ad35461c8bf8487ca8a9cba7599c270 -Author: Steve Hillier -Date: Thu Apr 26 10:52:02 2018 -0700 - - remove unused file - -commit 847435a26cb1b0256cd39f79ee680b370ed66ff8 -Author: Steve Hillier -Date: Thu Apr 26 10:48:57 2018 -0700 - - reset db migrations - -commit cfd44c9e6f78d4160a4bde21c7aac4ca2069cb1d -Author: Steve Hillier -Date: Thu Apr 26 10:46:06 2018 -0700 - - add required=False to current_status field - -commit 6a938cc14def2fe1a75039e491602b225f115fc3 -Merge: c3348144c f2e8a069c -Author: Steve Hillier -Date: Thu Apr 26 10:33:54 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into gworg - -commit 17f7409875611f97078068c1bf66edfd529305be -Author: Sybrand Strauss -Date: Thu Apr 26 10:32:28 2018 -0700 - - Accidently added wrong file - -commit c3348144ceecc7507cb4bcd0291b2dd8993817b6 -Author: Steve Hillier -Date: Thu Apr 26 10:13:24 2018 -0700 - - add prefetch items to improve response times - -commit c59099b52dc43a9534bfb71f177e583e53292740 -Author: Sybrand Strauss -Date: Thu Apr 26 09:38:57 2018 -0700 - - Added requests and tests for patching application - -commit 5dd888edaed4af402a121818207938e269f5117b -Author: Steve Hillier -Date: Thu Apr 26 09:29:31 2018 -0700 - - moving organization reference onto Register model - -commit 8293a6a1589025732e47f677d8c924d7fc56d1ed -Merge: 5dd333a34 f2e8a069c -Author: Sybrand Strauss -Date: Thu Apr 26 09:28:35 2018 -0700 - - Merge branch 'developer' into feature/applicationAdminSerializer - -commit 5dd333a34eb1072bf67ddf7b5a6b3eb41f173828 -Author: Sybrand Strauss -Date: Thu Apr 26 09:27:53 2018 -0700 - - Fixed pep-8 styling issues - -commit f2e8a069cf6121412b943f162843a5ae17e022be -Merge: 03ca405de 3640f841f -Author: Steve Hillier -Date: Thu Apr 26 09:26:07 2018 -0700 - - Merge pull request #642 from Sybrand/feature/applicationAdminSerializer - - Added serialization for RegistrationApplication - -commit 3640f841f3dd0515cf9bf817390bd1b6bf2a1275 -Author: Sybrand Strauss -Date: Thu Apr 26 09:21:20 2018 -0700 - - Fixed issue with patch not including new current status - -commit f257e5b980eb59f3fbe852aafc206617d7f7d0a1 -Author: Sybrand Strauss -Date: Thu Apr 26 09:08:22 2018 -0700 - - Changed comment to be more appropriate, doing single pop (instead of get and pop), also wrapped entire update in transaction. - -commit 8cca953e8af0a3234f8e0dcdc3ab3558ec6cc8f1 -Author: Sybrand Strauss -Date: Wed Apr 25 16:49:48 2018 -0700 - - Added serialization for RegistrationApplication - -commit 03ca405dee7261a13df4774b5ab94a291144b6a4 -Merge: a3304de0a f14e1acf5 -Author: garywong-bc -Date: Wed Apr 25 16:11:49 2018 -0700 - - Merge pull request #641 from garywong-bc/developer - - Additional notes on failures due to OpenShift resource limits. - -commit f14e1acf5692da47fe085f4ab5ee4d42d32338c2 -Author: Gary Wong (BC Gov) -Date: Wed Apr 25 16:10:40 2018 -0700 - - Additional notes on failures due to OpenShift resource limits. - -commit 2c4febb8f876ddbb2ce5cc5c71b189a4918e4197 -Merge: c1a640997 07784d891 -Author: Steve Hillier -Date: Wed Apr 25 15:10:37 2018 -0700 - - Merge branch 'garywong-bc-registries-v4' into gworg - -commit 07784d891b66805dc8e73d0b1e3027c733d4d63d -Merge: c1a640997 f72d1b06e -Author: Steve Hillier -Date: Wed Apr 25 15:10:15 2018 -0700 - - merge changes from GW - -commit c1a64099751ab339088561af87f0bf0181f6574f -Merge: 58bbf073c a3304de0a -Author: Steve Hillier -Date: Wed Apr 25 15:00:59 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into gworg - -commit a3304de0a763efb5a3943cd28f1e3ebb706adb0e -Author: Derek Roberts -Date: Wed Apr 25 14:54:34 2018 -0700 - - Jenkinsfile-developer - reverted to use SonarQube again - -commit ae1a5220066cf9b4ca42176081ebe381aeb27998 -Merge: f104cf821 bd90dbedf -Author: Steve Hillier -Date: Wed Apr 25 14:51:40 2018 -0700 - - Merge pull request #640 from stephenhillier/developer - - Clean up navigation bar and breadcrumbs on Registries pages - -commit bd90dbedfd3c049da47765fd7050a16ec9590ad8 -Author: Steve Hillier -Date: Wed Apr 25 12:25:31 2018 -0700 - - change spans in list to list items
  • - -commit f72d1b06eb9429143a52a6540ea32f371451ea64 -Merge: 928420557 f104cf821 -Author: Gary Wong (BC Gov) -Date: Wed Apr 25 12:19:49 2018 -0700 - - Merging in latest from developer with revamped Registries V4. - -commit f3d076a85def4e0fe6847bcf0dee5718f7f56f33 -Author: Steve Hillier -Date: Wed Apr 25 11:12:15 2018 -0700 - - update breadcrumbs - -commit 3bc42f690eb190d54ab07c9f20c7fd002436edb2 -Author: Steve Hillier -Date: Wed Apr 25 11:11:00 2018 -0700 - - fix list with non-list item element - -commit f104cf82100a4019977f0c4fcf41d8b4f6f992aa -Merge: 88b4658a8 c9d39d90c -Author: garywong-bc -Date: Tue Apr 24 19:36:44 2018 -0700 - - Merge pull request #639 from garywong-bc/developer - - temporarily comment out SonarQube section.. - -commit c9d39d90cd6970687ba4a22e0e13dd37f0cdb626 -Author: Gary Wong (BC Gov) -Date: Tue Apr 24 19:36:01 2018 -0700 - - temporarily comment out SonarQube section.. - -commit 88b4658a8294124b62c2d24621c935ee6ba261ec -Merge: abbc18004 ad20005d9 -Author: garywong-bc -Date: Tue Apr 24 18:14:21 2018 -0700 - - Merge pull request #632 from garywong-bc/developer - - Document how to run a single Functional Test. - -commit abbc180044f8a1d6f2da6c02850ba9a4d5307a9a -Merge: 62d5eed06 d5947fac6 -Author: garywong-bc -Date: Tue Apr 24 18:14:05 2018 -0700 - - Merge pull request #638 from stephenhillier/developer - - Applicant/person detail view (draft) - -commit d5947fac69054c511f4c98c32b6a14e4b6ccb309 -Author: Steve Hillier -Date: Tue Apr 24 17:35:43 2018 -0700 - - draft of person detail view with edit placeholders - -commit 62d5eed067dbc9367fd7b6ea29c02c3484e2939f -Merge: 563debdd6 1c674ac5e -Author: Steve Hillier -Date: Tue Apr 24 17:10:50 2018 -0700 - - Merge pull request #637 from bcgov/revert-636-developer - - Revert "add --debug to sonarqube script" - -commit 1c674ac5e86e84d7ba0c84d201cc2af3f0ca8824 -Author: Steve Hillier -Date: Tue Apr 24 17:10:02 2018 -0700 - - Revert "add --debug to sonarqube script" - -commit 6735e788c3fce6bbbf6a055b2029d6e52f1a7262 -Author: Steve Hillier -Date: Tue Apr 24 17:04:36 2018 -0700 - - remove whitespace - -commit c20dc289e196d3ec59616471383d576d891d25e0 -Author: Steve Hillier -Date: Tue Apr 24 17:03:56 2018 -0700 - - clean up css and remove unused styles - -commit 2c01952a2d251e7f45c280b76204f80137ddab01 -Author: Steve Hillier -Date: Tue Apr 24 17:02:54 2018 -0700 - - adjust fields returned for application endpoint - -commit 563debdd6aa1320ea04fed7541c165fadbe36a67 -Merge: 9694b0323 5b6eb5c66 -Author: Steve Hillier -Date: Tue Apr 24 16:37:17 2018 -0700 - - Merge pull request #636 from stephenhillier/developer - - add --debug to sonarqube script - -commit 5b6eb5c662e4f0190452ad6d5d2c99591272477a -Author: Steve Hillier -Date: Tue Apr 24 16:36:13 2018 -0700 - - add debug to sonarqube script - -commit 9694b0323be4de4ce33ae0e94fde33cffde205b1 -Merge: e0a57edee 135ebb803 -Author: Steve Hillier -Date: Tue Apr 24 15:02:43 2018 -0700 - - Merge pull request #634 from stephenhillier/developer - - Fixes for Registries frontend - -commit 135ebb8036a7c8bf2c727a9983941f63b9006f2f -Author: Steve Hillier -Date: Tue Apr 24 14:52:29 2018 -0700 - - link to person details page is now the person's name - -commit e0a57edeedee49d6313555bbb1648e44c830023d -Merge: f20907112 3d762dfb6 -Author: Derek Roberts <4391600+DerekRoberts@users.noreply.github.com> -Date: Tue Apr 24 14:33:44 2018 -0700 - - Database backup and maintenance scripts - DerekRoberts/db-scripts - - Database backup and maintenance scripts - -commit 3d762dfb646ce36a0ca26e6262f9ed083342ad28 -Author: Derek Roberts -Date: Tue Apr 24 14:31:13 2018 -0700 - - oc-dump.sh + rsync progress indicator, no perms - -commit 4b4db03ff09c3c0440419c14bf85260a5e8bdab9 -Author: Derek Roberts -Date: Tue Apr 24 14:30:34 2018 -0700 - - oc-dump.sh - no longer changing dirs - -commit f209071123572903ce412a8fac8a20126595f2f2 -Merge: b1ff09164 82cdc40a4 -Author: Steve Hillier -Date: Tue Apr 24 14:26:52 2018 -0700 - - Merge pull request #633 from Sybrand/task/general_enquiries - - Task/general enquiries - -commit f7fcc069f76e6c4aac8af8b77fe8f1396062e3d2 -Author: Steve Hillier -Date: Tue Apr 24 13:31:23 2018 -0700 - - add store to test setup (component references store.getters.error) - -commit 82cdc40a44710652821f3688cf703662347f5c2a -Author: Sybrand Strauss -Date: Tue Apr 24 13:28:08 2018 -0700 - - Added general enquiries link, changed where static resources from Vue component are placed. - -commit 34491502b1cb6e34cc14392712c00364a074195d -Author: Steve Hillier -Date: Tue Apr 24 13:26:30 2018 -0700 - - check to make sure contact_info exists before trying to iterate over it - -commit 15ae490814bfe0d014f54fd141241873a743c2de -Author: Steve Hillier -Date: Tue Apr 24 13:25:50 2018 -0700 - - add global (vuex) error mapping - -commit c5ffb9cd0fe61a8593406f7ec4814f31cf4f82ad -Author: Sybrand Strauss -Date: Tue Apr 24 12:49:45 2018 -0700 - - Changed location of static files and added git ignore for it - -commit ad20005d992dc8edb3ccbc2603cda46731833811 -Author: Gary Wong (BC Gov) -Date: Tue Apr 24 12:00:08 2018 -0700 - - Document how to run a single Functional Test. - -commit 459e2a85845d7fecee9fbd72ebabce2d9e0a60ef -Author: Steve Hillier -Date: Tue Apr 24 10:56:22 2018 -0700 - - update author and license fields - -commit b1ff0916425dca0c4b6d2f583af38240735efd75 -Merge: 295743f07 9fe24a77a -Author: Steve Hillier -Date: Tue Apr 24 09:07:07 2018 -0700 - - Merge pull request #629 from stephenhillier/developer - - Person add and Organization add pages/views (frontend and backend) - -commit 9fe24a77a1ffed5c070a8131366121eca0b09340 -Merge: 9e130be02 295743f07 -Author: Steve Hillier -Date: Tue Apr 24 09:06:53 2018 -0700 - - Merge branch 'developer' into developer - -commit cb3b0f80625e8b2027645eefb7599fd4678fc0a6 -Author: Derek Roberts -Date: Mon Apr 23 17:50:49 2018 -0700 - - oc-dump.sh - cleanup - -commit 9e130be0292b77d7ea5e5bd8afbd5d27ee8dd668 -Author: Steve Hillier -Date: Mon Apr 23 17:05:06 2018 -0700 - - add comment to hard to read statement - -commit 44001861c143de3acfe0e103452751e17bff959a -Author: Steve Hillier -Date: Mon Apr 23 16:59:18 2018 -0700 - - fix spacing of if statement - -commit 30f70719e40166a4377e3a66b52ae7aece0b96f2 -Author: Derek Roberts -Date: Mon Apr 23 16:58:16 2018 -0700 - - oc-dump.sh - echo summary - -commit 295743f0792374673f4fc03c4cb68b55ad53066d -Merge: 0e5e36981 6cf87746a -Author: Sybrand Strauss -Date: Mon Apr 23 16:46:46 2018 -0700 - - Merge pull request #631 from Sybrand/fix/npm_version - - Change npm version to match our pods - -commit 6cf87746a1a0f4e955a85aab07e2291a39a18e5a -Author: Sybrand Strauss -Date: Mon Apr 23 16:45:06 2018 -0700 - - Change npm version to match our pods - -commit 41e8819830115cd0798d941cc341b6fd65b5ff6f -Author: Derek Roberts -Date: Mon Apr 23 16:39:50 2018 -0700 - - oc-dump.sh - ensure save name has .gz extension - -commit e5f2a71b6654fd4192f403345223d64bc6eac3c2 -Author: Steve Hillier -Date: Mon Apr 23 16:30:57 2018 -0700 - - remove unused http404 import - -commit 0e5e369812551c8519776a94a01bbfda7bb5c8d1 -Merge: c9965adc6 049e20acd -Author: Sybrand Strauss -Date: Mon Apr 23 16:30:42 2018 -0700 - - Merge pull request #630 from Sybrand/stephen_branch_on_steroids - - Common header and footer - -commit 1f48317fa1af799add4e4412b87438d5208d2e32 -Author: Steve Hillier -Date: Mon Apr 23 16:29:03 2018 -0700 - - remove unnecessary try/except block - -commit 049e20acd1384035ce89253ac9dbcccc1e2c9a5f -Author: Sybrand Strauss -Date: Mon Apr 23 15:41:48 2018 -0700 - - Moved to optional packages to dev dependancy - -commit a2c7b8b5ba030def86c196e54fbc9c322d5b7436 -Author: Sybrand Strauss -Date: Mon Apr 23 15:30:37 2018 -0700 - - Changed from BASE_URL to AXIOS_BASE_URL to avoid confusion with GWELLS_API_BASE_URL - -commit 237ab90a66897178c67b8e1d1c0cbbf198668b94 -Author: Derek Roberts -Date: Mon Apr 23 15:12:01 2018 -0700 - - oc-dump.sh - return from maintenance mode - -commit 58bbf073c629a98db5a1c27ba8868df2a07ca90a -Merge: aee1aaa23 5eca95d76 -Author: Steve Hillier -Date: Mon Apr 23 14:59:50 2018 -0700 - - Merge pull request #2 from garywong-bc/developer - - Merge changes made by GW - -commit 5eca95d766e3ab2d72a961a91ad6394d4b462700 -Merge: cd013a129 aee1aaa23 -Author: Steve Hillier -Date: Mon Apr 23 14:59:22 2018 -0700 - - Merge branch 'gworg' into developer - -commit 4b9346d773e263506655c93f005dbce58e5b3fd1 -Merge: f5cd67d84 ee13487d8 -Author: Sybrand Strauss -Date: Mon Apr 23 14:44:05 2018 -0700 - - Merge branch 'developer' into stephen_branch_on_steroids - -commit ee13487d8aea74e707b106c51e248119189d21d1 -Merge: ed72c3442 c9965adc6 -Author: Sybrand Strauss -Date: Mon Apr 23 14:34:31 2018 -0700 - - Merge branch 'developer' of github.com:bcgov/gwells into developer - -commit 355f2a0056b8d97fcf5ad5533393b431fb07b516 -Author: Derek Roberts -Date: Mon Apr 23 12:27:26 2018 -0700 - - oc-dump.sh - remove backups from pod - -commit 60b53d43379c503701939d18d750be2e50e8a3cd -Author: Derek Roberts -Date: Mon Apr 23 11:53:22 2018 -0700 - - oc-dump.sh - shorter var names, smarter defaults - -commit dfbcc2a16ac79516d2d1b7df3de1876cdfe3f49c -Author: Derek Roberts -Date: Mon Apr 23 11:41:39 2018 -0700 - - oc-dump.sh + more flexible save path location - -commit aee1aaa23fc23ca645be0eab3b67bae36389b49e -Author: Steve Hillier -Date: Mon Apr 23 11:26:42 2018 -0700 - - change delete requests to set expired_date instead of deleting - -commit 1606e0806c56b12fdb3950bbbc56a6cf78c16226 -Author: Steve Hillier -Date: Mon Apr 23 11:26:14 2018 -0700 - - clean up tests file - -commit de9bca3e8f5960ebe82bc67b250885b1a2281f3b -Author: Steve Hillier -Date: Mon Apr 23 11:25:58 2018 -0700 - - better handling of empty or missing nested objects when creating person - -commit f5cd67d84cd279dd2e2458b77c4d3dae0a327f1a -Author: Sybrand Strauss -Date: Mon Apr 23 11:20:09 2018 -0700 - - Updated header and test - -commit 1685406757254282d1acfb6fbcb55cfa26f0d074 -Author: Sybrand Strauss -Date: Mon Apr 23 11:18:44 2018 -0700 - - Changed header to contain ids, changed tests to match new html of header links - -commit 2e31882fadb32d63afdf428768bb7965b111af55 -Author: Derek Roberts -Date: Mon Apr 23 11:12:13 2018 -0700 - - oc-dumnp.sh - backup db into pod /tmp - -commit d338f435acb9086599d5dcd8bf641f50f3fc6c15 -Author: Derek Roberts -Date: Mon Apr 23 11:11:13 2018 -0700 - - oc-dump.sh - grab running db name - -commit d4e92598a7e94e507b67131f49458fc6db53ebcf -Author: Derek Roberts -Date: Mon Apr 23 11:08:48 2018 -0700 - - oc-dump.sh - conditional and var revision - -commit 0d66b2563e5487d3df5a4145493a57b4b92fb124 -Author: Steve Hillier -Date: Mon Apr 23 09:30:50 2018 -0700 - - fix component and test for new model - -commit cd013a1294d1a8b837d3516b62495db3c1b39df8 -Merge: 45a8b4a70 928420557 -Author: Gary Wong (BC Gov) -Date: Fri Apr 20 18:13:45 2018 -0700 - - Merge branch 'registries-v4' into developer - -commit 45a8b4a70bb73466429b03f8a86ceb510b25fe5c -Merge: f319d6520 c9965adc6 -Author: Gary Wong (BC Gov) -Date: Fri Apr 20 18:13:12 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 928420557dee75b9a8d118e6ea2ca84702958454 -Author: Gary Wong (BC Gov) -Date: Fri Apr 20 18:12:42 2018 -0700 - - Registries V4 - awaiting updated API Tests. - -commit 600d8173f486d5ef0745ca295bf7a9557862459e -Author: Steve Hillier -Date: Fri Apr 20 17:11:13 2018 -0700 - - display organization email in company details card - -commit 9876f98115db279d89ae49deb1af62ea38432566 -Merge: c9965adc6 7c824f6f2 -Author: Steve Hillier -Date: Fri Apr 20 16:41:18 2018 -0700 - - Merge branch 'data-entry' into developer - -commit 7c824f6f289ab5dd1073f273c1fccc2542655f7a -Author: Steve Hillier -Date: Fri Apr 20 16:40:12 2018 -0700 - - integrate organization add screen to the person add screen - -commit c5e1771182158454cd9e7dd562b0f6a272df537e -Author: Steve Hillier -Date: Fri Apr 20 16:39:15 2018 -0700 - - add email to Organization model - -commit 30628f867f3cfa81c211cf029e1ad85cd868ca61 -Author: Gary Wong (BC Gov) -Date: Fri Apr 20 14:00:57 2018 -0700 - - Cleanup of files no longer needed, and confirmed to be not used. - -commit c9965adc646faeaf2caae7fe015e9e38abf9db9c -Merge: f94c83143 8f4ffa277 -Author: garywong-bc -Date: Fri Apr 20 13:57:23 2018 -0700 - - Merge pull request #627 from garywong-bc/developer - - Final version of Registries V3 Data Model - -commit f319d6520833e29fd9c35b1dc2be045b067e360b -Merge: 8f4ffa277 f94c83143 -Author: Gary Wong (BC Gov) -Date: Fri Apr 20 13:54:59 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 8f4ffa277b19fb1eb84c0de95cd85ae8d41ff021 -Author: Gary Wong (BC Gov) -Date: Fri Apr 20 13:54:37 2018 -0700 - - Add fake applications from pre-2016-FEB-29 well drillers. - -commit 22685bc3c2ea2b5a7f5b1e124b750305a00c5293 -Author: Derek Roberts -Date: Fri Apr 20 11:25:37 2018 -0700 - - setup_osx.sh - iterate through db commands, cleanup - -commit 8afd2c4f9c374b10c58f0edff0dd0f2e1388a454 -Author: Derek Roberts -Date: Fri Apr 20 11:07:01 2018 -0700 - - setup-xfer.sh - consolidated scripts, kept wells over public schema - -commit fa6398ef4ea16b4e45f24d3fb47d6b100d12f0f2 -Author: Derek Roberts -Date: Fri Apr 20 10:57:11 2018 -0700 - - oc-dump.sh + var, renaming, msg conditions and var passing - -commit 648c97919dc3ee8cd907daa6985e8bc855ddc44e -Author: Derek Roberts -Date: Fri Apr 20 10:09:56 2018 -0700 - - oc-dump.sh + scale down w/ maintenance mode - -commit 8e1e1ce6ea3238f5498765fc58fd961b3c9c49e3 -Author: Derek Roberts -Date: Fri Apr 20 08:53:39 2018 -0700 - - oc-dump.sh - subshell adjustment - -commit de8eadbc2ea86a2f769769dbee5baa942277f19e -Author: Gary Wong (BC Gov) -Date: Fri Apr 20 08:36:21 2018 -0700 - - Reformat SQL Data Replication scripts (from WELLS) - -commit e54261228135ad2b75c27e186889fb90b47941ca -Author: Derek Roberts -Date: Thu Apr 19 18:03:58 2018 -0700 - - oc-dump.sh + maintenance mode flag, default true - -commit d836634dfdba87fc719cacf14104d17e76f3a1f4 -Author: Steve Hillier -Date: Thu Apr 19 17:52:39 2018 -0700 - - improve person add screen - -commit 41294f212d6874fbb8700ae67585f96d53f2f62f -Author: Steve Hillier -Date: Thu Apr 19 17:52:13 2018 -0700 - - Add organization name list view - -commit 7d3e9f9da6dd6d00d97cb085c5b9ae289978e37b -Author: Sybrand Strauss -Date: Thu Apr 19 17:43:07 2018 -0700 - - Adding id to links, and changing url to match tests - -commit 3db5bad5aaab532f8ea5b8ac4c5bdbd9bc4ef70b -Author: Derek Roberts -Date: Thu Apr 19 17:14:48 2018 -0700 - - oc-dump.sh - put app into maintenance mode - -commit 805c29d0ea14c41c092f9f94baa6a00ef9055ec9 -Merge: aa5609ba0 5d2dd8521 -Author: garywong-bc -Date: Thu Apr 19 17:13:01 2018 -0700 - - Merge pull request #626 from garywong-bc/master - - Syncing back-end changes from last.. - -commit 5d2dd852119961a963a7bab6cf823182eb21eab0 -Merge: 82cbcb4ba c3e490573 -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 17:10:46 2018 -0700 - - Merge branch 'developer' - -commit afad0280d0ca68a263619039d3878cd1b576881c -Author: Derek Roberts -Date: Thu Apr 19 16:36:52 2018 -0700 - - +oc_dump.sh - dump script based on setup-xfer.sh - -commit 02b9ecfe6581ea8a3b2fc56755fbc2813eb38e97 -Author: Sybrand Strauss -Date: Thu Apr 19 16:32:10 2018 -0700 - - Fixed Font Awesome alert icon - -commit ea54a28358806bba125ce14c13a44c0a9b8e1217 -Author: Derek Roberts -Date: Thu Apr 19 16:27:27 2018 -0700 - - setup_osx.sh - cleanup, shorter VERBOSE handling - -commit f94c83143c2e8d9ba10035fd60d8a0b5679b44c9 -Merge: 4c05e809f c3e490573 -Author: garywong-bc -Date: Thu Apr 19 16:27:11 2018 -0700 - - Merge pull request #625 from garywong-bc/developer - - Correcting erroneous work on master - -commit c3e490573be810e7be9571df047d2376f1b979ed -Merge: c829cad6a 4c05e809f -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 16:26:28 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit c829cad6a81f08e0ec53a8ffd62eafaff0a10fd1 -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 16:26:24 2018 -0700 - - re-sync with changes made on master by mistake part 6 - -commit a3b56f44f848626da041d52c82278929bd77f252 -Author: Sybrand Strauss -Date: Thu Apr 19 16:19:47 2018 -0700 - - Updated classes to match updated component - -commit 871360691a9a413727805f9ca6836d28e9753eb1 -Author: Sybrand Strauss -Date: Thu Apr 19 16:19:14 2018 -0700 - - Added comment relating to bootstrap4 crispy template (it's still in alpha) - -commit 6b5b55853391c4c5b148219e7ee74f539405e7bb -Author: Steve Hillier -Date: Thu Apr 19 16:03:50 2018 -0700 - - remove redundant migration - -commit 4c05e809fc7367c19f8584fa127943dd977122d1 -Merge: 9eee6991a 2c4e53dcb -Author: garywong-bc -Date: Thu Apr 19 16:02:51 2018 -0700 - - Merge pull request #624 from garywong-bc/developer - - Update Test data - -commit 9eee6991a19242aa76fc2821f6239542361d284d -Merge: 7721eb685 91bc4c327 -Author: Derek Roberts -Date: Thu Apr 19 15:51:12 2018 -0700 - - API tests: remove response time test - stephenhillier/developer - - API tests: remove response time test - -commit 2c4e53dcb3f55106a48a5b9300217d3cfb179439 -Merge: 3655b5495 7721eb685 -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 15:47:55 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 3655b549569f436573254d7879adaac3bc49437e -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 15:47:41 2018 -0700 - - re-sync with changes made on master by mistake part 5 - -commit 91bc4c327aa200ad327413d46c4c9288dd3306e5 -Author: Steve Hillier -Date: Thu Apr 19 15:42:10 2018 -0700 - - remove 200 ms response test (occasionally fails and blocks pipeline) - -commit 9b18fb835941a6af92151df3764b125f3f245ce7 -Merge: 9231c3063 7721eb685 -Author: Steve Hillier -Date: Thu Apr 19 15:33:07 2018 -0700 - - Merge developer into branch - -commit 7721eb68521be8ba305df8184154b78a1f92d14f -Merge: dc292ddd8 757e1fefc -Author: Derek Roberts -Date: Thu Apr 19 15:30:59 2018 -0700 - - Registries search page fixes - stephenhillier/developer - - Registries search page fixes - -commit 757e1fefcbb652e19f254f420b913a668dd7b003 -Author: Steve Hillier -Date: Thu Apr 19 15:29:45 2018 -0700 - - switch from bold tag to class - -commit 82cbcb4ba1caf93bc96c939d60c745cc14c2a17b -Merge: 6f8285f57 5ac28e001 -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 15:15:42 2018 -0700 - - Merge branch 'developer' - -commit 4553b088dccda51d83af535e43b2d6a795a91340 -Author: Steve Hillier -Date: Thu Apr 19 15:15:40 2018 -0700 - - fix ordering of organizations - -commit 69fd00fd02c0e9dc53f1733101c81883cb8bda0b -Merge: 7f28c9437 dc292ddd8 -Author: Steve Hillier -Date: Thu Apr 19 15:14:05 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 7f28c9437d3a488ae89657a3d085b6c9dfa332a7 -Author: Steve Hillier -Date: Thu Apr 19 15:12:44 2018 -0700 - - add default ordering of drillers by surname - -commit dc292ddd8b0aa20e8a77ecc0f27908b69f849427 -Merge: 123ae1eae 5ac28e001 -Author: garywong-bc -Date: Thu Apr 19 15:11:30 2018 -0700 - - Merge pull request #621 from garywong-bc/developer - - Updated Registries FT results - -commit 3cf59e00dc665865a30e23252f2ac452fbe3441f -Author: Steve Hillier -Date: Thu Apr 19 14:42:14 2018 -0700 - - remove duplicate mock file - -commit dfa5983917d4e926e34e59bd62ef21dce24ed29e -Author: Steve Hillier -Date: Thu Apr 19 14:40:36 2018 -0700 - - add ids to table cells for testing - -commit f7ca4ffdc1aedfc390011c5b731a46b13f4554af -Author: Steve Hillier -Date: Thu Apr 19 14:40:27 2018 -0700 - - add more tests for search page - -commit bcb600b9668fe0c2e182a573d457460c614531e5 -Author: Steve Hillier -Date: Thu Apr 19 14:40:03 2018 -0700 - - more accurate mock person and person list - -commit 40776a7163db7555b60e8c2fdde0be7153fdbdf6 -Author: Steve Hillier -Date: Thu Apr 19 14:39:28 2018 -0700 - - add jest ApiService mock - -commit 4f622ed30aa596589eab3747b8724e6d021ff92d -Author: Steve Hillier -Date: Thu Apr 19 14:39:15 2018 -0700 - - add prefetch for contact_info - -commit 1d88ed19f5b358e5a9e9b3a2d0e9ca3b40a08029 -Author: Sybrand Strauss -Date: Thu Apr 19 14:36:33 2018 -0700 - - Changed admin link test (vue renders based on meta tag, so now checking for meta tag presence) - also added id to vue header in case there's a functional test for it. - -commit 5ac28e001a887fe75c1da6c94c5407b3b133a14e -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 14:36:28 2018 -0700 - - re-sync with changes made on master by mistake part 4 - -commit 5bbf12172e1d7689ee7f6dc5820c068a91537fb5 -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 14:35:22 2018 -0700 - - re-sync with changes made on master by mistake part 3 - -commit 0155497ce91ba0ab3a22f31da02d5b2c1f05439a -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 14:02:31 2018 -0700 - - re-sync with changes made on master by mistake part 2 - -commit 4912838951d21dce9d3cd388ec8e409361334d3a -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 13:59:52 2018 -0700 - - re-sync with changes made on master by mistake - -commit 6f8285f570698b3f3201d68dcd7c11a95d480fd8 -Merge: ed698396c aa5609ba0 -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 13:51:27 2018 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit ed698396cc02f1f307b83cdc8a0248dcee5eef36 -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 13:47:40 2018 -0700 - - Updated Registries with new export and with updated FT results. - -commit 61634c143456e79ffc944e1033d6d49dd057870b -Merge: 6cc1e57ed ed72c3442 -Author: Sybrand Strauss -Date: Thu Apr 19 11:33:55 2018 -0700 - - Merge branch 'developer' into stephen_branch_on_steroids - -commit ed72c34420da21675e9135abc6fb7d8cdbca4466 -Merge: 3d24cbabe 123ae1eae -Author: Sybrand Strauss -Date: Thu Apr 19 11:33:27 2018 -0700 - - Merge branch 'developer' of github.com:bcgov/gwells into developer - -commit 6cc1e57ed0442e1492bfbec1ded2532f7fa7a9a6 -Author: Sybrand Strauss -Date: Thu Apr 19 11:32:13 2018 -0700 - - Cleaning up - -commit e0c5b1940310943b8c934ab35992103bd398b4cb -Author: Sybrand Strauss -Date: Thu Apr 19 11:27:52 2018 -0700 - - Fixed to version of node in our deployment environment - -commit a1fc40f1b3082d2903d7d4aeef70af679c3fddd4 -Merge: 937f207ff 123ae1eae -Author: Gary Wong (BC Gov) -Date: Thu Apr 19 09:34:54 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells - -commit f13b82887ce0ec410f1289d71b46ff01ba4d3a43 -Author: Sybrand Strauss -Date: Thu Apr 19 09:19:53 2018 -0700 - - Upped versions, and fixed to LTS - -commit 213bfa1026707bc716c09eaf6b425e43c97cbbf4 -Author: Sybrand Strauss -Date: Thu Apr 19 09:18:55 2018 -0700 - - Modules changed top commonjs for jest to work - -commit 9fb41d790ae642342e53c1c11b653c28ac950eb7 -Author: Steve Hillier -Date: Wed Apr 18 16:59:26 2018 -0700 - - revert changes made to nose tests - -commit 7ba610d6d8fca3e0c0a9addff811fea945ccc176 -Merge: 32141c3ab 123ae1eae -Author: Steve Hillier -Date: Wed Apr 18 16:36:05 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 123ae1eae3aeeebbec7054d4ff83baaa88ce8d02 -Merge: d3054a098 dfaff4510 -Author: garywong-bc -Date: Wed Apr 18 14:50:20 2018 -0700 - - Merge pull request #620 from garywong-bc/developer - - Better documentation. - -commit dfaff45102d5d5b030bde864891cd60b2513a044 -Merge: 0d2e3bcb0 d3054a098 -Author: Gary Wong (BC Gov) -Date: Wed Apr 18 14:49:22 2018 -0700 - - Merged from upstream - -commit 0d2e3bcb02f915c11c0bc2e04ed3cfd3bf24937a -Author: Gary Wong (BC Gov) -Date: Wed Apr 18 14:45:40 2018 -0700 - - Refined parameterized shell scripts, and better documentation. - -commit d3054a098346bc509747031ff014d79c8319a6da -Author: Derek Roberts -Date: Wed Apr 18 14:00:57 2018 -0700 - - setup-xfer.sh + added namespace to oc rysnc - -commit 23906a5f6b28d8a01ab67f90b268c71dd729066d -Merge: f71ab1c04 540524735 -Author: garywong-bc -Date: Wed Apr 18 13:17:45 2018 -0700 - - Merge pull request #619 from garywong-bc/developer - - Fixes to FT test results. - -commit 540524735b8cf6d749525d994506ea8afe03b7d3 -Merge: 381b12655 f71ab1c04 -Author: Gary Wong (BC Gov) -Date: Wed Apr 18 13:16:11 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 381b12655f4ad09e0f487b5b4e0196ba0c1865a2 -Author: Gary Wong (BC Gov) -Date: Wed Apr 18 13:14:57 2018 -0700 - - Updated and corrected FT for new data. - -commit f71ab1c044f695540a8e46a2dbde95ec65df19c6 -Merge: 4390073a6 46b686e66 -Author: Derek Roberts -Date: Wed Apr 18 12:57:06 2018 -0700 - - Db script overhaul and add params - DerekRoberts/script-params - - Script overhaul and add params - -commit 46b686e66a49f39039ededde922a6401c7997b57 -Author: Derek Roberts -Date: Wed Apr 18 12:54:45 2018 -0700 - - reset-gwells-all.sh - chmod +x - -commit 0c7719d2714ab6fcc41dc1d54a0057bed26a9710 -Author: Derek Roberts -Date: Wed Apr 18 12:52:46 2018 -0700 - - reset-gwells-all.sh + comments, cleanup - -commit 60748700cce13acb621a9f3bb1313e2eb1b53763 -Author: Derek Roberts -Date: Wed Apr 18 12:34:32 2018 -0700 - - reset-gwells-all.sh + check oc login and project availability - -commit 60a3f137b96193f48fec37f29982585609aa0494 -Author: Derek Roberts -Date: Wed Apr 18 12:33:09 2018 -0700 - - reset-gwells-all.sh + use project from var - -commit c3aaa5d4ae7ee25cd8b277d3feaaa53a0e39fef2 -Author: Derek Roberts -Date: Wed Apr 18 12:32:10 2018 -0700 - - reset-gwells-all.sh + check params, output message - -commit 2c1a084bf63643b38490d0339017d468e5037c05 -Author: Derek Roberts -Date: Wed Apr 18 12:31:29 2018 -0700 - - reset-gwells-all.sh + receive project as a parameter - -commit b6a249da5f7e45a9fc0a29fe3c9ea14608bd5e2a -Author: Derek Roberts -Date: Wed Apr 18 12:28:30 2018 -0700 - - reset-gwells-all.sh + halt conditions, verbosity and field separator - -commit 5448d1aee2f48a48ad8f3031163eb1098c77d015 -Author: Derek Roberts -Date: Wed Apr 18 12:15:02 2018 -0700 - - setup-xfer.sh + parameter for copy/import files - -commit 0c5a7e08725f37dc3b7d5f7201c085d437e7d954 -Author: Derek Roberts -Date: Wed Apr 18 12:02:09 2018 -0700 - - setup-xfer.sh + handle each sql file separately, echo names - -commit 189eacefdbd14d42682e1ea1b6f639118a5adeda -Author: Derek Roberts -Date: Wed Apr 18 11:30:30 2018 -0700 - - setup-xfer.sh + use project parameters for copy and sql - -commit 4390073a6360e8d7b786c43b33740fcddf8ebe5b -Merge: 70ae91d0b 50ce3ec1a -Author: garywong-bc -Date: Wed Apr 18 11:19:45 2018 -0700 - - Merge pull request #617 from garywong-bc/developer - - Included phase1/2 grandparented drillers into Well SubActivity Codes … - -commit 50ce3ec1a07d19e5771b2e18509eb4bea62fbeb2 -Author: Gary Wong (BC Gov) -Date: Wed Apr 18 11:13:09 2018 -0700 - - Included phase1/2 grandparented drillers into Well SubActivity Codes and included enabled automatic call to post-deploy.py Django management command. - -commit de0d7c1776054d17d3b086f0e874f4d12aae529d -Author: Derek Roberts -Date: Wed Apr 18 10:48:06 2018 -0700 - - setup-xfer.sh + verify oc login - -commit 1fd6d3c101a3de54eb4680fc1305b4ec9373ea1d -Author: Derek Roberts -Date: Wed Apr 18 10:47:36 2018 -0700 - - setup-xfer.sh + check project availability - -commit 7bafc575b8fb56a8e1170eedbc4558041a27181f -Author: Derek Roberts -Date: Wed Apr 18 10:46:49 2018 -0700 - - setup-xfer.sh + receive project as a parameter - -commit 0387b4ab52dedf391c52dc4d56d28aca3889e444 -Author: Derek Roberts -Date: Wed Apr 18 10:46:04 2018 -0700 - - setup-xfer.sh + halt conditions, verbosity and field separator - -commit 337fd58de6ed20475933215ef8174bfaaf8f63eb -Author: Derek Roberts -Date: Wed Apr 18 09:33:55 2018 -0700 - - maintenance.mht - removed unused maintenance option - -commit 70ae91d0b83a8b6d288a4647ab037b94c0e904ac -Merge: c9896881d 7026c4ce6 -Author: garywong-bc -Date: Wed Apr 18 09:16:31 2018 -0700 - - Merge pull request #616 from garywong-bc/developer - - Refinements to documentation of Registries load, and initial debug of… - -commit 7026c4ce6d9ce852c86636a738d5f8cce237a9d8 -Author: Gary Wong (BC Gov) -Date: Tue Apr 17 20:50:43 2018 -0700 - - Refinements to documentation of Registries load, and initial debug of https://github.com/travis-ci/travis-ci/issues/5268 - -commit 32141c3aba1b164a5293544730ab6e12c3caf275 -Author: Steve Hillier -Date: Tue Apr 17 17:45:41 2018 -0700 - - add nose args when manage.py test called - -commit 9c0c3c8f2b4cbb7f715c489d125f9bd7ac92117a -Merge: 1a1e0202b 3d24cbabe -Author: Sybrand Strauss -Date: Tue Apr 17 17:32:47 2018 -0700 - - Merge branch 'developer' into stephen_branch_on_steroids - -commit 3d24cbabe1b87e3c492bca05916eaa5d9b57d3b5 -Merge: 4fb0afbcd c9896881d -Author: Sybrand Strauss -Date: Tue Apr 17 17:32:20 2018 -0700 - - Merge branch 'developer' of github.com:bcgov/gwells into developer - -commit 1a1e0202b0015bf6f3784b1857dce5998868766a -Author: Sybrand Strauss -Date: Tue Apr 17 17:31:01 2018 -0700 - - Hide the login button if auth disabled - -commit d79842c42ddcbb822bf12b3e81ccf12c2656efd9 -Author: Sybrand Strauss -Date: Tue Apr 17 17:24:34 2018 -0700 - - Moved base URL for api to config - -commit 6065710518f1518aea9c1e3b7cee6f46373c3f6f -Author: Sybrand Strauss -Date: Tue Apr 17 17:18:08 2018 -0700 - - Added documentation - -commit c9896881d5e242887d530d8a72a3580a192bc8b6 -Merge: bff91ae2f a51763b4b -Author: Derek Roberts -Date: Tue Apr 17 17:11:07 2018 -0700 - - Maintenance/Caddy variables and cleanup DerekRoberts/caddy-revisions - -commit a51763b4b27a70b31627c848c121cec2c4185c4f -Author: Derek Roberts -Date: Tue Apr 17 17:09:56 2018 -0700 - - Maintenance/Caddy - variable cleanup - -commit bff91ae2f4b38c70220577ba309eec68449f0940 -Merge: 7724f037d 9e089e934 -Author: garywong-bc -Date: Tue Apr 17 16:55:13 2018 -0700 - - Merge pull request #615 from garywong-bc/developer - - Resolving merge error from two different DB migrations. - -commit 9e089e9342e76f25aba928e53929823ee89beded -Author: Gary Wong (BC Gov) -Date: Tue Apr 17 16:53:41 2018 -0700 - - Resolving merge error from two different DB migrations. - -commit d8ad9cf04ec4d7cd68e29dfb9352907da61dd491 -Author: Sybrand Strauss -Date: Tue Apr 17 16:51:48 2018 -0700 - - Router base now feeds off configured value - -commit 7724f037d710fba0d43755519af5deb518347c3c -Merge: ce6bdbb63 09b819366 -Author: garywong-bc -Date: Tue Apr 17 16:16:59 2018 -0700 - - Merge pull request #613 from stephenhillier/developer - - well class migrations - -commit 09b8193664078c3c38551233283c16954836f3c4 -Author: Steve Hillier -Date: Tue Apr 17 16:12:27 2018 -0700 - - well class migrations - -commit 9231c3063c620a1fd10dc7f0f25f3aa390c4fbb9 -Author: Steve Hillier -Date: Tue Apr 17 16:10:02 2018 -0700 - - fix test for sorting - -commit ce6bdbb638190a5ad3b29f4f28b03b04577b68cc -Merge: 5baec3359 f61db3dd5 -Author: garywong-bc -Date: Tue Apr 17 15:50:34 2018 -0700 - - Merge pull request #612 from garywong-bc/developer - - Updated data load from fixed Registries data from Lindsay. - -commit 5cf7a39b3f2509a1d97d7ed2823aa25f9ed34360 -Author: Derek Roberts -Date: Tue Apr 17 14:43:47 2018 -0700 - - +README.md + Maintenance/proxy build, deployment and usage - -commit 2cb7a5e438f94638d008786d51d0d1a22e648c59 -Author: Derek Roberts -Date: Tue Apr 17 14:42:42 2018 -0700 - - caddy-build.json - removed unused variable, renamed another - -commit d8ec0bd353806e30fe76d0bb2c75096ea13da81c -Author: Derek Roberts -Date: Tue Apr 17 14:41:48 2018 -0700 - - maintenance.sh - renamed var IMG_NAME -> IMG_SRC - -commit f61db3dd54dbde19da6219117b5dfef8f8237861 -Merge: 98651279e 5baec3359 -Author: Gary Wong (BC Gov) -Date: Tue Apr 17 13:46:38 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 98651279eda3b3ca50dee37647505ea3cf392671 -Author: Gary Wong (BC Gov) -Date: Tue Apr 17 13:46:22 2018 -0700 - - Disabling two FT for now.. - -commit 035379279ecbfb2effe4ac874cfb5c6452490c13 -Author: Sybrand Strauss -Date: Tue Apr 17 13:13:55 2018 -0700 - - Changed comment - -commit acbf72e7c5641dfc773fc6cdbdc4da3c695b89e9 -Author: Sybrand Strauss -Date: Tue Apr 17 13:11:27 2018 -0700 - - Reverted to routing from developer branch - -commit 92963aef8c8cda28e942a11e47ed6cec217eda28 -Author: Sybrand Strauss -Date: Tue Apr 17 13:08:15 2018 -0700 - - Fixed back to top overlap issue on reactive footer - -commit 5baec3359a73f13c9dd4de784af17c76b283382e -Merge: 899d920c5 5dbb664f1 -Author: Derek Roberts -Date: Tue Apr 17 12:59:26 2018 -0700 - - Point Caddyfile to single page .html - DerekRoberts/caddy-revisions - - Caddyfile - now pointing to single page .html - -commit 5dbb664f1c466ad9270c790d0996bbfa27e884e3 -Author: Derek Roberts -Date: Tue Apr 17 12:58:13 2018 -0700 - - Caddyfile - now pointing to single page .html - -commit 899d920c5bf35605daa38fa5e952be112637709e -Merge: 7a0ee9a27 d0b1f543b -Author: Derek Roberts -Date: Tue Apr 17 12:45:44 2018 -0700 - - Drop back to simpler maintenance.html - DerekRoberts/caddy-revisions - - Drop back to simpler maintenance.html - -commit a608b07184742671c67f7ce2a987678a87ac7226 -Merge: dc0a6ca28 4fb0afbcd -Author: Sybrand Strauss -Date: Tue Apr 17 12:43:20 2018 -0700 - - Merge branch 'developer' into stephen_branch_on_steroids - -commit d0b1f543b414a00b7933086a52a027b3e86fb781 -Author: Derek Roberts -Date: Tue Apr 17 12:37:07 2018 -0700 - - Caddyfile and maintenance.html - simpler, single file versions being used - -commit 9f3a03426237b955a0c39d514d416590ef6a34b0 -Merge: 19d3a2709 7a0ee9a27 -Author: Gary Wong (BC Gov) -Date: Tue Apr 17 12:33:02 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 7a0ee9a277d452d1a7b1afda474f495b11992c18 -Merge: e8ace16bd a2bcd2765 -Author: garywong-bc -Date: Tue Apr 17 12:30:00 2018 -0700 - - Merge pull request #609 from stephenhillier/developer - - add package cryptography to requirements.txt - -commit a2bcd2765d1af58a949509ae92a36bc20f1591a5 -Author: Steve Hillier -Date: Tue Apr 17 12:27:34 2018 -0700 - - add cryptography to requirements.txt - -commit e8ace16bd51a64dec8f755ba8abd0350f97d8256 -Merge: 7a308af4a 9673667d6 -Author: Derek Roberts -Date: Tue Apr 17 11:09:45 2018 -0700 - - Caddy revisions and .mht maintenance page - DerekRoberts/caddy-revisions - - Caddy revisions and .mht maintenance page - -commit 9673667d66acdc0e9a3f4cea8716fed93c2d56d5 -Author: Derek Roberts -Date: Tue Apr 17 11:07:43 2018 -0700 - - Caddy - removed .html and subfolder - -commit 798dcd97e51d060ae33b7c66d98aa8aeec315189 -Author: Derek Roberts -Date: Tue Apr 17 11:06:06 2018 -0700 - - Caddyfile - point to .mht instead of .html and subfolder - -commit 19d3a270974987d74091be03083efce7b20fad46 -Author: Gary Wong (BC Gov) -Date: Tue Apr 17 11:06:02 2018 -0700 - - Local testing of new FT - -commit e4c9704feff95f22a0d70561d845f508106a85fd -Author: Derek Roberts -Date: Tue Apr 17 10:59:27 2018 -0700 - - maintenance.mht - single file version of maintenance page - -commit d4baf4133c321842bde02454740ff5daf6023191 -Author: Derek Roberts -Date: Tue Apr 17 10:52:31 2018 -0700 - - .gitattributes + binary type (.eot, font) - -commit 7a308af4aee0108fc2034514c7095af112f6bbfe -Merge: 66d6a4db9 168a26308 -Author: Steve Hillier -Date: Tue Apr 17 10:32:25 2018 -0700 - - Merge pull request #607 from stephenhillier/developer - - revert env variable public key - -commit f4c3a949967c2a40addc5e4b3c0b688dd825dcf0 -Merge: 168a26308 66d6a4db9 -Author: Steve Hillier -Date: Tue Apr 17 10:28:16 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 168a26308c0624bcd578ccac2a4a7370a3f25af5 -Author: Steve Hillier -Date: Tue Apr 17 10:27:24 2018 -0700 - - revert env variable public key - -commit 66d6a4db9a00ab50d4e8eeee188375c975ae65e9 -Merge: c02c06c1b cce2b0af6 -Author: garywong-bc -Date: Tue Apr 17 09:41:33 2018 -0700 - - Merge pull request #606 from stephenhillier/developer - - Switch back to hardcoded url for API tests - -commit cce2b0af626f998ee4964c0c9b3c03cf0722f876 -Author: Steve Hillier -Date: Tue Apr 17 09:33:39 2018 -0700 - - revert usage of env variable for base_url - -commit 4fb0afbcdd0a5c235631615a3da7197edf02e1d5 -Merge: 6705ef7c7 c02c06c1b -Author: Sybrand Strauss -Date: Tue Apr 17 08:38:15 2018 -0700 - - Merge branch 'developer' of github.com:bcgov/gwells into developer - -commit 6705ef7c7d04c4df9f2abda3116fd63ea67d47f6 -Author: Sybrand Strauss -Date: Tue Apr 17 08:34:35 2018 -0700 - - Adding some binaries to gitattributes - -commit 755560afa41e0fbc2a3558ab7155cc8320441479 -Author: Steve Hillier -Date: Mon Apr 16 22:12:29 2018 -0700 - - add OrganizationAdd screen - -commit 3497461b389018b0a5a37b928333fd9bfff31a1e -Merge: ae1f426c1 c02c06c1b -Author: Steve Hillier -Date: Mon Apr 16 20:46:39 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into data-entry - -commit c02c06c1b8c8c122b1973900d38dbe0f63010b6d -Author: Steve Hillier -Date: Mon Apr 16 17:47:40 2018 -0700 - - Add env variables - -commit ae1f426c1c499b81a11706000464b8d0f13abaa1 -Author: Steve Hillier -Date: Mon Apr 16 17:42:17 2018 -0700 - - fix default ordering for drillers - -commit 2d2a7563f905c5c24845358a7e61408ba44b6b40 -Author: Steve Hillier -Date: Mon Apr 16 17:42:08 2018 -0700 - - sorting fixes - -commit dc0a6ca28683024e60d2964b4dfb5df6216a4f6f -Author: Sybrand Strauss -Date: Mon Apr 16 17:09:48 2018 -0700 - - Now using meta to pass admin variable - -commit f146f79862dbedaecdd092c800ebd265d2a86552 -Merge: c7215a19f dd9e8780f -Author: Gary Wong (BC Gov) -Date: Mon Apr 16 17:05:51 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit dd9e8780fb6283096139923f7d93a8d19ec63da2 -Merge: df3056db9 8a5cd9b27 -Author: Derek Roberts -Date: Mon Apr 16 17:03:17 2018 -0700 - - Registries: keycloak authentication and search page fixes - stephenhillier/developer - - Registries: keycloak authentication and search page fixes - -commit df3056db93638a7659d69666084053b7f2b79618 -Author: Derek Roberts -Date: Mon Apr 16 17:00:20 2018 -0700 - - Caddyfile - rewrite only /gwells folder - -commit 4963dd7cdcb1fb0d1e88b995f39e0afaa0908f8a -Author: Steve Hillier -Date: Mon Apr 16 16:51:09 2018 -0700 - - disabled company input for now - -commit 4a129f1bedb24e37ce4e59cf105cfa79e4dbc879 -Author: Steve Hillier -Date: Mon Apr 16 16:50:57 2018 -0700 - - save last searched params (fix sorting bug) - -commit b5f0a6bdda669dfdcc89997b63b08b95bee65685 -Merge: 58ba81ea4 2f8d61245 -Author: Derek Roberts -Date: Mon Apr 16 16:47:49 2018 -0700 - - Caddy - maintenance script, updated maintenance screen - DerekRoberts/caddy-revisions - - Caddy - maintenance script, updated maintenance screen - -commit 2f8d612458e490898f9fda646d02a3d457dcfd84 -Author: Derek Roberts -Date: Mon Apr 16 16:41:49 2018 -0700 - - maintenance.sh - shortened maint-on and maint-off to just on and off - -commit 6973fa6057f11e5b8870b3e168de19b9ac685036 -Author: Derek Roberts -Date: Mon Apr 16 16:41:09 2018 -0700 - - maintenance.sh + updated help output - -commit 6a82837ac2fb4ebe14c6ca4e7c39f52f78ecbf83 -Author: Derek Roberts -Date: Mon Apr 16 16:34:03 2018 -0700 - - maintenance.sh - cleanup, arrangement and shortening - -commit 54cb15bdf83f0989856fa35eae48e8267f29534a -Author: Sybrand Strauss -Date: Mon Apr 16 16:22:39 2018 -0700 - - Moved ENABLE_DATA_ENTRY into config - -commit c7215a19ff9d3a8196b0fb99f82ae24624c07757 -Merge: 8162dd4a7 58ba81ea4 -Author: Gary Wong (BC Gov) -Date: Mon Apr 16 16:15:16 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 8162dd4a72dabe5e3c5b634d808ef926a3648793 -Author: Gary Wong (BC Gov) -Date: Mon Apr 16 16:13:52 2018 -0700 - - With new corrected data from Registries, via Lindsay. - -commit 58ba81ea4eddaa3736d27605f10859eb2afcaa2f -Author: Derek Roberts -Date: Mon Apr 16 15:58:47 2018 -0700 - - Jenkinsfile-developer - shortened var names - -commit 8a5cd9b27604c1ea2deba444a2fc39485d1b0aa8 -Author: Steve Hillier -Date: Mon Apr 16 15:55:31 2018 -0700 - - get keycloak public key and expected audience from env variables - -commit 5b6035466034ffa30a4801ae2150e25d4b17414a -Author: Sybrand Strauss -Date: Mon Apr 16 15:44:20 2018 -0700 - - Removed font reference - -commit ed667259b06c07be919ccc7dfdb1543cc1005b8c -Author: Sybrand Strauss -Date: Mon Apr 16 15:04:09 2018 -0700 - - Back to top button now working as used to - -commit c8791ae6cf1fb6f03731d17aaf63f7236428c443 -Author: Derek Roberts -Date: Mon Apr 16 14:59:55 2018 -0700 - - Jenkinsfile-developer - updated newman vars - -commit c77947461d4c08020c08531b011cefce19bd558b -Author: Derek Roberts -Date: Mon Apr 16 14:53:16 2018 -0700 - - caddy.sh -> maintenance.sh, moved to ./maintenance folder - -commit 1a6fda1caac300dd137706a8b625a94430396d3c -Author: Steve Hillier -Date: Mon Apr 16 14:53:07 2018 -0700 - - switch between base_urls based on node_env - -commit 62648c614da9593c7b7ec03b1db3803b5c40fcef -Author: Steve Hillier -Date: Mon Apr 16 14:52:45 2018 -0700 - - remove console.log statement - -commit 78e2f7bd7c64ae9cf3be43826c3b1a0207c6092d -Author: Derek Roberts -Date: Mon Apr 16 14:51:53 2018 -0700 - - caddy.sh + check project var against oc projects - -commit 2314d22f743ebf32d9bc83e2ef71df81ea8b6f65 -Author: Derek Roberts -Date: Mon Apr 16 14:51:03 2018 -0700 - - caddy.sh + mandatory project variable, removed BUILD_PROJECT - -commit 55f1ae3d91f38bae5b3557a68ae8efbec4a9823d -Author: Sybrand Strauss -Date: Mon Apr 16 14:47:06 2018 -0700 - - Fixed issue with footer not sticking to the bottom of the page - -commit 26e25907c6e362d0b7d51324c8aca316de2d5049 -Author: Derek Roberts -Date: Mon Apr 16 14:10:05 2018 -0700 - - maintenance.html + default gov footer - -commit a3d6c20cc2b9ffd3a0b70b7ca9343893f399828f -Author: Steve Hillier -Date: Mon Apr 16 14:02:51 2018 -0700 - - update API tests to use keycloak - -commit fbd6a2c9d1e0c2c6cb25f4b9b5fe7e69f52b5928 -Author: Derek Roberts -Date: Mon Apr 16 12:56:03 2018 -0700 - - caddy.sh + vars for changing ports - -commit d1eb76a3821773bf3a155f4950e6a9d64a990b98 -Author: Derek Roberts -Date: Mon Apr 16 12:54:44 2018 -0700 - - caddy.sh - cleanp - -commit 1228b0b69540892cd017ea0ee8cd437e95a78c2d -Author: Sybrand Strauss -Date: Mon Apr 16 12:31:04 2018 -0700 - - Upgraded to latest datatables to match boostrap 4 - -commit 92c6977b78e45c554d80257e1760055671173a9e -Author: Derek Roberts -Date: Mon Apr 16 12:12:02 2018 -0700 - - caddy.sh - dropped APP_REDIRECT, APP_MAINT_OFF covers primary usage - -commit 6e5504609720b30f4ea2b20fe3370e53056ec2d4 -Author: Derek Roberts -Date: Mon Apr 16 12:09:00 2018 -0700 - - caddy.sh - swap maint on and off routes - -commit aee662556f1063116f3f3b078a141929f3a145f7 -Author: Derek Roberts -Date: Mon Apr 16 11:32:26 2018 -0700 - - caddy.sh - changed default app redirect to use gwells (maint off var) - -commit c65581d351cb8fb24f8cf2e4b4e991e96aede09b -Merge: 9846ba7aa 0120bcc6c -Author: Steve Hillier -Date: Mon Apr 16 11:13:10 2018 -0700 - - merge upstream - -commit 0120bcc6ceaf87e0f1660d197525fa75a3701754 -Author: Steve Hillier -Date: Mon Apr 16 11:09:40 2018 -0700 - - Remove spinner from search button - -commit 962fe4257817c8a813140670c065f32741272fe9 -Author: Derek Roberts -Date: Mon Apr 16 10:53:10 2018 -0700 - - maintenance.html + propriately styled version and files - -commit 68903db8943d4c89ca437345dcca794bb18d99a6 -Author: Steve Hillier -Date: Sun Apr 15 22:25:31 2018 -0700 - - add form and working submit button to add new driller and register them - -commit 89d0b945c0a981f7a3725aabf77f7cf43edbd9f4 -Author: Steve Hillier -Date: Sun Apr 15 22:24:02 2018 -0700 - - fix url for post requests - -commit ca03b5d6fa1749b18870767063b8ba996e279bd2 -Author: Steve Hillier -Date: Sun Apr 15 22:23:47 2018 -0700 - - automatically create related records when creating a person - -commit 6623b99274812bb970956ef618314e9584b25d50 -Author: Steve Hillier -Date: Sun Apr 15 22:23:21 2018 -0700 - - add ProvinceState to admin site - -commit 40d8ae39363f169fad8a00fee4350e9591641d9a -Author: Steve Hillier -Date: Sun Apr 15 14:37:49 2018 -0700 - - remove common css from component - -commit a5518005a10fa7547cc35294b587b253170d79a6 -Author: Steve Hillier -Date: Sun Apr 15 14:37:33 2018 -0700 - - add new add person screen - -commit a6adceb52d1d57e6cf00704620c9d73eb89f869b -Author: Steve Hillier -Date: Sun Apr 15 14:37:13 2018 -0700 - - add vue-select component to project - -commit 5cd9328935d505c27b5fc8812fd274e21d83c5d1 -Author: Steve Hillier -Date: Sun Apr 15 14:36:56 2018 -0700 - - move some common css rules into main app template - -commit d7b2a42d07894f7a440ec2b095a5e4704ee050bf -Author: Steve Hillier -Date: Sun Apr 15 14:36:37 2018 -0700 - - stop select css rule overriding bootstrap-vue's component style - -commit 79092c811734415e90eaa0ad78d7a6f7ebd6735c -Author: Steve Hillier -Date: Sun Apr 15 14:35:37 2018 -0700 - - add vue-select package - -commit 5723a1b426f02029de88fdfc754ae3bdb3fe9e90 -Author: Steve Hillier -Date: Fri Apr 13 19:41:06 2018 -0700 - - auto add email to profile - -commit 0eea273144a291486208d27f20f90c26f1877cf0 -Author: Steve Hillier -Date: Fri Apr 13 19:40:52 2018 -0700 - - formatting fixes - -commit 038a5ca3dc2128308ffa0c8b6f7047522f1d071f -Author: Steve Hillier -Date: Fri Apr 13 19:40:13 2018 -0700 - - makemigrations - -commit cb28bff438e8f8581ef21dcc92e64d9e0ffe4087 -Author: Steve Hillier -Date: Fri Apr 13 18:41:19 2018 -0700 - - add scroll to table when search performed - -commit 140a226b5b6cb461035ae510c16347bc41a764e6 -Author: Steve Hillier -Date: Fri Apr 13 18:41:02 2018 -0700 - - add package vue-smoothscroll - -commit aa5609ba05f71002ea6a2f70d79a08892eb58756 -Merge: cefe2efe4 937f207ff -Author: garywong-bc -Date: Fri Apr 13 14:29:16 2018 -0700 - - Merge pull request #602 from garywong-bc/master - - Merge from developer. - -commit 937f207ffa1d4c05f3c5c9d246369d9ce3219ff6 -Merge: cefe2efe4 9846ba7aa -Author: Gary Wong (BC Gov) -Date: Fri Apr 13 14:25:43 2018 -0700 - - Merged from developer, with fixes to CRLF - -commit 9846ba7aa5bd083c5796dfd714e5d1305a7acbff -Merge: 28e5f0d09 fed50cf97 -Author: Derek Roberts -Date: Fri Apr 13 14:01:39 2018 -0700 - - Updated docs... - garywong-bc/developer - - Updated docs... - -commit fed50cf97e2ff6437509c943345b5cfcb55d617b -Author: Gary Wong (BC Gov) -Date: Fri Apr 13 14:01:03 2018 -0700 - - Typo fix. - -commit c6f1c36a6aa8011432c007ff9253356eefdd2e71 -Author: Gary Wong (BC Gov) -Date: Fri Apr 13 13:23:15 2018 -0700 - - Better documentation of arcane database resets to match reset Django migrations. - -commit 9f804e2f7417a3977c21bc2f804e22c3b77cc608 -Author: Gary Wong (BC Gov) -Date: Fri Apr 13 13:23:04 2018 -0700 - - Better documentation of arcane database resets to match reset Django migrations. - -commit 28e5f0d0980f216ea61c8473576071e3a3555ee3 -Merge: e82eaa719 46d1c6797 -Author: Derek Roberts -Date: Fri Apr 13 10:04:30 2018 -0700 - - Caddy revisions - DerekRoberts/caddy-revisions - - Caddy revisions - -commit 46d1c67970b7952eece73f8c7df5739b4028a001 -Author: Derek Roberts -Date: Fri Apr 13 08:54:59 2018 -0700 - - caddy.sh - removed APP_NAME var (replaced by APP_MAINT_ON) - -commit e82eaa719e251fc77c8e24fda5d1d5678769f74c -Merge: 8ceaac8aa 93901f634 -Author: garywong-bc -Date: Fri Apr 13 00:10:16 2018 -0700 - - Merge pull request #599 from garywong-bc/developer - - Production data revised Artesian pressure - -commit 93901f63464d572f4bbbcd045d5fca58772a4e6b -Author: Gary Wong (BC Gov) -Date: Fri Apr 13 00:09:21 2018 -0700 - - Production data revised Artesian pressue, so revising FT results to match. - -commit 8ceaac8aa773f617a165d007e08242f439a629c0 -Merge: b1e676a5a adb625628 -Author: garywong-bc -Date: Thu Apr 12 23:17:26 2018 -0700 - - Merge pull request #598 from garywong-bc/developer - - Missing get_env_var() and updated FT test results. - -commit adb625628688a93ec57156e94e65718012697bea -Merge: b23964d81 b1e676a5a -Author: Gary Wong (BC Gov) -Date: Thu Apr 12 23:16:16 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit b23964d818dc2901bec92bc0e8c41b83e917b813 -Author: Gary Wong (BC Gov) -Date: Thu Apr 12 23:15:51 2018 -0700 - - Missing get_env_var() and updated FT test results. - -commit db24fd3c2c3f467c953f81383629bb03913c25df -Author: Derek Roberts -Date: Thu Apr 12 18:22:46 2018 -0700 - - caddy.sh - only expose route if APP_NAME != APP_REDIRECT - -commit 9d8c266f296c928207dd7ea9e6550ddb1038ce2c -Author: Derek Roberts -Date: Thu Apr 12 18:22:01 2018 -0700 - - caddy.sh + variables for target, maint-on and maint-off routes - -commit 1d0932c3bfdb8232eaa50c58ce9797e961a55536 -Merge: 0bc6b3a13 13a87f728 -Author: Sybrand Strauss -Date: Thu Apr 12 17:39:56 2018 -0700 - - Merge branch 'rest-oidc' of github.com:stephenhillier/gwells into stephen_branch_on_steroids - -commit 0bc6b3a131154a391c0b9b09e777b3b6140d406e -Author: Sybrand Strauss -Date: Thu Apr 12 17:29:04 2018 -0700 - - Even closer to matching old styles - -commit 92c5474fca63000324717db11f89d77aa358099d -Author: Sybrand Strauss -Date: Thu Apr 12 17:03:15 2018 -0700 - - Very close to original look, with new header and footer - -commit e599fd8d542267f5421e2207b0892f4e90295e0b -Author: Sybrand Strauss -Date: Thu Apr 12 16:54:02 2018 -0700 - - Changed vue modules to be simplified, display now closer to desired - -commit 00681e0b225f67ef4dd271beaa410a81d489913c -Author: Derek Roberts -Date: Thu Apr 12 16:41:53 2018 -0700 - - caddy.sh - change target app from jenkins to gwells - -commit 6495ca549f19f467c28467445c6aa48fe405b583 -Author: Derek Roberts -Date: Thu Apr 12 16:30:01 2018 -0700 - - caddy.sh - revised repo link - -commit e8eb908171b904cc6ae105d305d6d3116fa79c83 -Author: Sybrand Strauss -Date: Thu Apr 12 15:22:16 2018 -0700 - - Experimenting with layout - -commit 13a87f728479173636e63e3e6d1332341d656d42 -Author: Steve Hillier -Date: Thu Apr 12 14:16:26 2018 -0700 - - first draft updating application detail page - -commit b1e676a5a549ab184cebab62712cbdabfa65f1f6 -Merge: 316537b89 37dd99f32 -Author: Derek Roberts -Date: Thu Apr 12 11:47:42 2018 -0700 - - .gitattributes and further cleanup of line endings - DerekRoberts/line-endings - - .gitattributes and further cleanup of line endings - -commit 37dd99f3278b5e5c59266a3b4929189903cc14d9 -Author: Derek Roberts -Date: Thu Apr 12 11:12:24 2018 -0700 - - setup_osx.sh + pip upgrade - -commit d7319731cd04398bbd2922bb7a355b546b9af108 -Author: Derek Roberts -Date: Thu Apr 12 11:01:02 2018 -0700 - - setup_osx.sh + escape character in filler secret key - -commit 687e816955a8ae8c94a38588d74769eaa650eeaa -Author: Derek Roberts -Date: Thu Apr 12 10:48:20 2018 -0700 - - Further line ending cleanup - -commit a16e7be8832d59178faf1596321e87041b66d0b0 -Author: Derek Roberts -Date: Thu Apr 12 10:46:12 2018 -0700 - - .gitattributes + jar, png and tff binary file types - -commit e2cf334c9e954375579c4ec5e3fd9ab80ab281f5 -Author: Derek Roberts -Date: Thu Apr 12 10:42:59 2018 -0700 - - .gitattributes + excluce static files folder - -commit b0f78614203928b8f48d95019c44eb3a8b3a55a7 -Author: Sybrand Strauss -Date: Thu Apr 12 10:28:40 2018 -0700 - - Trying to fix template - -commit 2a0033857a1d9085dc565e3c7f78ace0e3b2eb44 -Author: Steve Hillier -Date: Thu Apr 12 09:55:05 2018 -0700 - - allow django admins permission in the IsGwellsAdmin permission class - -commit 316537b89192fad313149cd477dc163342729aac -Merge: be6ec6b27 d0410963e -Author: garywong-bc -Date: Thu Apr 12 08:50:25 2018 -0700 - - Merge pull request #596 from garywong-bc/developer - - Updated FT record counts. - -commit d0410963e6b83d8f122f150a789406bf4d643115 -Merge: 587551769 be6ec6b27 -Author: Gary Wong (BC Gov) -Date: Thu Apr 12 08:49:02 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 5875517694eceed9054c6b9fae68787591d9ced7 -Author: Gary Wong (BC Gov) -Date: Thu Apr 12 08:45:09 2018 -0700 - - updated FT record counts, and also got CRLF changes. - -commit b4196fa47ece9c150537a9ad1d0d05e8e186b45c -Author: Sybrand Strauss -Date: Wed Apr 11 18:26:53 2018 -0700 - - Removed legacy unused code - -commit 046efac0ed894b68710821ef8215e70ee369ff3f -Author: Sybrand Strauss -Date: Wed Apr 11 18:22:37 2018 -0700 - - I don't think anything in misc.js matters - -commit a9c9b68ee9029a043dee3f23f664c55228c742ed -Author: Sybrand Strauss -Date: Wed Apr 11 18:03:01 2018 -0700 - - Getting links to work (not in a good way, but good for testing) - -commit be570e653fa3ee5885ac683383528ca712ba9e33 -Author: Steve Hillier -Date: Wed Apr 11 17:42:12 2018 -0700 - - convert from findIndex to array.some for finding an item in array - -commit 9d5ef293b3773f625edbf2067b8bea06a4bf1dde -Author: Steve Hillier -Date: Wed Apr 11 17:41:30 2018 -0700 - - fix separate email/tel list - -commit 579873721995e6292293f076d6c11af0453d7f9f -Author: Steve Hillier -Date: Wed Apr 11 17:41:00 2018 -0700 - - update layout - -commit 4ff0aeffea93ebdec32c1dc56f64a1598da7220c -Author: Steve Hillier -Date: Wed Apr 11 17:40:40 2018 -0700 - - first steps fixing layout - -commit cefe2efe4d533ae5208e8cdeda321dc293d7d8d2 -Author: Derek Roberts -Date: Wed Apr 11 17:38:03 2018 -0700 - - Files revised by more aggressive line ending cleanup - -commit 3b7fc064e3546035b5193b39f2d17e8fd005ad7b -Author: Derek Roberts -Date: Wed Apr 11 17:29:16 2018 -0700 - - .gitattributes - more aggressive line ending cleanup - -commit be6ec6b27dac01774290c43ab79b2fc890d4109c -Author: Derek Roberts -Date: Wed Apr 11 17:30:36 2018 -0700 - - Files revised by more aggressive line ending cleanup - -commit 0f5a565b4a284806e08e307583b7cff174d34127 -Author: Derek Roberts -Date: Wed Apr 11 17:29:16 2018 -0700 - - .gitattributes - more aggressive line ending cleanup - -commit a0c83c556c93f647072e0b8cc7209f28ce02da65 -Merge: 968598b86 62543b09f -Author: garywong-bc -Date: Wed Apr 11 17:08:46 2018 -0700 - - Merge pull request #595 from garywong-bc/developer - - Undoing attempt to move post-deploy.py to post-lifecycle - -commit 62543b09fd143cd931ca3c0dad218b1d6d4442bc -Author: Gary Wong (BC Gov) -Date: Wed Apr 11 17:07:11 2018 -0700 - - Undoing attempt to move post-deploy.py to post-lifecycle as error still occurred. - -commit 968598b863c651b9c380807e5667d73b6571153d -Merge: 518858f00 7e59215a0 -Author: Derek Roberts -Date: Wed Apr 11 16:58:26 2018 -0700 - - .gitattributes - force unix line endings more aggressively - DerekRoberts/line_endings - - .gitattributes - force unix line endings more aggressively - -commit 7e59215a0f64332985ccd2b9f62065b0372487ba -Author: Derek Roberts -Date: Wed Apr 11 16:54:02 2018 -0700 - - .gitattributes - force unix line endings more aggressively - -commit f05f91f8e4c95f8e0a7fc486004b50b72cac871b -Author: Steve Hillier -Date: Wed Apr 11 16:43:48 2018 -0700 - - more company/contact info for person detail serializer - -commit bf49bb9bcf25c98233316b7201ba60f6f0874e50 -Author: Steve Hillier -Date: Wed Apr 11 16:43:32 2018 -0700 - - add staff flag to user if his/her token has gwells_staff role - -commit 419b7b8b40e48c0364e8853a5d634cdd847cfcfa -Author: Steve Hillier -Date: Wed Apr 11 16:43:00 2018 -0700 - - change findIndex to array.prototype.some - -commit 9efc5ab6b53f6d23f884fd2eda4f9c3ad2bd61fa -Author: Steve Hillier -Date: Wed Apr 11 16:42:34 2018 -0700 - - new fontawesome version - -commit 518858f007879dbc6dbd5661b29d107d397eb4cb -Merge: 98c39551b 50695e794 -Author: garywong-bc -Date: Wed Apr 11 16:15:07 2018 -0700 - - Merge pull request #593 from garywong-bc/developer - - Moving Django command execution for post-lifecycle from mid-lifecycle - -commit 50695e79495d56ef6cce482044d16b4aa99ed0bd -Author: Gary Wong (BC Gov) -Date: Wed Apr 11 16:11:21 2018 -0700 - - Moving Django command execution for post-lifecycle from mid-lifecycle - -commit a2619754422f89812daa40bf0811eb3c985cbcac -Author: Sybrand Strauss -Date: Wed Apr 11 15:47:26 2018 -0700 - - Change to bootstrap4, switch to using vue for header and footer - -commit 692556384e4c28b6bfed9149486ece6842a70715 -Author: Steve Hillier -Date: Wed Apr 11 13:55:21 2018 -0700 - - moving keycloak init code out of components - -commit 1f4715e9069877f37cb764917dbe28ecbffa6b1f -Author: Steve Hillier -Date: Wed Apr 11 13:55:00 2018 -0700 - - add meta info to routes to help with authorization - -commit 5d6207e6c422d516c865c3b0cfc3e5d4547918a3 -Author: Steve Hillier -Date: Wed Apr 11 13:53:58 2018 -0700 - - whitespace & pylint warning corrections - -commit 98c39551be44f61829444650fc3521672eae09b8 -Merge: 50cc4fef9 1310fbcd6 -Author: Derek Roberts -Date: Wed Apr 11 10:40:48 2018 -0700 - - Environment variables - non build breaking - Sybrand/task/environment - - Environment variables - non build breaking - -commit 1310fbcd63cf7362c1d601d1cbefe3ba6a7e2d20 -Merge: 640555dff 50cc4fef9 -Author: Sybrand Strauss -Date: Wed Apr 11 10:04:08 2018 -0700 - - Merge branch 'developer' into task/environment - -commit 2893826a27b9c84a33f4659c92dda8ec9d39e497 -Author: Steve Hillier -Date: Wed Apr 11 09:20:05 2018 -0700 - - update tests for switch to keycloak auth - -commit 50cc4fef9e5e4a923e050508ee09fcc671f029db -Merge: 18f9914c4 56e86600f -Author: garywong-bc -Date: Tue Apr 10 17:36:23 2018 -0700 - - Merge pull request #592 from garywong-bc/developer - - Reset migrations and updated FT counts on Registries. - -commit 50a847299f49ccaf835730e1e2c45e00f9d63c34 -Author: Steve Hillier -Date: Tue Apr 10 17:23:56 2018 -0700 - - fix protected components to use keycloak getters - -commit dd2f8da93d6b659f2ac5f323c52fa97c4094fb6b -Author: Steve Hillier -Date: Tue Apr 10 17:23:36 2018 -0700 - - change position of login button - -commit e78952c0389178a51f948b8bc321a733ddee414b -Author: Steve Hillier -Date: Tue Apr 10 17:23:05 2018 -0700 - - simplify authGuard - -commit 586296f958e7fff39806a29621e3c1ba8473cc32 -Author: Steve Hillier -Date: Tue Apr 10 17:22:49 2018 -0700 - - add userIsAdmin getter - -commit 8bd42cee94eda619de3ffe0652968809ac623b88 -Author: Steve Hillier -Date: Tue Apr 10 17:22:36 2018 -0700 - - send user to home when logged out - -commit 56e86600fc38e0254574ac2a2405e7ff031e33c1 -Author: Gary Wong (BC Gov) -Date: Tue Apr 10 17:05:22 2018 -0700 - - Reset migrations and updated FT counts on Registries. - -commit d06e509a26304a9c3e819658fe3b9ae902ee3e81 -Author: Sybrand Strauss -Date: Tue Apr 10 16:25:24 2018 -0700 - - Removed node environment check. Not required when running with vue integration - -commit 0e8262f4ecd364b9fae418127f412914ae96712a -Author: Sybrand Strauss -Date: Tue Apr 10 16:24:01 2018 -0700 - - Pushed up to latest version of webpack-bundle-tracker - -commit aaceb34cfc294bd859aa529c4be506be4898df77 -Author: Sybrand Strauss -Date: Tue Apr 10 16:23:33 2018 -0700 - - Added plugin to webpack dev config - -commit 16bb2a658310f1e67abca624ee681f2a3c2c72f1 -Author: Steve Hillier -Date: Tue Apr 10 16:15:54 2018 -0700 - - add IDP hint - -commit 8a12e96f405f8e5bf16fd18aad1f439222e2e0a6 -Author: Steve Hillier -Date: Tue Apr 10 16:15:39 2018 -0700 - - fix audience - -commit b86e708e5d0c587904e5321efb128755edf7ed6f -Author: Gary Wong (BC Gov) -Date: Tue Apr 10 16:10:00 2018 -0700 - - Added application statuses to data loads. - -commit b3d84cae40a7243ccc5c0cfa961fe7b8aa922b0e -Merge: ff137b907 d719dda12 -Author: Sybrand Strauss -Date: Tue Apr 10 14:58:09 2018 -0700 - - Merge branch 'frontend-bs4' of github.com:stephenhillier/gwells into stephen_branch - -commit a2a0c8d2e170e316d4c88ad0da081376ce9374a6 -Author: Steve Hillier -Date: Tue Apr 10 14:47:55 2018 -0700 - - recreate migrations (conflict) - -commit 2750cd2b8a55d39f102f110c1e84716f2c35a67d -Merge: 5390f9091 d719dda12 -Author: Steve Hillier -Date: Tue Apr 10 14:47:34 2018 -0700 - - Merge branch 'frontend-bs4' into rest-oidc - -commit 5390f9091fee85a89710363fe6154ee39b93d756 -Author: Steve Hillier -Date: Tue Apr 10 14:43:31 2018 -0700 - - add IsGwellsAdmin permission class back in - -commit 38175839e4591a23fe57ba41b59f12936fbe06ed -Merge: 6c20d580a 18f9914c4 -Author: Steve Hillier -Date: Tue Apr 10 14:43:14 2018 -0700 - - merge developer branch - -commit d719dda12f128236be0a508984caacb0f2eba9c5 -Author: Steve Hillier -Date: Tue Apr 10 14:40:48 2018 -0700 - - adjust login button position (still needs work) - -commit ff137b9079a2ac4f71d73c79e482253339615d5e -Merge: 09f01faba 309556d1c -Author: Sybrand Strauss -Date: Tue Apr 10 14:39:35 2018 -0700 - - Merge branch 'task/vue_header' into stephen_branch - -commit f0a2fb2d76bdb5831b907fc5321bdc5bad7ef762 -Author: Steve Hillier -Date: Tue Apr 10 14:36:11 2018 -0700 - - adjust text displayed when logged in - -commit f7f2ce733b0a64d0a1efd6250511d425fb0238c0 -Author: Steve Hillier -Date: Tue Apr 10 14:33:37 2018 -0700 - - turn devtools on when loading app with django - -commit 5509789422a7e2deeeade4c02e3ea8b88bdb302d -Author: Steve Hillier -Date: Tue Apr 10 14:33:22 2018 -0700 - - automatically enable logging on dev server - -commit b1b0beb2d9a0a533c9fbd5d0bef9d1bd640208f0 -Author: Steve Hillier -Date: Tue Apr 10 14:33:01 2018 -0700 - - add separate base_url for prod build - -commit 6eed278ace872092f20b6d435cbddfe922f2d37f -Author: Steve Hillier -Date: Tue Apr 10 14:32:27 2018 -0700 - - add a logout function - -commit ecc8edc0ea799f875bedbd6fa611899e50d39b33 -Author: Steve Hillier -Date: Tue Apr 10 14:31:38 2018 -0700 - - removed $ from end of registries home url (allow fallback) - -commit 09f01fabac7ee6b399a6302b6ad00398c4cef742 -Author: Steve Hillier -Date: Tue Apr 10 13:39:30 2018 -0700 - - adjust auth "onLoad" and "login button clicked" behavior - -commit a9f9aa5797b1108ba0898cc4388e4854a4fbfc2c -Author: Steve Hillier -Date: Tue Apr 10 13:28:53 2018 -0700 - - remove unnecessary auth-related stuff from header - -commit 309556d1c2341967460cb4a9850a4b8df7b9caeb -Author: Sybrand Strauss -Date: Tue Apr 10 13:27:11 2018 -0700 - - Changed assetsSubDirectory from static to bundles - -commit b9176f87c4a5893923dd38c93fb19efeabc3872d -Author: Sybrand Strauss -Date: Tue Apr 10 13:18:03 2018 -0700 - - Fixed linting issues - -commit 82de99a1ea161f58c1bd6f72d589b293ce663956 -Merge: a6b0a46a3 18f9914c4 -Author: Steve Hillier -Date: Tue Apr 10 13:16:51 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into frontend-bs4 - -commit a6b0a46a380b073edff5b624e96faa6bc1a41cd1 -Author: Steve Hillier -Date: Tue Apr 10 13:16:21 2018 -0700 - - change router mode to history (remove hash from urls) - -commit 40d9e80fdeb53e0bcbb896bcb1307b445915da5d -Author: Sybrand Strauss -Date: Tue Apr 10 13:16:18 2018 -0700 - - Changed dev webpack to extract modules in the same was as prod - -commit 70d0ff276265d137e8aa2be00a92e24273d597a4 -Author: Steve Hillier -Date: Tue Apr 10 13:16:06 2018 -0700 - - remove old auth link in header - -commit bea8db77c99c4a1b7abb6d43bc18ac5da66e494d -Author: Steve Hillier -Date: Tue Apr 10 13:15:53 2018 -0700 - - add simple auth component for logging into keycloak - -commit 5775fc1b95d18d84b5ebb85f3a226d0067c38485 -Author: Steve Hillier -Date: Tue Apr 10 13:15:36 2018 -0700 - - add keycloak-js adapter package - -commit 5647241539b8a85bdd075740874c74111b022f22 -Author: Steve Hillier -Date: Tue Apr 10 13:15:25 2018 -0700 - - add keycloak object to store/state - -commit 43543f6d09d03aa3a1692e758df8d0bb631ae690 -Author: Steve Hillier -Date: Tue Apr 10 13:15:09 2018 -0700 - - add 127.0.0.1 to debug cors whitelist - -commit 16f2ffbb03b4df94e20dd4a40fa92d2eb2b1c6cf -Author: Sybrand Strauss -Date: Tue Apr 10 11:42:05 2018 -0700 - - Fixed asset path for dev - -commit 2c3347f2e7e806eab711a0cdb2cf786301c2aa1a -Author: Sybrand Strauss -Date: Tue Apr 10 11:41:35 2018 -0700 - - Changed location of tracker file and fixed some linting issues - -commit a0410c9f99cdbed05a91743712efbff4da14312a -Author: Sybrand Strauss -Date: Tue Apr 10 11:30:58 2018 -0700 - - Added a watch command for django - -commit 093508f30532d3270deb25c383b68475a6253813 -Author: Sybrand Strauss -Date: Tue Apr 10 11:27:06 2018 -0700 - - Removed some settings from WEBPACK_LOADER, not sure if they're required. - -commit 9c69fe91d070d6fae38deb8cc0cfd3cdbc16829a -Merge: a345f8ed6 18f9914c4 -Author: Gary Wong (BC Gov) -Date: Tue Apr 10 10:12:45 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 18f9914c46aeef2beecfe5ff0195d78f81037b76 -Merge: 97af08fc6 6880b2308 -Author: garywong-bc -Date: Tue Apr 10 10:12:34 2018 -0700 - - Merge pull request #590 from stephenhillier/developer - - Registries API - better registrations & applications endpoints - -commit a345f8ed68a0e9fcbcdfb0bb7ef74dffeac16384 -Author: Gary Wong (BC Gov) -Date: Tue Apr 10 10:11:49 2018 -0700 - - Syntax fixes. - -commit 6880b230805b20a658cb46257780b99aedb40520 -Author: Steve Hillier -Date: Mon Apr 9 17:04:17 2018 -0700 - - update API tests to delete the created test application - -commit b2ce9ab388f0c74eeafaab10c244e7b055ec7977 -Author: Steve Hillier -Date: Mon Apr 9 17:03:57 2018 -0700 - - remove invalid prefetch_related - -commit d0fff956937f44d31a4c5d154a88e8fa03ee765f -Author: Gary Wong (BC Gov) -Date: Mon Apr 9 16:52:44 2018 -0700 - - Added applications to data load and added new DB views. - -commit 6916aec0d531a195bf11bd5709b14b77c24348eb -Author: Steve Hillier -Date: Mon Apr 9 16:50:52 2018 -0700 - - allow on_delete=cascade for Application / ApplicationStatus - -commit 68a53235cf849838088ac5f0647b7422cb570716 -Merge: 31ee8b28c 97af08fc6 -Author: Steve Hillier -Date: Mon Apr 9 16:49:07 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 35e0ac7dc990ec4f56b4f137b29210312ffef4a3 -Author: Steve Hillier -Date: Mon Apr 9 16:48:57 2018 -0700 - - convert to bs4 - -commit 1213cf29153a4cd7412b20020355c9afe115cda7 -Author: Steve Hillier -Date: Mon Apr 9 16:48:53 2018 -0700 - - add fontawesome import - -commit b95aa912b5c36bafd56961783199b7aec7f9d7c7 -Merge: fe7b691fe 97af08fc6 -Author: Steve Hillier -Date: Mon Apr 9 14:24:45 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into frontend-bs4 - -commit fe7b691fec39c47d1ad035ff507d977576dc884b -Author: Steve Hillier -Date: Mon Apr 9 14:24:21 2018 -0700 - - add certifying authority to driller search results - -commit aad576494ff4002c24772ef6b3949d5076605fec -Author: Steve Hillier -Date: Mon Apr 9 14:24:02 2018 -0700 - - add certifying authority to application lists - -commit 86dee82ceb4e90f7180eb3d9160f29992cf1b2e2 -Author: Steve Hillier -Date: Mon Apr 9 14:23:41 2018 -0700 - - remove prefetch from applications view class - -commit 5e866b7248db9e176aac9e7585e262885f5c4b43 -Merge: 4549699dc 97af08fc6 -Author: Sybrand Strauss -Date: Mon Apr 9 13:42:54 2018 -0700 - - Merge branch 'developer' into task/vue_header - -commit 5230a3640f3b7263a69fc09860cc3085cbabb2be -Author: Steve Hillier -Date: Mon Apr 9 12:21:42 2018 -0700 - - move search table logic into separate components - -commit 0e798f1e5f539ef6824a4016027be7a1d12eee80 -Author: Steve Hillier -Date: Mon Apr 9 12:20:38 2018 -0700 - - fix duplicate person entries returned when filtering on other table - -commit 4f6194adae31628ff49f9942958692535a929fd6 -Author: Steve Hillier -Date: Mon Apr 9 12:19:52 2018 -0700 - - update contact info serializer - -commit 41f88c5b8f6e993ddb509398316449c582f1d691 -Author: Steve Hillier -Date: Mon Apr 9 12:19:34 2018 -0700 - - go to search home when logout button pushed - -commit 7e0c808464b51a016a6d0bc472a4d91fdacb9752 -Author: Steve Hillier -Date: Mon Apr 9 12:19:00 2018 -0700 - - start with a blank string in city array to ensure "All" is selected - -commit 640555dff6b1b19caf89a37436d1bc3fa2f60a41 -Author: Sybrand Strauss -Date: Mon Apr 9 12:04:20 2018 -0700 - - Fixed BASE_DIR - -commit 3fe113809ac5c785c7d605ffae7a72ebfadcc369 -Author: Sybrand Strauss -Date: Mon Apr 9 11:58:18 2018 -0700 - - Fixed module import - -commit 0764acf85b8e06f31396a54c76a15f35408be096 -Author: Sybrand Strauss -Date: Mon Apr 9 11:46:39 2018 -0700 - - Implemented environmental variable checking, changed code to be pep8 compliant, added some files to gitignore. - -commit e2ec758f75f4d53752fe9988a0b246676a088baa -Author: Sybrand Strauss -Date: Mon Apr 9 09:39:18 2018 -0700 - - Reverted to developer - -commit fff1c059d1754c2d62037f51b629ee49166cc4db -Merge: e8c0e6f34 97af08fc6 -Author: Sybrand Strauss -Date: Mon Apr 9 09:38:51 2018 -0700 - - Merge branch 'developer' into task/environment - -commit 4549699dc53d498d8797b9ad87d7dc1a04eb0f07 -Author: Sybrand Strauss -Date: Mon Apr 9 09:00:47 2018 -0700 - - Added in BundleTracker - -commit 1c5412111ab954dcf10dbc7f8ec8bfbb40451753 -Author: Steve Hillier -Date: Sun Apr 8 20:15:02 2018 -0700 - - change table heading ("class of driller") - -commit ae34e3042a8719ba82df64c3f519a724bed1ed83 -Author: Steve Hillier -Date: Sun Apr 8 20:14:32 2018 -0700 - - move subactivity logic out of table component - -commit 86a387e03dc340bd38ec1e3fa7cb2be52d099019 -Author: Steve Hillier -Date: Sat Apr 7 20:10:49 2018 -0700 - - fix visiblity check on alert tag to avoid type warning - -commit 172658f098fcbbf41e50a353254851961ad6149b -Author: Steve Hillier -Date: Sat Apr 7 20:08:59 2018 -0700 - - fix badly named mutations and actions - -commit 8de7239d7a3a1bf6f998dd15e2047afcfe28474c -Author: Steve Hillier -Date: Sat Apr 7 20:08:09 2018 -0700 - - update tests with new title selector - -commit c65770d002ab356b4a1a5f608e43afe1465bd9c2 -Author: Steve Hillier -Date: Sat Apr 7 20:07:36 2018 -0700 - - register bootstrap-vue components in tests - -commit 97af08fc6be42d46f653cadc0588b0a43b82a609 -Merge: bf9923e03 19db0f978 -Author: garywong-bc -Date: Fri Apr 6 18:25:02 2018 -0700 - - Merge pull request #588 from garywong-bc/developer - - Baseline DB Views for Registries - -commit 19db0f97820b132a46c1cfb43d6d1497bb624448 -Merge: 194e60fb9 bf9923e03 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 18:20:09 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 194e60fb97e610de909cddf508a8e0aee154dd90 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 18:19:54 2018 -0700 - - Baseline Registries View Definitions. - -commit 0be12867bab211f640fbfa09a14c8363936ec3f5 -Author: Steve Hillier -Date: Fri Apr 6 17:29:03 2018 -0700 - - add company, address, city info back in - -commit eff5bb541c404ef5984a0d17ff119b1c50123f8a -Author: Steve Hillier -Date: Fri Apr 6 17:28:40 2018 -0700 - - adjust qualification serializer fields - -commit cb7baadf6ed5bf10ca4767b9ba81350c054d4356 -Author: Steve Hillier -Date: Fri Apr 6 17:28:07 2018 -0700 - - remove invalid related name - -commit bf9923e03e2850a27349780d93633b13fb0deed2 -Merge: 118ece266 c2e74ce2a -Author: garywong-bc -Date: Fri Apr 6 17:04:45 2018 -0700 - - Merge pull request #587 from garywong-bc/developer - - Updated FT results to fit additional TEST created records - -commit c2e74ce2ac81debbd58bd0021a4ab65c3ae9287d -Merge: 441781791 118ece266 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 17:03:19 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 44178179159764e0d72b6d230bd0f00a3dee04e6 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 17:03:00 2018 -0700 - - Updated FT results to fit additional TEST created records. - -commit 1bfd10152f17268e2e04d773e14f162d7ce55b01 -Merge: dfbe6040c 31ee8b28c -Author: Steve Hillier -Date: Fri Apr 6 16:29:30 2018 -0700 - - merge developer into branch - -commit 31ee8b28c4d558e3bc4ecf34b2dd5ce051e6889f -Author: Steve Hillier -Date: Fri Apr 6 16:15:37 2018 -0700 - - update API tests - -commit 227ae2d041bced9ec1da867a6e336e44b61d144c -Author: Steve Hillier -Date: Fri Apr 6 16:15:32 2018 -0700 - - add readable cert authority name - -commit 118ece266a327a4fbc4936aeb48148973623364e -Merge: 3c08a32a2 449b88e19 -Author: garywong-bc -Date: Fri Apr 6 16:02:46 2018 -0700 - - Merge pull request #586 from garywong-bc/developer - - updated FT results - -commit 449b88e19f73d1f0d00d878ead2ee44e4c05e208 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 16:01:29 2018 -0700 - - Updated FT Test Results for Registries. - -commit 418a687fe7e5e57c9bf801bbd82ef59302838d29 -Author: Steve Hillier -Date: Fri Apr 6 15:46:04 2018 -0700 - - optimize db queries - -commit ea9f10ef4ffde17e5e5aefb369b5c8bdfc3fb0c0 -Author: Steve Hillier -Date: Fri Apr 6 15:45:41 2018 -0700 - - fix indentation - -commit 36dc4741d254ce08ce5aad127ba55acb732d9241 -Author: Steve Hillier -Date: Fri Apr 6 15:45:35 2018 -0700 - - add well qualification code to qualification str representation - -commit cae91d3fc8263c0e65ee4929557caef4b65f07d8 -Merge: 8fb999c95 3c08a32a2 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 14:52:08 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 8fb999c95a8321f24ef0a5664db7959c150c30c8 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 14:52:00 2018 -0700 - - Updated Registries clear-tables.sql to match new names. - -commit 3c08a32a28a6a3d3b9946fc814f0d87a6cd7208c -Merge: 44ae1bcc3 c93380250 -Author: garywong-bc -Date: Fri Apr 6 14:25:22 2018 -0700 - - Merge pull request #585 from garywong-bc/developer - - Revised base_url for newman tests. - -commit c93380250aef9b11a63a744ac51900af3675225c -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 14:24:41 2018 -0700 - - Revised base_url for newman tests. - -commit 44ae1bcc34746091f3a9d3c19877a3051b82e79c -Merge: 4e1ec8fc7 f583e8637 -Author: garywong-bc -Date: Fri Apr 6 13:34:55 2018 -0700 - - Merge pull request #584 from garywong-bc/developer - - Added automatic createtestuser step in post-deploy - -commit f583e86376f9ac33943556b87351d8e47448c20a -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 13:33:55 2018 -0700 - - Adding automatic createtestuser as part of post-deploy - -commit b2aaca93a9c1e968a79070d188992b124c777778 -Merge: ffc3cb748 4e1ec8fc7 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 11:17:29 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit ffc3cb7486766fbce3b7e34c27ba135be4bfc07d -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 11:17:17 2018 -0700 - - Migrating Registries 'Removed' registrants. - -commit 4e1ec8fc767feb728bf1626bcd26270a28ebb074 -Merge: c14655554 fb1c5594d -Author: garywong-bc -Date: Fri Apr 6 11:08:28 2018 -0700 - - Merge pull request #583 from stephenhillier/developer - - Updating API tests for new model relationships - -commit fb1c5594d7b25b04428ccc1fec3ffb077f7fcfa5 -Author: Steve Hillier -Date: Fri Apr 6 11:06:44 2018 -0700 - - add db_column to foreignkey fields - -commit cec234a3df65e3281d7b2dfa2a4b7024ac73ff3f -Author: Steve Hillier -Date: Fri Apr 6 10:38:43 2018 -0700 - - updating api tests for new models - -commit 9ffc590eedf9daa7b3ae43c0b364060ec70c03ef -Author: Steve Hillier -Date: Fri Apr 6 10:10:51 2018 -0700 - - switch to /gwells/api/ from /gwells/registries/api url patterns - -commit a5c133c8ba544b3df41e5962c5124c6a7925b202 -Author: Steve Hillier -Date: Fri Apr 6 10:10:17 2018 -0700 - - trial of removing blank=true from charfields in Organization model - -commit 5d7977c8ddb85d36a5c2585a8fade5b32f2efcef -Author: Steve Hillier -Date: Fri Apr 6 09:38:52 2018 -0700 - - trial removing blank=True from charfields - -commit c14655554f9be00352d190744ed228c7cf361cf0 -Merge: 1a2221842 9c156c97e -Author: garywong-bc -Date: Fri Apr 6 09:23:26 2018 -0700 - - Merge pull request #582 from garywong-bc/developer - - Fixes to Registries data migration. - -commit 9c156c97e03149c0abc336765856016c683985c2 -Author: Gary Wong (BC Gov) -Date: Fri Apr 6 09:22:30 2018 -0700 - - Fixes to Registries data migration. - -commit 1a2221842ce60687cd13dd39645107e9fe7b82b8 -Merge: f955e4c3b a67ec4f14 -Author: garywong-bc -Date: Thu Apr 5 18:53:06 2018 -0700 - - Merge pull request #581 from garywong-bc/developer - - adding Pump Installer companies. - -commit a67ec4f14529c6ba54f99894d308a851f80dce9e -Author: Gary Wong (BC Gov) -Date: Thu Apr 5 18:52:23 2018 -0700 - - adding Pump Installer companies. - -commit f955e4c3bf54dd0748207925c9aad8e2b5b140d0 -Merge: df13529b4 bee0d0cfa -Author: Derek Roberts -Date: Thu Apr 5 18:08:43 2018 -0700 - - bring tests in line with new model fields - stephenhillier/revised_models - - bring tests in line with new model fields - -commit df13529b47500115a8ee237bd4c4f6f02744d570 -Merge: 117e22437 f35ed865b -Author: Derek Roberts -Date: Thu Apr 5 17:57:38 2018 -0700 - - Roll back env enforcement - DerekRoberts/env-rollback - - Roll back env enforcement - -commit bee0d0cfa044985419c5572e8820c37e3b117f68 -Author: Steve Hillier -Date: Thu Apr 5 17:51:27 2018 -0700 - - bring tests in line with new model fields - -commit f35ed865b7166b2f96b64c61b655a0b165748d6e -Author: Derek Roberts -Date: Thu Apr 5 17:42:04 2018 -0700 - - Roll back env enforcement - -commit 117e22437068b90c478e058a3b7aad341c8f71b4 -Merge: ea495a39d 351b8a21d -Author: Derek Roberts -Date: Thu Apr 5 17:10:39 2018 -0700 - - Sync'ing in Registries Refactoring - garywong-bc/developer - - Sync'ing in Registries Refactoring - -commit 351b8a21d228f122119b3d5c8b9be812e7bc3a83 -Author: Gary Wong (BC Gov) -Date: Thu Apr 5 17:07:25 2018 -0700 - - Cleaned out Derek change. - -commit 691332a3563b3350353aa37b8b86cd59c8199680 -Author: Gary Wong (BC Gov) -Date: Thu Apr 5 16:53:09 2018 -0700 - - Associated persons with the companies they work for. - -commit 1fe224d3c23c291cadea5fdcf19cea274ff42aa6 -Merge: 1e8896230 011d209e8 -Author: garywong-bc -Date: Thu Apr 5 16:42:08 2018 -0700 - - Merge pull request #4 from stephenhillier/revised_models - - Revised models - -commit e8c0e6f344080aef010588af5a9fc26f28bf903d -Author: Sybrand Strauss -Date: Thu Apr 5 16:39:35 2018 -0700 - - Trying to get build working adding more default values - -commit 011d209e8b99d36351affebddc8dcb6e5dd6b115 -Author: Steve Hillier -Date: Thu Apr 5 16:19:53 2018 -0700 - - remove possible blank strings input for cities - -commit 0cdfdf4ed2f97751d663323ce3be3390d52ff0bd -Author: Sybrand Strauss -Date: Thu Apr 5 16:01:59 2018 -0700 - - Removed default values for DJANGO_ADMIN_URL, DJANGO_ADMIN_USER, ENABLE_DATA_ENTRY, ENABLE_GOOGLE_ANALYTICS, ENABLE_ADDITIONAL_DOCUMENTS, S3_HOST, S3_ROOT_BUCKET - -commit 294de0339f7876e97f242f32d470cdc52f656605 -Author: Steve Hillier -Date: Thu Apr 5 15:37:57 2018 -0700 - - remove whitespace - -commit 9e025357d0575365ecd9c7f5739227f5ebc2b03d -Author: Steve Hillier -Date: Thu Apr 5 15:36:22 2018 -0700 - - add function to create a pending status record along with an application - -commit 1e889623061b77632f49c3a82941b68b68adf2c5 -Merge: f035b06e7 0f786e6e9 -Author: garywong-bc -Date: Thu Apr 5 14:20:31 2018 -0700 - - Merge pull request #3 from stephenhillier/revised_models - - Revised models - -commit 0f786e6e9a77f3f3192251fa03239035d1858ce2 -Author: Steve Hillier -Date: Thu Apr 5 14:18:09 2018 -0700 - - fix registration and application fields - -commit 5c3e1bdb11c8267364820ba0bd0d05e748c59bff -Author: Steve Hillier -Date: Thu Apr 5 14:17:55 2018 -0700 - - fix typo - -commit 3d57e75fc327f1418ca649420e64a339b35139e2 -Author: Steve Hillier -Date: Thu Apr 5 14:17:46 2018 -0700 - - register new models - -commit f035b06e7a3144dd45664875953155504813df94 -Author: Gary Wong (BC Gov) -Date: Thu Apr 5 14:17:36 2018 -0700 - - with corrected spelling of django_extension - -commit d1c6fa1520c43a91d551597db5992d506dadd948 -Author: Steve Hillier -Date: Thu Apr 5 14:17:36 2018 -0700 - - fix typo - -commit ac8f004d4dd8e1633604f92e8edd436a26037765 -Author: Gary Wong (BC Gov) -Date: Thu Apr 5 14:06:48 2018 -0700 - - Added missing django_extensions reference. - -commit bf507a53d320efa4a6202f9da62f238c17eebb88 -Merge: c59a44d32 67b571f35 -Author: Gary Wong (BC Gov) -Date: Thu Apr 5 14:05:47 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 67b571f35eb0aea4d819612f39d44519a8e672e4 -Merge: f57d48d80 1618a5b4c -Author: Sybrand Strauss -Date: Thu Apr 5 13:01:41 2018 -0700 - - Merge pull request #576 from Sybrand/task/environment - - Working with @DerekRoberts getting build into a good state. - -commit 1618a5b4c2927214b12c5dc5984d3fc1becdcbfc -Author: Sybrand Strauss -Date: Thu Apr 5 12:52:50 2018 -0700 - - Can now set a flag to enfore environment variables. Set ENFORCE_ENV_VARIABLES to False to use defaults. - -commit 4dfee22c51f51add51a5b6c0d4ccc3c479b6dd50 -Author: Steve Hillier -Date: Thu Apr 5 12:32:43 2018 -0700 - - new migrations (conflicts) - -commit 90174f550db8114cd8435a7eadb8c120c0f82784 -Author: Steve Hillier -Date: Thu Apr 5 12:32:35 2018 -0700 - - adjust serializer fields for new models - -commit 48b313afd6b90a341d96267fcb7ec04086d8fa3a -Author: Derek Roberts -Date: Thu Apr 5 12:22:14 2018 -0700 - - Jenkinsfile-developer - variable fails - -commit d7dc85ff384bb88b715dd38d9eb1545908d9a034 -Author: Derek Roberts -Date: Thu Apr 5 12:16:02 2018 -0700 - - Jenkinsfile-developer + tester DJANGO_SECRET_KEY - -commit 99b90727cc828334de88c4b900fb7994e4e0f905 -Author: Derek Roberts -Date: Thu Apr 5 12:13:40 2018 -0700 - - Jenkinsfile-developer + export DJANGO_SECRET_KEY - -commit 2ef747b7be29b2b8022d75ea1ca8a6f342ed4f63 -Author: Sybrand Strauss -Date: Thu Apr 5 11:43:41 2018 -0700 - - Adding bundle tracker - -commit c59a44d32f77958346a23c60dca50ea2b5b51479 -Merge: 15d618bc6 f57d48d80 -Author: Gary Wong (BC Gov) -Date: Thu Apr 5 11:28:11 2018 -0700 - - with help from DevOps to get past error pushing to origin - -commit 15d618bc6b89db0eb2808541b23909fae35fe480 -Author: Gary Wong (BC Gov) -Date: Thu Apr 5 11:14:33 2018 -0700 - - Added missing django_extensions requirement. - -commit b967d3cfeed0e1b7c1f75235f05aaa820cbd8b0c -Merge: e63bb321d d9880069b -Author: Steve Hillier -Date: Thu Apr 5 10:51:32 2018 -0700 - - fix conflict and merge new models - -commit d9880069bd3c79046b6ee2caa2467875dc45e6ff -Merge: e4f28fa56 210db46bb -Author: Steve Hillier -Date: Thu Apr 5 10:04:14 2018 -0700 - - Merge pull request #1 from garywong-bc/developer - - Updated registries models - -commit 210db46bbffceb931151f57454cd1bc93b0a13cb -Merge: 2516d3d2b e4f28fa56 -Author: Steve Hillier -Date: Thu Apr 5 09:37:43 2018 -0700 - - Merge branch 'revised_models' into developer - -commit f57d48d80faadea93725bc18c043da24231b37f9 -Merge: 249ea990d a14c8c407 -Author: Sybrand Strauss -Date: Thu Apr 5 09:29:23 2018 -0700 - - Merge pull request #575 from bcgov/revert-573-revert-572-task/environment - - Revert "Revert "Task/environment"" - -commit a14c8c40797a31560de47acffa2d8fd367528a31 -Author: Sybrand Strauss -Date: Thu Apr 5 09:27:57 2018 -0700 - - Revert "Revert "Task/environment"" - -commit 2516d3d2bb3c9565b4e4bfec7d4d4f9efce296ec -Author: Gary Wong (BC Gov) -Date: Wed Apr 4 23:33:20 2018 -0700 - - Complete Registries Data model refactor - -commit 6dfe554b9cd2478d95bfac9eb0e7ef9764784b6f -Merge: f9391ba21 249ea990d -Author: Gary Wong (BC Gov) -Date: Wed Apr 4 22:17:38 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into registries_remodel - -commit f9391ba2119fd67feb5d18074b929131fb57c709 -Author: Gary Wong (BC Gov) -Date: Wed Apr 4 22:17:14 2018 -0700 - - With new CertifyingAuthorities and AccreditedCerts - -commit 6c20d580a36f641b9026d46db1989662324e75aa -Author: Steve Hillier -Date: Wed Apr 4 16:49:11 2018 -0700 - - migrations for Profile model - -commit f989f13d2770520f9341207571ced11fb4a00a06 -Author: Steve Hillier -Date: Wed Apr 4 16:48:57 2018 -0700 - - add IsGwellsAdmin class - -commit e914d33fa17f475142c2e8b267f2e096944150a3 -Author: Steve Hillier -Date: Wed Apr 4 16:48:44 2018 -0700 - - add roles from keycloak to user profile - -commit 560e5b60fe1b9b97a40ac905c8cf387a06051c9f -Author: Steve Hillier -Date: Wed Apr 4 16:48:20 2018 -0700 - - register Profile model - -commit b621f696b179589536d00cebd97c08d5986d8dc4 -Author: Steve Hillier -Date: Wed Apr 4 16:44:15 2018 -0700 - - add is_gwells_admin flag - -commit 249ea990d8c5a60b5815d85ec5dc2d47810f8018 -Merge: 94597725e 252f64a9f -Author: Derek Roberts -Date: Wed Apr 4 16:26:41 2018 -0700 - - Merge pull request #573 from bcgov/revert-572-task/environment - - Revert "Task/environment" - -commit 252f64a9f9a0a17e2d31c94cf7b695df4be0712a -Author: Derek Roberts -Date: Wed Apr 4 16:25:38 2018 -0700 - - Revert "Task/environment" - -commit b2596e02701a5eef22a26404488bf1337c6e0dc7 -Author: Steve Hillier -Date: Wed Apr 4 16:21:57 2018 -0700 - - add custom auth for oidc tokens - -commit 67ad11777ade64fe857b02fe8ad3c64441101eed -Author: Steve Hillier -Date: Wed Apr 4 16:21:43 2018 -0700 - - add longer username to auditmodel - -commit 0647e43f777d61eeceb7396479a2754647459f0a -Author: Steve Hillier -Date: Wed Apr 4 16:21:29 2018 -0700 - - add realm attr to user profile - -commit c0aad81160de3080364f1ac8ace83d484f9c385c -Author: Gary Wong (BC Gov) -Date: Wed Apr 4 16:15:25 2018 -0700 - - Clean makemigrations/migrate/dataload-static - -commit 94597725edede9e0c355210b2f31535847ba38fb -Merge: ea495a39d bb60347a9 -Author: Derek Roberts -Date: Wed Apr 4 15:59:32 2018 -0700 - - Task/environment - Sybrand/task/environment - - Task/environment - -commit bb60347a9abdb3740108259440a01f9c634d1624 -Author: Sybrand Strauss -Date: Wed Apr 4 15:30:15 2018 -0700 - - Fixed overrides and variable usage - -commit d908cfad4c9fea1cbfcf1997d6a107b6b04c9507 -Author: Sybrand Strauss -Date: Wed Apr 4 15:12:40 2018 -0700 - - Updated script to have new required environment variables - -commit ea495a39d6470f7d26d276d41e63369e02398e86 -Merge: 7eabe16a3 b2d1d3028 -Author: Derek Roberts -Date: Wed Apr 4 14:55:22 2018 -0700 - - Caddy and Maintenance Page - DerekRoberts/caddy - - Caddy and Maintenance Page - -commit 4b092746daf1e012861ef9017864d01c9c778f6f -Merge: a2c3ec2b3 7eabe16a3 -Author: Sybrand Strauss -Date: Wed Apr 4 14:53:36 2018 -0700 - - Merge branch 'developer' into task/environment - -commit a2c3ec2b3c2d2671fb08e372093dd2225967342d -Author: Sybrand Strauss -Date: Wed Apr 4 14:46:47 2018 -0700 - - Made pep8 compliant - -commit 7eabe16a320e76d20ea4181ce3e2b9d28fbaa3fb -Merge: ce3b99870 0b1c47296 -Author: Derek Roberts -Date: Wed Apr 4 14:32:43 2018 -0700 - - Created wells fixtures and formatting changes in functional tests - cwevans/developer - - Created wells fixtures and formatting changes in functional tests - -commit 0b1c47296c8912004c4ca9a662a3f1de73d82a75 -Author: Christian Evans -Date: Wed Apr 4 14:24:31 2018 -0700 - - Created wells fixtures and formatting changes in functional tests - -commit 050c4c0ffee3a77bc633e25ba300506ebcfb961c -Author: Sybrand Strauss -Date: Wed Apr 4 13:57:18 2018 -0700 - - Changed BASE_DIR logic to use Path, and point to direct folder given move to settings module - -commit b2d1d3028e1333ed02961f2f58ce0a6c872e9589 -Author: Derek Roberts -Date: Tue Apr 3 17:34:30 2018 -0700 - - caddy.sh + nuke option for delete everything by tag - -commit 06a9042518beb3c10439e1cf86b6a95350911f94 -Author: Derek Roberts -Date: Tue Apr 3 17:26:41 2018 -0700 - - caddy.sh + get and dump container image path to logfile - -commit 30a34719e8f0888c71874c70039b1c12d5b36ed8 -Author: Derek Roberts -Date: Tue Apr 3 17:25:52 2018 -0700 - - caddy.sh + check for route before creating/exposing - -commit 20a14f4aa8d7441cf13c6cf9850d464445fdf9f6 -Author: Derek Roberts -Date: Tue Apr 3 17:23:53 2018 -0700 - - caddy.sh + use BUILD_PROJECT variable during builds - -commit b5c1b40cd0cdf0683d861c85d6fc040c410cd0b0 -Author: Derek Roberts -Date: Tue Apr 3 17:22:04 2018 -0700 - - caddy-build.json + context dir var - -commit bbd3dec591d05da7b10c5f111d2829839af150f3 -Author: Derek Roberts -Date: Tue Apr 3 17:21:08 2018 -0700 - - Caddyfile - revised path to maintenance.html - -commit 42e4d24e87edf925314d627d8efd44638d2657bc -Author: Derek Roberts -Date: Tue Apr 3 14:21:49 2018 -0700 - - caddy.sh - pointing default to proper repo - -commit 64d8659349a987ee4edd189418202c16de28a527 -Author: Derek Roberts -Date: Tue Apr 3 14:20:07 2018 -0700 - - Caddyfile - moved Caddyfile to ./maintenance - -commit 12fdf3dfe39865c2a60aa9895c02e4fb2f5d7c81 -Author: Derek Roberts -Date: Tue Apr 3 11:55:58 2018 -0700 - - caddy.sh - caddy setup script - -commit 44a9836ea1a2a2a385cc3f230f1b3e215f70fb0f -Author: Derek Roberts -Date: Tue Apr 3 11:54:55 2018 -0700 - - caddy-build.json - added support for git branches - -commit 5ff393851e5f697407a045423883494fa3f3a1b9 -Author: Derek Roberts -Date: Tue Apr 3 11:39:05 2018 -0700 - - caddy-deploy.json - var for build project (e.g. moe-gwells-tools) - -commit ed3ea160cdb9e105692ece0b8d5cefb0dfcd7b33 -Author: Derek Roberts -Date: Wed Mar 28 10:57:52 2018 -0700 - - caddy-*.json - app name set by var - -commit ae02672be517c99507fc53048a092a2e484dd1cd -Author: Derek Roberts -Date: Tue Mar 27 15:20:17 2018 -0700 - - Caddyfile - updated path to maintenance.html - -commit 6fe0eac977e1f879e7d68a8648f84807a0dabbd1 -Author: Derek Roberts -Date: Tue Mar 27 15:08:30 2018 -0700 - - caddy.json - split up into caddy-build.json and caddy-deploy.json - -commit 20021d45f5efa362aa0566ef57af30f2bd84071b -Author: Derek Roberts -Date: Tue Mar 27 15:04:27 2018 -0700 - - caddy.json - renamed app from maintenance to proxy-caddy - -commit 39540015068ed549b3bad71a049331047bbc2d53 -Author: Derek Roberts -Date: Tue Mar 27 13:47:00 2018 -0700 - - +maintenance.html - basic maintenance message page - -commit 99ce41f4203f320dd2b77233285dcccda2ca0683 -Author: Derek Roberts -Date: Tue Mar 27 13:24:02 2018 -0700 - - +caddy.json - openshift template - -commit 42c22b4d08da71ce67e1ef4ecacaef90c91d1aa0 -Author: Derek Roberts -Date: Tue Mar 27 11:58:11 2018 -0700 - - +Caddyfile - -commit ce3b99870ceebd78cc27dacbb5f1e3f8b1269bb0 -Merge: a23d0a636 820515b46 -Author: Derek Roberts -Date: Wed Apr 4 13:25:44 2018 -0700 - - Add script for running local postman tests - - Add script for running local postman tests - -commit a23d0a63658acd06ec30ab432a98dbb9faaba3c1 -Merge: 6ed06527e 17216c929 -Author: Derek Roberts -Date: Wed Apr 4 13:24:09 2018 -0700 - - Merge pull request #569 from DerekRoberts/setup_osx - - ./setup/README.md and ./README.md changes, setup revisions - -commit 73a0120c682a7abfd5425bea642fddc171d2ba29 -Author: Steve Hillier -Date: Wed Apr 4 13:10:41 2018 -0700 - - add custom auth class - -commit 17216c929c55d6abe54e0480068f8434a55aa1c9 -Author: Derek Roberts -Date: Wed Apr 4 12:56:11 2018 -0700 - - setup_osx.sh + nodejs install and build for Registries frontend - -commit ec1d836e3a3176b2ce4fbb4e18abe895e5d15331 -Author: Derek Roberts -Date: Wed Apr 4 12:54:04 2018 -0700 - - README.md + nodejs install and build for Registries frontend - -commit fb7599b8d6d02a6ff7fc9520febc74c015206b92 -Author: Sybrand Strauss -Date: Wed Apr 4 12:49:14 2018 -0700 - - Switching to required env. variables - -commit e63bb321d6b5b5394aa127c65dd32e401a4b946a -Author: Steve Hillier -Date: Wed Apr 4 09:24:16 2018 -0700 - - fix some linting errors - -commit e4f28fa56ae9406c3afdfcc08ce018d182b67adc -Author: Steve Hillier -Date: Tue Apr 3 23:10:57 2018 -0700 - - adjust serializers for applications and registrations - -commit 8b2025d270d3e780ed016d47b51b3c1e0894c650 -Merge: ae70b6d16 b066eccb9 -Author: Steve Hillier -Date: Tue Apr 3 22:37:50 2018 -0700 - - Merge branch 'revised_models' of github.com:stephenhillier/gwells into revised_models - -commit ae70b6d160bff54449b5f492a8691759868d23d1 -Author: Steve Hillier -Date: Tue Apr 3 22:37:43 2018 -0700 - - fix prefetch_related for applications view - -commit b066eccb9d1f2a9d1c38d932ba5a687d0db7745a -Author: Steve Hillier -Date: Tue Apr 3 22:29:54 2018 -0700 - - add registrations and applications views - -commit cae486ab05de86e710a55407de4d4f40e1fe2783 -Author: Sybrand Strauss -Date: Tue Apr 3 16:57:39 2018 -0700 - - Switching to required env. variables - -commit a34a67b72eb73743de57d21ef82d65f7ec512348 -Merge: dcfc1aa66 73e1f3d53 -Author: Gary Wong (BC Gov) -Date: Tue Apr 3 16:50:10 2018 -0700 - - Merge branch 'stephenhillier-revised_models' into registries_remodel - -commit 73e1f3d530b6fc8b9b29e0207097818f3029fc7c -Merge: dcfc1aa66 e47a919bb -Author: Gary Wong (BC Gov) -Date: Tue Apr 3 16:50:02 2018 -0700 - - Update, syncing with Steven. - -commit e47a919bb681ca01a9cabbaac57a4aab1e1adbbf -Author: Steve Hillier -Date: Tue Apr 3 16:43:29 2018 -0700 - - add registration list and detail views - -commit ff323513c7ee51a12045cc9bd49020088ff5be87 -Author: Steve Hillier -Date: Tue Apr 3 16:43:18 2018 -0700 - - add codes fixtures - -commit f9ef6fbcb5737f10d64c0c024926f5ec2af87e85 -Author: Steve Hillier -Date: Tue Apr 3 16:43:05 2018 -0700 - - remove 'registries' from API urls - -commit fd782a91ff1082d2c30b967314d2e03056a77137 -Author: Steve Hillier -Date: Tue Apr 3 16:42:40 2018 -0700 - - change 'person' field to 'registration' - -commit 38105da377f895b8bb175206fe0e914fd12b9eba -Author: Steve Hillier -Date: Tue Apr 3 16:42:04 2018 -0700 - - remove 'registries' string from registries entry in urlconf - -commit c097dfe19e56f5a42720759578222400a950d5c8 -Merge: 36b2f76b0 820515b46 -Author: Steve Hillier -Date: Tue Apr 3 13:36:44 2018 -0700 - - Merge branch 'developer' into revised_models - -commit dfbe6040c8c0d00a54c7ab86761f57aea296214f -Author: Steve Hillier -Date: Tue Apr 3 13:27:01 2018 -0700 - - fix margins between main and footer - -commit 36617a1f911eb438461c0354fc28197910abb8e4 -Author: Derek Roberts -Date: Tue Apr 3 13:15:00 2018 -0700 - - README.md - remove duplicate/stale steps, point to ./setup - -commit 820515b4610e755b6e35d36d2c8813a4c730d8c9 -Author: Steve Hillier -Date: Tue Apr 3 12:27:04 2018 -0700 - - add usage comments - -commit 02a36e4e55a16a8fa5ad8469da0c4cbe0621ee94 -Merge: 29dae00ce 6ed06527e -Author: Steve Hillier -Date: Tue Apr 3 12:13:09 2018 -0700 - - Merge branch 'developer' of https://github.com/stephenhillier/gwells into developer - -commit 29dae00ce7be18a0a4b67f219f279cd95d8f4f5b -Author: Steve Hillier -Date: Tue Apr 3 12:12:37 2018 -0700 - - add script to run postman tests locally - -commit f764ef38818655b98f54cc8eb104b88d06dd87bb -Author: Steve Hillier -Date: Tue Apr 3 12:06:10 2018 -0700 - - rename gwells.js to ApiService.js - -commit 74ab97ae3d83b670015084df3cfc49ddd58ce9e4 -Author: Derek Roberts -Date: Tue Apr 3 12:03:29 2018 -0700 - - setup/README.md - finish setup doc overhaul - -commit 7a5d840128a078d269a38878f472f43b5d37986d -Author: Steve Hillier -Date: Tue Apr 3 08:27:54 2018 -0700 - - remove empty class attribute from div - -commit b0dab4e6f808bfdd0ad3d77316df1029bdbc8040 -Author: Steve Hillier -Date: Tue Apr 3 08:27:39 2018 -0700 - - convert to bootstrap-vue components - -commit 28743b988915f067371491ffdb976b1033a53621 -Author: Steve Hillier -Date: Tue Apr 3 08:27:17 2018 -0700 - - use smaller heading - -commit d1bbcc937bdc457f3489965e15a92831445a10c1 -Author: Steve Hillier -Date: Tue Apr 3 08:27:09 2018 -0700 - - add larger margin for small screens - -commit 43c36c899776a5b9a5354655286ba0ad8bb6818a -Author: Steve Hillier -Date: Tue Apr 3 08:26:54 2018 -0700 - - adjust padding - -commit 2bcbf33da49a7d6e09cffc4d960aa5075d8be92e -Author: Steve Hillier -Date: Tue Apr 3 08:26:44 2018 -0700 - - add breakpoint to height rule - -commit 4f2e4b01c61a3e65b1ad10796eecb3812fc2beab -Author: Steve Hillier -Date: Tue Apr 3 08:26:21 2018 -0700 - - remove unnecessary js/css etc - -commit 456343636093589a2e5ceeeec04931cca332ed6e -Author: Steve Hillier -Date: Tue Apr 3 08:25:59 2018 -0700 - - add debug check to localhost origin whitelist - -commit ed45e236fea27855c6078a4e6844a1dbce4550e2 -Author: Steve Hillier -Date: Sun Apr 1 22:40:54 2018 -0700 - - add cors whitelist for local dev server - -commit fc447865c5dc14333da5ef6e0f808d9871d5f641 -Author: Steve Hillier -Date: Sun Apr 1 22:40:30 2018 -0700 - - convert login to async so dispatcher function can await it - -commit 2310c85487bb21c22b32d6917a7b867e17def5e5 -Author: Steve Hillier -Date: Sun Apr 1 22:39:37 2018 -0700 - - add boostrap-vue css - -commit b251a7720f3b112661503ca9cc5b60342185800d -Author: Steve Hillier -Date: Sun Apr 1 22:39:29 2018 -0700 - - add flex rules and error message - -commit 321f7c29f95ea034350acfece7d4feda9a82ee46 -Author: Steve Hillier -Date: Sun Apr 1 22:39:10 2018 -0700 - - add login form - -commit 346c480e6658a85e913491bb81915ff725e76380 -Author: Steve Hillier -Date: Sun Apr 1 22:38:56 2018 -0700 - - convert to bootstrap-vue components - -commit 5faf138ff1153da3c1c9845faf228c62d143e7f6 -Author: Steve Hillier -Date: Sun Apr 1 22:38:14 2018 -0700 - - change baseurl for local development - -commit 902c5d86bb6c7acf5356d4bffff213c036eb077c -Author: Steve Hillier -Date: Sun Apr 1 22:37:52 2018 -0700 - - convert to bs4 and add dismiss box - -commit b1ab42fddcc42b59d4e8db0d6852bd6c6b31f9fe -Author: Steve Hillier -Date: Sun Apr 1 12:50:50 2018 -0700 - - add sass loader - -commit 1fd9c9372ff78b25b165bfec2dff9e0886864c05 -Author: Steve Hillier -Date: Sun Apr 1 12:50:02 2018 -0700 - - add proper look and feel elements to header and footer - -commit 98a061151c86a76f7b4b63ba905c347d6df6f2b6 -Author: Steve Hillier -Date: Sun Apr 1 11:00:29 2018 -0700 - - add bc gov bootstrap4 style - -commit 8a5a1a4ca4e53678ff976ccdbe2b1e0c327fccb3 -Author: Steve Hillier -Date: Sun Apr 1 11:00:13 2018 -0700 - - add bootstrap-vue - -commit c4b28a7adaef864b112bdaf9f601bc8a4e2178d0 -Author: Steve Hillier -Date: Sun Apr 1 10:59:54 2018 -0700 - - better file organization - -commit 4b200bd5622016aa41383f4852e36c4e0ce4d907 -Author: Steve Hillier -Date: Fri Mar 30 16:22:58 2018 -0700 - - add bcgov bootstrap4 theme files - -commit 6ed06527e7067d2e4225537f96bb01744cd65ba3 -Merge: 317a8f2f3 db5b37d8d -Author: garywong-bc -Date: Thu Mar 29 16:51:12 2018 -0700 - - Merge pull request #567 from garywong-bc/developer - - Disabling django_extensions in pipeline until team decides we should … - -commit db5b37d8d9977f57a14b21ad6380e3672969f7dd -Author: Gary Wong (BC Gov) -Date: Thu Mar 29 16:50:30 2018 -0700 - - Disabling django_extensions in pipeline until team decides we should include in requirements.txt - -commit 317a8f2f3933d0bf63db27e693efba463419bcf9 -Merge: 09a5a40a8 cdbc3ced2 -Author: garywong-bc -Date: Thu Mar 29 16:35:33 2018 -0700 - - Merge pull request #566 from garywong-bc/developer - - Enable graphviz and migration of Registries driller/installer Cert # - -commit cdbc3ced2c29d88c67b458ad6c9717d5d9890c16 -Author: Gary Wong (BC Gov) -Date: Thu Mar 29 16:34:02 2018 -0700 - - Enable graphviz and migration of Registries driller/installer Cert # - -commit 09a5a40a895765b4a772e0948eb80661c9e4589e -Merge: f479132fb 8d9957a88 -Author: garywong-bc -Date: Thu Mar 29 16:30:18 2018 -0700 - - Merge pull request #565 from stephenhillier/developer - - fixes for Registries search page (clean up styles and text) - -commit 8d9957a886a67004ad00df5657079b46bb57cf1a -Merge: 97ef4361b f479132fb -Author: Steve Hillier -Date: Thu Mar 29 13:08:22 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 97ef4361b50c71505a0ce63cdf89027aebdcc4db -Author: Steve Hillier -Date: Thu Mar 29 13:08:04 2018 -0700 - - add mock driller list to tests since table needs drillers - -commit e815f47c8df444c97da749fd716e4a003bdbf29a -Author: Steve Hillier -Date: Thu Mar 29 13:07:18 2018 -0700 - - fix title for search results and change search button label - -commit 1db7263d6dc71ea2e86e950a1e987ea99ebfb072 -Author: Steve Hillier -Date: Thu Mar 29 13:06:31 2018 -0700 - - fix extra spaces between city and province - -commit 24409ca42e0d8d817632a14ffa3d9677457265bf -Author: Steve Hillier -Date: Thu Mar 29 12:34:41 2018 -0700 - - move no results message out of table - -commit 6ce3e2881f33ee903f699ac8ee1f8dfba615a3d1 -Author: Steve Hillier -Date: Thu Mar 29 12:23:52 2018 -0700 - - remove style attribute and put style rule into class - -commit 75ef4313b120f4427759385c2ed43dbf85ab00dd -Author: Steve Hillier -Date: Thu Mar 29 12:23:10 2018 -0700 - - fix extra comma when there is a province but no city - -commit 797a32e37104805ec5036cb64bb8a05d5367d0d8 -Author: Steve Hillier -Date: Thu Mar 29 12:06:32 2018 -0700 - - switch from css to html size attribute for sizing select box - -commit 53c3dcd2ad9343c7b02f3ab311d114cdabfff977 -Author: Steve Hillier -Date: Thu Mar 29 11:50:19 2018 -0700 - - put bootstrap base css back into html template - -commit ac8a196247a153daba2242d8111576ba4206313d -Author: Steve Hillier -Date: Thu Mar 29 11:38:32 2018 -0700 - - remove unnecessary css imports - -commit c5148123a7d76b6414bbe7bc5a486baba8e6528e -Author: Steve Hillier -Date: Thu Mar 29 11:38:14 2018 -0700 - - move custom css rules into app.vue (so all components can inherit) - -commit d4c1de585d90d59838d579040c134a6ea0ffac94 -Author: Steve Hillier -Date: Thu Mar 29 11:29:35 2018 -0700 - - add custom styles back to buttons - -commit f479132fb965f0181f3046e4aaf1e76584c270e3 -Merge: 614dd7f1e 738a0ef32 -Author: Derek Roberts -Date: Thu Mar 29 11:23:56 2018 -0700 - - Feature/better error map server - - Feature/better error map server - -commit 738a0ef322b56811c48a879df609d0196f1bcccf -Author: Sybrand Strauss -Date: Thu Mar 29 11:21:13 2018 -0700 - - Removed debugging text - -commit c6a0d0d5b6f5ed93b522f2126e9545197432e686 -Author: Steve Hillier -Date: Thu Mar 29 11:04:34 2018 -0700 - - remove commented out js imports - -commit 64bf92f6c813d59c4835386116eae56f440281dc -Author: Steve Hillier -Date: Thu Mar 29 11:02:47 2018 -0700 - - remove vue-smoothscroll package - -commit 4699566335577fcdd97aa60c0a50485ed723548e -Author: Steve Hillier -Date: Thu Mar 29 11:01:46 2018 -0700 - - remove scroll from search button - -commit 3834cd5475ce8c88de963152e215a459f20382f6 -Merge: 73722428c 614dd7f1e -Author: Steve Hillier -Date: Thu Mar 29 10:29:07 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 73722428cdc59be3fb95a2dfc1b4b350ce5c9226 -Author: Steve Hillier -Date: Thu Mar 29 10:26:59 2018 -0700 - - recreate base.html without leaflet and unnecessary css - -commit 9975da8f6835031a0a395f05fa3350d5f09c198d -Merge: 69df80917 614dd7f1e -Author: Sybrand Strauss -Date: Thu Mar 29 09:42:09 2018 -0700 - - Merge branch 'developer' into feature/BetterErrorMapServer - -commit 67aa3abda66bd02798759c90aa78b26567d1565f -Merge: ec94e973e 3f6ccd87d -Author: garywong-bc -Date: Wed Mar 28 20:41:53 2018 -0700 - - Merge pull request #563 from garywong-bc/master - - Updated calls to db_replicate(bool) to reflect new 2-step process of … - -commit 3f6ccd87d03be70c2115bcfca32ca57ff6b13fce -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 20:39:20 2018 -0700 - - Updated calls to db_replicate(bool) to reflect new 2-step process of db_replicate_step1(bool) and db_replicate_step2() - -commit 614dd7f1e27da920e1bbe74497338143c4c9edb6 -Merge: 888137119 62179727b -Author: garywong-bc -Date: Wed Mar 28 20:36:30 2018 -0700 - - Merge pull request #562 from garywong-bc/developer - - Disabled auto-refresh of Registries content with GWELLS post-deploy. - -commit 62179727b087743e780b29821a3c0b7be1e631c5 -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 20:35:31 2018 -0700 - - updated docs - -commit 0b45e9b9d6ad37b748d315ab01849774ba63ef45 -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 20:22:34 2018 -0700 - - Disabled auto-refresh of Registries content with GWELLS post-deploy. - -commit 88813711940d99d51933e1f51748632763860eb2 -Merge: f4e10e2bd e0ac6e6a0 -Author: garywong-bc -Date: Wed Mar 28 19:28:15 2018 -0700 - - Merge pull request #561 from garywong-bc/developer - - Updated test results to reflect - -commit f4e10e2bdc2480ddfc963ba9e69a31c11533295a -Merge: fed154c6c dbe10dd93 -Author: garywong-bc -Date: Wed Mar 28 19:28:03 2018 -0700 - - Merge pull request #557 from stephenhillier/developer - - add cors headers for gov.bc.ca domains - -commit e0ac6e6a025489ed7337ab50bb81fb8c2fd52d2e -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 19:26:25 2018 -0700 - - reconciled with upstream to avoid accidental conflict with /migrations/* files - -commit 2b7a7794d2da4c664aa996b72c0108f2c7f99813 -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 17:28:13 2018 -0700 - - With update FT results. - -commit aac69f34af7c0c75675a861fb0bd4900646d47e5 -Author: Steve Hillier -Date: Wed Mar 28 16:53:22 2018 -0700 - - add scroll to table when searching - -commit dcfc1aa66678ecb70db354d4b7143f7d579207b5 -Merge: 20bc0c675 c3d183258 -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 16:09:55 2018 -0700 - - Merge branch 'stephenhillier-revised_models' into registries_remodel - -commit c3d18325803a06c4a46fa9470777278a1b8d3698 -Merge: 20bc0c675 36b2f76b0 -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 16:09:38 2018 -0700 - - merged from Steven. - -commit 20bc0c675d648705afd5cab738c83c369321b828 -Merge: 5dd6fc88f fed154c6c -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 16:02:39 2018 -0700 - - Merging in from upstream developer, prior to handing off to Steve - -commit f2deeeb6ac56a6db5681fc93f6a3ec9ad92762ab -Author: Steve Hillier -Date: Wed Mar 28 15:58:58 2018 -0700 - - add scroll to table effect - -commit fed154c6cb44a1d05f86953c4318fbc8f5aca671 -Merge: ce72ca7e4 867792544 -Author: garywong-bc -Date: Wed Mar 28 15:53:06 2018 -0700 - - Merge pull request #560 from garywong-bc/developer - - Backport hotfix in Master branch https://github.com/bcgov/gwells/comm… - -commit 867792544b280d82fd5f4ad687aa4a28d3b56dd2 -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 15:52:10 2018 -0700 - - Backport hotfix in Master branch https://github.com/bcgov/gwells/commit/ec94e973ef862fdb34700ab63d18b971a198819d into developer branch - -commit 69df809175b5a516f1b7901513952a8a74515ef3 -Author: Sybrand Strauss -Date: Wed Mar 28 15:25:13 2018 -0700 - - Fixed bootstrap bug (child of row must be column) - -commit dbe10dd939b1e19bebd08a4ec622940c2e511fd8 -Author: Steve Hillier -Date: Wed Mar 28 14:49:01 2018 -0700 - - add django-cors-headers package - -commit ef230a0a23a50a70135fab0bc25c6170e2beabef -Author: Steve Hillier -Date: Wed Mar 28 14:47:35 2018 -0700 - - add cors whitelist for gov.bc.ca domains - -commit ce72ca7e42663861a876f756490d8d1ea7df552d -Merge: 3d1217d3c 5b06bf0a2 -Author: garywong-bc -Date: Wed Mar 28 14:34:32 2018 -0700 - - Merge pull request #559 from garywong-bc/developer - - Defaulting Province/State - -commit 5b06bf0a2e8d994c50e1ab2529b989109d1097ef -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 14:32:40 2018 -0700 - - Default province_state=BC where not set in Registries. - -commit 36b2f76b0cbcce1f02351ea4e8e37903dc1dfcac -Author: Steve Hillier -Date: Wed Mar 28 14:06:53 2018 -0700 - - add comment for test - -commit 921d64c7cf8a2ef09e4409f6e91c738ca62de4c4 -Author: Steve Hillier -Date: Wed Mar 28 14:06:25 2018 -0700 - - fix field names - -commit e9d1702cd08a1036407320cdaf4a27f430b5c2cf -Author: Steve Hillier -Date: Wed Mar 28 11:25:58 2018 -0700 - - commented out fixture tests temporarily (no fixtures to load) - -commit e74dd1806b41f1da712df38ca781dbbc0b9a3e29 -Author: Steve Hillier -Date: Wed Mar 28 11:25:12 2018 -0700 - - remove old fields from person and organization lists - -commit ec94e973ef862fdb34700ab63d18b971a198819d -Merge: ba46557b6 9078b772a -Author: garywong-bc -Date: Wed Mar 28 10:38:35 2018 -0700 - - Merge pull request #558 from garywong-bc/master - - Hot Patch - break out db_replicate() into two distinct steps - -commit 9078b772a5c0340b280de38523445703ce9e06ef -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 10:37:25 2018 -0700 - - Hot Patch - break out db_replicate() into two distinct steps, to avoid 'Past EOF' database error. - -commit d0d8bb3704e3c42f6ddc646f2b83d91bf6abcf4a -Merge: 11b110bd7 3d1217d3c -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 10:22:36 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 11b110bd7c90be518bb15d22c0d0fe89a0f7a52a -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 10:22:14 2018 -0700 - - Including Pump Installers into Registries data migration. - -commit 50a37fd6f83fcca12ff05a97c5b68f325b8e5e3e -Author: Gary Wong (BC Gov) -Date: Wed Mar 28 10:21:28 2018 -0700 - - Update to include Pump Installers - -commit fd8a280bb541a305b7997efb5bbbd24f284fb7ff -Author: Steve Hillier -Date: Wed Mar 28 08:56:34 2018 -0700 - - add names to form select tags - -commit 3d1217d3cf16a8eb10879aff3d3f005b5ba42948 -Merge: 99d7e5ab2 5831e7765 -Author: Roland Stens -Date: Tue Mar 27 17:09:37 2018 -0700 - - Merge pull request #556 from rstens/developer - - Registries Tests - -commit 5831e7765069a45ad7b3f2047a292632972e24de -Author: Roland Stens -Date: Tue Mar 27 17:08:07 2018 -0700 - - Registries Tests - -commit 7d456c7030845a49f44736ce1473c3911f4bf290 -Author: Steve Hillier -Date: Tue Mar 27 16:33:39 2018 -0700 - - update admin and serializers with new models - -commit b2fd7774e114ea181f484cfc841cb1a15a42d237 -Author: Sybrand Strauss -Date: Tue Mar 27 15:49:29 2018 -0700 - - Changed error message to match trello ticket closer. - -commit 593bdf223a27cc31730ec239b8ef76d218930ef5 -Author: Sybrand Strauss -Date: Tue Mar 27 15:28:51 2018 -0700 - - Made pep8 compliant. - -commit 44b9c64cd2481f2ba0719abb8915d28b1249c86a -Author: Sybrand Strauss -Date: Tue Mar 27 15:27:19 2018 -0700 - - Moved map error element and changed to match other errors on search page. - -commit 3a41af3c0f457a97ecb7351cd82d8af9e2c5ef66 -Author: Sybrand Strauss -Date: Tue Mar 27 15:26:32 2018 -0700 - - Added error handling for tiles failing to load - -commit 84b6ea53ef3f810a9068e14322c9d3b1b1a3da17 -Author: Sybrand Strauss -Date: Tue Mar 27 15:25:37 2018 -0700 - - Made pep8 compliant - -commit 69a520ef5e36493e7dfabe59d64e11c320294643 -Author: Sybrand Strauss -Date: Tue Mar 27 15:25:26 2018 -0700 - - Added virtual env igores, and moved vscode ignore to the correct section - -commit 99d7e5ab26faebcc3d6ca3d6a36b5674e8c013ad -Merge: 4848d4ef8 6ec4daa02 -Author: garywong-bc -Date: Tue Mar 27 15:19:01 2018 -0700 - - Merge pull request #555 from garywong-bc/developer - - Removing auto truncate of prov_state - -commit 6ec4daa02e76327519eb7a2a53189cd9de1a8405 -Author: garywong-bc -Date: Tue Mar 27 15:11:33 2018 -0700 - - Removing auto truncate of prov_state - - to avoid accidental wipe of Registries tables. - -commit 1fe94c2b4c3f3097738afbb063d30921812b87c7 -Merge: 785a7b992 4848d4ef8 -Author: Steve Hillier -Date: Tue Mar 27 14:54:52 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into revised_models - -commit 785a7b992d371e900fb4294bbc1983e906ad0968 -Author: Steve Hillier -Date: Tue Mar 27 14:54:30 2018 -0700 - - update views and serializers with new models - -commit 4848d4ef8b720eeb9d9f614200e08829f164423d -Merge: 0d138f76a ac67da147 -Author: Roland Stens -Date: Tue Mar 27 14:20:16 2018 -0700 - - Merge pull request #554 from stephenhillier/developer - - pressing reset button now clears driller list (registries) - -commit ac67da147873e77bf9c191428814f75d31b57d54 -Author: Steve Hillier -Date: Tue Mar 27 14:19:47 2018 -0700 - - remove commented code - -commit e5cf81e1a809f1cb84e1e97b125b6249612ddd37 -Author: Steve Hillier -Date: Tue Mar 27 14:16:18 2018 -0700 - - fix typos in title/options - -commit b5bf43a37703abf80e812daa17a50c4ad4844990 -Author: Steve Hillier -Date: Tue Mar 27 14:09:46 2018 -0700 - - remove commented code - -commit e1da24cdd1b1e186f93f2f168229429f3f594e8f -Author: Steve Hillier -Date: Tue Mar 27 14:09:05 2018 -0700 - - pressing reset button now clears driller list - -commit 880c6e08de8f399cd0edb0884d59e61b386a2268 -Author: Steve Hillier -Date: Tue Mar 27 13:46:48 2018 -0700 - - first run at model changes - -commit 0d138f76aacae2fd019e61640be251113ecf88ad -Merge: 21e98f901 b0569427a -Author: Roland Stens -Date: Tue Mar 27 11:31:12 2018 -0700 - - Merge pull request #553 from stephenhillier/developer - - add grouping by province in city list (registries) - -commit b0569427a53f6fc0dd14fd02f31a6344b2238401 -Author: Steve Hillier -Date: Tue Mar 27 11:14:17 2018 -0700 - - add grouping by province in city list - -commit 5dd6fc88ff88a26e83e55e9c1db4c43c86f7a99b -Author: Gary Wong (BC Gov) -Date: Tue Mar 27 10:30:18 2018 -0700 - - V1.2 - -commit 21e98f9018f5286f8a6fb6680564747b7303ad36 -Merge: c558ba600 8a918ef3d -Author: Roland Stens -Date: Mon Mar 26 17:06:45 2018 -0700 - - Merge pull request #552 from stephenhillier/developer - - change id on table rows to be unique for each row (registries) - -commit 8a918ef3d938a58c972cb96beb47aa8eef7cbc9a -Author: Steve Hillier -Date: Mon Mar 26 16:58:08 2018 -0700 - - remove test for removed header title - -commit 36669386aa89f2a41da8d70109681297ad1d08b9 -Author: Steve Hillier -Date: Mon Mar 26 16:56:32 2018 -0700 - - move title out of webapp into body title section of template - -commit 350ec2ec1f820c9d756f329ef812e48dda276bae -Author: Steve Hillier -Date: Mon Mar 26 16:56:08 2018 -0700 - - fix registration status column - -commit cb36a43e782517d17194f60b2516f6379f76f70b -Author: Steve Hillier -Date: Mon Mar 26 16:32:08 2018 -0700 - - add more id attributes to tags - -commit c558ba600bdbe6f712081d3ff2e72c59cc46eab0 -Author: Roland Stens -Date: Mon Mar 26 16:15:28 2018 -0700 - - Update Jenkinsfile - -commit 6d0786f6138006e5d63e913317809d7711519586 -Author: Steve Hillier -Date: Mon Mar 26 16:15:24 2018 -0700 - - add id to more tags - -commit ba46557b6d170adead3233d0a914e65f2fc38409 -Author: Roland Stens -Date: Mon Mar 26 16:14:58 2018 -0700 - - Update Jenkinsfile - -commit 382f546f352026e123a37f6a89c889a4da655ffa -Merge: 6821ac665 c7659ddb7 -Author: Steve Hillier -Date: Mon Mar 26 15:58:54 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 6821ac66593ead32204e66e2818769952aca7b66 -Author: Steve Hillier -Date: Mon Mar 26 15:58:09 2018 -0700 - - fixes for accessibility checker - -commit c79d18e319760003b32768f5172181ec0632302e -Author: Derek Roberts -Date: Mon Mar 26 15:53:04 2018 -0700 - - Removed Jenkinsfile-bddstack - no longer in use - -commit c53a3cbc313b5492f12aa1805a4eb6a094ef78af -Author: Roland Stens -Date: Mon Mar 26 15:46:05 2018 -0700 - - Update Jenkinsfile - -commit c7659ddb781ae66c06a1bfd0d4cba26bd27e9e8e -Author: Roland Stens -Date: Mon Mar 26 15:45:41 2018 -0700 - - Update Jenkinsfile - -commit 7f6db2c076dbeaa898a86e821760131561897374 -Author: Roland Stens -Date: Mon Mar 26 15:45:09 2018 -0700 - - Update Jenkinsfile - -commit 620c5f463918c74f18811fd29977a0ab5070663a -Merge: 4b2e10380 12ea15ee9 -Author: Steve Hillier -Date: Mon Mar 26 15:34:46 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 4b2e1038038a381a1ec739250e475b9aac3477f2 -Author: Steve Hillier -Date: Mon Mar 26 15:32:41 2018 -0700 - - remove extra container-fluid - -commit e7e1115b57990aebf3c861dfbc38bf89e6540e64 -Author: Roland Stens -Date: Mon Mar 26 15:27:25 2018 -0700 - - Update Jenkinsfile - -commit 12ea15ee937573123b1ec862e4c6b10696899e7e -Author: Roland Stens -Date: Mon Mar 26 15:26:41 2018 -0700 - - Update Jenkinsfile - -commit 33af1a78e88efab99ace887a4a87a5e836557787 -Author: Roland Stens -Date: Mon Mar 26 15:19:09 2018 -0700 - - Update Jenkinsfile - -commit 3f1a32237e06b4407fdeb78520564077500e61cd -Author: Roland Stens -Date: Mon Mar 26 14:48:33 2018 -0700 - - Update Jenkinsfile - -commit 9d0b9555bbf401f2079687f4435340a24080c6c4 -Merge: 72e28f1fd b63073b30 -Author: Steve Hillier -Date: Mon Mar 26 14:48:27 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 72e28f1fdc5a09d59f24d45d4a5548de57c36814 -Author: Steve Hillier -Date: Mon Mar 26 14:47:25 2018 -0700 - - change id on table rows to be unique for each row - -commit 862f5a9c8743e22f5a91dc04a3aec7aa798e689e -Merge: 430ae1411 c53d230c2 -Author: garywong-bc -Date: Mon Mar 26 14:30:40 2018 -0700 - - Merge pull request #551 from garywong-bc/master - - Updated Unit Tests - -commit c53d230c2bf53f9380642c4e6725af0c68eb5e6c -Merge: 7ec6fed23 b63073b30 -Author: Gary Wong (BC Gov) -Date: Mon Mar 26 14:29:00 2018 -0700 - - Merge branch 'developer' - -commit 858d6ca1e404546e279ac42f3177723869df88c5 -Author: Gary Wong (BC Gov) -Date: Mon Mar 26 14:28:30 2018 -0700 - - V1.2 - -commit b63073b30acd73a8df714dd15b4c20044ba6a10f -Merge: 3d501f19f 430ae1411 -Author: garywong-bc -Date: Mon Mar 26 13:39:25 2018 -0700 - - Merge pull request #550 from bcgov/master - - Updated Unit Test for Registries - -commit 7ec6fed2381f73ef455d69ae28721f2392468e3f -Merge: 430ae1411 3d501f19f -Author: Gary Wong (BC Gov) -Date: Mon Mar 26 13:37:35 2018 -0700 - - Merge branch 'developer' - -commit 4bc232fa2293f9f4f0c76e81b95ccd687142dda3 -Author: Gary Wong (BC Gov) -Date: Mon Mar 26 13:37:05 2018 -0700 - - Version 1.1 - -commit ab1838e748493559de95a5f8b74a78f0ae931c8d -Author: Derek Roberts -Date: Mon Mar 26 13:29:00 2018 -0700 - - setup_osx.sh + updated help message - -commit 3d501f19f1bca9e2e86f1155b6e5b44391813bc4 -Merge: 262a66efd bba82c783 -Author: Roland Stens -Date: Mon Mar 26 13:04:43 2018 -0700 - - Merge pull request #549 from stephenhillier/developer - - add multiselect for community options (registries) - -commit bba82c783270608ab4ca21bc1187891a57592738 -Author: Steve Hillier -Date: Mon Mar 26 12:58:58 2018 -0700 - - add multi-select for communities - -commit 430ae1411ad65415ab18cde0beab7468e0a37927 -Merge: b07ee2fb6 3ec260e37 -Author: garywong-bc -Date: Mon Mar 26 11:45:33 2018 -0700 - - Merge pull request #548 from garywong-bc/master - - Additional tests in pipeline with G.A. on print button - -commit 5dc68103efbfc8a7892f29b125cfc0a20bbca13e -Author: Derek Roberts -Date: Mon Mar 26 11:42:30 2018 -0700 - - setup_osx.sh + modern/new database import and variable - -commit 3ec260e37355a0b740a71e863d1930ea789e457f -Merge: b68b394f4 262a66efd -Author: Gary Wong (BC Gov) -Date: Mon Mar 26 11:40:41 2018 -0700 - - Update setup scripts and new Jenkinsfile (with additional tests) and GA on the print button. - -commit a25a530ae5488988af2a633a6df4911e66b587b5 -Author: Gary Wong (BC Gov) -Date: Mon Mar 26 11:31:30 2018 -0700 - - first pass, but still with makemigrations inconsistencies. - -commit 262a66efd9f5ae8a5716eabf2bddc5220f6ac681 -Author: Roland Stens -Date: Mon Mar 26 09:28:44 2018 -0700 - - Update Jenkinsfile - -commit 7686bf770a1da05e98c157c2fc18abc9297398e7 -Merge: cae561938 6682653c3 -Author: Roland Stens -Date: Mon Mar 26 09:22:22 2018 -0700 - - Merge pull request #547 from rstens/developer - - Updated production Jenkinsfile - -commit 6682653c3bea320b10164ca9fe1c376ccc142c36 -Author: Roland Stens -Date: Mon Mar 26 09:21:05 2018 -0700 - - Updated production Jenkinsfile - -commit 7b1a55a4578c3e636e0f657a87396b54085e6666 -Author: Steve Hillier -Date: Mon Mar 26 09:09:16 2018 -0700 - - add comment to explain city searching - -commit cae5619380dd271a9e78f7c2dcb3881c6106dddb -Merge: 3002ebb2f a6d51131b -Author: garywong-bc -Date: Fri Mar 23 17:39:13 2018 -0700 - - Merge pull request #546 from garywong-bc/developer - - Tested out Python PEP8 Linting to test for compliance. - -commit a6d51131b444073531b8c13191263becc81539c3 -Author: Gary Wong (BC Gov) -Date: Fri Mar 23 17:38:26 2018 -0700 - - Tested out Python PEP8 Linting to test for compliance. - -commit 3002ebb2fe4909407e1be525343d414a4f6dc298 -Merge: 74bd26199 9a80cab53 -Author: Roland Stens -Date: Fri Mar 23 17:10:36 2018 -0700 - - Merge pull request #545 from stephenhillier/developer - - fixes to Registries search page - -commit 9a80cab533d65afeaa1283f30b5cdc56ddd42368 -Author: Steve Hillier -Date: Fri Mar 23 17:01:08 2018 -0700 - - add ability to search multiple cities - -commit 74bd26199ce6d2cb38d0faa5359e8a811b18d557 -Merge: 6fb21c4db 89b017abe -Author: Derek Roberts -Date: Fri Mar 23 14:07:40 2018 -0700 - - Setup OS X + postactivate (virtualenv) and nose.cfg testing - - Setup OS X + postactivate (virtualenv) and nose.cfg testing - -commit 89b017abebc85f4cb8b00ce375586ae2c38efd40 -Author: Derek Roberts -Date: Fri Mar 23 12:28:06 2018 -0700 - - setup_osx.sh + basic testing and var to trigger - -commit 81d9372ab74ed386dfd7417a35749866d6f20003 -Author: Derek Roberts -Date: Thu Mar 22 12:15:25 2018 -0700 - - setup_osx.sh + createdb for gwells user (for testing) - -commit 695c1d59525164f692671b9fc73d974f1f4e64b9 -Author: Derek Roberts -Date: Thu Mar 22 12:14:49 2018 -0700 - - setup_osx.sh - removed virtualenv var exports, replaced by postactivate - -commit 33a38deca944742cc285f95ba274cbecba31cf0e -Author: Derek Roberts -Date: Wed Mar 21 17:34:44 2018 -0700 - - setup_osx.sh + postactivate with env vars for virtualenv - -commit 28714e47ef761a61c61ce17ba41b1baeba95b982 -Merge: ec5f3e776 6fb21c4db -Author: Steve Hillier -Date: Fri Mar 23 13:49:31 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 6fb21c4db83031599b7d6a1120364a39d6bd917b -Merge: 2ab392f97 e792cbe5c -Author: garywong-bc -Date: Fri Mar 23 11:18:29 2018 -0700 - - Merge pull request #543 from garywong-bc/developer - - Includes scripts to faciliate loading of Well Drillers - also removed… - -commit e792cbe5c813745a36d263fd9b92dfefc8a49d52 -Author: Gary Wong (BC Gov) -Date: Fri Mar 23 11:16:39 2018 -0700 - - Includes scripts to faciliate loading of Well Drillers - also removed automatic clearing of these same table, to avoid empty Registries after a deploy. - -commit 2ab392f97a9ebcab75c653ff0717af9278074831 -Merge: 8d6e3be79 218e4d003 -Author: garywong-bc -Date: Thu Mar 22 17:33:23 2018 -0700 - - Merge pull request #542 from garywong-bc/developer - - Better document subset_ind boolean parameter in db_replicate. - -commit 218e4d0032a549a898662cb371ccad92a47807f5 -Author: Gary Wong (BC Gov) -Date: Thu Mar 22 17:29:18 2018 -0700 - - Better document subset_ind boolean parameter in db_replicate. - -commit ec5f3e7763f302b3f320a32811a93af754440fee -Author: Steve Hillier -Date: Thu Mar 22 16:45:38 2018 -0700 - - add status column to table and number of entries select box - -commit 3f32d383bf4e1cae6854c03bef99b8c8e0257aec -Author: Steve Hillier -Date: Thu Mar 22 13:47:57 2018 -0700 - - add title based on search criteria (driller or pump installer) - -commit 8d6e3be7911e6a9fed50e1a602b87e1000ad2b65 -Merge: 5b87be246 2fbea2b5e -Author: Roland Stens -Date: Thu Mar 22 13:35:25 2018 -0700 - - Merge pull request #540 from stephenhillier/developer - - Add well pump installer list feature (Registries frontend) - -commit 2fbea2b5e71daf2dfd635844a49dfce5fc7e5aa3 -Author: Steve Hillier -Date: Thu Mar 22 13:32:36 2018 -0700 - - revert npm run test script back to "npm run unit" - -commit 5aa3df88cba236c845e261ff6bd1783afe4426f4 -Author: Steve Hillier -Date: Thu Mar 22 13:28:11 2018 -0700 - - add test runner auto-watch script to package.json - -commit 7d837f1e4f812b3e78d6e8a7e80d2fc707e8c036 -Author: Steve Hillier -Date: Thu Mar 22 13:20:23 2018 -0700 - - add better fake data (driller list) - -commit b1b2c53c4aa56bcaa53b9815bcaecbb5cb1d0853 -Author: Steve Hillier -Date: Wed Mar 21 17:00:31 2018 -0700 - - add registration no under person name - -commit abf0565e0e4c21eb0c80b858c527ff17cdc72393 -Author: Steve Hillier -Date: Wed Mar 21 17:00:19 2018 -0700 - - add test for columns for drillers and pump installers - -commit 6b012df2c4f6caa52427a9a4098b31c0123b4f84 -Author: Steve Hillier -Date: Wed Mar 21 16:06:24 2018 -0700 - - add well pump installer columns - -commit 29c15e58630fb84a9ffddc115485cd1ab654c08d -Merge: a1d128c78 5b87be246 -Author: Steve Hillier -Date: Wed Mar 21 14:28:29 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 5b87be2461d18b63908e5021680a8464306425c9 -Merge: c326ed459 b3493648a -Author: Derek Roberts -Date: Wed Mar 21 10:22:26 2018 -0700 - - well_detail.html - wrap print analytic count in if-else for test/prod - - well_detail.html - wrap print analytic count in if-else for test/prod - -commit b3493648a0d32054c42462aabb04c1da7fef17a8 -Author: Derek Roberts -Date: Wed Mar 21 10:20:20 2018 -0700 - - well_detail.html - wrap print analytic count in if-else for test/prod - -commit a1d128c78706f0b950d282990d22eb654e3d1bf7 -Merge: b2ae6f53a c326ed459 -Author: Steve -Date: Tue Mar 20 16:35:55 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit b2ae6f53a34518e9fef882485b7ad06b012081a8 -Author: Steve -Date: Tue Mar 20 16:35:12 2018 -0700 - - add separate city lists (by activity) for better list fetch/display code - -commit c326ed4596cbb8f4d953cb96be2517e792044788 -Merge: d44e7e5e0 80510ff9e -Author: Derek Roberts -Date: Tue Mar 20 13:39:05 2018 -0700 - - Google Analytics - track print event - - Google Analytics - track print event - -commit 80510ff9ebd853344ad3ce14732a1ae0dec6cc9c -Author: Derek Roberts -Date: Tue Mar 20 13:37:49 2018 -0700 - - well_detail.html + added Button print event - -commit 7d8ac0fee3bcced891047654ddb42db73e3663cd -Author: Derek Roberts -Date: Tue Mar 20 11:10:28 2018 -0700 - - setup_osx.sh - removed most .SQL migration scripts, covered by post_deploy - -commit 781ee37d7dc5f8a4dd7c3c475b7abb894c150c95 -Author: Derek Roberts -Date: Tue Mar 20 10:56:41 2018 -0700 - - setup_osx.sh + post-deploy.sh kicked off by POST_DEPLOY=true var - -commit 08b5fd3fd45a1c92ff9432ffc286089e515ac2a9 -Author: Derek Roberts -Date: Tue Mar 20 10:46:51 2018 -0700 - - setup_osx.sh + import foreign schema from wells into wells (legacy) - -commit ac53986d669ef54e835f0f1c453b9605e6b11502 -Author: Derek Roberts -Date: Mon Mar 19 16:29:03 2018 -0700 - - setup_osx.sh - simplify pg_restore call - -commit ef6edddd5db3c7b98ca2bdac00e32ba3e2a816ab -Author: Derek Roberts -Date: Mon Mar 19 16:20:57 2018 -0700 - - setup_osx.sh - removed psql restart, unnecessary - -commit 821a73edddce086bb74311515f69eb9485a28cf3 -Author: Derek Roberts -Date: Mon Mar 19 16:17:26 2018 -0700 - - setup_osx.sh + symlink to resemble OpenShift's /app-root/src dir - -commit b07ee2fb67a38beba5505a64626772a52308e36f -Merge: b0307a996 b68b394f4 -Author: garywong-bc -Date: Tue Mar 20 10:07:00 2018 -0700 - - Merge pull request #538 from garywong-bc/master - - Updated OpenShift Secrets - -commit b68b394f484bec3f7845bd5dc4ac3b3ad5891b25 -Merge: b0307a996 d44e7e5e0 -Author: Gary Wong (BC Gov) -Date: Tue Mar 20 10:03:48 2018 -0700 - - Merge branch 'developer' - -commit d44e7e5e00ef2faf9cfbcf53066edcd72165e980 -Author: Roland Stens -Date: Tue Mar 20 09:35:35 2018 -0700 - - Update Jenkinsfile-perftest - -commit 6c3d1cc77eb1f959c09b0ee76fa9b92674bfcfbf -Author: Roland Stens -Date: Tue Mar 20 09:24:19 2018 -0700 - - Update Jenkinsfile-perftest - -commit f5f8ce61c739a9ff3f2d4b84d5fc5b66e4074ca8 -Author: Roland Stens -Date: Tue Mar 20 09:12:01 2018 -0700 - - Update Jenkinsfile-perftest - -commit 9a81a16e868fa3c2ebd867a5c1edf8ec9278829a -Author: Roland Stens -Date: Tue Mar 20 09:09:50 2018 -0700 - - Update Jenkinsfile-perftest - - Forcing 0 return. - -commit 15674e44594358f40b7d676017b61abca725d7d4 -Merge: c06ee58ed fec251023 -Author: garywong-bc -Date: Mon Mar 19 17:00:18 2018 -0700 - - Merge pull request #537 from garywong-bc/developer - - Corrected env variable for admin interface - -commit fec251023780f7c209e6388f73a17212a500bc14 -Merge: 0692e8f9f c06ee58ed -Author: Gary Wong (BC Gov) -Date: Mon Mar 19 16:59:34 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit c06ee58ed26ed46500349f5eff68ac61ede21b62 -Merge: 521e23d31 77adf3bad -Author: garywong-bc -Date: Mon Mar 19 16:59:15 2018 -0700 - - Merge pull request #536 from stephenhillier/developer - - Add manage.py command to create default groups - -commit 0692e8f9ffcf958d6fc74ce8b312d7fcdbcb2435 -Merge: 613db1afe 521e23d31 -Author: Gary Wong (BC Gov) -Date: Mon Mar 19 16:58:58 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 613db1afe661722be59a285892070e8caea88658 -Author: Gary Wong (BC Gov) -Date: Mon Mar 19 16:58:50 2018 -0700 - - Adjust env variable for Admin URL - -commit 77adf3bad1fed6d9d66360771c15fe56f3dc6386 -Author: Steve -Date: Mon Mar 19 16:33:25 2018 -0700 - - add creategroups manage command - -commit 8227e21e99e5bb8a4ab31a8393594b4ac87ff1ba -Author: Steve -Date: Mon Mar 19 16:33:11 2018 -0700 - - move createtestuser manage command to gwells app - -commit 521e23d31728831eee71bb44953231ca7523a39f -Merge: cebcace3b 4fad041c1 -Author: garywong-bc -Date: Mon Mar 19 16:08:02 2018 -0700 - - Merge pull request #535 from garywong-bc/developer - - Ignore new .venv folder - -commit 4fad041c12e22e70571fbe5d0beb84b530cb3100 -Author: Gary Wong (BC Gov) -Date: Mon Mar 19 16:07:06 2018 -0700 - - Added placholder for hidden /admin URL - -commit 4e2445bcad41144f3f6bdc6b4af9733d2987368e -Author: Steve -Date: Mon Mar 19 15:50:30 2018 -0700 - - revert pump-installers url back to installers - -commit 64f3f0e74be481918cecee37c125e3ccc97e2996 -Merge: f2d0623d0 d218e72af -Author: Steve -Date: Mon Mar 19 15:32:58 2018 -0700 - - Merge branch 'developer' of https://github.com/stephenhillier/gwells into developer - -commit f2d0623d064f8e355f07ac7ea4f8e35801652c27 -Merge: 92ec68d9c cebcace3b -Author: Steve -Date: Mon Mar 19 15:32:07 2018 -0700 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit eecd8752a2a4c55c719edecb173cb119fa93719c -Author: Gary Wong (BC Gov) -Date: Mon Mar 19 13:46:06 2018 -0700 - - Ignore new .venv folder - -commit cebcace3bcd1a861aef5839e3e15569f3b905b28 -Merge: c98922434 eaafa24ec -Author: Roland Stens -Date: Mon Mar 19 13:44:22 2018 -0700 - - Merge pull request #534 from rstens/developer - - update chromeDriver version - -commit eaafa24ec54bb2be51b216d6a0c117463d2572eb -Author: Roland Stens -Date: Mon Mar 19 13:42:56 2018 -0700 - - update chromeDriver version - -commit 92ec68d9c72b3802370c01b696cc2f89d6a8d3af -Author: Steve -Date: Mon Mar 19 13:13:34 2018 -0700 - - add swagger settings (for helping build the API spec) - -commit c9892243429117de378d950dc40d479619ee132c -Merge: 70384d0cc 6ff8afe39 -Author: Roland Stens -Date: Mon Mar 19 13:06:01 2018 -0700 - - Merge pull request #533 from rstens/developer - - Remove pre-defined nodes in Jenkins - -commit 6ff8afe39b710fa7bb79d4a97a71a02c9ab26b81 -Author: Roland Stens -Date: Mon Mar 19 13:04:56 2018 -0700 - - Remove pre-defined nodes in Jenkins - -commit 70384d0ccb5e04d644f6169f1bfcea8c1e1f99ef -Merge: 469a4552b adeaf5662 -Author: Derek Roberts -Date: Mon Mar 19 12:36:22 2018 -0700 - - Merge branch 'DerekRoberts-setup_osx' into developer - -commit adeaf56626f3827fc6ecd0a2ca614a7d8c260643 -Merge: 469a4552b 542b3216c -Author: Derek Roberts -Date: Mon Mar 19 12:35:29 2018 -0700 - - .gitignore - conflict and cleanup - -commit 469a4552b7b7eb1447418ae700ebff81c0f866e3 -Author: Roland Stens -Date: Mon Mar 19 11:22:54 2018 -0700 - - Update README.md - -commit e352103a6602301b6b878db1ae9aa75bc2d64376 -Author: Roland Stens -Date: Mon Mar 19 11:22:13 2018 -0700 - - Update README.md - -commit abf0281e31f3fff7a204ea6321e09a957d71f158 -Merge: 0477fac70 06a387980 -Author: Roland Stens -Date: Mon Mar 19 10:42:46 2018 -0700 - - Merge pull request #531 from rstens/developer - - Jenkinsfile changes to eliminate Node defs in Jenkins - -commit 06a3879809c5097e1d43b087a5e3512c30ae90ef -Author: Roland Stens -Date: Mon Mar 19 10:38:11 2018 -0700 - - Formatting update - -commit cb3840be72344dd01e0bdfe6a73eed64034cbd39 -Author: Roland Stens -Date: Mon Mar 19 10:35:56 2018 -0700 - - Adding the node definition in the JenkinsFile - -commit 542b3216cd4c28d7c7a0031b2d486ac71c92a141 -Author: Derek Roberts -Date: Thu Mar 15 16:31:03 2018 -0700 - - setup_osx.sh + \n\t internal field separator and more explicit list iteration - -commit b0307a996e015e5f0ab3f9da23fb3ea00fc21284 -Author: Roland Stens -Date: Thu Mar 15 15:37:07 2018 -0700 - - Create gwells-pipeline.yaml - -commit 34cce064d0f13058aa98daf634aa195c30a731a1 -Author: Derek Roberts -Date: Thu Mar 15 15:29:29 2018 -0700 - - Restored most recent available Jenkinsfile - -commit 3b5e0132fd9db65f42e1e879c7b976093b63e369 -Author: Roland Stens -Date: Thu Mar 15 15:11:53 2018 -0700 - - Restoring the Jenkinsfile - -commit 0c8b6ef5aef0de5f9d93e1122db23f54b1a128c2 -Merge: b271b7457 4fb699941 -Author: garywong-bc -Date: Thu Mar 15 14:39:31 2018 -0700 - - Merge pull request #530 from garywong-bc/master - - Sync DB structures - -commit 4fb699941d6eaaba9f33635fe84378264f2faf97 -Merge: b271b7457 0477fac70 -Author: Gary Wong (BC Gov) -Date: Thu Mar 15 14:06:06 2018 -0700 - - Adding new Print button, new DB structures, and new Survey feature. - -commit 0477fac7055a778d68614f40e76530f6b3c2d1fa -Merge: 3a957549f e9ec8b26f -Author: garywong-bc -Date: Thu Mar 15 13:50:03 2018 -0700 - - Merge pull request #529 from garywong-bc/developer - - Additional legacy DB objects to drop upon reset. - -commit e9ec8b26fbbce4245a3a31531a7a72682f44e05a -Author: Gary Wong (BC Gov) -Date: Thu Mar 15 13:44:36 2018 -0700 - - Additional legacy DB objects to drop upon reset. - -commit e00e3e79ce7466f2d8ea3e5f7f3ccd7c7ab32f89 -Author: Derek Roberts -Date: Thu Mar 15 13:04:24 2018 -0700 - - setup_osx.sh + pipefail - return fails from any series, not just final command (e.g. ! fail | grep) - -commit c955e0bf5060793d10fd18c7ff36ec336806a6e0 -Author: Derek Roberts -Date: Thu Mar 15 12:37:57 2018 -0700 - - setup_osx.sh + print help if any params used - -commit 5ce8676528fae4786441d2ca72a48a594724b250 -Author: Derek Roberts -Date: Thu Mar 15 12:36:31 2018 -0700 - - setup_osx.sh + adapt schema from Wells (legacy) for GWells - -commit 69d62780c4e9fc6d4f76707db0d5401ce2ba9eee -Author: Derek Roberts -Date: Thu Mar 15 12:32:43 2018 -0700 - - setup_osx.sh - start vs restart postgresql - -commit 3a957549f2be4ea18891125d90193d5f94bbc2b6 -Author: Roland Stens -Date: Thu Mar 15 11:32:46 2018 -0700 - - Update Jenkinsfile-developer - -commit fee18f753c622cc43c6b8acdeb763a768489b6d7 -Author: Derek Roberts -Date: Thu Mar 15 11:12:41 2018 -0700 - - setup_osx.sh - use var to pass a legacy dump in - -commit d218e72af1f05d87eb2b54843ec6eaf762f25fef -Author: Steve Hillier -Date: Wed Mar 14 21:29:59 2018 -0700 - - fix endpoint url to be more descriptive - -commit 89fcd6efb5b1daa1fbb60426098bd984a436f3c9 -Merge: fcaa11824 cd7c0b719 -Author: Roland Stens -Date: Wed Mar 14 16:49:59 2018 -0700 - - Merge pull request #528 from fieranmason/auth2merged - - Removed dropped store from legacy implemntation of the test - -commit 6c727389e1d435e8892a40eaa1578c5f011e3262 -Author: Derek Roberts -Date: Wed Mar 14 16:30:38 2018 -0700 - - setup_osx.sh + allow server to receive ctrl+C, but continue script - -commit cd7c0b7192a7306cc6e0b2ede3b993e9c3db34c5 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 16:30:30 2018 -0700 - - Removed dropped store from legacy implemntation of the test - -commit fcaa1182498b93a8438598d0847205c5cb240222 -Merge: b7b52a167 370500a42 -Author: Roland Stens -Date: Wed Mar 14 16:09:38 2018 -0700 - - Merge pull request #527 from fieranmason/auth2merged - - Added test to validate that the application does not fail if the admi… - -commit 370500a422706aefc5c4947a5ed3d71571197c94 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 16:05:49 2018 -0700 - - Added test to validate that the application does not fail if the admin group has not been created - -commit b7b52a1679f310d1d7613766f33d25c3d1901f91 -Merge: 6c23374ec 092e9409f -Author: Roland Stens -Date: Wed Mar 14 16:05:27 2018 -0700 - - Merge pull request #526 from fieranmason/auth2merged - - added a check on the group to ensure app doesn't break before it is c… - -commit 092e9409fc4ab1dead5c08d14f2a1727c5001a28 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 15:57:07 2018 -0700 - - added a check on the group to ensure app doesn't break before it is configured - -commit 6c23374ecd45ff464a6057889a29df99bce0b9db -Merge: 6a8b33a97 267d38bf3 -Author: Roland Stens -Date: Wed Mar 14 15:21:54 2018 -0700 - - Merge pull request #525 from stephenhillier/developer - - Improvements to Swagger API documentation (Registries) - -commit 267d38bf364c704141e2db41ac6efad7ac17291f -Author: Steve -Date: Wed Mar 14 15:04:31 2018 -0700 - - configure drf-yasg swagger schema endpoint - -commit 0d1357ccd3246584083c111b50bad0a04ec0f579 -Author: Steve -Date: Wed Mar 14 15:04:01 2018 -0700 - - clean up view names for auto-generated API documentation - -commit cb1993a3841d4cd05387cb99f3d7bb7f212eba53 -Author: Steve -Date: Wed Mar 14 15:03:24 2018 -0700 - - switch from django rest swagger to drf-yasg - -commit 6a8b33a9778bfb89e1799eb2c5746543c0659979 -Merge: 559fc384e b5a172ffa -Author: Roland Stens -Date: Wed Mar 14 15:02:50 2018 -0700 - - Merge pull request #524 from stephenhillier/developer - - Registries fixes - -commit 559fc384e0892931df5ded6882bcf472c055606d -Author: Roland Stens -Date: Wed Mar 14 14:46:59 2018 -0700 - - Update Jenkinsfile-developer - -commit b5a172ffa51c8ccf389624c6d148909983621b73 -Author: Steve -Date: Wed Mar 14 13:32:53 2018 -0700 - - fix description of API - -commit a052382464a11adf307e8b9563821f98e60c42c4 -Author: Steve -Date: Wed Mar 14 13:22:53 2018 -0700 - - fix errors when returning string repr of some models - -commit 71913bf3a947a66770a3388b2e517ee900ad924e -Author: Steve -Date: Wed Mar 14 13:13:51 2018 -0700 - - add DRF schema generator url - -commit 119d5812863dc177860ea6bd605d829fc3dccd48 -Merge: ac5f57200 b3f72cf56 -Author: garywong-bc -Date: Wed Mar 14 11:39:02 2018 -0700 - - Merge pull request #523 from stephenhillier/developer - - add version to Registries API urls - -commit ac5f57200cc4c5f6c9071124dffcabc57840ee7c -Merge: 2d44acc0f c87ae5ff0 -Author: garywong-bc -Date: Wed Mar 14 11:38:30 2018 -0700 - - Merge pull request #522 from fieranmason/auth2merged - - Added Survey feature with authentication and authorization implemented - -commit 23ca6ef0029bf929831e0ae3945a957a0009bc86 -Author: Derek Roberts -Date: Wed Mar 14 11:36:21 2018 -0700 - - + .gitattributes - generalized file attributes, using for CRLF here - -commit 5cda687ba2c712b2d84e41e09a36e51910e80d15 -Author: Derek Roberts -Date: Wed Mar 14 11:12:20 2018 -0700 - - .gitignore - commented out file types used in the repo - -commit c87ae5ff0d28ac9544c11cce96c583aff6905044 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 10:49:20 2018 -0700 - - Readded lost unit tests and updated them - -commit c1738615120f6980defa5d375e375459fa33251f -Author: Fieran Mason-Blakley -Date: Wed Mar 14 10:18:41 2018 -0700 - - moved site administration features to different path to avoid collissions with django native admin - -commit b3f72cf5616440843811247e05d370c73b2eac98 -Author: Steve -Date: Wed Mar 14 09:33:31 2018 -0700 - - update frontend API service to use API url with version - -commit 126333ce58aad8b178fcb1e96b03eca9125a588e -Author: Derek Roberts -Date: Wed Mar 14 09:33:02 2018 -0700 - - .gitignore + github suggested config - -commit 4c266ea2b798e34842017461cae7b1a0e5a58b81 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 09:32:07 2018 -0700 - - moving features into production - -commit 9c2a0969bf7950ea6bfaf1a774ae6c532de0f3d2 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 09:24:40 2018 -0700 - - Patched class name - -commit 5dadd92d05120ae96cdeda0bee0b7399421c24f0 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 09:23:32 2018 -0700 - - Patched the way the survey is presented - -commit 686751c0a88b974d48f50063bc307c05a224c3f2 -Author: Derek Roberts -Date: Wed Mar 14 09:16:47 2018 -0700 - - .gitignore + more OS files - -commit 31a101f538dbbed77bb00cff43dee2c5657b82a8 -Author: Steve -Date: Wed Mar 14 09:16:46 2018 -0700 - - add version to API urls - -commit b1ea2576cbb5d9d9d4f5340a8e2380ccdfdb4e65 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 09:03:23 2018 -0700 - - qualified model name - -commit 6393161475e9751a54fded080b184589af1ffdb8 -Author: Fieran Mason-Blakley -Date: Wed Mar 14 09:00:58 2018 -0700 - - commented out the lines that display output on execution - -commit f968d63b8de2ae75fed88c17c7205595bdbb56d6 -Merge: bbd4eb4c4 2d44acc0f -Author: Fieran Mason-Blakley -Date: Wed Mar 14 08:17:20 2018 -0700 - - Merge branch 'developer' into auth2merged - -commit 38ba476884f395fa9ecace263c21ec998871e561 -Author: Derek Roberts -Date: Tue Mar 13 15:38:49 2018 -0700 - - setup_osx.sh - moved all settings vars to top, pick up env vars - -commit 2d44acc0f5740e28efd665b1e6e6a9d2f4bfeee9 -Merge: d0013b76b 1aba60615 -Author: Roland Stens -Date: Tue Mar 13 14:25:08 2018 -0700 - - Merge pull request #521 from rstens/developer - - Remove the separate Unit Test pipeline definition - -commit 1aba606154c3632bee1b0f49bfa0c4191d9db032 -Author: Roland Stens -Date: Tue Mar 13 14:24:16 2018 -0700 - - Remove the separate Unit Test pipeline definition - -commit d0013b76b48513c423463ea1fb67b4bca8fb156e -Author: Roland Stens -Date: Tue Mar 13 14:20:36 2018 -0700 - - Maintenance items - -commit 674111dfd31816664459193780e6d28aae53526f -Author: Roland Stens -Date: Tue Mar 13 14:17:24 2018 -0700 - - Update to Windows script - Path - -commit 40d08b99dc82a088a034d5ad2cad1f4e7155f1a2 -Author: Derek Roberts -Date: Tue Mar 13 14:06:04 2018 -0700 - - setup_osx.sh + DB_LEGACY var for importing a legacy db - -commit 63b9812ed906b72179072a15868d799777ef3c1e -Author: Derek Roberts -Date: Tue Mar 13 13:39:13 2018 -0700 - - .gitignore + system files to ignore - -commit c3276867aa0f7d1ed6dc10d7062acc81ec08178a -Author: Derek Roberts -Date: Tue Mar 13 11:30:03 2018 -0700 - - setup_osx.sh + further data migrations - -commit bbd4eb4c41a8e8191005787ad0b0016e14432394 -Merge: 933521077 8fca059c6 -Author: Fieran Mason-Blakley -Date: Tue Mar 13 11:13:02 2018 -0700 - - merged latest - -commit 371b01d92af29f116afd60e66c1c9f518c3c5731 -Merge: 33ca1b41c ab99d5634 -Author: garywong-bc -Date: Tue Mar 13 10:58:27 2018 -0700 - - Merge pull request #520 from garywong-bc/developer - - Optimizing NOT SQL where clause. - -commit ab99d5634231cc8934dc789de7041568f9954b0a -Author: Gary Wong (BC Gov) -Date: Tue Mar 13 10:57:33 2018 -0700 - - Optimizing NOT SQL where clause. - -commit b9d33d23a3a25637d72cc2c1f8042de4891c68c7 -Author: Derek Roberts -Date: Tue Mar 13 10:49:04 2018 -0700 - - setup_osx.sh + create foreign data wrapper linking wells to gwells dbs - -commit 2703dd0a023492475f302a6ef0a1315bc88a68cc -Author: Derek Roberts -Date: Tue Mar 13 10:45:42 2018 -0700 - - setup_oisx.sh + temporary db import - -commit 483dbd0a0fbc5b500c16d572650653d44ba891c0 -Author: Derek Roberts -Date: Tue Mar 13 10:42:19 2018 -0700 - - setup_osx.sh + db foreign key wrapper - -commit 33ca1b41c4160c60d6c9c693ef7f1f23218c9524 -Merge: 8fca059c6 4449121a1 -Author: garywong-bc -Date: Tue Mar 13 09:33:55 2018 -0700 - - Merge pull request #519 from fieranmason/perforationUpdate - - Patched script to accept partially populated records instead of inclu… - -commit a4e517a389f2d71b19ff725e56c1720a2a736f67 -Author: Derek Roberts -Date: Tue Mar 13 09:18:30 2018 -0700 - - setup_osx.sh + legacy wells user, pw and db - -commit d00a7455abadf14ff19acdf8f84d80b6b310b76c -Author: Derek Roberts -Date: Tue Mar 13 09:16:07 2018 -0700 - - setup_osx.sh + password for gwells user - -commit 25f6bcc614fadc78037a0354ef064c4a85f3df94 -Author: Derek Roberts -Date: Tue Mar 13 09:15:10 2018 -0700 - - setup_osx.sh - clobber gwells user and db, not check - -commit ac31c83efa0d8baca46bd926371849328748448e -Author: Derek Roberts -Date: Tue Mar 13 08:51:47 2018 -0700 - - setup_osx.sh + store starting directory - -commit d6a4aabec4127f884b9b71e1294e098f64eccf85 -Author: Derek Roberts -Date: Tue Mar 13 08:51:19 2018 -0700 - - setup_osx.sh + legacy database varialbles - -commit 4449121a1da5e51d9f1b7e0afb7825322f1f6ae7 -Author: Fieran Mason-Blakley -Date: Tue Mar 13 08:47:25 2018 -0700 - - Patched script to accept partially populated records instead of including only fully populated records. Removed the restrictions that records needed to have been updated - -commit 8fca059c6a7f383e934c67feb8ab5f4889a966cc -Merge: 867d56bbe 5e295c5dc -Author: garywong-bc -Date: Mon Mar 12 16:51:06 2018 -0700 - - Merge pull request #518 from garywong-bc/developer - - Exclude liner perforations when null. - -commit 5e295c5dc07dbac0d5c4803feb48af2a255567b2 -Author: Gary Wong (BC Gov) -Date: Mon Mar 12 16:46:07 2018 -0700 - - Exclude liner perforations when null. - -commit 867d56bbe52343054862c72ac6285058a6556a58 -Merge: f52d33327 ad689eeb5 -Author: Roland Stens -Date: Mon Mar 12 15:29:46 2018 -0700 - - Merge pull request #517 from fieranmason/patch_table_hide - - Patch table hide - -commit ad689eeb5debd95939c8daa2dc438f40370799fa -Merge: 473596369 f52d33327 -Author: Fieran Mason-Blakley -Date: Mon Mar 12 15:14:13 2018 -0700 - - Merge branch 'developer' into patch_table_hide - -commit 4735963695a1c5c89b161032f846df070a887511 -Author: Fieran Mason-Blakley -Date: Mon Mar 12 15:11:48 2018 -0700 - - Improved wording to handle more cases of data variation - -commit 2e15af6b2a8da140e45e24c2a22ca5613226a567 -Author: Fieran Mason-Blakley -Date: Mon Mar 12 15:10:16 2018 -0700 - - Patched wording to improve messaging consistency. - -commit f52d333274e591cb4c3a2c4f4607cfe22108cc79 -Author: Roland Stens -Date: Mon Mar 12 14:52:57 2018 -0700 - - Update Jenkinsfile-developer - -commit 26db64c42351c22a48845c1da549aabe5069e6aa -Merge: 09ab8d6b7 d9f8356d5 -Author: garywong-bc -Date: Mon Mar 12 14:42:28 2018 -0700 - - Merge pull request #516 from fieranmason/surveylink - - Surveylink - -commit 09ab8d6b783a2e2c80b41f7ce716289745972077 -Merge: 6978f978b 2bd198658 -Author: Roland Stens -Date: Mon Mar 12 14:38:30 2018 -0700 - - Merge pull request #515 from stephenhillier/developer - - add jest-junit unit test reporting - -commit d9f8356d54b6d590e5e6da4c682ee57e0430191b -Author: Fieran Mason-Blakley -Date: Mon Mar 12 14:34:39 2018 -0700 - - changed survey link - -commit 2bd198658b5de2413cba61bdcb2e64bc73f1d027 -Author: Steve -Date: Mon Mar 12 14:32:42 2018 -0700 - - add jest-junit unit test reporting - -commit 6978f978bb0c61d9d6a59606fa3b498c461e8390 -Author: Roland Stens -Date: Mon Mar 12 14:16:18 2018 -0700 - - Update build.gradle - -commit e349516b216a3189afae32a9eef937da4ccb7839 -Merge: 85ed63183 badce131a -Author: Fieran Mason-Blakley -Date: Mon Mar 12 13:44:45 2018 -0700 - - Merge remote-tracking branch 'upstream/developer' into surveylink - -commit badce131aee5e00d9ac12d7be46909c980251f51 -Author: Roland Stens -Date: Mon Mar 12 13:41:50 2018 -0700 - - Update Jenkinsfile-developer - -commit 35c19d80cd69e9d718a4d9d79c41d79b2d49eabb -Merge: d7ed0391b 836d54e6e -Author: Roland Stens -Date: Mon Mar 12 13:39:07 2018 -0700 - - Merge pull request #513 from stephenhillier/developer - - fix bootstrap issues on Registries pages (now passes BootLint) - -commit d7ed0391b0529b83d4babf50439c862bd0e91ec5 -Merge: f23db6dca 331497eba -Author: Roland Stens -Date: Mon Mar 12 13:38:55 2018 -0700 - - Merge pull request #514 from rstens/developer - - Sonar runner config updates - -commit 331497ebaf8c8a6e9d3752231fe55b4ec72891b7 -Author: Roland Stens -Date: Mon Mar 12 13:37:39 2018 -0700 - - Updates to config - -commit 2a41a71b978eb33827ee2af20a7d143037ad98ca -Author: Roland Stens -Date: Mon Mar 12 13:36:50 2018 -0700 - - Sonar-runner config update - -commit 933521077e4930f4ed314a4152f7ffa5ee65326b -Author: Fieran Mason-Blakley -Date: Mon Mar 12 13:31:00 2018 -0700 - - Sonarqube adjustments - -commit 836d54e6e908ef3030c32b8b28dd844cc43660d5 -Author: Steve -Date: Mon Mar 12 13:02:25 2018 -0700 - - fix bootstrap issues (now passes BootLint) - -commit f23db6dca5adfb3f50e1a4515026660d34eb09d9 -Author: Roland Stens -Date: Mon Mar 12 11:36:38 2018 -0700 - - Update Jenkinsfile-unittest - -commit fb2a517710a2c1c1abd5341236c2a51856948600 -Merge: b8f7dff48 85ed63183 -Author: Fieran Mason-Blakley -Date: Mon Mar 12 11:30:15 2018 -0700 - - merged developer - -commit 550202324881837dd352cf4c8ca80920e04cfced -Merge: b31b27131 e3dffa39e -Author: Roland Stens -Date: Mon Mar 12 11:05:10 2018 -0700 - - Merge pull request #512 from stephenhillier/developer - - Fixes for registry web app - -commit b31b2713110f2ac1682cf561dfa07cdd4ff3a2aa -Author: Roland Stens -Date: Mon Mar 12 11:03:41 2018 -0700 - - Update Jenkinsfile-unittest - -commit fce6f2fda43bea7fa86898a54bd501822effc094 -Author: Roland Stens -Date: Mon Mar 12 10:53:35 2018 -0700 - - Update Jenkinsfile-unittest - -commit cc7172a3e0576d5d52f2c0e0c9d3fcef2cf7a54f -Author: Roland Stens -Date: Mon Mar 12 10:51:24 2018 -0700 - - Update Jenkinsfile-unittest - -commit e3dffa39edc195a427461f82d9d4f1514c504920 -Author: Steve -Date: Mon Mar 12 10:48:07 2018 -0700 - - remove test that depends on node build script running - -commit a86086881e6a3eb9f8f6dcfe30920e2bad25c26e -Author: Roland Stens -Date: Mon Mar 12 10:48:01 2018 -0700 - - Update Jenkinsfile-unittest - -commit 3f344699bf86123e7bba312f9914a0c01c9ddc9f -Author: Steve -Date: Mon Mar 12 10:46:01 2018 -0700 - - fix whitespace in margins of page - -commit 9a4edc5fb42caa32a16a2ee3353371da43b7e230 -Author: Roland Stens -Date: Mon Mar 12 10:33:42 2018 -0700 - - Update Jenkinsfile-unittest - -commit a738bfde802bfc3b79ee3d03f91bfbecc178bef8 -Author: Roland Stens -Date: Mon Mar 12 10:31:35 2018 -0700 - - Update Jenkinsfile-unittest - -commit 3ea7aa7122736a683a829f8a0011865d1d67eae3 -Author: Roland Stens -Date: Mon Mar 12 10:22:11 2018 -0700 - - Update Jenkinsfile-unittest - -commit f647853c45b69e843a829e8815dc21bc206220ce -Author: Steve -Date: Mon Mar 12 09:39:29 2018 -0700 - - fix column size for info displayed below table - -commit 5746dc6bbde9ed46fd8f3489a6a88f76cba62ac5 -Author: Steve -Date: Mon Mar 12 09:20:34 2018 -0700 - - add conditional check for more error details - -commit 85ed631836b32fcdfdb7bf2af133174de05defc5 -Merge: 8354c5732 23037c286 -Author: Fieran Mason-Blakley -Date: Mon Mar 12 09:05:40 2018 -0700 - - Merge remote-tracking branch 'upstream/developer' into developer - -commit b8f7dff489f808e43fb8119f8431eab141a779a2 -Author: Fieran Mason-Blakley -Date: Mon Mar 12 09:04:30 2018 -0700 - - Finished testing auth feature - -commit 23037c28631fb6fdb4766d63f17e8c681b6342d9 -Merge: 46c6ddc60 f96da02a3 -Author: garywong-bc -Date: Sun Mar 11 20:17:32 2018 -0700 - - Merge pull request #511 from garywong-bc/developer - - Local Auth, Online Survey - -commit f96da02a3f8744092677225d26155a9ded889414 -Author: Gary Wong (BC Gov) -Date: Sun Mar 11 20:15:55 2018 -0700 - - Local auth and sample Online Survey sample of Django Admin. - -commit 84faa55ac2b867f790bccdf67f1f7e9f68527e78 -Author: Gary Wong (BC Gov) -Date: Sun Mar 11 19:49:36 2018 -0700 - - Merged from upstream and local branches that were testing out local auth and Django Admin. - -commit 02e54564709341ba9f209d3da2790b4615b8ee25 -Author: Gary Wong (BC Gov) -Date: Sun Mar 11 19:47:59 2018 -0700 - - With sample OnlineSurvey using Django Admin. - -commit 514275e74a424907cadda50604e26234e6377371 -Merge: 46c6ddc60 733261ce0 -Author: Gary Wong (BC Gov) -Date: Sat Mar 10 23:36:50 2018 -0800 - - Merge branch 'local-auth' into developer - -commit 46c6ddc609b22b56347476e9872e8da0dea0bad8 -Author: Roland Stens -Date: Fri Mar 9 17:47:31 2018 -0800 - - Update Jenkinsfile-unittest - -commit 733261ce0618fb15412c29f7061fb90a738ba099 -Author: Gary Wong (BC Gov) -Date: Fri Mar 9 15:30:57 2018 -0800 - - Barebones implementation of local auth - -commit 1f1f22ec801e3c2e8062632bb4abcf7294cee227 -Author: Roland Stens -Date: Fri Mar 9 14:11:54 2018 -0800 - - Update Jenkinsfile-developer - -commit 9a56e0049f5a526cea3cddc7ee65903cdc08f671 -Merge: a359970ba 8354c5732 -Author: Fieran Mason-Blakley -Date: Fri Mar 9 13:42:28 2018 -0800 - - Merge branch 'developer' into auth2 - -commit 8354c5732e1ccea3dae7c7546b3fd22fc8ab12f1 -Merge: 1b68176a6 b209b313d -Author: Fieran Mason-Blakley -Date: Fri Mar 9 13:42:09 2018 -0800 - - Merge remote-tracking branch 'upstream/developer' into developer - -commit a359970ba78910c9007ab87a940d6c6ab1566336 -Author: Fieran Mason-Blakley -Date: Fri Mar 9 13:41:32 2018 -0800 - - interim commit for auth - -commit b209b313d858f30b7e7e0fa96b2a8f8896633a25 -Author: Roland Stens -Date: Fri Mar 9 12:24:35 2018 -0800 - - Update Jenkinsfile-unittest - -commit cdc2705ef07e9e47791de460bf63eb37d20dc4b1 -Author: Roland Stens -Date: Fri Mar 9 12:23:35 2018 -0800 - - Create Jenkinsfile-unittest - -commit 892a0dd5b751cfacf337579d5abcf142c11b4188 -Author: Fieran Mason-Blakley -Date: Fri Mar 9 08:28:19 2018 -0800 - - Added login required mixin to admin view - -commit 6f174916f34f3079a5230d9ea02c8cbbe07a23e5 -Merge: be9a6df6b d4bf08653 -Author: garywong-bc -Date: Thu Mar 8 22:55:30 2018 -0800 - - Merge pull request #510 from garywong-bc/developer - - Allow for UNK values in replicated data from legacy Oracle DB. - -commit d4bf08653a3e458eeb81c6cdec3161288a7e8ce3 -Merge: 41712f022 be9a6df6b -Author: Gary Wong (BC Gov) -Date: Thu Mar 8 21:47:54 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 41712f0225ce08518b55d359b473ebb53c2ab508 -Author: Gary Wong (BC Gov) -Date: Thu Mar 8 21:41:28 2018 -0800 - - Supporting UNK values in legacy data. - -commit be9a6df6b9595f7ca41e789d6743475e13daa1d8 -Merge: 19d2672e2 8e09ebb7a -Author: Roland Stens -Date: Thu Mar 8 21:34:46 2018 -0800 - - Merge pull request #509 from stephenhillier/developer - - remove 2 api tests that rely on fixture data - -commit 19d2672e2a4cbb8b83c076c6be5ed3aa2f0e2b7d -Author: Roland Stens -Date: Thu Mar 8 21:27:20 2018 -0800 - - Update Jenkinsfile-developer - -commit 8e09ebb7a22178ae3ad812bb0b1accde3e0d6ee3 -Author: Steve Hillier -Date: Thu Mar 8 19:19:41 2018 -0800 - - remove 2 tests that rely on fixture data - -commit fcd829f7f48e65cd2bc9a1bdcd47b7953e8c07ff -Merge: eee310359 748a3d63c -Author: Roland Stens -Date: Thu Mar 8 17:06:54 2018 -0800 - - Merge pull request #508 from stephenhillier/developer - - Update frontend folder README - -commit 748a3d63c89c132ec6b4fa28fa95be3fe42d656f -Author: Steve Hillier -Date: Thu Mar 8 16:00:40 2018 -0800 - - Update README.md - -commit f1fa8db3ef458dd3e67d55623a67f4fe22cfbce9 -Author: Steve Hillier -Date: Thu Mar 8 16:00:22 2018 -0800 - - Update README.md - -commit 81e8ba3851aea60485f0c75cd5b6c1316ec85fe8 -Author: Steve Hillier -Date: Thu Mar 8 15:57:10 2018 -0800 - - Update README.md - -commit eee310359fc2a254380e56e404bdad85ed77a58c -Author: Roland Stens -Date: Thu Mar 8 15:52:29 2018 -0800 - - Update Jenkinsfile-developer - -commit c3e28a7d0e5922e31d020ed8a64d6fef8ea98b10 -Author: Steve -Date: Thu Mar 8 15:48:23 2018 -0800 - - update README - -commit 5281dc14604dcdc7910fed12a296b110e9191932 -Merge: 0ad3bffce 2e14c07c9 -Author: Steve -Date: Thu Mar 8 15:46:13 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 2e14c07c9cc75a718d1abc0cce4de4b48e7cfb52 -Author: Roland Stens -Date: Thu Mar 8 15:43:50 2018 -0800 - - Commenting out the Unit Test to get the image build - -commit 0ad3bffce83825a692abe60bf58aac85545b42ef -Author: Steve -Date: Thu Mar 8 15:39:50 2018 -0800 - - fix typos - -commit e95563875595c46d455aad81689c954afd67e77c -Author: Roland Stens -Date: Thu Mar 8 15:20:17 2018 -0800 - - Update Jenkinsfile-developer - -commit 01650778df6452926274cad6adef9ee49de14e63 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:19:37 2018 -0800 - - added unit tests - -commit e4264b4aea5f398de4113475fffdc2fb2661ffc0 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:19:20 2018 -0800 - - Added filter to control access to the admin feature - -commit 17315875ed6ed4a3168f1c4e018c768e57495205 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:18:56 2018 -0800 - - added unit tests for admin - -commit a708126e9c32ca9e45aeae45b9c0349241768aa3 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:18:33 2018 -0800 - - Added necessary precondition to support group filter - -commit 5c81976c90880a1d2b7eeacf65353f12d847f96c -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:17:36 2018 -0800 - - Added necessary precondition to support group filter - -commit d0eef9c53520e536bc50d6264cf2aba880119deb -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:16:47 2018 -0800 - - Added a necessary precondition --- for groups filter - -commit 82c254c39c857b5bd4dab36103aa6894fef59b2a -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:16:05 2018 -0800 - - Added a necessary precondition - -commit c836ecaa287a9fcd79a18d1fb3f1d1a797adc9c4 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:15:15 2018 -0800 - - testing profile - -commit f7a4082234129a660caa0e79448cc4fdbc61cd09 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 15:14:42 2018 -0800 - - Patched templates to restrict access to survey feature - -commit 29827e84ec51555d520b3c4af6dbd822ef499ce4 -Merge: c8282dcef bb13b5d78 -Author: Roland Stens -Date: Thu Mar 8 15:04:56 2018 -0800 - - Merge pull request #507 from stephenhillier/developer - - Remove test for cities list - -commit bb13b5d78a4672110764edd56d8cd37ab67fa2f7 -Author: Steve -Date: Thu Mar 8 15:01:53 2018 -0800 - - add readme to frontend folder - -commit ef537c7739511a6c77e82b3df5af0513bffc020d -Author: Steve -Date: Thu Mar 8 15:00:25 2018 -0800 - - remove test for function that is not compatible with sqlite - -commit c8282dcef085275b8e00ffdfc24528b9f288460c -Merge: c0e38326c b810483ae -Author: Derek Roberts -Date: Thu Mar 8 14:57:05 2018 -0800 - - Merge pull request #506 from DerekRoberts/setup_osx - - Expanded on Mac setup and README - -commit c0e38326ce338f175c2767f3529484af011e508b -Author: Roland Stens -Date: Thu Mar 8 14:50:26 2018 -0800 - - Update assemble - -commit b810483aecaaf1688fa5e065172c7c603fee474f -Author: Derek Roberts -Date: Thu Mar 8 14:48:18 2018 -0800 - - Deleted Windows' junk files (Thumbs.db) - -commit 153d33eb904405889be05e61d7a67d5f9db8b9a9 -Author: Roland Stens -Date: Thu Mar 8 14:48:00 2018 -0800 - - Update build.gradle - -commit da977420c2e6c3b20d84317466065d466945dff6 -Author: Derek Roberts -Date: Thu Mar 8 14:47:42 2018 -0800 - - README.md - expanded git setup - -commit 15fe4254cf0c1d4b9a051db6639398714f7b7ae5 -Author: Roland Stens -Date: Thu Mar 8 14:45:33 2018 -0800 - - Update build.gradle - -commit be66e7d5036a9d66d8034e3591b16cc270ee7f6f -Merge: ecb15ed64 7c1f46d88 -Author: Roland Stens -Date: Thu Mar 8 14:44:33 2018 -0800 - - Merge pull request #505 from stephenhillier/developer - - Well Driller Register webapp - -commit ecb15ed648bd26e31a371b848f455ead30231dba -Author: Roland Stens -Date: Thu Mar 8 14:40:22 2018 -0800 - - Update README.md - -commit f77d2b5744cd95e7289840d8bf37ecbe0b74f079 -Author: Roland Stens -Date: Thu Mar 8 14:39:47 2018 -0800 - - Update README.md - -commit 71b2c62f41ea01462bc99df5ae76c2059192bc21 -Author: Roland Stens -Date: Thu Mar 8 14:39:01 2018 -0800 - - Create README.md - -commit b29d6301a70648001d44d6f25cdbcf7546e68986 -Merge: b72ad7ffa 3b08eea6f -Author: Roland Stens -Date: Thu Mar 8 14:22:03 2018 -0800 - - Merge pull request #504 from rstens/developer - - Update dos2unix - -commit 3b08eea6f712158d7bc0f8556d1349edc127b2b9 -Author: Roland Stens -Date: Thu Mar 8 14:19:31 2018 -0800 - - Update dos2unix - -commit b72ad7ffaba9d510bac4d897a7c8d9f0aedab7d2 -Author: Roland Stens -Date: Thu Mar 8 14:09:54 2018 -0800 - - Update assemble - -commit 94bf344a9bb0d0d71c88ba7c358eab1de0f79e31 -Author: Roland Stens -Date: Thu Mar 8 13:58:00 2018 -0800 - - Update assemble - -commit 37cfa2099a0a9eb7c10d6a7e430611d6f17f6e34 -Merge: 4e9d48d55 fd9c9c6da -Author: Roland Stens -Date: Thu Mar 8 13:54:19 2018 -0800 - - Merge pull request #503 from rstens/developer - - s2i update of assemble - -commit fd9c9c6da539018ba06ffc86e1d5fb0d8e5cf9f0 -Author: Roland Stens -Date: Thu Mar 8 13:53:14 2018 -0800 - - s2i update of assemble - -commit 7c1f46d883d8199bcb8491d493f02963db123d5e -Author: Steve -Date: Thu Mar 8 13:49:08 2018 -0800 - - clean up packages - -commit a32cb39e4b0433ef7d3e0dcb1a949da032e86297 -Author: Steve -Date: Thu Mar 8 13:49:01 2018 -0800 - - switch to relative base url path and turn off logging by default - -commit be137e26648709100d341a78a7528e57872bd941 -Author: Steve -Date: Thu Mar 8 13:26:41 2018 -0800 - - remove corsheaders package - -commit e59f1a927731c61de7b80e675b523f74e597487a -Author: Steve -Date: Thu Mar 8 13:20:53 2018 -0800 - - fix pagination button placement - -commit ffab286a6672b489f0e70041ad917c58562fdc01 -Author: Steve -Date: Thu Mar 8 13:14:09 2018 -0800 - - remove css loading (inherit from django template) - -commit d7520e3cf32e30840b731daf641fd922b6b7e6a0 -Merge: 4e9d48d55 8635efce9 -Author: Steve -Date: Thu Mar 8 13:12:44 2018 -0800 - - Merge branch 'frontend-bs4-vanilla' into developer - -commit 8635efce900d0b587ae7651f4c3ed1ef574e402e -Author: Steve -Date: Thu Mar 8 13:11:34 2018 -0800 - - improve test coverage - -commit a38bacb16b39b15e43b62b866043475d29de57bc -Author: Steve -Date: Thu Mar 8 13:11:26 2018 -0800 - - remove console.log statements - -commit eebb53155d11747eaed93a57354654bc308ed683 -Author: Steve -Date: Thu Mar 8 13:10:59 2018 -0800 - - add labels to components - -commit 17be86ef1be75b94704b2bddf61088ed2b041e23 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 11:20:09 2018 -0800 - - enabled admin routes - -commit 20d521fb04bb3ca78f611d8bd4a82d3b998dee81 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 11:00:43 2018 -0800 - - Minimized potential conflicts on admin route prior to auth implementation. Removed tests for survey details view as this is hanled by the site admin interface. - -commit 6a39ac8e4fe7cdcb9a847b4f8548b521a8e6ae6d -Author: Fieran Mason-Blakley -Date: Thu Mar 8 10:35:45 2018 -0800 - - Added user extension migration - -commit ce6ec863c00eb76fd6e49d94b8639349ff6911fb -Author: Fieran Mason-Blakley -Date: Thu Mar 8 10:35:09 2018 -0800 - - Removed legacy view. This is now handled by SurveyView's get method - -commit 9bab87808f391760cff3a5bf08eb5c23a870c151 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 10:21:41 2018 -0800 - - Added Profile, changed to fully qualified class names - -commit 44d05db5dbe1e7940f9101d7bbed2b59c449aa62 -Author: Steve -Date: Thu Mar 8 09:36:51 2018 -0800 - - improve test coverage - -commit 93fbb8d1f6ee54ebef541cd1fda8c58c98ee7df5 -Author: Steve -Date: Thu Mar 8 09:36:32 2018 -0800 - - remove unnecessary function attached to created hook - -commit 1b68176a65c74d5aca62322cc4f618fe11982ae1 -Merge: 8126d7a24 4e9d48d55 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 09:17:28 2018 -0800 - - Merge remote-tracking branch 'upstream/developer' into developer - -commit 8126d7a24be649eddf1c36aa5e3be8aae8abe1d1 -Merge: bc23eece6 592a59bd4 -Author: Fieran Mason-Blakley -Date: Thu Mar 8 09:17:03 2018 -0800 - - Merge branch 'ticket#737' into developer - -commit 4e9d48d5527c8cb594eb4cb2f85b0d8725481e8a -Merge: bf9b6e9b4 592a59bd4 -Author: Roland Stens -Date: Thu Mar 8 09:10:38 2018 -0800 - - Merge pull request #502 from fieranmason/ticket#737 - - Ticket#737 Ticket#831 - -commit b70c96c111b09e54e986302d7e210d9e623c6415 -Author: Steve -Date: Thu Mar 8 08:52:21 2018 -0800 - - remove static files from frontend folder and update references - -commit 592a59bd40aca81f649289701f0179a85561f4b0 -Merge: 272b130c9 bf9b6e9b4 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 19:40:18 2018 -0800 - - merge and resolve conflicts - -commit bc23eece66e6f793c61cda158b4f3680a730ddb4 -Merge: 26fd4da55 bf9b6e9b4 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 19:27:51 2018 -0800 - - Merge branch 'developer' into ticket#831 - -commit 272b130c92a10c6ad8c93037cdc3e3a3eed18356 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 19:22:25 2018 -0800 - - Added tests for no information feature - -commit a36c4425cd2a8e6996689c25eb80e76835b487f4 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 19:20:54 2018 -0800 - - Added selectors for no info spans - -commit 2872549d75f6994e8745690c51247f505de68c71 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 19:19:46 2018 -0800 - - changed ids to make them usable in a groovy context - -commit bf9b6e9b4e3a2ef4d88d1523bc47dc647ba8b683 -Author: Roland Stens -Date: Wed Mar 7 17:15:07 2018 -0800 - - Update readme.md - -commit 4d614f390507e4737b49eb3550f353894382dbc8 -Author: Roland Stens -Date: Wed Mar 7 16:59:17 2018 -0800 - - Update Jenkinsfile-developer - -commit 6a6c680e978c2b8a5a57c90a8554f68dd3aeb3f2 -Author: Roland Stens -Date: Wed Mar 7 16:58:36 2018 -0800 - - Update Jenkinsfile-perftest - -commit 7b06fbd9d965388d3ab314950cef0990aa3e2a29 -Author: Roland Stens -Date: Wed Mar 7 16:52:01 2018 -0800 - - Update Jenkinsfile-perftest - -commit df8b713acd907c2a1fb659b9d34141249aac001a -Author: Roland Stens -Date: Wed Mar 7 16:50:57 2018 -0800 - - Update Jenkinsfile-developer - -commit 0be1ae985d94899ca43099e3aa91a28ab083c889 -Author: Roland Stens -Date: Wed Mar 7 16:48:42 2018 -0800 - - Create Jenkinsfile-perftest - -commit ac20e835377dca4275199f65f5212ba1785ce5e3 -Author: Steve -Date: Wed Mar 7 16:19:28 2018 -0800 - - fix overwriting another url name from gwells app - -commit dd4697e19e0d437c6a8202bc716de1ae378e6939 -Merge: 7406549fb 7bafea738 -Author: Steve -Date: Wed Mar 7 15:54:21 2018 -0800 - - Merge branch 'developer' into frontend-bs4-vanilla - -commit 7406549fbcf57c8dbcbebad79430d4fd6ff41b5f -Author: Steve -Date: Wed Mar 7 15:53:55 2018 -0800 - - add tests for application detail - -commit 7bafea738a4f8bd66eb2ee68ca76fd0ef21713b8 -Merge: a27419a6f 8e72b49b9 -Author: garywong-bc -Date: Wed Mar 7 15:47:25 2018 -0800 - - Merge pull request #501 from rstens/developer - - Create perftest stage - -commit 8e72b49b991d414609b3295a01456ffba6da7bba -Author: Roland Stens -Date: Wed Mar 7 15:44:51 2018 -0800 - - Create perftest stage - -commit a1f03990ec69533c1ae473b4de26c382ce81e7bb -Author: Fieran Mason-Blakley -Date: Wed Mar 7 15:35:58 2018 -0800 - - Changed behaviour of empty result set for tabular data. Provides no data message when there are no rows to display. Affects: lithology, casings, liner details and screens. - -commit a27419a6fd16cb5a3ee4bd9387c976e48afbb5e6 -Author: Roland Stens -Date: Wed Mar 7 15:15:56 2018 -0800 - - Update README.md - -commit 45007a901c08053b3718c7a7dd750ee9bf6982e9 -Merge: dc832312d 28b8d33b5 -Author: Roland Stens -Date: Wed Mar 7 15:09:09 2018 -0800 - - Merge pull request #500 from rstens/developer - - Re-order JMeter execution - -commit 28b8d33b56463427087c0befe718c16a8e0f0f0d -Author: Roland Stens -Date: Wed Mar 7 15:00:12 2018 -0800 - - Re-order JMeter execution - -commit dc832312d08695c4dfefed92f423c41cdd46d2fd -Merge: 40146802a be0ff85e0 -Author: Roland Stens -Date: Wed Mar 7 14:56:08 2018 -0800 - - Merge pull request #498 from fieranmason/ticket#830 - - Ticket#830 - -commit efedbdd79a7253f513f6092d5203f9a36bc1d89a -Author: Steve -Date: Wed Mar 7 14:49:18 2018 -0800 - - add column sorting - -commit 40146802a7af2dc9163851d07556a958cbb86378 -Merge: 96372b610 f163bbb51 -Author: Roland Stens -Date: Wed Mar 7 14:44:42 2018 -0800 - - Merge pull request #499 from rstens/developer - - Re-activate JMeter - -commit f163bbb51f34011939b027f598f2b03aec6b4f45 -Author: Roland Stens -Date: Wed Mar 7 14:43:33 2018 -0800 - - Re-activate JMeter - -commit 26fd4da55efcb3092a2ad70e08b5b2de8362088a -Author: Fieran Mason-Blakley -Date: Wed Mar 7 14:41:22 2018 -0800 - - Added survey section back - -commit be0ff85e0f70b9cbf5199f3df6990bff95dd2f38 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 14:25:53 2018 -0800 - - Removed unit tests associated with data removed from the details page - -commit 3d391cbef2c72d0fe65252af4432b0b815185451 -Merge: df2ed9893 96372b610 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 13:59:15 2018 -0800 - - Merge branch 'developer' into ticket#830 - -commit df2ed9893725846867a1ba473ff5c71f459dae14 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 13:49:57 2018 -0800 - - removed well identification plate is attached - -commit 0d3e33cadbeb6e83a305456ca53cfc8dc862a987 -Author: Fieran Mason-Blakley -Date: Wed Mar 7 13:46:49 2018 -0800 - - removed water supply system well name, removed waster supply system name - -commit 96372b610c24b2d46af36e9a6820d10ae63d72c2 -Merge: c249997c7 d07442bb2 -Author: garywong-bc -Date: Wed Mar 7 12:54:15 2018 -0800 - - Merge pull request #497 from garywong-bc/developer - - Refactored unit tests to use new data model. - -commit d07442bb246474d4a3d98449ee05c9ab7af6e42d -Author: Gary Wong (BC Gov) -Date: Wed Mar 7 12:53:13 2018 -0800 - - Refactored unit tests to use new data model. - -commit c249997c76356ac33dbf4ea31e35555a0852be3e -Merge: 590b5af58 2d692a7e5 -Author: garywong-bc -Date: Wed Mar 7 12:29:39 2018 -0800 - - Merge pull request #496 from stephenhillier/developer - - Test fixes for django tests and postman API tests - -commit 2d692a7e5231be1582f4cd2aa63dea25f0d3d973 -Author: Steve -Date: Wed Mar 7 12:14:25 2018 -0800 - - fix test after province_state pk was changed - -commit 40f7a7118f2aeb40da632b8fa148d0707964bccc -Merge: f19e906dd c5639a0a6 -Author: Steve -Date: Wed Mar 7 12:02:09 2018 -0800 - - Merge branch 'developer' into frontend-bs4-vanilla - -commit c5639a0a6aaa1c0d49c65a87ed589df795f866cb -Merge: 9fdbbac07 590b5af58 -Author: Steve -Date: Wed Mar 7 12:01:18 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit f19e906dd713e88a748c525960cae67e880b5a47 -Author: Steve -Date: Wed Mar 7 12:00:48 2018 -0800 - - additional store tests - -commit 590b5af586ac6004e1ab3e8370657917e79d86fe -Merge: 17ed195a7 316ce719f -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Mar 7 11:40:22 2018 -0800 - - Merge pull request #495 from cwevans/developer - - Updated registries fixtures to match new data model. - -commit 316ce719f22a01b57a5d3934618af72bb51f2ed0 -Author: Christian Evans -Date: Wed Mar 7 11:30:10 2018 -0800 - - Updated registries fixtures to match new data model. - -commit 17ed195a79b0bd5dc202963d4c90d51fa62dd613 -Merge: e31414a9d 93c9a3204 -Author: garywong-bc -Date: Wed Mar 7 10:37:30 2018 -0800 - - Merge pull request #494 from garywong-bc/developer - - Remove obsolete reference to is_hidden - -commit 93c9a32041e0b72a6a571620d778c60bab9cb2d1 -Author: Gary Wong (BC Gov) -Date: Wed Mar 7 10:25:23 2018 -0800 - - Remove obsolete reference to is_hidden - -commit e31414a9d6e3a1b7c9a9afc9a1fd17a339598a1e -Merge: 0f0f877b3 71f97a2e5 -Author: garywong-bc -Date: Tue Mar 6 16:07:25 2018 -0800 - - Merge pull request #493 from garywong-bc/developer - - Updated list of legacy DB objects to reset. - -commit 71f97a2e5dd088532e81ec3d120501022d9fd766 -Author: Gary Wong (BC Gov) -Date: Tue Mar 6 16:06:07 2018 -0800 - - Updated list of legacy DB objects to reset. - -commit 0f0f877b37f14ab873c65e073a9dca8305a70036 -Merge: 4871627a6 37854b4e5 -Author: garywong-bc -Date: Tue Mar 6 15:47:54 2018 -0800 - - Merge pull request #492 from garywong-bc/developer - - V2 of DA fixes - -commit 37854b4e52f88616c072f9a3ae3474b228a8c7d1 -Author: Gary Wong (BC Gov) -Date: Tue Mar 6 15:46:34 2018 -0800 - - Prepare for final push of DA Standards changes. - -commit 4871627a689db0d4788a75c8a2c795fd37190c61 -Merge: 172699515 91efa4837 -Author: Roland Stens -Date: Tue Mar 6 14:39:13 2018 -0800 - - Merge pull request #491 from rstens/developer - - Removing the junit element for jmeter - -commit 91efa4837155ef0abdadb56afe3be879e5148993 -Author: Roland Stens -Date: Tue Mar 6 14:37:40 2018 -0800 - - Removing the junit element for jmeter - -commit 172699515aa04054db55e46354fe03812b4702a9 -Merge: e9a9fef8c 203d32fbc -Author: Roland Stens -Date: Tue Mar 6 14:11:29 2018 -0800 - - Merge pull request #490 from rstens/developer - - Remove assemble - -commit 203d32fbc0a377bd8551be7647fd553fd2e4cf25 -Author: Roland Stens -Date: Tue Mar 6 14:10:08 2018 -0800 - - Remove assemble - -commit fa2cc060609bab504e96a3ad8ee2654d5a44e854 -Merge: 5dc31a0a9 e9a9fef8c -Author: Gary Wong (BC Gov) -Date: Tue Mar 6 14:02:42 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit e9a9fef8c798724725f65c4e37024a77e3f210c0 -Merge: bff4a2a90 b94a7bbe9 -Author: Roland Stens -Date: Tue Mar 6 13:48:39 2018 -0800 - - Merge pull request #489 from rstens/developer - - Custom Assemble file - to support building the Registries frontend - -commit b94a7bbe95bd1367f26d8112a6ad610ae2342366 -Author: Roland Stens -Date: Tue Mar 6 13:47:29 2018 -0800 - - Custom Assemble file - -commit bff4a2a9046b34946a682ef5fc90f2d6c34b18f7 -Merge: f46346f8c e8240a09e -Author: Roland Stens -Date: Tue Mar 6 13:41:07 2018 -0800 - - Merge pull request #488 from rstens/developer - - temporarily disable performance test - -commit e8240a09e14c1e24faaf2558568afb33208b1aa0 -Author: Roland Stens -Date: Tue Mar 6 13:39:37 2018 -0800 - - temporarily disable performance test - -commit 05b705a8954c35ed20520dc05ca0ec3a1f502910 -Author: Steve -Date: Tue Mar 6 12:45:07 2018 -0800 - - always display notes header even if no notes - -commit b1a0e061402e13b0fc25f303affac50413d39006 -Author: Steve -Date: Tue Mar 6 12:19:17 2018 -0800 - - (cleanup) remove commented code - -commit 5a8ebcc6d5318aba8726b0a140f8f8598db8d460 -Author: Steve -Date: Tue Mar 6 12:16:54 2018 -0800 - - add input fields for adding classifications - -commit 1703b382886e87dc8eadd565a794711f9ac6d7fc -Author: Steve -Date: Tue Mar 6 12:16:14 2018 -0800 - - fix links opening in new tab and remove disabled inputs - -commit f46346f8c640e16934f5694c865df95ad12169c6 -Merge: 228653b2e af46a2b86 -Author: Roland Stens -Date: Tue Mar 6 11:55:21 2018 -0800 - - Merge pull request #487 from rstens/developer - - Reverse - -commit af46a2b86bd35ad34f44180d8fd34891662a70c9 -Author: Roland Stens -Date: Tue Mar 6 11:54:39 2018 -0800 - - Reverse - -commit 228653b2e243a5b83865cf5d6af780b46eadfda0 -Merge: 6ba2335f8 f62d494e8 -Author: Roland Stens -Date: Tue Mar 6 11:50:04 2018 -0800 - - Merge pull request #486 from rstens/developer - - Assemble update to insert custom build activities - -commit f62d494e817b30ec1766b23b0047542f9dc32b28 -Author: Roland Stens -Date: Tue Mar 6 11:48:49 2018 -0800 - - Assemble update - -commit 06ae2e9a91c31cb74e1f4ba2c3c4a06d27b499de -Author: Roland Stens -Date: Tue Mar 6 11:44:01 2018 -0800 - - Add custom set up to the assemble file. - -commit 509232001024e17a6e3689e448c700bdf889ac02 -Author: Steve Hillier -Date: Mon Mar 5 21:54:20 2018 -0800 - - fix typo for linter - -commit cfcae194eccf6d077ede9e1ea4657b6d5722c628 -Author: Steve Hillier -Date: Mon Mar 5 21:54:05 2018 -0800 - - start an add classification component - -commit 6ba2335f8b48c2d4e274f13b74770df10e5f903c -Merge: ba575bd6f 9b0cd25da -Author: Roland Stens -Date: Mon Mar 5 16:53:02 2018 -0800 - - Merge pull request #485 from rstens/developer - - Put environmnet variable into pipeline - -commit 9b0cd25dac825247a6cf61cfeb28e09bfbbdfe72 -Author: Roland Stens -Date: Mon Mar 5 16:52:15 2018 -0800 - - Put environmnet variable into pipeline - -commit cf51bd4b94deca7a929b2f121a58b16ae568b734 -Author: Steve -Date: Mon Mar 5 16:42:59 2018 -0800 - - add person edit view to router - -commit 237dc72ed839617f0668967a64a1ab99d982784c -Author: Steve -Date: Mon Mar 5 16:42:45 2018 -0800 - - reorganize table columns - -commit a1614bf8fdb4c6acf37e43440d3c00f5e248df9a -Author: Steve -Date: Mon Mar 5 16:42:19 2018 -0800 - - add person edit view - -commit aca6e0cb9796d33e61c019f22c69d6146cc011c2 -Author: Steve -Date: Mon Mar 5 16:42:09 2018 -0800 - - add user getter to test spec - -commit 7a475f220321c71b0644ed0d6e457e4fb53ee5c8 -Author: Steve -Date: Mon Mar 5 16:41:48 2018 -0800 - - temporarily remove results limit dropdown - -commit cbea294112ce3b413457c4beae0378d0f0cc4082 -Author: Steve -Date: Mon Mar 5 16:41:26 2018 -0800 - - add link to edit page - -commit fde475be9523d9a8673571a8a83a6e343a2a63fc -Author: Steve -Date: Mon Mar 5 16:41:14 2018 -0800 - - fix typo - -commit 47891eb4a01cabafc6bea0f76210a523ad0bcb59 -Author: Steve -Date: Mon Mar 5 16:41:05 2018 -0800 - - add postal code and website to contact serializer - -commit ba575bd6fc80c9b2da7a0013a04315cb50caa991 -Merge: 788620b20 a49ddd647 -Author: Roland Stens -Date: Mon Mar 5 15:06:55 2018 -0800 - - Merge pull request #484 from rstens/developer - - Put survey back otherwise the build breaks - -commit b271b7457e20e0e379490fe70661541611301c4c -Merge: 86eba86c1 e5576ed2b -Author: garywong-bc -Date: Mon Mar 5 14:13:53 2018 -0800 - - Merge pull request #483 from garywong-bc/master - - Including missing gunicorn file - -commit e5576ed2b546d0a0e7897a8ff4186d8f6160e89c -Author: Gary Wong (BC Gov) -Date: Mon Mar 5 14:13:21 2018 -0800 - - Including missing gunicorn file - -commit 5e64e7fca1e63889d21fbbe9cfb67390afc557fc -Author: Steve -Date: Mon Mar 5 13:44:58 2018 -0800 - - clean up commented out code - -commit 4157570f1fe4790e556e80e3b8c1715806521ae2 -Author: Steve -Date: Mon Mar 5 13:44:45 2018 -0800 - - add tests for ApiService - -commit 5332a9766922abfef55b6d2a50f6cb8a5682f54c -Author: Steve -Date: Mon Mar 5 13:44:30 2018 -0800 - - add mutations and getters tests - -commit 86eba86c1e7a4d28c25f689412f3d68a0d7efd84 -Merge: d7144b982 53e8fe611 -Author: garywong-bc -Date: Mon Mar 5 13:34:49 2018 -0800 - - Merge pull request #482 from garywong-bc/master - - Hot patch to hide Admin menu link and route. - -commit 53e8fe6116d7e55b497b75d53796abfefad703f5 -Author: Gary Wong (BC Gov) -Date: Mon Mar 5 13:34:10 2018 -0800 - - Hot patch to hide Admin menu link and route. - -commit a49ddd64758b23565870439bda36fafd5e1dac39 -Author: Roland Stens -Date: Mon Mar 5 13:29:54 2018 -0800 - - Put survey back otherwise - -commit 5dc31a0a99a1359e38fdeaa71371408163f65af6 -Merge: 842210709 788620b20 -Author: Gary Wong (BC Gov) -Date: Mon Mar 5 13:25:16 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 788620b20f43f112a0b251a7af553c38d61fdbfc -Author: Roland Stens -Date: Mon Mar 5 13:23:45 2018 -0800 - - Update base.html - -commit 95119aa9136dfd46071175192cd9db5f993876dd -Merge: cd0aaee76 f55b9e80b -Author: Roland Stens -Date: Mon Mar 5 13:20:23 2018 -0800 - - Merge pull request #481 from rstens/developer - - Put a variable around the Admin view from Fieran - -commit f55b9e80b623a051a8dd9d5034407eeb875e1dde -Author: Roland Stens -Date: Mon Mar 5 13:18:12 2018 -0800 - - Put a varaiable around the Admin view from Fieran - -commit 67fcf3a5b824603a99b3f5c7f56415cb3f7715b0 -Author: Steve -Date: Mon Mar 5 13:16:47 2018 -0800 - - change layout to bring layout closer in line with wireframes - -commit 4624678c08c3003c421111a2f14366e785735f3f -Author: Steve -Date: Mon Mar 5 13:15:56 2018 -0800 - - add tests for register home page - -commit e9c4d5fb372ca79c2de0c603f1f8e6fe67c7c2ac -Author: Steve -Date: Mon Mar 5 13:15:15 2018 -0800 - - add more tests for person detail view - -commit 727acfb155955e242e558fc60350435e39938387 -Author: Steve -Date: Mon Mar 5 13:14:54 2018 -0800 - - tests for error msg component - -commit d7144b9824c30ecd75d5a6c412b06d206adab46d -Merge: f75511a21 6e41a012e -Author: garywong-bc -Date: Mon Mar 5 10:44:51 2018 -0800 - - Merge pull request #480 from garywong-bc/master - - Updating requirements.txt and also downgraded python to 3.5... - -commit 6e41a012ed3f817f68efc65ee9d16a8140cb759b -Author: Gary Wong (BC Gov) -Date: Mon Mar 5 10:44:01 2018 -0800 - - Updating requirements.txt and also downgraded python to 3.5 at https://console.pathfinder.gov.bc.ca:8443/console/project/moe-gwells-tools/browse/builds/gwells?tab=history - -commit f75511a21bffd5782041876b50bbbed9607ab56d -Merge: ac76ce324 a1ff65a27 -Author: garywong-bc -Date: Mon Mar 5 10:31:58 2018 -0800 - - Merge pull request #479 from garywong-bc/master - - Patching S3 Document listings - -commit a1ff65a2719c8b9b05e6ec7b40a0c4381462a474 -Author: Gary Wong (BC Gov) -Date: Mon Mar 5 10:30:26 2018 -0800 - - Patching S3 Document listings - -commit 84221070934a86347f7e0bf3f223610e07c5591d -Author: Gary Wong (BC Gov) -Date: Mon Mar 5 10:29:16 2018 -0800 - - Git Ignore update - -commit 201b12963b7cf637a3c172731b6414a59eea7068 -Merge: 17a6f68f0 cd0aaee76 -Author: Gary Wong (BC Gov) -Date: Mon Mar 5 09:39:08 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 44141dd9779a8c2e1355eacd2ae29ce4dbca2401 -Author: Steve Hillier -Date: Sun Mar 4 23:17:47 2018 -0800 - - convert tests from chai asserts to jest - -commit a28c30971d29266a56d90e3bfafc4f9f526c3a87 -Author: Steve Hillier -Date: Sun Mar 4 23:16:39 2018 -0800 - - add tests for person detail view - -commit 8b48400a60db57073b51c55cdce9775e16fd6257 -Author: Steve Hillier -Date: Sun Mar 4 23:16:17 2018 -0800 - - fix typo in actions list - -commit 924e34dc13f274c7875e424794bd2963a7ed98d5 -Author: Steve Hillier -Date: Sun Mar 4 23:16:01 2018 -0800 - - add legal text component for display below results table - -commit 891444e148f092e2673a63c8efa9daa31bf9f0c2 -Author: Steve Hillier -Date: Sun Mar 4 23:15:39 2018 -0800 - - tests for legal text below search results - -commit aa6ff2f49bf0a0d6eb023c8b7512204c5726c7a4 -Author: Steve Hillier -Date: Sun Mar 4 23:15:17 2018 -0800 - - set up jest - -commit 66aa68c205a5d3c9b978b8306331c71ced1f82fc -Author: Steve Hillier -Date: Sun Mar 4 21:15:13 2018 -0800 - - add check for token in localstorage when loading app - -commit 5be8e59bb6df182127431a8e411b9c934ca3d65d -Author: Steve Hillier -Date: Sun Mar 4 21:14:50 2018 -0800 - - add legal text - -commit 5834f4a266232e9cf4e0c5024cae7fe9aa614e05 -Author: Steve Hillier -Date: Sun Mar 4 21:14:32 2018 -0800 - - clean up script section and add link to application detail page - -commit 1a9fe1f5bb43ab15cbad1788e92f7db6f4ee1853 -Author: Steve Hillier -Date: Sun Mar 4 21:13:59 2018 -0800 - - refinements to layout of application detail page - -commit bef7df90ceaced8d03707c22b76e1be63fd1b80d -Author: Steve Hillier -Date: Sun Mar 4 21:13:14 2018 -0800 - - clean up main app entry - -commit 108d99ac720432ce71db59a417bd33a3950c6fb9 -Author: Steve Hillier -Date: Sun Mar 4 12:25:23 2018 -0800 - - add more getter stubs to mocked vuex store - -commit ddd629edb7e52482869b457dac2375c00fad86f2 -Author: Steve Hillier -Date: Sun Mar 4 11:57:46 2018 -0800 - - add computed prop that lists applications and a table to display them - -commit 2b36a33931243e16ce7f0ec717030835517610ee -Author: Steve Hillier -Date: Sun Mar 4 11:56:15 2018 -0800 - - add driller list getter to home view - -commit 83e748cb94aacb1cfd9450e22b7c4b5e45cf0d94 -Author: Steve Hillier -Date: Sun Mar 4 11:55:50 2018 -0800 - - switch to truthy logic for displaying checkbox or not - -commit 2785fca901368f0c5f2bb8f7bf87b2cfe064f177 -Author: Steve Hillier -Date: Sun Mar 4 11:55:02 2018 -0800 - - remove redundant logging message - -commit 6509fd9efd060c32e14416d0d590194244321a9b -Author: Steve Hillier -Date: Sat Mar 3 23:40:35 2018 -0800 - - add token auth login/logout - -commit 8dce5edae85ad36364123281fdbea09caefc302a -Author: Steve Hillier -Date: Sat Mar 3 23:40:03 2018 -0800 - - add longer expiry time for JWT tokens - -commit dba8452b76bd402111acd8ed449b27c3328a29cf -Author: Steve Hillier -Date: Sat Mar 3 21:40:54 2018 -0800 - - add tests for filtering and searching - -commit f0359a13ac08098c01f532ebfa05170cd64a299a -Author: Steve Hillier -Date: Sat Mar 3 21:10:44 2018 -0800 - - add swagger doc url back - -commit 5bb459ed2e07afecf2bbe4145d23541cb2c178d0 -Merge: 5d99ae1b0 9fdbbac07 -Author: Steve Hillier -Date: Sat Mar 3 11:58:31 2018 -0800 - - Merge branch 'developer' of https://github.com/stephenhillier/gwells into frontend-bs4-vanilla - -commit 5d99ae1b04883ed90d1dcee93853628556289c39 -Author: Steve -Date: Fri Mar 2 16:30:52 2018 -0800 - - separate person detail and application detail pages - -commit ec4e26b00283c58c49c9df716acd22f5f4643a79 -Author: Steve -Date: Fri Mar 2 16:30:20 2018 -0800 - - add simple logging - -commit cd0aaee76aa73fe00a2a0fd2408ed4bf2b642ae9 -Author: Roland Stens -Date: Fri Mar 2 16:11:00 2018 -0800 - - Update Jenkinsfile-developer - -commit ad310555a52e12b97b66c5826909f08f6179a930 -Merge: f6f08b048 55ae88d38 -Author: Roland Stens -Date: Fri Mar 2 15:50:20 2018 -0800 - - Merge pull request #478 from fieranmason/PatchForTooManyDocsShowing - - Hot path for document regex and document display for multiple docs - -commit 55ae88d385780d2bcc250e636f64491483769dcf -Author: Fieran Mason-Blakley -Date: Fri Mar 2 15:43:19 2018 -0800 - - Hot path for document regex and document display for multiple docs - -commit f6f08b04839d913f259c584f43b3fe658575a824 -Merge: f7274e941 6ef0ee460 -Author: Roland Stens -Date: Fri Mar 2 15:26:37 2018 -0800 - - Merge pull request #477 from rstens/developer - - Add Perftest to pipeline. - -commit 6ef0ee460ddfddf8e2435961e949117be1751374 -Author: Roland Stens -Date: Fri Mar 2 15:25:39 2018 -0800 - - Add Perftest to pipeline. - -commit f78c083d99480a49d32d9a3945ade75300c7b3e6 -Author: Steve -Date: Fri Mar 2 15:15:25 2018 -0800 - - hide details links from anonymous users - -commit 66c45832a9dc2ed16cec39d461a2dd08aa7efdfb -Author: Steve -Date: Fri Mar 2 15:15:09 2018 -0800 - - quick login mocked, can be extended to real login later - -commit a689faf42bab8e566efdf07566c685f30445771b -Author: Steve -Date: Fri Mar 2 15:14:33 2018 -0800 - - add status code to application status serializer - -commit f7274e941f30c7f22e495200d87db753593624c6 -Author: Roland Stens -Date: Fri Mar 2 15:12:16 2018 -0800 - - Update build.gradle - -commit 816b04419de463d17279a7a968d3cc5ef85e5064 -Merge: 0e91f9f8b 715803898 -Author: Roland Stens -Date: Fri Mar 2 14:58:51 2018 -0800 - - Merge pull request #476 from rstens/developer - - Add JMeter Test - -commit 7158038984c7a38098b919015e6285557e9d0283 -Merge: 008a49de0 0e91f9f8b -Author: Roland Stens -Date: Fri Mar 2 14:58:43 2018 -0800 - - Merge branch 'developer' into developer - -commit f1959769c42f0c789c66748247ea4b7bfe925126 -Author: Steve -Date: Fri Mar 2 14:55:39 2018 -0800 - - add serializer for application status fields - -commit 008a49de0aa1632c7dcdde41cf31c4d977aea8b1 -Author: Roland Stens -Date: Fri Mar 2 14:29:08 2018 -0800 - - Add JMeter Test - -commit 3ca42a2a3e5b6664894e7ae481fe7d053287ff71 -Author: Steve -Date: Fri Mar 2 14:03:04 2018 -0800 - - add serializers for rest of application related fields - -commit ee0d147adf376a61af94e686883ea38c482aa56c -Author: Steve -Date: Fri Mar 2 14:02:44 2018 -0800 - - add registry models to admin page - -commit e04fec6692c6e1695351b34342a1a67393c8d472 -Author: Steve -Date: Fri Mar 2 11:48:22 2018 -0800 - - add qualificatoin picker and checkboxes - -commit 6000b5316bbf5c0d86ecf8311ed3d2cefd923a4b -Author: Steve -Date: Fri Mar 2 11:48:03 2018 -0800 - - create separate person edit view based on person detail view - -commit 3064b0697d9d0596080ad0e614a78a61734d6be7 -Author: Steve -Date: Fri Mar 2 11:47:08 2018 -0800 - - create small checkbox component with on/off state - -commit 0e91f9f8bb85f3204b3acdace4f5e6c26448b376 -Author: garywong-bc -Date: Fri Mar 2 11:22:17 2018 -0800 - - Revert - -commit 573370dc0259d9539f9db5a287873c559c84fcd8 -Author: garywong-bc -Date: Fri Mar 2 11:17:51 2018 -0800 - - Update urls.py - -commit 9fdbbac078434443a9771d226ba8782faa29f3b4 -Author: Steve -Date: Fri Mar 2 09:10:24 2018 -0800 - - remove tests that depend on fixtures being loaded - -commit eac0b4bf6c1510c5746a820cbc8a01dd5b342e2e -Author: Steve -Date: Fri Mar 2 08:46:04 2018 -0800 - - add webpack-stats.json to .gitignore (created during npm build) - -commit 68993567e40a19303ffcee6a870b2911e729714b -Merge: 9871367d6 1447c5152 -Author: Steve -Date: Fri Mar 2 08:45:32 2018 -0800 - - merge developer from origin - -commit 17a6f68f025c9889de2dd29ec8d3515778938dd2 -Merge: 05a74b8da 0d8915c72 -Author: Gary Wong (BC Gov) -Date: Thu Mar 1 23:04:48 2018 -0800 - - Post merge, with resolved conflicts into local 05a74b8 branch - -commit 05a74b8da2e438dead93985179bce9a89bc6d368 -Author: Gary Wong (BC Gov) -Date: Thu Mar 1 23:00:06 2018 -0800 - - DA fixes, after prov_state. - -commit 124aa1ef223ffad77cd7346eca4530e2015de1fc -Author: Steve Hillier -Date: Thu Mar 1 22:44:54 2018 -0800 - - populate cities list for both drillers and pump installers - -commit 84c6e7b248de6c91a0c1dac6f857286359febb83 -Author: Gary Wong (BC Gov) -Date: Thu Mar 1 21:19:36 2018 -0800 - - DA fixes - removed unnecessary status_flag from code tables. - -commit 1447c51524f7f51c075ee56f7c80cb3e78b0a309 -Author: Steve Hillier -Date: Thu Mar 1 21:10:06 2018 -0800 - - update api tests with better fail messages - -commit 068637d60019d26d89967e2521ec0df14a4d6ad0 -Author: Steve Hillier -Date: Thu Mar 1 20:57:38 2018 -0800 - - add better test error messages and explicitly request json - -commit 1edc9aa8759d544000e1e0856892f6dfbe306296 -Author: Gary Wong (BC Gov) -Date: Thu Mar 1 20:45:32 2018 -0800 - - Interim save, just prior to status_flag fixes. - -commit 9360b0d05133865b69d18270c422f967932d063a -Author: Steve Hillier -Date: Thu Mar 1 19:50:50 2018 -0800 - - add stubbed functions to test - -commit a16458dc489fc074e6b08db17e0622324f1eefa7 -Author: Steve Hillier -Date: Thu Mar 1 19:31:00 2018 -0800 - - add django-filter to requirements - -commit 8a707149dbf43562afcb7cdd9a2f48080b5065c7 -Author: Steve -Date: Thu Mar 1 16:52:30 2018 -0800 - - disable inputs for fields that arent ready to be used yet - -commit 2adc61d5497f09ebeaaeb0d4e38a04ce249b4ad1 -Merge: 868c3bcc4 9871367d6 -Author: Steve -Date: Thu Mar 1 16:19:51 2018 -0800 - - Merge branch 'developer' into frontend-bs4-vanilla - -commit a44dca6b59a5d89ab2eef6cb1bad727aa068863e -Author: Derek Roberts -Date: Thu Mar 1 16:07:45 2018 -0800 - - setup_osx.sh + set JAVA_HOME in ~/.bash_profile - -commit 9871367d6e477c852914004e77a65e4158843c7d -Merge: 2245aee3a 0d8915c72 -Author: Steve -Date: Thu Mar 1 16:04:44 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 868c3bcc4f78eaca22d9ee9b78501787f5c1fea0 -Author: Steve -Date: Thu Mar 1 16:03:26 2018 -0800 - - add support for search fields - -commit d1c06cbd5279d72dcf0538d83d15e52d46abe4a6 -Author: Derek Roberts -Date: Thu Mar 1 15:49:46 2018 -0800 - - setup_osx.sh - improve Java 8 install checks - -commit 41a3f3d755fb86945563c6dd11eaa7f6d737f026 -Author: Derek Roberts -Date: Thu Mar 1 15:48:35 2018 -0800 - - setup_osx.sh + check ~/.bash_profile for changes and recommend sourcing it - -commit 0d8915c726294df5ed21afc0941a1251e40b4d35 -Merge: d66888f51 c449104e9 -Author: Roland Stens -Date: Thu Mar 1 15:40:57 2018 -0800 - - Merge pull request #475 from fieranmason/RemoveCustomUser - - Remove custom user - -commit c449104e95eecc3434b2b3485e232b77273e3770 -Merge: 17b5f5d5d d66888f51 -Author: Fieran Mason-Blakley -Date: Thu Mar 1 15:33:26 2018 -0800 - - Merge branch 'developer' into RemoveCustomUser - -commit 17b5f5d5daa1ca4d96905c2a9f8e49c8173cfde3 -Author: Fieran Mason-Blakley -Date: Thu Mar 1 15:30:34 2018 -0800 - - reverted use of custom user - -commit 4613d38d9d1855058e8d8a35d7abcc1d05146d42 -Author: Derek Roberts -Date: Thu Mar 1 15:28:36 2018 -0800 - - setup_osx.sh - java link direct to 1.8 download - -commit 7cf71fcba5c6333187a2b45d28091f664cb073e6 -Author: Derek Roberts -Date: Thu Mar 1 15:27:57 2018 -0800 - - setup_osx.sh - shorten waits and some cleanup - -commit ef0192acce6e9b44275dd72002ee5ce935477a0e -Author: Steve -Date: Thu Mar 1 15:16:05 2018 -0800 - - populate city dropdown through api via store - -commit ef715b92ba568efa44d921111b66989841b58d03 -Author: Derek Roberts -Date: Thu Mar 1 14:34:08 2018 -0800 - - setup_osx.sh + wait for Java 8 install - -commit d66888f51def272dce6a8723834c9b4232da6323 -Author: Roland Stens -Date: Thu Mar 1 14:28:18 2018 -0800 - - Update custom-form.css - -commit 0d8d7bb92faa0051172bb07e57b09be42b6f69c2 -Merge: 459b9dbef ab2a62e40 -Author: Roland Stens -Date: Thu Mar 1 14:24:03 2018 -0800 - - Merge pull request #474 from fieranmason/ticket#355 - - Ticket#355 - added print button - -commit ab2a62e40b38b66e7880d11cf935b23d12e86e4c -Merge: 008ea33e8 459b9dbef -Author: Fieran Mason-Blakley -Date: Thu Mar 1 14:18:27 2018 -0800 - - Merge branch 'ticket#767' into ticket#355 - -commit 9f713fb8261691145f0ac84c3009f62ef1a48212 -Author: Steve -Date: Thu Mar 1 14:11:11 2018 -0800 - - add cities endpoint that returns list of cities with qualified drillers - -commit 008ea33e81e3e229c64d832866b80e4c78583b78 -Author: Fieran Mason-Blakley -Date: Thu Mar 1 14:09:19 2018 -0800 - - Added print button - -commit 459b9dbefdee1d64d62a8a17582ee9f5d41a4455 -Author: Roland Stens -Date: Thu Mar 1 13:54:56 2018 -0800 - - Sonarqube reported bug fix - -commit 98875e0cc8f8e4395e52385f4c1725b3e1a3de08 -Author: Roland Stens -Date: Thu Mar 1 13:49:47 2018 -0800 - - Fixing Sonarqube code smells - -commit a3bda6486c937bc4ea51d4d0ecd006c0d14a4cf9 -Author: Steve -Date: Thu Mar 1 13:09:53 2018 -0800 - - fixes for small screen layout - -commit d460e10025b265a6c4ce86895e3f8de7e1d69d1c -Author: Steve -Date: Thu Mar 1 13:04:26 2018 -0800 - - add full functionality for search form - -commit c9bca6cd5822295fe9fb9a0c31337e9155a126c6 -Author: Roland Stens -Date: Thu Mar 1 13:00:57 2018 -0800 - - Update runzap.sh - -commit a12384c728e5ff7dc3ccf404a090d3bf389051ae -Merge: 0135bea56 2245aee3a -Author: Steve -Date: Thu Mar 1 12:40:04 2018 -0800 - - merge upstream into branch - -commit 2245aee3aefa4e7e610e9323d21fa7a6c5954398 -Author: Steve -Date: Thu Mar 1 12:24:05 2018 -0800 - - remove commented out code - -commit 3d5cb655a6896e40b5fb1b84fed386d53039eb8f -Author: Gary Wong (BC Gov) -Date: Thu Mar 1 11:53:10 2018 -0800 - - Interim Save, after WellClassCode. - -commit ca3808786095e3ac29f34d3d86db43888b1ef4b9 -Merge: 5ec157c70 5010cfbd4 -Author: Roland Stens -Date: Thu Mar 1 11:43:52 2018 -0800 - - Merge pull request #473 from fieranmason/ticket#767 - - Removed alert in intro. Changed alert severity from danger to warning… - -commit 5ec157c70340dadedccc8bc11a8920a791036095 -Merge: eef821181 0e6f94046 -Author: Roland Stens -Date: Thu Mar 1 11:43:24 2018 -0800 - - Merge pull request #472 from stephenhillier/developer - - remove problem test (false positive if env variable missing) - -commit 0e6f94046823b498aa184131ff5600e10f1993d6 -Author: Steve -Date: Thu Mar 1 11:24:42 2018 -0800 - - remove problem test (false positive if env variable missing) - -commit 6994ff35003be923f024a136eab13126cca50186 -Author: Derek Roberts -Date: Thu Mar 1 11:18:32 2018 -0800 - - setup_osx.sh + java dl and install prompt - -commit eef821181633c77507a5b1915c66e9bdab52ed41 -Author: Roland Stens -Date: Thu Mar 1 11:16:57 2018 -0800 - - Update nose.cfg - -commit 0135bea561a551a9ad2200de263dab3c62f65dba -Author: Steve -Date: Thu Mar 1 10:57:08 2018 -0800 - - remove redundant #app div - -commit 5010cfbd4f6e51ff42c9c24c2ca6e47f2b96b3be -Author: Fieran Mason-Blakley -Date: Thu Mar 1 10:52:41 2018 -0800 - - Removed alert in intro. Changed alert severity from danger to warning in additional documentation section. - -commit a702ae52727b3ccb9b88ae84c941b23e82c6f911 -Author: Steve -Date: Thu Mar 1 10:49:26 2018 -0800 - - remove unnecessary Vue.use that causes error message - -commit 0d718b3998ea74fd58ba3101165295fc1e5b69bb -Author: Steve -Date: Thu Mar 1 10:40:43 2018 -0800 - - add stub for router-link - -commit 0c6492e369fc3fa67db57a9f660ff9a364ef9df0 -Author: Roland Stens -Date: Thu Mar 1 10:36:40 2018 -0800 - - Update nose.cfg - -commit 70ea1f03ed07e32fc97b317f2690d332d69e802a -Author: Steve -Date: Thu Mar 1 10:35:05 2018 -0800 - - add links to table - -commit d8082c1a217878e2307fbaa15bae27e6077b910b -Merge: 951cbd6f1 4d2658ecc -Author: Roland Stens -Date: Thu Mar 1 10:10:37 2018 -0800 - - Merge pull request #471 from stephenhillier/developer - - Add createtestuser command to generate a Postman API test user - -commit 358cea86e47db5b89ae56fb8c14f49cf79cc4b4b -Author: Steve -Date: Thu Mar 1 10:03:11 2018 -0800 - - reinstall node modules - -commit 951cbd6f1e7763331f4386e6274396233a9e37d1 -Merge: f86a322a7 1301ddfab -Author: Roland Stens -Date: Thu Mar 1 09:36:16 2018 -0800 - - Merge pull request #470 from rstens/developer - - Update Record counts - -commit 1301ddfabbe5bc11a83f3aa0fedcc1084a0d14a8 -Author: Roland Stens -Date: Thu Mar 1 09:35:12 2018 -0800 - - Update Record counts - -commit 4d2658ecc169cf2c9235c5dd8986b893a2feff5e -Author: Steve -Date: Thu Mar 1 09:31:58 2018 -0800 - - add staff flag to test user account - -commit 5e11b6349061ed827176adb54f24552d56825886 -Author: Steve -Date: Thu Mar 1 09:23:42 2018 -0800 - - add createtestuser command - -commit 27de19c95f131f3bced25efa2c9309d9611dd733 -Author: Steve -Date: Thu Mar 1 09:00:29 2018 -0800 - - Add built bundle files to gitignore - -commit e6cd22cbbb5f41b122833f7ad2077d95d6292f6c -Merge: 0649b9671 f86a322a7 -Author: Steve -Date: Thu Mar 1 09:00:05 2018 -0800 - - Merge upstream changes - -commit a004a4ce8cabd5dab9acf4dc9785970d83b70a25 -Author: Steve Hillier -Date: Wed Feb 28 22:43:56 2018 -0800 - - add checkboxes for person qualifications - -commit f2bc0cc0dfa4c6737090c68850d53ee46e0294a2 -Author: Steve Hillier -Date: Wed Feb 28 21:30:48 2018 -0800 - - removing cached webpack-stats.json - -commit 147cdfac4a3663b22db5eb4ee26835454c4a731a -Author: Steve Hillier -Date: Wed Feb 28 21:28:23 2018 -0800 - - Add file to gitignore - -commit b1a714a5c3f635e1df474cf1e5fd592476e9d3bd -Author: Steve Hillier -Date: Wed Feb 28 21:26:44 2018 -0800 - - Add fields to driller table - -commit 3ffc2e20f33cb8f95a49047d3bb790250ce84523 -Author: Steve Hillier -Date: Wed Feb 28 21:25:04 2018 -0800 - - Add webpack-stats.json to gitignore - -commit d845b78fd01dd7ee1f4052ca68a208deea25cb79 -Author: Steve Hillier -Date: Wed Feb 28 21:10:40 2018 -0800 - - Remove unused components and assets - -commit 170155a37704549a8302a31cfb55b093b62e20a8 -Author: Steve Hillier -Date: Wed Feb 28 21:10:25 2018 -0800 - - New build for Django template - -commit 4c2e8ef3c6e86fee5b110804ab141ddfb0d6e600 -Author: Steve Hillier -Date: Wed Feb 28 21:09:58 2018 -0800 - - Clean up test spec for linter - -commit 02da99196b1d378230210832ed27672aec5c83d1 -Author: Steve Hillier -Date: Wed Feb 28 21:09:41 2018 -0800 - - Add formatting to driller detail page - -commit efffcf8e8b43e714244f710ace2c3c2dfca98bce -Author: Steve Hillier -Date: Wed Feb 28 21:09:14 2018 -0800 - - Remove unused dependencies - -commit f86a322a76a5be09be38299c06dbbc24d9c91457 -Merge: f0b23002c 1734ad052 -Author: Roland Stens -Date: Wed Feb 28 16:56:37 2018 -0800 - - Merge pull request #469 from fieranmason/SurveyForm - - use reverse to avoid hard coding address - -commit 1734ad0521c23a56cd6581f7488f912ee8c25fb9 -Author: Fieran Mason-Blakley -Date: Wed Feb 28 16:55:43 2018 -0800 - - use reverse to avoid hard coding address - -commit f0b23002ce97f6b11135731610de2390f34d6dff -Merge: 6ecae04c7 68fa52e68 -Author: Roland Stens -Date: Wed Feb 28 16:53:14 2018 -0800 - - Merge pull request #468 from fieranmason/SurveyForm - - Hack to patch tests until problem with accessing APP_CONTEXT_ROOT can… - -commit 68fa52e688289a029a71341a801c370752755a9c -Author: Fieran Mason-Blakley -Date: Wed Feb 28 16:52:11 2018 -0800 - - Hack to patch tests until problem with accessing APP_CONTEXT_ROOT can be resolved - -commit 71cf5df1884b92f5d368c46e4958086800b73587 -Author: Steve -Date: Wed Feb 28 16:24:07 2018 -0800 - - Add sections to PersonDetail and pull in values from store - -commit 6ecae04c78767dcf6508f45b6f270f4d8d05091f -Merge: 2baff6361 11e6a403f -Author: garywong-bc -Date: Wed Feb 28 15:52:44 2018 -0800 - - Merge pull request #467 from fieranmason/SurveyForm - - Survey form feature completed and tested - -commit 221e236f9e7e7da08c28645504227082c29ae4a6 -Author: Steve -Date: Wed Feb 28 15:27:36 2018 -0800 - - Add driller detail page with link from driller list - -commit c2897fdfeb55ce23bd60731625ac5d4a096bd2cb -Author: Steve -Date: Wed Feb 28 15:27:09 2018 -0800 - - Add actions, state, mutations and getter for currentDriller - -commit 5000b5a12b5fb2a1e89db2babd72a2b0a1d59564 -Author: Gary Wong (BC Gov) -Date: Wed Feb 28 15:11:11 2018 -0800 - - Interim save, after LithologyMaterialCode. - -commit 64aee5709cfda5fa02417135ba53d4b987ce69b3 -Author: Steve -Date: Wed Feb 28 14:08:15 2018 -0800 - - Add test for driller fields and removed two unused tests - -commit 4d8fc8d683ec957151e32f18b5b49050861e709e -Author: Steve -Date: Wed Feb 28 13:49:09 2018 -0800 - - Move unused components into backup folder - -commit cd854cdfe623bb4ab96959519e71c7255b81e25c -Author: Steve -Date: Wed Feb 28 13:43:58 2018 -0800 - - Switch to ChromeHeadless for tests - -commit 6323e37451670d9e2b3166c6081ee741bec8acff -Author: Steve -Date: Wed Feb 28 13:43:42 2018 -0800 - - Simple tests for RegisterHome and RegisterTable components - -commit a08982a7b74171df7f72128032d69d2999665656 -Author: Steve -Date: Wed Feb 28 13:42:54 2018 -0800 - - Add some id attributes to tags to help test component - -commit 5e5718fa47cb8c8f3a960bc50daa4c14dd1c4fd8 -Author: Steve -Date: Wed Feb 28 13:42:02 2018 -0800 - - Fix location of static files - -commit 19112b37b641c8cefb1bcecdda67f2eae13e0cdf -Author: Gary Wong (BC Gov) -Date: Wed Feb 28 13:14:13 2018 -0800 - - Interim save, after IntendedWaterUseCode - -commit a681b29c02e89518ec1a5650e863311cfd63cea0 -Author: Steve -Date: Wed Feb 28 10:24:16 2018 -0800 - - Move assets out of src to avoid explicitly excluding them for tests - -commit da0024568adf58987ad7907f2273c107393fcf80 -Author: Steve -Date: Wed Feb 28 10:22:28 2018 -0800 - - Reorganize test config and app entry point to make for easier testing - -commit 2baff63615dcc60cc6e1c3af34c1dacb67c8ace5 -Merge: 380d8da72 82ad70ed8 -Author: Roland Stens -Date: Wed Feb 28 09:37:03 2018 -0800 - - Merge pull request #466 from rstens/developer - - update .gitignore - -commit 82ad70ed8402aa650ac252880b75446c95b84244 -Author: Roland Stens -Date: Wed Feb 28 09:36:21 2018 -0800 - - update .gitignore - -commit 380d8da720f2b1a3690cc27b0a65f86702ac698a -Merge: ebd9c880c 531d6e4ce -Author: Roland Stens -Date: Wed Feb 28 09:26:30 2018 -0800 - - Merge pull request #465 from rstens/developer - - Clean up files - -commit 531d6e4cef5791e436322b36b33d139e99e062e8 -Merge: 691f1c3ec ebd9c880c -Author: Roland Stens -Date: Wed Feb 28 09:26:22 2018 -0800 - - Merge branch 'developer' into developer - -commit 691f1c3ec85190d09804817964bef7f388ad6eb6 -Author: Roland Stens -Date: Wed Feb 28 09:07:37 2018 -0800 - - Updates to sonar-runner - -commit 5ff550b05f3f47c63e71728c7c728838977fd17f -Author: Gary Wong (BC Gov) -Date: Wed Feb 28 09:05:23 2018 -0800 - - Interim Save, after FilterPackMaterialSizeCode - -commit ca8f110a3c3cb195713bde5d05cd321165db6a73 -Author: Steve Hillier -Date: Tue Feb 27 22:32:22 2018 -0800 - - Add test for RegisterHome title - -commit 648a5fc7a9d794fe7ee18ef6880a1df75b9c7f15 -Merge: 4df90ba53 65d676475 -Author: Gary Wong (BC Gov) -Date: Tue Feb 27 17:38:28 2018 -0800 - - Merge branch 'da-changes-v2' into developer - -commit 4df90ba53f18253ca4536261f95aaa25dc687dd4 -Merge: a257d07a7 ebd9c880c -Author: Gary Wong (BC Gov) -Date: Tue Feb 27 17:37:38 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit a257d07a7090445208660f98bbf9400a5ad26ecd -Merge: feaa1222d ac76ce324 -Author: Gary Wong (BC Gov) -Date: Tue Feb 27 17:36:34 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells into developer - -commit 65d6764751f522f3834fca39a9f064f780b43d45 -Author: Gary Wong (BC Gov) -Date: Tue Feb 27 17:36:13 2018 -0800 - - Interim save, after Development Method Code - -commit 11e6a403f4964f091e9155153422d3f459df98db -Author: Fieran Mason-Blakley -Date: Tue Feb 27 17:00:43 2018 -0800 - - missed .models - -commit b7f3f6c1758e267b1ffeb00ed821f232bec98b33 -Author: Fieran Mason-Blakley -Date: Tue Feb 27 16:57:37 2018 -0800 - - remove gwells prefix to revert closer to upstream - -commit 5beaa77dfd9f379ccce4eb5cbc0440293f4ac5a1 -Author: Fieran Mason-Blakley -Date: Tue Feb 27 16:41:14 2018 -0800 - - Adding initial migrations for reset - -commit b27e598ed6e7a6bf6f1385cd80f8388b703236b4 -Author: Steve -Date: Tue Feb 27 16:29:47 2018 -0800 - - Add component for error handling - -commit 043cef5552c6665d818b8f2c4e90755ee4199d18 -Author: Steve -Date: Tue Feb 27 16:29:30 2018 -0800 - - Add FontAwesome - -commit 8af8163185b3f38084945801adf36f1ff336bfb9 -Author: Steve -Date: Tue Feb 27 16:29:13 2018 -0800 - - Increase throttling limits - -commit 6a88b2e65bd55a98a04898852711891f130784db -Author: Steve -Date: Tue Feb 27 16:29:02 2018 -0800 - - Change error state variable name to be more specific - -commit 927149049df899a2033d4b3219ef139a07368290 -Author: Steve -Date: Tue Feb 27 14:26:10 2018 -0800 - - Change api driller list response to flat json format (no nested objects) - -commit b9d26a72e6cbacd9c68397ebfc33a11dacecd090 -Author: Steve -Date: Tue Feb 27 12:54:58 2018 -0800 - - Add pagination to driller list - -commit d085162dee4568d66f4ba2b146bc0e3d6881b7e7 -Author: Steve -Date: Tue Feb 27 12:54:42 2018 -0800 - - Add DrillerDetail screen (with mock data for development) - -commit 1e84559025dbca16f88c28d47ac09be14191ab15 -Author: Fieran Mason-Blakley -Date: Tue Feb 27 12:43:19 2018 -0800 - - Suppressed 404 warnings for test output - -commit 37a7d0a7cedd51c91ae9741b99a1f39492eece7f -Author: Fieran Mason-Blakley -Date: Tue Feb 27 12:42:30 2018 -0800 - - Patched for model change - -commit e1221c99ca040b9b2e4e3b8eac6398dba8566bef -Author: Fieran Mason-Blakley -Date: Tue Feb 27 12:41:50 2018 -0800 - - patched for model change - -commit b99e4b34f455c729b37c8be484af44c0f6e7ce2c -Author: Fieran Mason-Blakley -Date: Tue Feb 27 12:40:34 2018 -0800 - - Patched for model changes - -commit b4d11a60affbe9a7c75816240b10a3c8dea86910 -Author: Fieran Mason-Blakley -Date: Tue Feb 27 12:40:05 2018 -0800 - - Patched for model change - -commit 1311ecdd530387589b402f2c9a3acca292e8901f -Author: Fieran Mason-Blakley -Date: Tue Feb 27 12:39:32 2018 -0800 - - patched white space issue - -commit 8ea17c89d513b84ac2d70e1f4865cf846dfcd55f -Author: Fieran Mason-Blakley -Date: Tue Feb 27 12:39:00 2018 -0800 - - pathched model name change - -commit 4a70c1b7e5f2289e934ee07651e62172ec83b1a7 -Author: Fieran Mason-Blakley -Date: Tue Feb 27 12:37:48 2018 -0800 - - patching to match model changes - -commit d6e2f5cd2001260f4678c0028a13629bcdf1d8d5 -Author: Fieran Mason-Blakley -Date: Tue Feb 27 10:59:52 2018 -0800 - - merging - -commit 64f614c150ea950193c5feb1bdb24d049fcd1a2f -Author: Gary Wong (BC Gov) -Date: Tue Feb 27 10:56:41 2018 -0800 - - incremental, at DecommisionMethodCode - -commit b7c44e7d9e6e862f801d7b8fe543d7587def5f3d -Merge: 6a034733b ebd9c880c -Author: Fieran Mason-Blakley -Date: Tue Feb 27 10:23:38 2018 -0800 - - merged - -commit 4c9452c0737830dd8e7045f7cc1207208af3533a -Author: Steve -Date: Tue Feb 27 10:20:24 2018 -0800 - - Remove promise rejection handling from api helper functions - -commit 4e8aa444bf7957ac6cf3d95f32af23a7b6cc1b16 -Author: Steve -Date: Tue Feb 27 10:19:55 2018 -0800 - - Clean up components - -commit a910b9903e48123c9bf78ab01bc55b8369b4a426 -Author: Gary Wong (BC Gov) -Date: Mon Feb 26 16:51:08 2018 -0800 - - incremental update - -commit 3272cfcd7c2d541e6d28b79a93e281524bce3b5a -Author: Steve -Date: Mon Feb 26 16:31:20 2018 -0800 - - Add better query string params for list requests - -commit 6326d5f727aec750f4079038c0fdcef437318899 -Author: Steve -Date: Mon Feb 26 16:08:36 2018 -0800 - - Making registry list view compatible with GWELLS css - -commit 58f8623f6be14ec439d2eb44da15db133e429c6d -Author: Derek Roberts -Date: Mon Feb 26 16:06:46 2018 -0800 - - setup_osx.sh - improved git setup checks, added autocrlf - -commit ba3a6ca881efff3896d1203467e27b1153caa0f6 -Author: Gary Wong (BC Gov) -Date: Mon Feb 26 15:49:32 2018 -0800 - - Removing is_hidden column and attribute - -commit f69bfb3c8b4ca4113d1d77b09abbf3d7ca7e0567 -Author: Steve -Date: Mon Feb 26 14:02:50 2018 -0800 - - Better encapsulation of css rules for mockup header/footer - -commit 6a034733b2e2dd8b1a9544aa8b53fa7be70ba89a -Author: Fieran Mason-Blakley -Date: Mon Feb 26 13:59:29 2018 -0800 - - Patch for unit test - -commit d85008de448b985f821c72bdd66151e31c330ab8 -Author: Steve -Date: Mon Feb 26 13:48:14 2018 -0800 - - Allow building directly to template/static dirs in Django app - -commit 7cd55e978f634b2334fa8681567a0716d2864d1c -Author: Steve -Date: Mon Feb 26 13:46:01 2018 -0800 - - Load Vue frontend with template at gwells/registries/ - -commit ab4d626b3ff1838f428445195d0728f09992ba86 -Author: Fieran Mason-Blakley -Date: Mon Feb 26 13:41:03 2018 -0800 - - corrections for bootlint - -commit ebd9c880c450bd9f000613516b3962cd442c858a -Merge: 44b779dac 48a03e77d -Author: Derek Roberts -Date: Mon Feb 26 12:56:05 2018 -0800 - - Merge pull request #464 from DerekRoberts/setup_osx - - Setup osx - -commit 48a03e77dd6a1666986f4c9bfcd8627261d2b28c -Merge: 5afd8bf62 44b779dac -Author: Derek Roberts -Date: Mon Feb 26 12:45:52 2018 -0800 - - Pulling in upstream developer - -commit 5afd8bf6232d2b384c903b0beb5b37530b33ef8a -Author: Roland Stens -Date: Mon Feb 26 11:47:36 2018 -0800 - - Delete developemnet files for authenticated ZAP - -commit 9b201b802f1284064fd74f6df7a80a81a5b8711c -Author: Derek Roberts -Date: Mon Feb 26 12:07:06 2018 -0800 - - setup/README.md - consistency and reordering - -commit 1503d2ba87223a40b4a06651ed0afe98dfc3c482 -Author: Gary Wong (BC Gov) -Date: Mon Feb 26 11:59:32 2018 -0800 - - Interm save prior to removing is_hidden - -commit af19d4f0ae1e5203e4ed927bc56dd4f94f3aee6c -Author: Derek Roberts -Date: Mon Feb 26 11:58:22 2018 -0800 - - setup_osx.sh - reordering and cleanup - -commit 1bc71ff2a1209fb30683da512c48a046b4962391 -Author: Roland Stens -Date: Mon Feb 26 11:56:15 2018 -0800 - - Clean up "test" piplines and configurations - -commit 44b779dac4118db3796f49cf15610e980df67503 -Merge: 5a8d72602 4b85a6b99 -Author: Roland Stens -Date: Mon Feb 26 11:48:44 2018 -0800 - - Merge pull request #463 from rstens/developer - - Delete developemnet files for authenticated ZAP - -commit 4b85a6b990d11d4d2bb879a799cb6f43747c83d3 -Author: Roland Stens -Date: Mon Feb 26 11:47:36 2018 -0800 - - Delete developemnet files for authenticated ZAP - -commit d65f2b27cb987b6bbe5d49f452d9deab830f7078 -Author: Derek Roberts -Date: Mon Feb 26 11:31:30 2018 -0800 - - setup_osx.sh - moved git config near beginning - -commit 70a1137d3632cd9c4e0c775a03d698428dc2df40 -Author: Derek Roberts -Date: Mon Feb 26 11:22:33 2018 -0800 - - setup_osx.sh + install Xcode command line tools - -commit 6ea05aac6c70d3186d73fbadc0b80af3a354a3e1 -Author: Roland Stens -Date: Fri Feb 23 15:28:19 2018 -0800 - - Add files via upload - -commit 68d70b09672ff25513ba12485999a59d3eb8164b -Author: Roland Stens -Date: Fri Feb 23 15:24:38 2018 -0800 - - Delete TFRS.context - -commit e3a3ae6f925f00885bc720bc8a71aa3d6c20fb70 -Author: Roland Stens -Date: Fri Feb 23 15:23:57 2018 -0800 - - Delete TFRS.session.data - -commit 8773f72eb34593cba1f246a0fb28b9c01f56d6a3 -Author: Derek Roberts -Date: Mon Feb 26 10:45:43 2018 -0800 - - setup_osx.sh - split up and removed step from psql setup - -commit 7cebb4202e6a9b730fa63a18cf505c975ba12f30 -Author: Derek Roberts -Date: Mon Feb 26 10:42:55 2018 -0800 - - setup_osx.sh - improved db checks - -commit c61d0494cee479eefd0476e4d3c57f2aa4e005ee -Author: Gary Wong (BC Gov) -Date: Mon Feb 26 09:25:39 2018 -0800 - - V3.0 of Rel 2 - -commit 8ca5c659556d31361a4759c11848622bea8bdbfa -Author: Fieran Mason-Blakley -Date: Mon Feb 26 09:18:30 2018 -0800 - - Added configuration feature to build - -commit d17c5a5df26248431f36cad5442e0396b82a9bc2 -Author: Fieran Mason-Blakley -Date: Mon Feb 26 09:04:20 2018 -0800 - - coforming to style guidines - -commit f56eb1a1fc3430a374c650bee8b00504541dba7a -Author: Fieran Mason-Blakley -Date: Mon Feb 26 09:03:49 2018 -0800 - - conforming to style guidlines - -commit c4ff5737ecdd8fa6705c7e8892b913730f0b058f -Author: Fieran Mason-Blakley -Date: Mon Feb 26 08:59:46 2018 -0800 - - conforming to style guidelines - -commit 904bff29222d8cb88eea86522bd4b90907aaf925 -Author: Fieran Mason-Blakley -Date: Mon Feb 26 08:57:54 2018 -0800 - - removed comment - -commit ac4408b63d29fff18ecb2beec19bec4441f7e904 -Author: Fieran Mason-Blakley -Date: Mon Feb 26 08:57:06 2018 -0800 - - removded use of deprecated width attribute - -commit bcd07381ec4df059fbe7d17f44cebeea66fbf24e -Author: Fieran Mason-Blakley -Date: Mon Feb 26 08:56:10 2018 -0800 - - removed commented out code - -commit e5a5ad4ec67ff28dd85fd2fa656120d53495dc86 -Author: Fieran Mason-Blakley -Date: Mon Feb 26 08:54:20 2018 -0800 - - cleaned up code smell --- sonarqube - -commit 2f0881a0c4ab98828171e7362aa13d9762f7ef4e -Author: Steve Hillier -Date: Sat Feb 24 20:51:51 2018 -0800 - - Add search capability - -commit 174b65b8238950b148a51a61a873a50d333d926a -Author: Steve Hillier -Date: Sat Feb 24 20:22:48 2018 -0800 - - Transform drillers api response (temporary - for testing) - -commit 80fe304351eb852ace0f2a20b8438b008cd2fd13 -Author: Steve Hillier -Date: Sat Feb 24 19:54:32 2018 -0800 - - Add corsheaders (necessary for local development) - -commit 8609ee76f250bffb4cc4c638957cf23391a51b3f -Author: Steve Hillier -Date: Sat Feb 24 19:36:43 2018 -0800 - - Add fetch driller list feature (fetching list from api to our store) - -commit 927c260aa8e917e02de07ce879926bdab5177c3f -Author: Steve Hillier -Date: Sat Feb 24 17:31:37 2018 -0800 - - Mockup with vue-bootstrap (bs4) using BC Gov 2.0 style - -commit 370cec3de63f3f86c784ccd7fe913552636e98f4 -Author: Steve Hillier -Date: Sat Feb 24 10:01:04 2018 -0800 - - Fix containers / rows / cols to allow responsiveness - -commit 663083435b17a64609302c0fb32765f158f6e2c0 -Author: Steve Hillier -Date: Sat Feb 24 09:19:19 2018 -0800 - - Add babel-polyfill for IE11 support - -commit 564142353e5d9fa6dcfc2cd6476605f16234ede6 -Author: Steve Hillier -Date: Fri Feb 23 23:12:59 2018 -0800 - - Fix layout of form - -commit d882c5cd5fc333051fc2270262e46ff59fbdee6b -Author: Steve Hillier -Date: Fri Feb 23 22:33:19 2018 -0800 - - Changed to more vanilla bs4 styling for development - -commit c4dc9da86e4c2d33e1a06fc24403de302bb5a4af -Author: Steve -Date: Fri Feb 23 16:29:34 2018 -0800 - - Basic scaffolding of vuex store - -commit 3bca347ecdfbad073f5b98bf7a8110c7f61cee1a -Author: Steve -Date: Fri Feb 23 16:29:14 2018 -0800 - - Add axios as dependency - -commit a00b31e380ca15810bf323e1c2d4bd27fedb667b -Author: Steve -Date: Fri Feb 23 15:44:45 2018 -0800 - - Add vuex to help manage state - -commit d9b1adbc977c3ffbaf645cb1c6e272f46a7245d6 -Author: Steve -Date: Fri Feb 23 15:36:41 2018 -0800 - - Semi-functional mockup of well driller search and table - -commit 5a8d72602ce1b9b52d7cb03c4d840798d32a7037 -Author: Roland Stens -Date: Fri Feb 23 15:28:19 2018 -0800 - - Add files via upload - -commit 7c295c178fd11305900e002bc4596779f9f20980 -Author: Roland Stens -Date: Fri Feb 23 15:24:38 2018 -0800 - - Delete TFRS.context - -commit 939ebeeda38a1733f8714e2fc1cdfc703b425767 -Author: Roland Stens -Date: Fri Feb 23 15:23:57 2018 -0800 - - Delete TFRS.session.data - -commit 0d56ea2350090df9a3c8a6e73831abef07286811 -Author: Roland Stens -Date: Fri Feb 23 14:38:49 2018 -0800 - - Update Jenkinsfile-zap - -commit 9c76c8c88f09b9e98a1039fd3cb56a6d4278aab1 -Author: Roland Stens -Date: Fri Feb 23 14:31:51 2018 -0800 - - Update Jenkinsfile-zap - -commit 3fb5db672bb28720980e4c1cc709f2569d81cf17 -Author: Roland Stens -Date: Fri Feb 23 14:28:57 2018 -0800 - - Update Jenkinsfile-zap - -commit 2994d1b482525a1ef61fb93ee1a0afe66380ec44 -Author: Roland Stens -Date: Fri Feb 23 14:16:30 2018 -0800 - - Update Jenkinsfile-zap - -commit e2ebb4eeb89747bd2cf18588cc6ab961b49c9938 -Author: Roland Stens -Date: Fri Feb 23 14:12:34 2018 -0800 - - Update runzap.sh - -commit e6cbb4122faea6cabf6ab46ad62b48009e67a1e7 -Author: Roland Stens -Date: Fri Feb 23 14:09:05 2018 -0800 - - Update Jenkinsfile-developer - -commit 63caa0fe02ddad4803db183e5458e22b0afb283d -Author: Roland Stens -Date: Fri Feb 23 14:01:51 2018 -0800 - - Update Jenkinsfile-zap - -commit bc2e1ed3d83e69ee3e1af173a6d1c79314c97abe -Author: Roland Stens -Date: Fri Feb 23 13:54:03 2018 -0800 - - Update runzapdev.sh - -commit 6619d099567c9e53fc960335684bebf81e6bc98c -Author: Roland Stens -Date: Fri Feb 23 13:51:11 2018 -0800 - - Update runzapdev.sh - -commit 80f84a69e8fa2607c65199ecda0329c0d5e3020d -Author: Roland Stens -Date: Fri Feb 23 13:47:48 2018 -0800 - - Update runzapdev.sh - -commit 6d35f85b6d1aa9fde7b0bd81d39b47df602ae10d -Author: Roland Stens -Date: Fri Feb 23 13:46:04 2018 -0800 - - Add files via upload - -commit 258b7e783c766ec57849a2737613180dc08bade2 -Author: Roland Stens -Date: Fri Feb 23 13:24:34 2018 -0800 - - Update runzapdev.sh - -commit f040ce71bb301be53930814d4d8ea8cdbb822fa6 -Author: Roland Stens -Date: Fri Feb 23 13:22:47 2018 -0800 - - Update runzapdev.sh - -commit f9903853e42db2de19ab790ef5ecee4e7689e97e -Author: Roland Stens -Date: Fri Feb 23 13:18:06 2018 -0800 - - Update runzapdev.sh - -commit d58bc08941a22c80266a2acda658c8f27beadc46 -Author: Roland Stens -Date: Fri Feb 23 13:12:23 2018 -0800 - - Update runzapdev.sh - -commit ad5da0e5fd74b04c415a14b5da0ca3853a2f217a -Author: Roland Stens -Date: Fri Feb 23 13:06:28 2018 -0800 - - Update runzapdev.sh - -commit bbfeb5d454453fafdfcaf9009a202d5f767a29df -Author: Roland Stens -Date: Fri Feb 23 12:59:18 2018 -0800 - - New context file for authenticated test - -commit 57e8d93ea305a35b58bd8252a3d40c6fa2c1b202 -Author: Derek Roberts -Date: Fri Feb 23 15:16:27 2018 -0800 - - setup_osx.sh + verbose mode w/ VERBOSE=true - -commit 894a051c6ebe17829b0182b5f59c2012e68b8b82 -Author: Roland Stens -Date: Fri Feb 23 14:38:49 2018 -0800 - - Update Jenkinsfile-zap - -commit 9b6a8732fcec2cf79215f061f83fcee5760e17e6 -Author: Roland Stens -Date: Fri Feb 23 14:31:51 2018 -0800 - - Update Jenkinsfile-zap - -commit 0a67ada6ee115c87f9a99a85633babdf2e88de9a -Author: Roland Stens -Date: Fri Feb 23 14:28:57 2018 -0800 - - Update Jenkinsfile-zap - -commit dc561a5c08cb281c67452e9b4648993c9b4a41c4 -Author: Roland Stens -Date: Fri Feb 23 14:16:30 2018 -0800 - - Update Jenkinsfile-zap - -commit c34449a7bd289dd63be1f0d49f712d78b7bab491 -Author: Roland Stens -Date: Fri Feb 23 14:12:34 2018 -0800 - - Update runzap.sh - -commit faac59a602341c4e50b87cf1806d386ca1135800 -Author: Roland Stens -Date: Fri Feb 23 14:09:05 2018 -0800 - - Update Jenkinsfile-developer - -commit d9986b2e7d7937c53b7d7b34dd5e5c4a81e16ca9 -Author: Roland Stens -Date: Fri Feb 23 14:01:51 2018 -0800 - - Update Jenkinsfile-zap - -commit b3c895c3bda2adbd6ee8dc59900485ec3c5c924e -Author: Roland Stens -Date: Fri Feb 23 14:00:49 2018 -0800 - - Update runzapdev.sh - -commit 00503763e81954eebfa6bb18aea26e5289fba45a -Author: Roland Stens -Date: Fri Feb 23 13:54:03 2018 -0800 - - Update runzapdev.sh - -commit d1755f8eea81a44c2e9af1f158cccf5b7b869e0e -Author: Roland Stens -Date: Fri Feb 23 13:51:11 2018 -0800 - - Update runzapdev.sh - -commit 114a3235f55c1ed30c4fd0ff1fd1aeca065ed70f -Author: Roland Stens -Date: Fri Feb 23 13:47:48 2018 -0800 - - Update runzapdev.sh - -commit a2ec5aaacf6473f89515259b15cd4b7b749941d8 -Author: Roland Stens -Date: Fri Feb 23 13:46:04 2018 -0800 - - Add files via upload - -commit bd6c56c8393d888275925c301b0a9ab8269f8777 -Author: Roland Stens -Date: Fri Feb 23 13:24:34 2018 -0800 - - Update runzapdev.sh - -commit afcc98ae16cfa3626ced5e790403fe92f5634259 -Author: Roland Stens -Date: Fri Feb 23 13:22:47 2018 -0800 - - Update runzapdev.sh - -commit 382e5dfc5f367eeee25d47aba2d8a6691d7ab92b -Author: Roland Stens -Date: Fri Feb 23 13:18:06 2018 -0800 - - Update runzapdev.sh - -commit 94eda8712634e27dd6eca824e8e88310f555c57b -Author: Roland Stens -Date: Fri Feb 23 13:12:23 2018 -0800 - - Update runzapdev.sh - -commit a875a81ae7d131d75db02052a444d709c154ebed -Author: Roland Stens -Date: Fri Feb 23 13:06:28 2018 -0800 - - Update runzapdev.sh - -commit a36bcbfeb61a05569c6ee5978d2b98758a59b41e -Author: Roland Stens -Date: Fri Feb 23 12:59:18 2018 -0800 - - New context file for authenticated test - -commit 150ec0265b491b625418ae07175af5549f114b1c -Author: Steve -Date: Fri Feb 23 12:49:29 2018 -0800 - - Reorganize registry homepage - -commit 7f4e7cadc7ea82a697330db6626f2fb4d8864b8e -Author: Steve -Date: Fri Feb 23 12:48:51 2018 -0800 - - Add bootstrap-vue as dependency - -commit b8852b059048fd924ed8c141d2f5e5d97ecf8e34 -Author: Derek Roberts -Date: Thu Feb 22 12:34:47 2018 -0800 - - README.md for setup and dev added to ./setup - -commit d11d3f1b5806752395c6ddebbc1d452c755b7629 -Author: Derek Roberts -Date: Thu Feb 22 12:31:02 2018 -0800 - - setup_osx.sh - python3 and slight reordering - -commit cd0b7951068f1bb2d9404a9fcd7a8f6eca8048f7 -Author: Derek Roberts -Date: Wed Feb 21 12:23:18 2018 -0800 - - setup_osx.sh - path juggling - -commit 39b05944babfa8819dc96f319b3192389324b467 -Author: Derek Roberts -Date: Wed Feb 21 11:47:20 2018 -0800 - - .gitignore + os files - -commit 7ac5cccd0595a65c31d0fd4dab876526fdd6f9f9 -Author: Derek Roberts -Date: Tue Feb 20 15:51:35 2018 -0800 - - +setup/ - for setup scripts, so far just setup_osx.sh - -commit 73c3d3847347d1c86761bd48dd4d935aa00db3b8 -Author: Derek Roberts -Date: Tue Feb 20 14:34:08 2018 -0800 - - setup_osx.sh - open browser after delay - -commit 99bb7f8251c52edb28ae5b8e59c13d339e17f6df -Author: Derek Roberts -Date: Tue Feb 20 14:33:44 2018 -0800 - - setup_osx.sh - config db with env vars - -commit 03c69def781b39866ccbd99c2c3b2322d9751c9b -Author: Derek Roberts -Date: Tue Feb 20 14:30:19 2018 -0800 - - setup_osx.sh - run server - -commit 115e545434f36ad95bcd11fec53c86f8e8c1ba9d -Author: Derek Roberts -Date: Tue Feb 20 14:29:48 2018 -0800 - - setup_osx.sh + dev db - -commit 7b12b420a82d01182ad99cf0f44ceab8393d5cb4 -Author: Derek Roberts -Date: Tue Feb 20 14:18:22 2018 -0800 - - setup_osx.sh - stop printing every command to terminal - -commit 2850107be3888f14f6ff7ae706c217816b261130 -Author: Derek Roberts -Date: Tue Feb 20 14:17:37 2018 -0800 - - setup_osx.sh - suppress errors from mkvirtualenv - -commit 962dd51b3f458c8d0f62b848519e635cf16176d7 -Author: Derek Roberts -Date: Tue Feb 20 13:47:34 2018 -0800 - - setup_osx.sh + pip3 install requirements - -commit 35fd7335a93dac2d5a4bcb06a34e0edd091339ef -Author: Derek Roberts -Date: Tue Feb 20 12:49:04 2018 -0800 - - setup_osx.sh + set upstream remote for dev - -commit 50c1c8c01e93df8381bc7f86ad6eb74fa9c7c182 -Author: Derek Roberts -Date: Tue Feb 20 12:32:06 2018 -0800 - - setup_osx.sh + setup and run mkvirtualenv - -commit 726e4411ce00728c089e0ba18a30fc437ca988c9 -Author: Derek Roberts -Date: Tue Feb 20 11:08:12 2018 -0800 - - setup_osx.sh + .bash_profile config for virtualenvwrapper - -commit 44c925d2270d02925f00ca543849b62e22d710d5 -Author: Derek Roberts -Date: Tue Feb 20 10:54:46 2018 -0800 - - setup_osx.sh - switched from which to brew list for package checks - -commit 2dd81db1ca1bd45bfc31c9e0fc5d67be2a76784a -Author: Derek Roberts -Date: Tue Feb 20 10:53:30 2018 -0800 - - setup_osx.sh - comments and cleanup - -commit 777685606acd1607d5f9d16554d657e2b78e1489 -Author: Derek Roberts -Date: Mon Feb 19 15:28:50 2018 -0800 - - setup_osx.sh + pip installs for virtualenv and virtualenvwrapper - -commit 89d30a30efa3c4ed40965a9713218393b0b0ebe3 -Author: Derek Roberts -Date: Mon Feb 19 12:53:34 2018 -0800 - - setup_osx.sh + check in psql setup - -commit 53a3e2134f19d2154dcf9481dcc91351711e163b -Author: Derek Roberts -Date: Mon Feb 19 11:23:00 2018 -0800 - - setup_osx.sh + create db and set owner - -commit a3693dddaa4c658309eebdc471bec9825badb514 -Author: Derek Roberts -Date: Mon Feb 19 10:44:24 2018 -0800 - - setup_osx.sh + psql user - -commit f144a90781d999363bafd7c866e5b0c6f2d20f4d -Author: Derek Roberts -Date: Mon Feb 19 10:43:52 2018 -0800 - - setup_osx.sh + init db - -commit 0119659bd977487e6a6ff9bb1c3b39d6174b5ef8 -Author: Derek Roberts -Date: Mon Feb 19 10:43:03 2018 -0800 - - setup_osx.sh + postgres service - -commit 8b18e92f50981d13b93a9b00b2d9b1007c5e5c66 -Author: Derek Roberts -Date: Sat Feb 17 20:07:30 2018 -0800 - - +setup_osx.sh - start of setup for OS X - -commit 837c4d0dca8a928795150fe54c96b782a678511f -Author: Roland Stens -Date: Fri Feb 23 11:42:00 2018 -0800 - - Update Jenkinsfile-developer - -commit 2f6baa60a9a90c662466da9308c1929b8ef3c4bc -Author: Roland Stens -Date: Fri Feb 23 11:38:29 2018 -0800 - - Update runnewman.sh - -commit 50f51ee1e042e90ab1fe51e5f3f35b65d3189d73 -Author: Roland Stens -Date: Fri Feb 23 11:32:17 2018 -0800 - - Delete apitest.json - -commit fd8dd6b3496e6eb08cd0c43888db748a7a943924 -Author: Roland Stens -Date: Fri Feb 23 11:09:37 2018 -0800 - - Update Jenkinsfile-developer - -commit 7f055449bb4ec65132727af909408ae1f1c056e0 -Author: Roland Stens -Date: Fri Feb 23 11:08:29 2018 -0800 - - Update runnewman.sh - -commit 0039f6d2704b6c06a15c41417525af553493977a -Author: Roland Stens -Date: Fri Feb 23 09:31:31 2018 -0800 - - Update runnewman.sh - -commit 47e270f1d3acdf9599ec167c925290456f81596c -Author: Roland Stens -Date: Fri Feb 23 09:31:20 2018 -0800 - - Update runnewman.sh - -commit 028a235492b5c62c4cf08cf80c311b2cfd4e98b4 -Author: Roland Stens -Date: Fri Feb 23 09:12:54 2018 -0800 - - Update Jenkinsfile-developer - -commit 93e8fb10826dca5f816a33a8a875d125d6dce1b3 -Author: Steve Hillier -Date: Thu Feb 22 21:29:17 2018 -0800 - - Fixed up mockup version of header/footer - -commit 1b6e665820789db8b584e84cfec134a9825af19c -Author: Steve Hillier -Date: Thu Feb 22 20:48:48 2018 -0800 - - Reorganize asset files (css etc) - -commit 95ec49008a6b282795118b3e6a129ed1c5c0bfd3 -Author: Roland Stens -Date: Thu Feb 22 16:39:06 2018 -0800 - - Update runnewman.sh - -commit 2d7bf6bb7d413af52ae8000228dbef6586d03ef8 -Author: Roland Stens -Date: Thu Feb 22 16:21:01 2018 -0800 - - Update Jenkinsfile-developer - -commit d873f41eee47e100390957305d60d780dcd10410 -Author: Roland Stens -Date: Thu Feb 22 16:20:07 2018 -0800 - - Update runnewman.sh - -commit 8bb7b3f03e47f36d72e630a7d1963ea6615bef29 -Author: Steve -Date: Thu Feb 22 16:19:15 2018 -0800 - - Add simple layout for list of companies with registered drillers - -commit 9fbaaaa2162e65eeca91bf39ede47f556898c41b -Author: Roland Stens -Date: Thu Feb 22 16:09:45 2018 -0800 - - Update runnewman.sh - -commit b2f23efd6f80f8fba9484767dbf3873902f56268 -Author: Roland Stens -Date: Thu Feb 22 16:09:01 2018 -0800 - - Update Jenkinsfile-developer - -commit 59400f5461d09b2a8283772b3d90741ee81d99b9 -Author: Roland Stens -Date: Thu Feb 22 16:06:38 2018 -0800 - - Update Jenkinsfile-developer - -commit feaa1222d23dd3fe92f55e594d36f1fe9aedc411 -Author: Roland Stens -Date: Thu Feb 22 15:36:35 2018 -0800 - - Update runnewman.sh - -commit b00e3e8258b35d6aa7a10488ec6f9a25a2ff1f08 -Author: Roland Stens -Date: Thu Feb 22 15:33:45 2018 -0800 - - Update runnewman.sh - -commit f168a478344bde60eafc1fc89239afc03a412a05 -Author: Steve -Date: Thu Feb 22 15:15:02 2018 -0800 - - Add more support for BC Gov bootstrap styles - -commit 1ed4c681d245244e1af78c147f850eac681f4564 -Author: Roland Stens -Date: Thu Feb 22 14:43:55 2018 -0800 - - Update runnewman.sh - -commit 3b58b7e0f70d4ca670f316149876b1e7647c2ccf -Author: Steve -Date: Thu Feb 22 14:36:04 2018 -0800 - - Testing VueJS and BCGov bootstrap compatibility - -commit 97ea4becacbc2f8d7a9f1d27bc8cae24c3c3efa3 -Author: Roland Stens -Date: Thu Feb 22 14:35:08 2018 -0800 - - Update Jenkinsfile-api-test - -commit bf98f70b23e99cf218724d01b24402bd9a8e5181 -Merge: 633ccb5d3 ea5a0e285 -Author: Roland Stens -Date: Thu Feb 22 14:32:40 2018 -0800 - - Merge pull request #462 from rstens/developer - - Set execute bit - -commit ea5a0e2852c3ee258df13266238bffcf5999d8c2 -Author: Roland Stens -Date: Thu Feb 22 14:31:52 2018 -0800 - - Set execute bit - -commit 633ccb5d3ec62dde1ddd1f94b9a53b532cea4ba1 -Author: Roland Stens -Date: Thu Feb 22 14:30:19 2018 -0800 - - API Tests run command - -commit e5834c4af3b14a7d652b22e4ac33b8126fc9db01 -Author: Steve -Date: Thu Feb 22 13:02:25 2018 -0800 - - Clone bootstrap skeleton into assets - -commit 089c59bba8ff1a373c44d92921242aada2ab44f2 -Author: Steve -Date: Thu Feb 22 13:02:03 2018 -0800 - - Change directory structure to accomodate future apps - -commit d10beba92932128bb8a83b30297ae525ec6feb40 -Author: Steve -Date: Thu Feb 22 11:30:20 2018 -0800 - - Scaffold frontend folder for Vue/webpack with vue-cli - -commit 0649b9671a325aa437b6db76dfa62901969fec4c -Author: Steve -Date: Thu Feb 22 11:05:54 2018 -0800 - - Add gitignore for frontend folder - -commit 80e18c34cbd8994850c0e8a7ba00c6c77466220f -Merge: cff7e051a f94012f72 -Author: Roland Stens -Date: Thu Feb 22 10:53:51 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 73d62fba527eeb8a463ef1bda4325f7e852966a1 -Author: Steve -Date: Thu Feb 22 10:43:04 2018 -0800 - - add frontend/node_modules/ dir to .gitignore - -commit f94012f729c6b04eecb64c9c886018c2249ce21e -Author: Roland Stens -Date: Thu Feb 22 10:42:24 2018 -0800 - - Update Jenkinsfile-api-test - -commit dfe4bb663cbe6681e5b7c326f8f14888eddd6322 -Merge: 2671dc0f3 fc6156775 -Author: Roland Stens -Date: Thu Feb 22 10:33:58 2018 -0800 - - Merge pull request #461 from stephenhillier/developer - - Remove fixture data from postman tests - -commit fc61567750e9fdec9d5edb00d0753ed4eb8d90d6 -Merge: 975d49ecf 2671dc0f3 -Author: Steve -Date: Thu Feb 22 09:22:38 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 2671dc0f3a69da87bb412488d14b76fd450141ba -Author: Roland Stens -Date: Wed Feb 21 17:46:19 2018 -0800 - - Update README.md - -commit 913699583b4392e7eee1ffad5a584721fbd9816e -Author: Roland Stens -Date: Wed Feb 21 17:46:00 2018 -0800 - - Update README.md - -commit 64861cc8cc2ad827b20ef6e3b92af1212fb803a8 -Author: Roland Stens -Date: Wed Feb 21 17:43:10 2018 -0800 - - Update README.md - -commit c10d5939878928abd2f8a80bd53bbfdb2e4aba16 -Author: Roland Stens -Date: Wed Feb 21 17:42:52 2018 -0800 - - Update README.md - -commit 615269f02212c38317d5dc6ca84d69865b981d8b -Author: Roland Stens -Date: Wed Feb 21 17:39:23 2018 -0800 - - Update README.md - -commit 18274c59de6d3c268b6efe29f40e8ef539822fed -Author: Roland Stens -Date: Wed Feb 21 17:39:01 2018 -0800 - - Update README.md - -commit be7105528acd547a2b6d5e42c5881a09dc9d6e32 -Author: Roland Stens -Date: Wed Feb 21 17:38:16 2018 -0800 - - Update README.md - -commit 3c016866b507e52d43d066fd876e456137dd08a3 -Author: Roland Stens -Date: Wed Feb 21 15:26:54 2018 -0800 - - Reactivate the swagger piece - - We can now re-activate swagger as we have found the issue with the slow server. - -commit fafb6f1eb546517cc601e8d01570ab9839af6cc4 -Author: Roland Stens -Date: Wed Feb 21 15:25:11 2018 -0800 - - Re-activate swagger - - We have found the issue, now we can re-activate swagger. - -commit 37a0423c893c09d459108f8fb90d72b3a1fa3ae5 -Author: Roland Stens -Date: Wed Feb 21 14:02:32 2018 -0800 - - Create gunicorn.cfg - -commit 1b13176d9cb49c73ac2528c07509077689e541ac -Author: Roland Stens -Date: Wed Feb 21 11:10:10 2018 -0800 - - Update requirements.txt - -commit 668213948639ac7d843008b3e3dd456940343119 -Author: Roland Stens -Date: Wed Feb 21 09:19:26 2018 -0800 - - Putting the registries tests back in - - Debugging the issue, by eliminating the swagger views and re-activating the registries unit tests - -commit b3e247e78a547aab2f4aff8cacb98b1a001f4a0c -Author: Roland Stens -Date: Wed Feb 21 09:17:04 2018 -0800 - - Commenting out swagger - - To debug the issues we commented out swagger. - -commit 6dc426d5cede2f8b8728d567844b73d8c23b76ac -Author: Roland Stens -Date: Wed Feb 21 09:16:05 2018 -0800 - - Point to the registries URL again - - This is part of the debugging of the solution, we have disabled the swagger component, but will to run with all the other registries services. - -commit 54dde01a6eb3283938c22cb081a0b09af5dd9e4b -Author: Roland Stens -Date: Wed Feb 21 09:14:43 2018 -0800 - - Comment out swagger - -commit 92908a33534754a6caa7e6428c10530a89df4753 -Author: Roland Stens -Date: Tue Feb 20 13:43:16 2018 -0800 - - Switch back to the psycop2 binary - -commit 933f9eb1b9bfb45b462999d608409e6b1d78810f -Author: Roland Stens -Date: Tue Feb 20 13:05:47 2018 -0800 - - Update urls.py - -commit af08746abe8af2f569a15fc233e96491bebfe8f4 -Author: Roland Stens -Date: Tue Feb 20 13:02:46 2018 -0800 - - Update settings.py - -commit 473fe6b7564126c58efdc755b9d827f41153c355 -Author: Roland Stens -Date: Tue Feb 20 12:59:32 2018 -0800 - - Update nose.cfg - -commit b36cd5d0351ed3936aeba1db7915212766959deb -Author: Roland Stens -Date: Tue Feb 20 11:06:40 2018 -0800 - - Update requirements.txt - -commit 6bb88175fe0780b48824cebf8221a1b4daede61a -Author: Roland Stens -Date: Tue Feb 20 10:42:42 2018 -0800 - - Update nose.cfg - -commit 975d49ecfd3db86063050fff8d05030dac040828 -Author: Steve -Date: Tue Feb 20 10:00:46 2018 -0800 - - Remove fixture data from postman tests - -commit f07519042bb39a4735505d658a45b9818931d86b -Author: Roland Stens -Date: Tue Feb 20 09:40:50 2018 -0800 - - Update nose.cfg - -commit 138f6f15cc7996188933e7e885ae748cf68f27cc -Merge: 666679db6 cc3afc001 -Author: Roland Stens -Date: Tue Feb 20 09:33:57 2018 -0800 - - Merge pull request #460 from stephenhillier/developer - - Refactor registries API views.py - -commit cc3afc00155f2081d29ab1b56aa9a882f148cf11 -Author: Steve -Date: Tue Feb 20 09:22:33 2018 -0800 - - Export new postman collection with env variables - -commit 4a709e12f7537461b346bafda6c26106bac5a050 -Merge: 666679db6 cc793eb23 -Author: Steve -Date: Tue Feb 20 09:16:18 2018 -0800 - - Merge branch 'registries-views' into developer - -commit cc793eb2372059fd8e56c9d95ea2799c37c271ce -Author: Steve -Date: Tue Feb 20 09:15:44 2018 -0800 - - Minor clean up (organization of view class properties) - -commit 017a25291d8662cd154b266058107207d5bd68a2 -Author: Steve Hillier -Date: Mon Feb 19 22:44:12 2018 -0800 - - Add default safe serializer to each view (in case request=None) - -commit 52a2b39a859c156f7620ff84a96d7975a84a6b1f -Author: Steve Hillier -Date: Mon Feb 19 22:11:48 2018 -0800 - - Refactor views for Person and Organization resources - -commit 3631990d79b981999243b3353b1e5c40883dae81 -Author: Steve -Date: Mon Feb 19 18:54:43 2018 -0800 - - Refactor organization view - -commit 666679db6f712e0515ba897fac9f2c9576d758e9 -Author: Roland Stens -Date: Mon Feb 19 16:46:13 2018 -0800 - - Update build.gradle - -commit 2db85df08fd685a804f91680e4a1e58896a795e0 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:36:47 2018 -0800 - - added unit tests - -commit 7571c7cfac7b12e034ad0f079b364bda65f1a211 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:36:22 2018 -0800 - - added fixtures for unit tests - -commit 9e879135ac7e0ee7d63a40faffddec006796dff6 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:35:16 2018 -0800 - - added configurable output swallowing. added some test files - -commit 2dbf24eb39532651b8bfe1873cfa06e98ceb1046 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:27:02 2018 -0800 - - cleaned up edge case handling - -commit 3ab9b70937078cff6d566d98baf0637c76167d7f -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:26:03 2018 -0800 - - enabled surveys - -commit d34c63835cb2275f5ac780e89588dd9db650346e -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:25:13 2018 -0800 - - enabled surveys - -commit 4c68b6adecda9bde2bae5bee21a6e9fdb86e3eeb -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:24:41 2018 -0800 - - cleanup for code style, enabled surveys - -commit a8b5e6ac1d69d6b486937ac017831610c8dbbef4 -Author: Roland Stens -Date: Mon Feb 19 16:24:25 2018 -0800 - - Update apitest.json - -commit 89532a9e9e7101cbd86dfb110a88010fb4cc7bd7 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:23:41 2018 -0800 - - enabled surveys on registry page - -commit 7de4563bf34097bd6cd94d3a552e83efd58dd5c9 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:23:07 2018 -0800 - - added survey view tests - -commit 087579b0ca7f484e469da8e125495b8437405487 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:22:34 2018 -0800 - - removed commented out survey component - -commit e8d4b053eb6d6032aa4421fa9d41f9b002bf272e -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:21:36 2018 -0800 - - cleaned up survey layout - -commit c26f2646ee71c16abbb00a06fb6cb18a553c0f46 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:20:56 2018 -0800 - - whitespace changes for readability - -commit 132d9b34cf84e27a1e552c9a3e81ec2f84430b8d -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:19:47 2018 -0800 - - Added survey template to base. Some whitespace changes for readability - -commit d8be9a7f5c849557e41a620802bdafebac4408d6 -Author: Fieran Mason-Blakley -Date: Mon Feb 19 16:18:19 2018 -0800 - - added styling for admin page - -commit f63b013e95f2a328456f85618879d72237a6e679 -Author: Roland Stens -Date: Mon Feb 19 16:07:28 2018 -0800 - - Update README.md - -commit f77adea2d9d28ac96b69f637c78ac6e89b885048 -Author: Roland Stens -Date: Mon Feb 19 16:06:36 2018 -0800 - - Update README.md - -commit aecb970f71bf7f24fcc41e17e209e231c9307b00 -Author: Roland Stens -Date: Mon Feb 19 16:04:46 2018 -0800 - - Update README.md - -commit bf8fa104295290dc337be30b9389d18451168f50 -Author: Roland Stens -Date: Mon Feb 19 16:04:00 2018 -0800 - - Update README.md - -commit 17ed4633f179057a7ad83abdaddcfdd3544b9621 -Merge: 4295b0ed8 d6eda404e -Author: Roland Stens -Date: Mon Feb 19 12:56:16 2018 -0800 - - Merge pull request #459 from stephenhillier/developer - - Remove manage.py createtestuser command - -commit d6eda404ec1488beef302a07ed964f2cf4ed496b -Merge: 3c9531a6e 4295b0ed8 -Author: Steve -Date: Mon Feb 19 12:49:07 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 3c9531a6ecb7d90c16b1fe15cdbdba12d8ec6536 -Author: Steve -Date: Mon Feb 19 12:47:10 2018 -0800 - - Remove manage.py createtestuser command - -commit 4295b0ed8507d39d230514b7b35df18d221705b0 -Merge: 0371ed049 c28b0d9fd -Author: Roland Stens -Date: Mon Feb 19 11:29:49 2018 -0800 - - Merge pull request #458 from stephenhillier/developer - - Add registries API endpoints for Driller and Organization models - -commit c28b0d9fd23a654129b9901d6ba2287f9417d0b6 -Merge: d731254cb 2e449ff67 -Author: Steve -Date: Mon Feb 19 11:06:37 2018 -0800 - - Merge branch 'registries-api' into developer - -commit 2e449ff67931e4b922c97efa5fcc1e0a39f6d791 -Author: Steve -Date: Mon Feb 19 11:06:14 2018 -0800 - - Add more tests for unauthenticated users - -commit be175bfb55972c321d7084c3f254010b0f8e445d -Author: Steve -Date: Mon Feb 19 10:59:37 2018 -0800 - - Change permission class for accessing API to IsAdminOrReadOnly - -commit a1b709bd5d636a60a7ca1d3a5f16334e723161ab -Author: Steve -Date: Mon Feb 19 10:59:08 2018 -0800 - - Add default case if GWELLS_API_TEST_USER env variable not set - -commit 72467acd590ae5a3494e5059ce2ba99cf656baaa -Author: Steve -Date: Mon Feb 19 10:43:14 2018 -0800 - - Add IsAdminOrReadOnly permission class - -commit 0d680636294e003b80b4681bc22a246765b0f3cc -Author: Steve -Date: Mon Feb 19 10:38:47 2018 -0800 - - Add "isAdminUser" permission class for RegistriesApplication views - -commit 5fd2259f65134dba03faae7e5d61ca9e9ed08f89 -Author: Steve -Date: Mon Feb 19 10:31:28 2018 -0800 - - Increase default pagination page size to 30 - -commit 63d24111e3026dbf21440e0530a34be4490abe49 -Author: Steve -Date: Mon Feb 19 10:12:36 2018 -0800 - - Add tests for pagination max page limit - -commit a713bcffcaf041539898a07fd1089a5a0eba8790 -Author: Steve -Date: Mon Feb 19 10:12:15 2018 -0800 - - Changed to higher max page limit - -commit 4cde6e88f29e6623efd27d96abf80d2d340b80c5 -Author: Steve -Date: Mon Feb 19 10:11:49 2018 -0800 - - Reorganized registries urlconf and put swagger docs at root url - -commit d731254cb29e779191a0003a1d52a9c67f3b45fa -Merge: f19ff578b 00eee55ae -Author: Steve -Date: Mon Feb 19 09:20:45 2018 -0800 - - Merge branch 'registries-api' into developer - -commit f19ff578b0121eaabded3c3ea909e74c6493439b -Merge: 51237dc5d 0371ed049 -Author: Steve -Date: Mon Feb 19 09:20:08 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 00eee55ae5c2d6578f1c8164edf82cbc8072d3be -Author: Steve Hillier -Date: Fri Feb 16 21:58:13 2018 -0800 - - Add tests for hiding unregistered organizations from anon user - -commit 117f839a10fb020143a5a961ad5c1315789eddf5 -Author: Steve Hillier -Date: Fri Feb 16 21:39:03 2018 -0800 - - Test for duplicated entries when using complex filtering - -commit 8258e3dd156f444ded639692870838f837f6b0d9 -Author: Steve Hillier -Date: Fri Feb 16 21:38:44 2018 -0800 - - Remove redundant distinct() call - -commit 2200a6e404b95bb940bfe366e5717e89219b745c -Author: Steve -Date: Fri Feb 16 19:41:20 2018 -0800 - - Add tests for pagination, searching - -commit 70872bf83220b9b3e966e4f41950b31b2b331bc7 -Author: Steve -Date: Fri Feb 16 19:41:02 2018 -0800 - - Add searching on driller registration number - -commit 68e39b47048094d147c62c63c9cbb38bee2ef951 -Author: Fieran Mason-Blakley -Date: Fri Feb 16 16:35:09 2018 -0800 - - Survey managment working - survey display not done - -commit 0371ed0491ccddbe2ebc15f7ccc14f530f9850b0 -Author: Roland Stens -Date: Fri Feb 16 15:11:21 2018 -0800 - - Update README.md - -commit 257e4cd23cfb81e506c4cfdf8cfa7e751ceefd4b -Author: Steve -Date: Fri Feb 16 14:53:49 2018 -0800 - - Add admin and anon serializers to hide admin-only fields from public - -commit cc666165a7ebb15324c1b5c37728be8ddb22d42a -Author: Steve -Date: Fri Feb 16 13:58:27 2018 -0800 - - Add separate queryset for anonymous users - -commit 0385999deaa370ee3290f73819c926cf2bc248d3 -Author: Steve -Date: Fri Feb 16 13:57:45 2018 -0800 - - Add tests for unauthenticated anonymous user - -commit 020ffffffacc477c4ddfe022dcea07a175b66f6b -Author: Steve -Date: Fri Feb 16 11:34:50 2018 -0800 - - Remove unused line/variable in test definition - -commit 6840a213f18e150a561f5d173bf7d7a19e5ff8f2 -Author: Steve -Date: Fri Feb 16 11:33:26 2018 -0800 - - Add filtering and pagination for Organization resource endpoint - -commit c63c6745eca8e30d824eb33ba4e903c684f5d7b8 -Author: Steve Hillier -Date: Thu Feb 15 23:04:59 2018 -0800 - - Update API tests with environment variables - -commit 35cea9bd9ea585033a61573109bfaf6149d63fdb -Author: Steve Hillier -Date: Thu Feb 15 22:05:16 2018 -0800 - - Add Postman/newman API test collection - -commit 35bb6218f44547b5e23872f7fbb5bcadaa60bcc4 -Author: Steve Hillier -Date: Thu Feb 15 22:04:36 2018 -0800 - - Add manage.py command createtestuser to help with API testing - -commit 51237dc5d0c1b0c8ab0dcb8bf2b14441209e094d -Author: Steve -Date: Thu Feb 15 16:35:42 2018 -0800 - - Recreate migration for registries - -commit d62bfe854ce3641c9a59758ddb2a2f036ac8b0d7 -Merge: ce58dcf02 f655219e7 -Author: Steve -Date: Thu Feb 15 16:29:50 2018 -0800 - - Merge branch 'developer' into registries-api - -commit ce58dcf026047221cff89aff024c15a6c8a27c51 -Author: Steve -Date: Thu Feb 15 16:24:24 2018 -0800 - - Add API pagination and searching - -commit ac76ce32466fa32859529258553b7eaf5b3c11c6 -Merge: c89a45089 80ce7385d -Author: garywong-bc -Date: Thu Feb 15 15:36:05 2018 -0800 - - Merge pull request #457 from garywong-bc/master - - Updated to align with DA standards - -commit f655219e7fef3f2121e8717805873866f3b05cde -Merge: c006ffb2b 8de617137 -Author: garywong-bc -Date: Thu Feb 15 15:34:20 2018 -0800 - - Merge pull request #456 from garywong-bc/developer - - Merging local to remote - -commit 80ce7385df4199ca569a13b7b4f58ee14cee7559 -Author: Gary Wong (BC Gov) -Date: Thu Feb 15 15:32:18 2018 -0800 - - Disabling Registries app from PROD - -commit 8de61713741b4e41870a66a5cf40fa5f352ca117 -Merge: c006ffb2b c89a45089 -Author: Gary Wong (BC Gov) -Date: Thu Feb 15 15:30:50 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells into developer - -commit 6c78773117b1250379c0ae89fe525d686601331b -Author: Steve -Date: Thu Feb 15 15:01:17 2018 -0800 - - Add registries migrations folder - -commit 8d45c276611d420a1fd79ab994c4d499cca891d9 -Author: Steve -Date: Thu Feb 15 15:00:47 2018 -0800 - - Change put request tests to reflect that we are testing update by put (not creating) - -commit c006ffb2bf6c2301ad82ee6c72576ceca373bdbc -Merge: 05ea99137 d86d72c90 -Author: garywong-bc -Date: Thu Feb 15 15:00:30 2018 -0800 - - Merge pull request #455 from garywong-bc/developer - - Commented out temporary DB view - -commit d86d72c9028e1e1a8b42ccbe0b0ea4e9f00811c4 -Author: Gary Wong (BC Gov) -Date: Thu Feb 15 14:37:52 2018 -0800 - - Commented out temporary DB view - -commit 05ea99137288a349394693dcd4b7335fc0782695 -Merge: cbdd7138a 9ca86394c -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Feb 15 14:27:40 2018 -0800 - - Merge pull request #454 from cwevans/developer - - Updated fixtures to match new data models. - -commit 9ca86394c3865d498e9c94d45863998d0971242f -Author: Christian Evans -Date: Thu Feb 15 14:26:43 2018 -0800 - - Updated fixtures to match new data models. - -commit 837c88be738c790ce3c3e81f6003bebfcad52495 -Author: Steve -Date: Thu Feb 15 14:14:24 2018 -0800 - - Update province_state_code fields to reflect changes to upstream models.py - -commit f8bb2dbb085c219840f7d486d8aa8c8813d069f0 -Merge: ecec681ca cbdd7138a -Author: Steve -Date: Thu Feb 15 13:23:51 2018 -0800 - - Merge branch 'developer' into registries-api - -commit ecec681ca15311187037dd71ad8a5356a87e2d9e -Author: Steve -Date: Thu Feb 15 13:22:53 2018 -0800 - - Add tests for unauthorized users - -commit cbdd7138a12e00b423e6dcc221f67f940cb8361d -Merge: 103667334 338b4ec1f -Author: garywong-bc -Date: Thu Feb 15 13:00:06 2018 -0800 - - Merge pull request #453 from garywong-bc/developer - - effective_date to be optional until test DB can be updated. - -commit 338b4ec1fe2b5fe0ae31225b439cf942a19a484c -Author: Gary Wong (BC Gov) -Date: Thu Feb 15 12:59:33 2018 -0800 - - effective_date to be optional until test DB can be updated. - -commit 103667334e716bb7fb60a4728797ce932d364713 -Merge: 7824e7e52 eeac8e235 -Author: garywong-bc -Date: Thu Feb 15 12:34:13 2018 -0800 - - Merge pull request #452 from garywong-bc/developer - - Updating model.py, and associated code - -commit eeac8e235fc56e1e0ed13605aaaf845d1eeaf7bd -Merge: 1d2ef3da7 7824e7e52 -Author: Gary Wong (BC Gov) -Date: Thu Feb 15 12:33:18 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 1d2ef3da706bdce177337ebb82510ffc621c09c4 -Author: Gary Wong (BC Gov) -Date: Thu Feb 15 12:33:05 2018 -0800 - - V3.2 of updating Model to match DA standards. Checkpoint merge into bcgov/gwells github repo. - -commit 7824e7e525e06c4f71064bffff3a5e789279480a -Author: Roland Stens -Date: Thu Feb 15 11:57:21 2018 -0800 - - Update Jenkinsfile-bddstack - -commit 7035aee94ac8eaedf49d308fdd42d8a92b6a913b -Author: Roland Stens -Date: Thu Feb 15 11:54:52 2018 -0800 - - Update Jenkinsfile-bddstack - -commit 3d0a4b8e615f04625e754d4061d37a362520bbde -Author: Roland Stens -Date: Thu Feb 15 11:40:13 2018 -0800 - - Update README.md - -commit 7193424a6a7485305c3047c417b4e80d92edaef3 -Author: Roland Stens -Date: Thu Feb 15 11:39:49 2018 -0800 - - Update README.md - -commit c9a43253787ea263af8c80e3ac8be20626109579 -Author: Roland Stens -Date: Thu Feb 15 11:39:17 2018 -0800 - - Update README.md - -commit 51434ebac3dd6a7d8e1d36f4f0d862cc651ec4ac -Author: Roland Stens -Date: Thu Feb 15 11:38:08 2018 -0800 - - Update README.md - -commit 6c354a41c5b1233612cbb48028c05604629ac791 -Author: Roland Stens -Date: Thu Feb 15 11:37:42 2018 -0800 - - Update README.md - -commit c17bcb83e3e0fd4dfec3726f0f616c0ed3f8a089 -Author: Steve -Date: Thu Feb 15 10:56:16 2018 -0800 - - Fix tests to incorporate auth - -commit 7c196ac25dac7a7864c86d55992f367c1959b06e -Author: Steve -Date: Thu Feb 15 10:55:58 2018 -0800 - - Minor whitespace changes - -commit 68a8e1b50c089da57405b9a4b0a7b3724ce686ac -Author: Roland Stens -Date: Thu Feb 15 09:32:44 2018 -0800 - - Update README.md - -commit 42cd8520008bdd7983bb80a1e2f6d578f6b3bc0e -Author: Roland Stens -Date: Thu Feb 15 09:26:51 2018 -0800 - - Update README.md - -commit 6475b2302eb95c95cc353b8da54a122d1024cbce -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 23:43:29 2018 -0800 - - V3.1 of updating Model to match DA standards - -commit d4ce4a4daf095268801e8fe869a68e0d89f99930 -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 23:28:06 2018 -0800 - - V3.0 of updating Model to match DA standards - -commit 1c52152f78e728446aaf280dd5324a4d5a217d3d -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 22:50:33 2018 -0800 - - V2.9 of updating Model to match DA standards - -commit d228ed84c5679396f98093d2b82b39af63738b43 -Merge: 8067eee2e 117548e64 -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 20:25:57 2018 -0800 - - V2.8 of updating Model to match DA standards - -commit 117548e64397cf45efad632fc69b4096a8876b09 -Merge: fba111871 702ccb26e -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 20:12:11 2018 -0800 - - merged with my interim save branch - -commit 8067eee2ead96cfaec3776566cd92b101796c6a4 -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 20:07:10 2018 -0800 - - to avoid merge conflict, temporarily removing migrations generated files - -commit 702ccb26e807068888544914a61578330322a1f7 -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 20:04:42 2018 -0800 - - .. and with fixed issues on GroundElevation - -commit fba111871c453f4e2819595b0aa4d536ae7b29dd -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 19:48:22 2018 -0800 - - interim commit, in between V2.7 and V2.8 of DA std changes. - -commit a694fa6208ce104f51746345673e5440923e5262 -Merge: 29c69027b dd950ef3c -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 19:35:23 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit f8c0f0dd0d4fbb64ac5bca8dc5ba19d3eee634ec -Author: Gary Wong (BC Gov) -Date: Wed Feb 14 19:34:57 2018 -0800 - - temporary save - -commit cff7e051a1399f8da9ab71da66c5debea53e0d21 -Author: Roland Stens -Date: Wed Feb 14 16:40:32 2018 -0800 - - json test output - -commit dd950ef3c328630c1e8498a46ffe6c7b92f8c9f4 -Merge: 5e8380cf9 7feabe1e3 -Author: Roland Stens -Date: Wed Feb 14 15:55:03 2018 -0800 - - Merge pull request #451 from rstens/developer - - Roll back change in build.gradle - -commit 7feabe1e355e5bf23cea227ee7f44c5c356532c7 -Author: Roland Stens -Date: Wed Feb 14 15:54:03 2018 -0800 - - Roll back change in build.gradle - -commit 5e8380cf92e2abd308d3ce45e264dc8d2bd2387f -Merge: 4e5bc06ec 687724c57 -Author: Roland Stens -Date: Wed Feb 14 15:44:45 2018 -0800 - - Merge pull request #450 from rstens/developer - - Test refactoring - -commit 687724c57dec3e57a23b67486441fa7aa27abb9b -Author: Roland Stens -Date: Wed Feb 14 15:43:21 2018 -0800 - - Test refactoring - -commit 4e5bc06ec2cee5333c78ad3cc277909109e64eb2 -Merge: 90d485111 f958be191 -Author: Roland Stens -Date: Wed Feb 14 14:51:12 2018 -0800 - - Merge pull request #449 from rstens/developer - - Add stash to the API test pipeline, for later use of the results - -commit f958be191ea696f0903c7932a929a2fa5f2445d6 -Author: Roland Stens -Date: Wed Feb 14 14:50:18 2018 -0800 - - Add stash to the API test pipeline, for later use of the results - -commit 7f021e1d0d86ab5bb5bb3e4678794450008beaae -Author: Steve -Date: Wed Feb 14 13:55:08 2018 -0800 - - Change driller list view behavior (logged in users get full list, anon users only see active registered drillers) - -commit 43e8c25331d4250fae1efaa593cc13645b46d386 -Author: Steve -Date: Wed Feb 14 12:59:22 2018 -0800 - - Reorganize RegistryApplication model views (to be incorporated in future) - -commit 2a87fe1b51eb10e3280660a5a25a00e9a9498360 -Author: Steve -Date: Wed Feb 14 12:40:15 2018 -0800 - - Driller list default behavior now only returns active registered drillers - -commit 90d4851115de261d3b55389c4cb819ce1e323276 -Merge: 8fbd12981 811d952a6 -Author: Roland Stens -Date: Wed Feb 14 11:52:18 2018 -0800 - - Merge pull request #448 from rstens/developer - - Include the Unit Test results in the Performance Test report - -commit 811d952a63ad821fb66f92bac094f02493596701 -Author: Roland Stens -Date: Wed Feb 14 11:51:30 2018 -0800 - - Include the Unit Test results in the Performance Test report - -commit 8fbd129815d50e8d656d890d52302833e46cda29 -Merge: 1a4a8f3fa 77f6b7142 -Author: Roland Stens -Date: Wed Feb 14 11:47:18 2018 -0800 - - Merge pull request #447 from rstens/developer - - Test Refactoring and Additions - -commit 77f6b7142cbf14aeb37dab1f0899777d2e2e44e8 -Author: Roland Stens -Date: Wed Feb 14 11:46:04 2018 -0800 - - Test Refactoring and Additions - -commit c58874cfdaa258358a334ced902e06e0aea3c943 -Author: Steve -Date: Wed Feb 14 11:32:13 2018 -0800 - - Add applications retrieve/update/delete endpoint - -commit ec82d23af593afdd6fbff0b5f15cb79a77b01a5c -Author: Steve -Date: Wed Feb 14 10:53:43 2018 -0800 - - Add session auth to DRF settings (to log in to browsable API while debugging) - -commit 8326d509c2dd467bbf945cdf759ef8d8c195418c -Author: Steve -Date: Wed Feb 14 09:44:23 2018 -0800 - - Add throttling with a default rate - -commit 925ff011851575ef8ef1d188fc4d878109452912 -Author: Steve -Date: Wed Feb 14 09:26:12 2018 -0800 - - Add djangorestframework-jwt as dependency - -commit 29c69027b51329eb35c2c816913a51c157409cfa -Author: Gary Wong (BC Gov) -Date: Tue Feb 13 23:02:35 2018 -0800 - - V2.7 of updating Model to match DA standards - -commit 1dd9bcfcc2e24932f3bca9e45df71df490e83970 -Author: Steve Hillier -Date: Tue Feb 13 22:31:46 2018 -0800 - - Add basic JWT auth for testing - -commit b824dcf6255bad55be4104dac13813aff12e90f2 -Author: Gary Wong (BC Gov) -Date: Tue Feb 13 20:51:52 2018 -0800 - - V2.6 of updating Model to match DA standards - -commit 1a4a8f3fadaadc9af64891f4eab5b5b971d11fa1 -Merge: 2579ccc2a 8989b56a1 -Author: Roland Stens -Date: Tue Feb 13 17:49:49 2018 -0800 - - Merge pull request #446 from rstens/developer - - Jenkinsfile updates - -commit 8989b56a1ea674ece23a03d34231bffb517d9766 -Author: Roland Stens -Date: Tue Feb 13 17:33:47 2018 -0800 - - Update to OpenshiftVerifyDeployment - -commit 15a7f954183c8702e473d37fa6892ab0fa7a8c1a -Author: Roland Stens -Date: Tue Feb 13 17:31:20 2018 -0800 - - Update - -commit 2579ccc2a2cd8d4f1040c100ae211ae2b6bc6d30 -Merge: d7b2dace9 fad6bf1cc -Author: Roland Stens -Date: Tue Feb 13 17:06:41 2018 -0800 - - Merge pull request #445 from rstens/developer - - Replicate on a windows platform. - -commit fad6bf1cce1b0ceb313c660e485522efc879838a -Author: Roland Stens -Date: Tue Feb 13 17:04:17 2018 -0800 - - Replicate on a windows platform. - -commit d7b2dace93d69e969dfb7c61825532db51407e5e -Merge: a0c9d3f56 9f3d0bf6b -Author: garywong-bc -Date: Tue Feb 13 16:45:00 2018 -0800 - - Merge pull request #444 from garywong-bc/developer - - With migrate task now - -commit 9f3d0bf6b9a3bd2aa19dc4763e949ae95e251f5a -Author: Gary Wong (BC Gov) -Date: Tue Feb 13 16:44:35 2018 -0800 - - With migrate task now - -commit 956ec162ab279127303dc4c927b9d633985e455d -Author: Steve -Date: Tue Feb 13 16:18:57 2018 -0800 - - Add applications and register serializers and views - -commit a0c9d3f56e8415d9b37ab104535823ab436074b7 -Merge: 05352697c 60d608ab9 -Author: garywong-bc -Date: Tue Feb 13 16:15:01 2018 -0800 - - Merge pull request #443 from garywong-bc/developer - - Added new Driller DB view - -commit 60d608ab9eca1cdd8f63bffbd1dc57d5357e65d1 -Author: Gary Wong (BC Gov) -Date: Tue Feb 13 16:13:40 2018 -0800 - - Added new Driller DB view - -commit 05352697c74cc2ca8eea54d983e59586ec0e7227 -Merge: 380c2aba0 f68718668 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Feb 13 15:47:00 2018 -0800 - - Merge pull request #442 from cwevans/developer - - Update fixtures to accommodate models - -commit f6871866836872d4fa027576376067d9df8e0eab -Author: Christian Evans -Date: Tue Feb 13 15:05:55 2018 -0800 - - Update fixtures to accommodate model changes. - -commit 380c2aba00c3fd94a4a1474287878c5106e2ea71 -Merge: b739addb7 5e41a6b2c -Author: Roland Stens -Date: Tue Feb 13 14:57:35 2018 -0800 - - Merge pull request #441 from rstens/developer - - SLeep update - -commit 5e41a6b2c4cc11e46937e0f20ba039f4fbe0f7af -Author: Roland Stens -Date: Tue Feb 13 14:57:03 2018 -0800 - - SLeep update - -commit b739addb70ef37ce0dbe080a9ea019ab1e54ac25 -Merge: 3d1ee0f31 c3686858b -Author: Roland Stens -Date: Tue Feb 13 14:29:03 2018 -0800 - - Merge pull request #440 from rstens/developer - - psycop try out - -commit c3686858bf7b421180d534c8fe4693070e67c14b -Author: Roland Stens -Date: Tue Feb 13 14:27:42 2018 -0800 - - psycop try out - -commit 3d1ee0f31ad7326fb2b43eb62435f09106d00bf9 -Merge: 658e93f09 132902ef7 -Author: Roland Stens -Date: Tue Feb 13 14:06:35 2018 -0800 - - Merge pull request #438 from cwevans/developer - - Developer - -commit 658e93f095a45e626974cd2f91072bb845025d7e -Merge: c43b3ef70 6a922c654 -Author: Roland Stens -Date: Tue Feb 13 14:06:04 2018 -0800 - - Merge pull request #439 from rstens/developer - - Fix build error psycop2 and update jenkinsfile for developer - -commit 6a922c654aa8ab41abd75e78bfbe6b5cf1ae5584 -Author: Roland Stens -Date: Tue Feb 13 14:05:26 2018 -0800 - - Fix build error psycop2 and update jenkinsfile for developer - -commit 132902ef7dd6d6a6b44204575eaf76e8f387a784 -Author: Christian Evans -Date: Tue Feb 13 13:58:49 2018 -0800 - - Fixed duplicate id. - -commit 5de8841707ae33a4aadc9ace03745507c4cf0c05 -Author: Steve -Date: Tue Feb 13 13:29:09 2018 -0800 - - Better tests for including a province when creating an organization - -commit c43b3ef70b4cecbd07651c343d8a0f3952b2095c -Merge: 4ef195f57 12d6ba14d -Author: Roland Stens -Date: Tue Feb 13 13:28:24 2018 -0800 - - Merge pull request #437 from rstens/developer - - Perfreport changes to Jenkins files - -commit 12d6ba14d100b51b7c74faa610ef8f4c5ba5c7c2 -Author: Roland Stens -Date: Tue Feb 13 13:27:28 2018 -0800 - - Perf reports - -commit 8c5ba90a5389848eb46dba7b460ff65e93d6f94e -Author: Roland Stens -Date: Tue Feb 13 13:23:20 2018 -0800 - - sync and perfreport changes - -commit f6f1284c27e55633556934a9866134f1de4c3f8f -Author: Steve -Date: Tue Feb 13 13:19:33 2018 -0800 - - Include ProvinceState as a serializer field (to allow adding a province/state when creating an organization) - -commit 4ef195f577cd6b1dc4544900a41bf80c12ca2df4 -Merge: c86dda130 bae19ea11 -Author: Roland Stens -Date: Tue Feb 13 12:47:30 2018 -0800 - - Merge pull request #436 from rstens/developer - - Add performance report to Dev Pipeline - -commit bae19ea118e500c1be2e4bf1102f5278a9241e50 -Author: Roland Stens -Date: Tue Feb 13 12:46:18 2018 -0800 - - Add performance report to Dev Pipeline - -commit c86dda130d2430668c6e5349dd9ff588b9ae97c5 -Merge: 2c95e1a92 ba9fc55be -Author: Roland Stens -Date: Tue Feb 13 12:33:49 2018 -0800 - - Merge pull request #435 from rstens/developer - - Perfreport addition - -commit ba9fc55be3b82e94bdbff67cd6c02e62cd5764bf -Author: Roland Stens -Date: Tue Feb 13 12:33:00 2018 -0800 - - Perfreport addition - -commit ecb19bf7a7fd99d668f50d9f1217eeab1c39ecb8 -Author: Steve -Date: Tue Feb 13 11:28:04 2018 -0800 - - Add tests for AuditModel fields for Organization and Person API tests - -commit c83ac0131b12c65aa4358e3f5749fd6ac1933795 -Author: Steve -Date: Tue Feb 13 11:23:49 2018 -0800 - - Update serializer, views and tests to accomodate AuditModel and ProvinceStateCode changes - -commit 6852bb085aa7b9ef7b41e8526606f957107ae3d0 -Merge: 9a57daa7a 2c95e1a92 -Author: Steve -Date: Tue Feb 13 10:35:58 2018 -0800 - - Merge branch 'developer' into registries-api - -commit 9a57daa7a6a206be0c9a2e2b761c7ec9c3d13aa9 -Author: Steve -Date: Tue Feb 13 10:27:03 2018 -0800 - - Change company name in tests to a more unique value - -commit 1d1ca5e34bfdbfc984ab7cd5056f9948f17f8542 -Author: Steve -Date: Tue Feb 13 10:19:08 2018 -0800 - - Add django unit tests for Organization and Person model - -commit 2c95e1a9275afe000d4d8959a9a1ca9e6ac3307d -Merge: 69afe6871 59bcfb1d2 -Author: Roland Stens -Date: Tue Feb 13 09:10:07 2018 -0800 - - Merge pull request #434 from rstens/developer - - Perfpublisher fix in the pipeline - -commit 59bcfb1d2f2aade270368a612cbc24371a6e58e4 -Author: Roland Stens -Date: Tue Feb 13 09:08:46 2018 -0800 - - Update jenkinsfile to avoid the PerformanceTest report failure - -commit b8c81e7ebb37a47623d39adac120dbe2a7c79e3d -Merge: f78e5bac9 69afe6871 -Author: Roland Stens -Date: Tue Feb 13 09:06:06 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 11c662a0a490981ab8b7beddecbf48272ec1aa77 -Author: Steve Hillier -Date: Mon Feb 12 23:00:40 2018 -0800 - - Minor change to variable names - -commit de8400acbf6645caf9d150814df5e3a37c8b0e3c -Author: Steve Hillier -Date: Mon Feb 12 22:57:32 2018 -0800 - - Add DRF tests - -commit 69afe68718c288c8815d27caf155c53e491ca8cf -Merge: 51a29bff5 d9a622627 -Author: garywong-bc -Date: Mon Feb 12 17:13:07 2018 -0800 - - Merge pull request #433 from garywong-bc/developer - - Phase 1 of renaming DB objects to better match D.A stds - -commit f78e5bac9b349adf71822d9170bd069a85993514 -Author: Roland Stens -Date: Mon Feb 12 17:09:52 2018 -0800 - - perfpublisher changes and updates - -commit d9a622627ca8c4b2b4057052de77614263e927da -Merge: 224079f0e 51a29bff5 -Author: Gary Wong (BC Gov) -Date: Mon Feb 12 17:08:01 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 224079f0e21edd9753956ee7d682b09163518241 -Author: Gary Wong (BC Gov) -Date: Mon Feb 12 17:07:53 2018 -0800 - - V2.5 of updating Model to match DA standards - -commit 51a29bff59812e0c122cc700e6022b0394bc1bda -Merge: ad59e334e d19e63fbb -Author: Roland Stens -Date: Mon Feb 12 16:50:11 2018 -0800 - - Merge pull request #432 from rstens/developer - - Fix stash name - -commit d19e63fbb78ab3920bb0f15fee99b6e15e5aab93 -Author: Roland Stens -Date: Mon Feb 12 16:49:33 2018 -0800 - - Fix stash name - -commit ad59e334ee463e71b0bbdb126e8a454971ce256e -Author: Roland Stens -Date: Mon Feb 12 16:39:35 2018 -0800 - - Update Jenkinsfile-developer - -commit 89f1b6304f5c830f7ea70c079d080c0fc24de72c -Merge: 2b3473c12 4e2b1cc3c -Author: Gary Wong (BC Gov) -Date: Mon Feb 12 16:33:06 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 2b3473c12fb60607aa4e1ab9889c790fd03fc510 -Author: Gary Wong (BC Gov) -Date: Mon Feb 12 16:10:30 2018 -0800 - - V2.4 of updating Model to match DA standards - to test on gwells-moe-dev - -commit 4e2b1cc3cd399a22220438e50b037c57c6a73e7e -Merge: 438d2e839 787a067ac -Author: Roland Stens -Date: Mon Feb 12 15:58:25 2018 -0800 - - Merge pull request #431 from rstens/developer - - Fixing some HTML Errors reported by W3C. - -commit 787a067ac29956dce06992b6e6aa0c2a773e36c0 -Author: Roland Stens -Date: Mon Feb 12 15:57:39 2018 -0800 - - Fixing some HTML Errors reported by W3C. - -commit 5700b84cb11d05552169e853af00d632ff4665f0 -Author: Gary Wong (BC Gov) -Date: Mon Feb 12 15:33:33 2018 -0800 - - V2.3 of updating Model to match DA standards - -commit 132433692632c74bc9ad235b2ba1398798869948 -Author: Gary Wong (BC Gov) -Date: Mon Feb 12 15:14:22 2018 -0800 - - V2.2 of updating Model to match DA standards - -commit cb279584bd79c385fb63ac2b46b3bb316c258d9a -Author: Gary Wong (BC Gov) -Date: Mon Feb 12 10:26:59 2018 -0800 - - V2.2 of updating Model to match DA standards - -commit 2858ac437a573df849ca29b4e51d0234e3fbf485 -Author: Gary Wong (BC Gov) -Date: Sun Feb 11 23:22:26 2018 -0800 - - V2.1 of updating Model to match DA standards - -commit 4462c7a93746e030f120321ecfb89e9406676803 -Author: Gary Wong (BC Gov) -Date: Sun Feb 11 23:02:34 2018 -0800 - - Version 2.0 of updating Model to match DA standards - -commit a95b7a42abd9a736254b1ddd97467aec2f7b28c9 -Author: Gary Wong (BC Gov) -Date: Sun Feb 11 22:36:10 2018 -0800 - - V1.9 of updating Model to match DA standards - -commit 438d2e839e241d05e069e189b5f83e602d93a0dc -Author: Roland Stens -Date: Sun Feb 11 20:26:37 2018 -0800 - - Update README.md - -commit 0bba277ac52e8e94c54eb9903cdd437f9b994b85 -Author: Roland Stens -Date: Sun Feb 11 20:21:19 2018 -0800 - - Update README.md - -commit 45db9b46603b8d05f1d65a37990c2cc402945bff -Author: Gary Wong (BC Gov) -Date: Sun Feb 11 12:10:16 2018 -0800 - - V1.9 of updating Model to match DA standards - -commit fe429c116c6566de4b4a219c25387be9499cf7a7 -Author: Gary Wong (BC Gov) -Date: Sun Feb 11 11:38:12 2018 -0800 - - V1.8 of updating Model to match DA standards - -commit f77fc515157a14c3592cffe131d32eecf78800f0 -Author: Gary Wong (BC Gov) -Date: Sun Feb 11 10:25:41 2018 -0800 - - Undoing my local change to grade - using -P command line parameters instead - -commit d69794eee00df2a8dadc478e3a56335449c284cc -Merge: 57770a851 fd4b1363e -Author: Gary Wong (BC Gov) -Date: Sun Feb 11 10:21:49 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 57770a851e6bf835134afca823c6f8a4e354e41c -Author: Gary Wong (BC Gov) -Date: Sat Feb 10 23:47:05 2018 -0800 - - V1.7 of updating Model to match DA standards - -commit 456e95e63ab7d3737bdb6593bbab8dd09ded549e -Author: Gary Wong (BC Gov) -Date: Sat Feb 10 23:30:49 2018 -0800 - - V1.6 of updating Model to match DA standards - -commit 0127c0ec4b2e2f08569e696698c6d425ab41ff7d -Author: Gary Wong (BC Gov) -Date: Sat Feb 10 23:08:13 2018 -0800 - - V1.5 of updating Model to match DA standards - -commit 4dfaf675749d1829bee7c557bd38c08f9e3ef3f5 -Author: Gary Wong (BC Gov) -Date: Sat Feb 10 21:37:02 2018 -0800 - - V1.4 of updating Model to match DA standards - -commit 2af4ae4d94f02a36bb6e5992820a3815042daef8 -Author: Gary Wong (BC Gov) -Date: Fri Feb 9 22:23:19 2018 -0800 - - V1.3 of updating Model to match DA standards - -commit 6398d6130c37d951b93970f32249549b3d6a65ac -Author: Gary Wong (BC Gov) -Date: Fri Feb 9 21:52:18 2018 -0800 - - V1.2 of updating Model to match DA standards - -commit 3f1a6bd3267d1fed237f7c9683cea36a254618a7 -Author: Gary Wong (BC Gov) -Date: Fri Feb 9 21:32:47 2018 -0800 - - V1.1 of updating Model to match DA standards - -commit 74b923abb74831adc71ac8d0e8a82a584fd7e06f -Author: Gary Wong (BC Gov) -Date: Fri Feb 9 20:37:13 2018 -0800 - - V1 of updating Model to match DA standards - -commit fd4b1363e0efa7a8cc677c0fab830ab113434e19 -Merge: fc6849c11 afa66f1b6 -Author: Roland Stens -Date: Fri Feb 9 17:08:11 2018 -0800 - - Merge pull request #430 from rstens/developer - - Set execute bit - -commit afa66f1b6763beec2d9cf825ac10ebb95968afc3 -Author: Roland Stens -Date: Fri Feb 9 17:06:58 2018 -0800 - - Set execute bit - -commit fc6849c1150ee5aa7915897b016d4817eaef9d1d -Merge: 8116add46 11e3d1a7c -Author: Roland Stens -Date: Fri Feb 9 17:01:06 2018 -0800 - - Merge pull request #429 from rstens/developer - - All zap updates to pipeline - -commit 11e3d1a7ca67de80e7132c1d95aaa99a6c6df71e -Author: Roland Stens -Date: Fri Feb 9 17:00:14 2018 -0800 - - All zap updates to pipeline - -commit 8116add469d55fff644eb690e9271ce2eb59fda9 -Merge: f5777dc99 2119e0b7c -Author: Roland Stens -Date: Fri Feb 9 16:30:17 2018 -0800 - - Merge pull request #428 from rstens/developer - - ZAP jenkins file and execution - -commit 2119e0b7cf7a3527b7edc02626d730499e30b9b6 -Author: Roland Stens -Date: Fri Feb 9 16:29:23 2018 -0800 - - Set execute bit - -commit b7b7d276a48717686bcff912d80d39b9b3cb886e -Author: Roland Stens -Date: Fri Feb 9 16:28:58 2018 -0800 - - Zap jenkins - -commit f5777dc9917e224e0afc24b51fc6f14ff3e7c443 -Author: Roland Stens -Date: Fri Feb 9 16:20:59 2018 -0800 - - Update README.md - -commit c1fa7880989f809ba0cabaf667d5d712ecea38ae -Merge: 63f5aba86 03e22acb1 -Author: Roland Stens -Date: Fri Feb 9 16:19:50 2018 -0800 - - Merge pull request #427 from rstens/developer - - ZAP Directory and Readme - -commit 03e22acb1d1fcbc1a010e1ae77fe27a0bf73978a -Author: Roland Stens -Date: Fri Feb 9 16:19:18 2018 -0800 - - ZAP Directory and Readme - -commit 63f5aba86b07e016b13c6fe48300db7509ce4400 -Merge: 83935ed8c 58f144ede -Author: Roland Stens -Date: Fri Feb 9 15:38:12 2018 -0800 - - Merge pull request #426 from rstens/developer - - Update jenkinsfiles - -commit 58f144ede15189df604163abd3611df94124a146 -Author: Roland Stens -Date: Fri Feb 9 15:37:37 2018 -0800 - - Update jenkinsfiles - -commit 183430a93aeb72b3a0f1d610b775e62daea56a59 -Author: Steve -Date: Fri Feb 9 15:23:13 2018 -0800 - - Refactor auto audit field fill-in as a mixin so future views can inherit - -commit 5e69e3359246a3922a7ed2a9f462bcb00c4ff31e -Author: Steve -Date: Fri Feb 9 14:38:06 2018 -0800 - - Audit fields are now automatically filled in when creating instances - -commit 83935ed8cf040f4c9b9fdbd043e1072a3770337b -Author: Roland Stens -Date: Fri Feb 9 13:51:38 2018 -0800 - - Update README.md - -commit 12c5734e6349745cdeea06be0e72a709427bfd01 -Merge: 26e11e0d4 7645f55c3 -Author: Roland Stens -Date: Fri Feb 9 13:42:45 2018 -0800 - - Merge pull request #425 from rstens/developer - - Last changes? - -commit 7645f55c392766845c9b55314659829535b876ba -Author: Roland Stens -Date: Fri Feb 9 13:42:16 2018 -0800 - - Last changes? - -commit 26e11e0d4bae121b59ea4f4006df58a05da87223 -Merge: 96743a7d1 2a4af1015 -Author: Roland Stens -Date: Fri Feb 9 13:05:08 2018 -0800 - - Merge pull request #424 from rstens/developer - - Update - -commit 2a4af101577b8cd2a1559bd3f72c5229f37a4b2d -Author: Roland Stens -Date: Fri Feb 9 13:04:35 2018 -0800 - - Update - -commit 96743a7d11ee1f57c477ea0bb783f6449793c315 -Merge: 0625baa17 f88ab80ca -Author: Roland Stens -Date: Fri Feb 9 12:59:10 2018 -0800 - - Merge pull request #423 from rstens/developer - - Update to Jenkinsfile - -commit f88ab80ca091e428195ac38d731a0bf615f37ba7 -Author: Roland Stens -Date: Fri Feb 9 12:58:22 2018 -0800 - - Update to Jenkinsfile - -commit 0625baa1774507da178d12d0a81b6ccb48ba91e6 -Merge: 4cb44e23b 228b25b14 -Author: Roland Stens -Date: Fri Feb 9 12:53:20 2018 -0800 - - Merge pull request #422 from rstens/developer - - Script changes - -commit 228b25b140c8625de652514daa2b4c0400e808f1 -Author: Roland Stens -Date: Fri Feb 9 12:52:33 2018 -0800 - - Script changes - -commit 4cb44e23bc7e1a2d5dfbe66e230b8d8ba47cb997 -Merge: 25d38816f 2404fd9c9 -Author: Roland Stens -Date: Fri Feb 9 12:32:15 2018 -0800 - - Merge pull request #421 from rstens/developer - - Updates - -commit 2404fd9c94854af54fc8acb44a49a5f5d6996c38 -Author: Roland Stens -Date: Fri Feb 9 12:31:54 2018 -0800 - - Updates - -commit 25d38816ff07ef827b4c3e74d15287d50b7c7e3e -Merge: 03e0c9871 aabd13c7c -Author: Roland Stens -Date: Fri Feb 9 12:20:15 2018 -0800 - - Merge pull request #420 from rstens/developer - - Updates - -commit aabd13c7c2440a48edcea0ac89d6d5aa76ee58fa -Author: Roland Stens -Date: Fri Feb 9 12:19:42 2018 -0800 - - Updates - -commit 03e0c98711b60abd4c6d73b0565fe5f459d44d12 -Merge: 9745989f5 e3cbe9bdd -Author: Roland Stens -Date: Fri Feb 9 12:15:54 2018 -0800 - - Merge pull request #419 from rstens/developer - - Script update - -commit e3cbe9bddbdfec10926ce84c05b3a78e8b535c31 -Author: Roland Stens -Date: Fri Feb 9 12:14:20 2018 -0800 - - Script update - -commit 9745989f529b9281f8a7c34f89f9b83844b37635 -Merge: 2418c0842 024905aa6 -Author: Roland Stens -Date: Fri Feb 9 12:04:01 2018 -0800 - - Merge pull request #418 from rstens/developer - - Set execute bit - -commit 024905aa637bfa8cc421b2d0a09a82932d1539d3 -Author: Roland Stens -Date: Fri Feb 9 12:03:29 2018 -0800 - - Set execute bit - -commit 2418c08424fc8984296fb92f958d9325f30958d9 -Merge: 11cd6fc7c aed4b5b26 -Author: Roland Stens -Date: Fri Feb 9 12:00:25 2018 -0800 - - Merge pull request #417 from rstens/developer - - API Test Pipeline - -commit aed4b5b268ddc2267dcd1c4e1dae9ba947f8251e -Author: Roland Stens -Date: Fri Feb 9 11:59:39 2018 -0800 - - API Test Pipeline - -commit 11cd6fc7c815516baaccc6090aeab5dc0c38e778 -Merge: d60b22d5d b38e07a67 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Feb 9 11:52:59 2018 -0800 - - Merge pull request #415 from cwevans/developer - - Fixtures for registries - -commit d60b22d5dcbf55d5bb903216f4377c868d67877f -Merge: b4a958785 d55ec7877 -Author: garywong-bc -Date: Fri Feb 9 11:35:48 2018 -0800 - - Merge pull request #416 from garywong-bc/developer - - Updated nightly replicate cron job - -commit d55ec78777c5f80ce68e0501bc604db49f2e86c0 -Merge: 9db2f697e b4a958785 -Author: Gary Wong (BC Gov) -Date: Fri Feb 9 11:34:39 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 9db2f697e1c2bfcdf77fd719a449be78d3510ada -Author: Gary Wong (BC Gov) -Date: Fri Feb 9 11:29:08 2018 -0800 - - Updated nightly replicate cron job to use updated gwells_db_replicate() DB Function. - -commit 79cebd53fdbe8c294a082302fd04ca0d31f6a2fe -Author: Steve -Date: Thu Feb 8 17:01:16 2018 -0800 - - Add person model endpoints (with serializer, views) - -commit b38e07a67f65c09ce42b18e37b054f44c41a5478 -Author: Christian Evans -Date: Thu Feb 8 15:32:56 2018 -0800 - - Moved province/state into registries JSON file. - -commit b4a958785189ad2983829918e47e08431e16bcd0 -Merge: a768a1904 9079224ac -Author: Roland Stens -Date: Thu Feb 8 15:16:14 2018 -0800 - - Merge pull request #414 from rstens/developer - - Add api-tests directory - -commit 9079224ac1686809a4295e7001f8d5e9add0d6f6 -Author: Roland Stens -Date: Thu Feb 8 15:15:14 2018 -0800 - - Add api-tests directory - -commit 0e0cb4bece00f8f96f28e160a2ecee94bde78d5d -Author: Steve -Date: Thu Feb 8 15:05:58 2018 -0800 - - Add registries back into installed apps - -commit f5774d239f2398b86de886af2a69c8f37dd303cd -Merge: 5b0b8cf0c 585a87e72 -Author: Steve -Date: Thu Feb 8 14:57:58 2018 -0800 - - Merge branch 'registries-api' of https://github.com/stephenhillier/gwells into registries-api - -commit 5b0b8cf0cfee1abe3e5622b942d44e6693728d79 -Author: Steve -Date: Thu Feb 8 14:52:19 2018 -0800 - - Add contact set to organization detail view - -commit 634f9ca314bcde5cd7a736d4693591017784be14 -Author: Steve -Date: Thu Feb 8 14:26:37 2018 -0800 - - Rename driller company references to organization (driller should represent a person) - -commit 88d28e95be49932002db320c53ede8ff3c3556fa -Author: Steve -Date: Wed Feb 7 15:02:55 2018 -0800 - - Add extra documentation to views - -commit a613d7899339c54bb776067bb4d43dc83c2a7d69 -Author: Steve -Date: Wed Feb 7 14:49:38 2018 -0800 - - Add Swagger documentation (Django REST Swagger) - -commit eef7f3797a6228c9e06717c3be49801a10b457a5 -Author: Steve -Date: Wed Feb 7 14:37:16 2018 -0800 - - Add docstrings to view classes - -commit 0fa97a44062b1da8d2e8c1341a411ec430ca116e -Author: Steve -Date: Wed Feb 7 13:45:39 2018 -0800 - - Modify retrieve view to also allow update and delete - -commit b95d8f2ed2da08765c08e1754f8962ee50775886 -Author: Steve -Date: Wed Feb 7 13:27:49 2018 -0800 - - Add create functionality (list/create endpoint) - -commit 37db37b07d49b19bda96de0c6afe82e910f6e8d7 -Author: Steve -Date: Wed Feb 7 12:05:48 2018 -0800 - - Add basic detail view - -commit 01dcc90d796922c7ffbaa7762b2808f90d11308a -Author: Steve Hillier -Date: Tue Feb 6 21:16:21 2018 -0800 - - Minor changes to formatting (eof newline, whitespace) - -commit 5c5a5ba868d5958be74a734e6e76090510613b58 -Author: Steve Hillier -Date: Tue Feb 6 21:15:51 2018 -0800 - - Add djangorestframework as dependency - -commit 1e0ac4612937583dec22a81db833c7962e91edc8 -Author: Steve Hillier -Date: Tue Feb 6 20:24:01 2018 -0800 - - Add prefetch to reduce queries on province_state - -commit 365411abd73275a529dc5ca7ec403b994c513aae -Author: Steve Hillier -Date: Tue Feb 6 20:15:45 2018 -0800 - - Add fields to driller list serializer - -commit ca8824a7d8be8eb814a07df76c3cb9e7bd1884f5 -Author: Steve Hillier -Date: Tue Feb 6 20:15:20 2018 -0800 - - Add driller model list endpoint - -commit 868c29b23d74ef2dced64eed545995d43f0256ef -Author: Steve Hillier -Date: Tue Feb 6 19:30:25 2018 -0800 - - Add simple driller list serializer - -commit 4eb2b17d7b988c3c9f1a7e32b0eee4e0b590ee0e -Author: Steve Hillier -Date: Tue Feb 6 19:30:05 2018 -0800 - - Add rest_framework to installed apps - -commit 585a87e7299dcb1d19a14e41dec81240504079cf -Author: Steve -Date: Thu Feb 8 14:52:19 2018 -0800 - - Add contact set to organization detail view - -commit 4f06271dfcc6ef64dcd3a161e526ce63e12d4bf6 -Author: Christian Evans -Date: Thu Feb 8 14:40:58 2018 -0800 - - Merging fixtures into one file. - -commit 09a13554ae0e15457446a1ca5ec2a9a53a65d585 -Author: Steve -Date: Thu Feb 8 14:26:37 2018 -0800 - - Rename driller company references to organization (driller should represent a person) - -commit 713615418e758362d97174776da2503afc54c95f -Author: Christian Evans -Date: Thu Feb 8 13:51:52 2018 -0800 - - Fixtures for registries. - -commit e9432b6bdee16b27a878df71c50563ee960ef211 -Author: Fieran Mason-Blakley -Date: Thu Feb 8 13:05:59 2018 -0800 - - styled survey_detail - -commit d51633febb80b5d1d5ee1bf9f339214b66c8537d -Author: Fieran Mason-Blakley -Date: Thu Feb 8 13:05:12 2018 -0800 - - adding styling for read view of forms - -commit 24e607494dfc77760ed7ed5c535a55c2406eb0a7 -Author: Fieran Mason-Blakley -Date: Thu Feb 8 13:04:12 2018 -0800 - - added tests for add survey - -commit a66ca2cc93e68a1f7c1344041b3f0a37ee1e1b9e -Author: Fieran Mason-Blakley -Date: Thu Feb 8 13:03:13 2018 -0800 - - added fixtures - -commit 7867cf2e1d57fbfe3a23a9ee445713298e98cdc8 -Author: Fieran Mason-Blakley -Date: Thu Feb 8 11:32:20 2018 -0800 - - removed commented out code - -commit cccfca7f9b6a12d091ded93b317b5354b58c5e51 -Author: Fieran Mason-Blakley -Date: Thu Feb 8 09:40:15 2018 -0800 - - Added a serialization method to parent class to assist in generating fixtures. - -commit c89a45089df01fdaf550ffc949a25dda75999abd -Merge: 006e4fed4 e7be86128 -Author: garywong-bc -Date: Wed Feb 7 17:19:09 2018 -0800 - - Merge pull request #411 from garywong-bc/master - - Refactor DB scripts to work with new data structures... - -commit 658cfd49989b0b00419df5e19ebe644717e18133 -Author: Fieran Mason-Blakley -Date: Wed Feb 7 17:15:22 2018 -0800 - - Got survey feature beta working. - -commit e7be86128b937a8f65b67c05fd358034036330e1 -Merge: a9ab74fe1 104cbab2c -Author: Gary Wong (BC Gov) -Date: Wed Feb 7 17:13:10 2018 -0800 - - Merge branch 'developer' - -commit a768a1904f7010853eaa4cf7cb86a264e37291b4 -Merge: 3b4b7c5db 104cbab2c -Author: garywong-bc -Date: Wed Feb 7 16:32:23 2018 -0800 - - Merge pull request #410 from garywong-bc/developer - - Refactored db_replicate() - -commit 2cc6ab41b43dfd084cdd7f7d83aa92a798ef9608 -Author: Steve -Date: Wed Feb 7 15:02:55 2018 -0800 - - Add extra documentation to views - -commit e990557e1eaf53a2a784fce00fc79429394fdce9 -Author: Steve -Date: Wed Feb 7 14:49:38 2018 -0800 - - Add Swagger documentation (Django REST Swagger) - -commit 3a8c738d8696f31f7024691d56b5edc411289b1b -Author: Steve -Date: Wed Feb 7 14:37:16 2018 -0800 - - Add docstrings to view classes - -commit 104cbab2c2cf5ddcc3db7d1bef9e70a87c0ac3b0 -Author: Gary Wong (BC Gov) -Date: Wed Feb 7 14:26:13 2018 -0800 - - Refactored gwells_db_replicate() DB function - -commit 05f47ce3e1c4405fa9f61ef3a4e17f1740aad545 -Author: Steve -Date: Wed Feb 7 13:45:39 2018 -0800 - - Modify retrieve view to also allow update and delete - -commit 31ba2345c52b7fc8d74d6ba80bfd8150964957bc -Author: Steve -Date: Wed Feb 7 13:27:49 2018 -0800 - - Add create functionality (list/create endpoint) - -commit 006e4fed4e03e967603159b77155e9afd2303bc4 -Merge: 4dc37b2a2 a9ab74fe1 -Author: garywong-bc -Date: Wed Feb 7 12:19:02 2018 -0800 - - Merge pull request #409 from garywong-bc/master - - disable not-yet-ready registries app - -commit a9ab74fe18fde9b3df0cc0d245ff7f7c54f11ba3 -Author: Gary Wong (BC Gov) -Date: Wed Feb 7 12:18:47 2018 -0800 - - disable not-yet-ready registries app - -commit 66d680252a6a60358dfe403c0b804246d1a74237 -Author: Steve -Date: Wed Feb 7 12:05:48 2018 -0800 - - Add basic detail view - -commit 4dc37b2a22ec817212b6bdf914709efcecfc59a0 -Merge: c282e252b cff63d484 -Author: garywong-bc -Date: Wed Feb 7 11:44:04 2018 -0800 - - Merge pull request #408 from garywong-bc/master - - Reset DB and leverage new OpenShift Secrets - -commit cff63d484599d2b52466797aaff926819216f3a8 -Merge: 3b4b7c5db c282e252b -Author: Gary Wong (BC Gov) -Date: Wed Feb 7 10:28:41 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells into developer - -commit a60eed9670cb230a13f62f088b007e529bc3df29 -Author: Fieran Mason-Blakley -Date: Wed Feb 7 09:43:48 2018 -0800 - - working on admin for surveys - -commit 9fa2613162429d662b902006a11399567d86a760 -Author: Steve Hillier -Date: Tue Feb 6 21:16:21 2018 -0800 - - Minor changes to formatting (eof newline, whitespace) - -commit 2078f6a6643e343c2b4f0324a5a792c90a29225e -Author: Steve Hillier -Date: Tue Feb 6 21:15:51 2018 -0800 - - Add djangorestframework as dependency - -commit a06f586ba95148643561122f051087db7b63fecb -Author: Steve Hillier -Date: Tue Feb 6 20:24:01 2018 -0800 - - Add prefetch to reduce queries on province_state - -commit 4303a55096edae7f7968bd0b252aa2eddaba2e9b -Author: Steve Hillier -Date: Tue Feb 6 20:15:45 2018 -0800 - - Add fields to driller list serializer - -commit 95c38a56ef913a639336bdc1a04c8fa16d6799f4 -Author: Steve Hillier -Date: Tue Feb 6 20:15:20 2018 -0800 - - Add driller model list endpoint - -commit d98d4b41c2ecab5a61f975e1b23b8e06709d4d3f -Author: Steve Hillier -Date: Tue Feb 6 19:30:25 2018 -0800 - - Add simple driller list serializer - -commit 8554b561f82697d9f34b702f4a7fd7b817dec61a -Author: Steve Hillier -Date: Tue Feb 6 19:30:05 2018 -0800 - - Add rest_framework to installed apps - -commit 3b4b7c5db9727a05f5d496e07d9f4d422f11f179 -Merge: 98e73f153 772fef81b -Author: garywong-bc -Date: Tue Feb 6 14:34:25 2018 -0800 - - Merge pull request #407 from garywong-bc/developer - - Better documentation for the Registries app - -commit 772fef81be7cd36b32761d5cd637d99b8d39c1ac -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 14:33:43 2018 -0800 - - Better documented the Registries app - -commit 3cf7eb69487bde679a226c95038b58971237aafe -Merge: 07b23d9e0 98e73f153 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 14:31:13 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 07b23d9e0dd833653b53f95ed21f7d7b47b2d926 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 14:30:27 2018 -0800 - - Better documented the Registries app - -commit c1cede58fc52db06f1653e31acb667e521931e0e -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 14:25:06 2018 -0800 - - Better documented the Registries app - -commit 22c4743453580cef491d013ea4156be8698c9ac1 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 14:23:25 2018 -0800 - - Better documented the Registries app - -commit 6ad1af8d833b72c3bb743ad2c15aa05402e76370 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 14:19:56 2018 -0800 - - Better documented the Registries app - -commit cd53c163ae831bde4a56ed8ee9f58651f81586a5 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 14:11:37 2018 -0800 - - Better documented the Registries app - -commit 478659be860f14c468b18bbe400317c431003363 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 13:51:33 2018 -0800 - - Better documented the Registries app - -commit 1eee2e42bc3198e2bb725fb0b4032ce396d24907 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 13:48:39 2018 -0800 - - Better documented the Registries app - -commit bd29a1e1a5e309766d3b32ec88cfc5a6f9669687 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 13:47:25 2018 -0800 - - Better documented the Registries app - -commit a30973620ea2d3b45f66cbf46432baabbe0c0ac1 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 13:45:48 2018 -0800 - - Better documented the Registries app - -commit f7a2e34d83e2f89920b76adcd3bb5e118875763e -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 13:44:55 2018 -0800 - - Better documented the Registries app - -commit 943efea0653fb8c55f083107c2786374881662d2 -Author: Gary Wong (BC Gov) -Date: Tue Feb 6 13:38:16 2018 -0800 - - Better documented the Registries app - -commit 98e73f15377300e73a5f85fa66c56c346a9ed678 -Merge: bf0ddb8e4 4a2994676 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Feb 6 11:20:28 2018 -0800 - - Merge pull request #406 from fieranmason/RegistryPageMetaData - - Registry page meta data - -commit 4a29946762d8e9e9e472ae7f18539b79a1fa3e43 -Author: Fieran Mason-Blakley -Date: Tue Feb 6 09:43:46 2018 -0800 - - Removing 500 test on account of problems in executing the test. Removed commented out tests for activity subission. Removing unused annotation. - -commit 01fe5368775b6baee7dc97929aa57490b216be64 -Author: Fieran Mason-Blakley -Date: Tue Feb 6 09:05:50 2018 -0800 - - patching issues with tests - -commit 0f471d5e0925c71e40a31935587fc8ae51c675fd -Author: Fieran Mason-Blakley -Date: Mon Feb 5 22:26:11 2018 -0800 - - Removed some problem tests to ensure that development can move forward. - -commit bf0ddb8e4c32ed54fe857ddd166f3e53a4ffc250 -Merge: 94fd0defb e06fe38e1 -Author: Roland Stens -Date: Mon Feb 5 13:44:40 2018 -0800 - - Merge pull request #405 from rstens/developer - - Re-organize Jenkinsfile - -commit e06fe38e12231f8bd1fc60ab304d2df0dc8195cd -Author: Roland Stens -Date: Mon Feb 5 13:44:16 2018 -0800 - - Re-organize Jenkinsfile - -commit 94fd0defb5702df27ef26aa6b5b1470a57d0c982 -Merge: 217677d87 0c54fc305 -Author: Roland Stens -Date: Mon Feb 5 13:41:14 2018 -0800 - - Merge pull request #404 from rstens/developer - - Publish Unit Test Results - -commit 0c54fc3055a262b41354bd6b32e66c30baea9b86 -Author: Roland Stens -Date: Mon Feb 5 13:40:00 2018 -0800 - - Publish Unit Test Results - -commit 096d49ef7ed3b54c9e65635e41f23938d47da8b7 -Author: Roland Stens -Date: Mon Feb 5 13:36:14 2018 -0800 - - Publish Unit Test Results - -commit 217677d87ed18be8eb70e2217b355f065ccb3716 -Merge: 8946c4650 26dea848b -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 12:23:37 2018 -0800 - - Merge pull request #403 from fieranmason/RemoveSurvey744 - - Remove survey744 - -commit 8946c4650fd26622c91313559616d306a4af12e9 -Merge: 1f6b50371 907ef8e25 -Author: Roland Stens -Date: Mon Feb 5 12:18:33 2018 -0800 - - Merge pull request #402 from rstens/developer - - Remove running the server - -commit 907ef8e25c1f53607a5697781fa892e37f99badd -Author: Roland Stens -Date: Mon Feb 5 12:17:57 2018 -0800 - - Remove running the server - -commit 1f6b503715a2dbd3c133df8ac37f4cbd39ff14b6 -Merge: 5c22f40d6 360c99c0f -Author: Roland Stens -Date: Mon Feb 5 12:09:55 2018 -0800 - - Merge pull request #401 from rstens/developer - - Add collectstatic - -commit 360c99c0f58fb9d6e78287f59a820d99f0c08251 -Author: Roland Stens -Date: Mon Feb 5 12:09:05 2018 -0800 - - Add collectstatic - -commit 5c22f40d66e435f412a0e24863cd2c1c7db6fed1 -Merge: 5b9faab07 08690f190 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 12:02:32 2018 -0800 - - Merge pull request #400 from rstens/developer - - Start server as daemon - -commit 08690f19089f0bed9486c4d03d67263d98624735 -Author: Roland Stens -Date: Mon Feb 5 12:01:35 2018 -0800 - - Start server as daemon - -commit 5b9faab070986acb5e8e9eac1ac0125b255561a6 -Merge: b6e207b58 300b124a6 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 11:54:00 2018 -0800 - - Merge pull request #399 from rstens/developer - - Run server to be able to run unit test. - -commit 300b124a63abd36cbef28971e3f286fb6883df4c -Author: Roland Stens -Date: Mon Feb 5 11:52:57 2018 -0800 - - Run server - -commit 890c94bb29393d76867616b0e4b699292ec52fec -Author: Roland Stens -Date: Mon Feb 5 11:52:13 2018 -0800 - - run server for test purposes - -commit b6e207b58a62cca3cb0dc85be9889a6419d9aa84 -Merge: 42cb63217 23789e33f -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 11:45:24 2018 -0800 - - Merge pull request #398 from rstens/developer - - Adding migration into unit test script - -commit 23789e33fb66c71023a3fc44708da0269ad5208f -Author: Roland Stens -Date: Mon Feb 5 11:44:30 2018 -0800 - - Adding migration into unit test script - -commit 42cb632179b38d904e0ae5f004dd37cf8cfa1830 -Merge: 6545ce6ea 6be7151bb -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 11:05:08 2018 -0800 - - Merge pull request #397 from rstens/developer - - Fix Bug - -commit 6be7151bbdac6a803fa40c453ba36b3972f517f3 -Author: Roland Stens -Date: Mon Feb 5 11:04:18 2018 -0800 - - Fix Bug - -commit 3e2c5587eaaef5569f0189ac544928271340f17b -Author: Fieran Mason-Blakley -Date: Mon Feb 5 11:02:31 2018 -0800 - - Set meta data text for registry page. - -commit 6545ce6ea07259fbfa9e3de16439a1467cdd564c -Merge: 0f4aa7323 6575ec264 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 11:01:27 2018 -0800 - - Merge pull request #396 from rstens/developer - - Update to run coverage - -commit 6575ec2644f237dd31e7970533dc5be6a0a1a69c -Author: Roland Stens -Date: Mon Feb 5 11:00:23 2018 -0800 - - Update to run coverage - -commit 0f4aa7323f08bd806f7120cc2a014c990df75277 -Merge: b99bdbff1 c8f55e2e2 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 10:18:46 2018 -0800 - - Merge pull request #395 from rstens/developer - - That did not work, fix the jenkins file - -commit c8f55e2e26147b456a41b6b0044e079eca44b8ac -Author: Roland Stens -Date: Mon Feb 5 10:17:29 2018 -0800 - - That did not work, fix the jenkins file - -commit b99bdbff1539db8e268e3883ca342658c01e5859 -Merge: 5fbae536d 0b38065fb -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 10:12:42 2018 -0800 - - Merge pull request #394 from rstens/developer - - Adding Tests to Sonar-Runner - -commit 0b38065fb21f3de95a7f1088e75ba3955db9927c -Author: Roland Stens -Date: Mon Feb 5 10:02:25 2018 -0800 - - Add the tests to SOnar-runner (update) - -commit f95481c1803cd726efbd83658a2230f6a0a74256 -Author: Roland Stens -Date: Mon Feb 5 10:01:43 2018 -0800 - - Add running the tests to Sonar-runner - -commit 26dea848b3e40b4fdd0ac01e55a56224f1caeabf -Merge: 2d86d39f9 5fbae536d -Author: Fieran Mason-Blakley -Date: Mon Feb 5 09:45:05 2018 -0800 - - Merge branch 'developer' into RemoveSurvey744 - -commit 5fbae536d42346cfd75472b3fcfaf32998b7cb05 -Merge: d1394c25a c9032563e -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Feb 5 09:38:34 2018 -0800 - - Merge pull request #393 from rstens/developer - - Adding coverage to the unit tests - -commit c9032563e3eec832c69754f05f08b5d94dc6622e -Author: Roland Stens -Date: Mon Feb 5 09:35:49 2018 -0800 - - Adding coverage to the unit tests - -commit 2d86d39f928c31548108bcd1bdb597b6c172a7de -Author: Fieran Mason-Blakley -Date: Mon Feb 5 09:08:23 2018 -0800 - - Removed survey link. - -commit d1394c25a4b034c5e609553beb4e3c882b843ae4 -Merge: 2d4aefcbf 0f219dfcf -Author: garywong-bc -Date: Sun Feb 4 20:03:30 2018 -0800 - - Merge pull request #392 from garywong-bc/developer - - Complete test data for V3 Registries - -commit 0f219dfcf15b81e168dc9a1a82aecc974247183c -Merge: 8ff413e9b 2d4aefcbf -Author: Gary Wong (BC Gov) -Date: Sun Feb 4 20:02:06 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 8ff413e9b56c7e1f2b6fe334f1410797bc820835 -Author: Gary Wong (BC Gov) -Date: Sun Feb 4 20:01:52 2018 -0800 - - V3 Registries with complete test dataset (mangled birthdates but with otherwise real data. - -commit effcf57209a5a56af4841744e8e31c887e4a22e3 -Author: Gary Wong (BC Gov) -Date: Sun Feb 4 11:23:36 2018 -0800 - - Interim Save. - -commit 04fe6d613ee72ea508d4412ca85d424132a057e3 -Author: Gary Wong (BC Gov) -Date: Sat Feb 3 14:06:30 2018 -0800 - - interim save. - -commit 2d4aefcbf282360aa93dd50bf0b824ab60d5f63f -Merge: f0523533b 6ff38c609 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Feb 2 15:26:12 2018 -0800 - - Merge pull request #391 from rstens/developer - - Test count updates. - -commit 6ff38c6090f50ec82dcf0c75c7427861710dcd7c -Author: Roland Stens -Date: Fri Feb 2 15:16:21 2018 -0800 - - Test count updates. - -commit 5ef3552ec24299d711451d99bfad689247c95a00 -Author: Gary Wong (BC Gov) -Date: Thu Feb 1 16:29:23 2018 -0800 - - V3 with more test data loading into Registries. - -commit f0523533b2adfabf716a8b6b2f695387c91bd8aa -Merge: 230432616 efbf17efd -Author: garywong-bc -Date: Wed Jan 31 22:32:14 2018 -0800 - - Merge pull request #390 from garywong-bc/developer - - V3 Registries with updated test data - -commit efbf17efde22a82fffb819d86a7cd85efc55b571 -Author: Gary Wong (BC Gov) -Date: Wed Jan 31 22:19:57 2018 -0800 - - Expanded tel model attributes. - -commit c07a801c88a907f79201639af7997e5d560ba2ad -Author: Gary Wong (BC Gov) -Date: Wed Jan 31 22:17:39 2018 -0800 - - V3 Registries refinment, start of data load into Registries model. - -commit cb83d907f37891bd8b240454b3ca27b25de4eb11 -Author: Gary Wong (BC Gov) -Date: Wed Jan 31 20:10:40 2018 -0800 - - Added additional provinces into lookup table - -commit daeee33b4989500259435a065c0d0efe773a2650 -Author: Gary Wong (BC Gov) -Date: Wed Jan 31 17:35:11 2018 -0800 - - Switched Well Driller Register test data to be symolic links to local files. - -commit 9ae3c23f23c2aff7a11f686158467bdb8f1904a8 -Author: Gary Wong (BC Gov) -Date: Wed Jan 31 17:22:05 2018 -0800 - - Registries V3 with sanitized test data from Access - -commit 230432616920066f4d49676bc431178621bcbf85 -Merge: 6bff55d37 2b1367a0d -Author: garywong-bc -Date: Wed Jan 31 16:14:55 2018 -0800 - - Merge pull request #389 from rstens/developer - - Test updates and ZAP run update - -commit 2b1367a0d6c399b4a17bf914309de14e0966338a -Author: Roland Stens -Date: Wed Jan 31 16:14:08 2018 -0800 - - Test updates and ZAP run update - -commit 6bff55d37a7b58181d33e4156ec5b250279808b6 -Merge: fe6e687f8 04f8fa68b -Author: garywong-bc -Date: Wed Jan 31 15:45:27 2018 -0800 - - Merge pull request #388 from fieranmason/developer - - Removed registry and set up new User model - -commit 04f8fa68b82343b58341c23e6e213c1ed03982f5 -Author: Fieran Mason -Date: Wed Jan 31 15:29:35 2018 -0800 - - removed registry place holder app - -commit d3c8dcf456413056ac299a0dfc13b8cafa1e490e -Author: Fieran Mason -Date: Wed Jan 31 12:20:22 2018 -0800 - - Switched to custom user. - -commit fe6e687f89d26072fe722d20a6ecf3a088d0be4a -Merge: 390417883 99ace6856 -Author: garywong-bc -Date: Tue Jan 30 16:36:18 2018 -0800 - - Merge pull request #387 from garywong-bc/developer - - v3 of Registries app model, with code CSV files - -commit 99ace685646004bfffaaa0cd396e8f830866467b -Author: Gary Wong (BC Gov) -Date: Tue Jan 30 16:29:48 2018 -0800 - - v3 of Registries app model, with code CSV files - -commit 390417883d99f92cdd7efe02c9b9c92415d4f6bc -Merge: 7957df578 7fea2f1c2 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Jan 30 10:37:36 2018 -0800 - - Merge pull request #386 from cwevans/developer - - Mask IPs in Google Analytics. - -commit 7fea2f1c2f2708adde16113d76add91ac7829828 -Author: Christian Evans -Date: Tue Jan 30 09:43:17 2018 -0800 - - Masking IP addresses in Google Analytics. - -commit 7957df578113a2b9880baec8e3c089051c54f061 -Merge: 91d699a01 edfca7f80 -Author: garywong-bc -Date: Sun Jan 28 21:18:27 2018 -0800 - - Merge pull request #385 from garywong-bc/developer - - Draft of complete Registry App model - -commit edfca7f8048244148f3dcdf1a44f1d05551871d0 -Author: Gary Wong (BC Gov) -Date: Sun Jan 28 21:16:35 2018 -0800 - - V1 of Registry app, ready to be shared with the team. - -commit 0faccc32f411ca809d61966bcefd3c7c70a20174 -Author: Gary Wong (BC Gov) -Date: Sun Jan 28 20:37:44 2018 -0800 - - v2 of Registry app model, with code CSV files - -commit e12968ab4d5a690a92f31d795d0027fa35b7dc22 -Author: Gary Wong (BC Gov) -Date: Sat Jan 27 22:28:48 2018 -0800 - - Core model, minus Registry and Application Statuses - -commit e713e584142b228c1661fec4bd57cd78bf777947 -Author: Gary Wong (BC Gov) -Date: Sat Jan 27 16:54:35 2018 -0800 - - Reverted registry app DB - -commit 91d699a010659320383ff81622bbc987d8655566 -Merge: 7f95d6e92 fd182c0ec -Author: garywong-bc -Date: Fri Jan 26 12:27:06 2018 -0800 - - Merge pull request #384 from rstens/developer - - Update to running ZAP inside the pipeline - -commit fd182c0ec45f22eacdd3a7ce9ed5977d501de7fb -Author: Roland Stens -Date: Fri Jan 26 12:20:40 2018 -0800 - - Update to running ZAP inside the pipeline - -commit 7f95d6e92174c6e256130d4e1eb5ba20072efbec -Merge: 1af781873 939e075fb -Author: garywong-bc -Date: Fri Jan 26 11:57:07 2018 -0800 - - Merge pull request #383 from rstens/developer - - Updated the test to find a well without additional information. - -commit 939e075fb8556d2324ef01fadc61f2bf6e51754a -Author: Roland Stens -Date: Fri Jan 26 11:14:46 2018 -0800 - - Updated the test to find a well without additional information. - -commit c282e252b90b04fb3508081e764df4e8666bf758 (tag: v1.23.0) -Merge: ce1cc2db1 109cbb8d9 -Author: garywong-bc -Date: Thu Jan 25 13:31:32 2018 -0800 - - Merge pull request #382 from garywong-bc/master - - Enabling S3 Documents - -commit 1af781873ce9bfb74ddd2d83e17b9d0514d543db -Merge: d2793a90e 109cbb8d9 -Author: garywong-bc -Date: Thu Jan 25 12:50:25 2018 -0800 - - Merge pull request #381 from garywong-bc/developer - - Temporarily deactivate registry app.. - -commit 109cbb8d93d373e7bce897aca5ff3b3c24f5c354 -Author: Gary Wong (BC Gov) -Date: Thu Jan 25 12:30:05 2018 -0800 - - Temporarily deactivate registry app. - -commit 5bed8847bd0d7f03895bed8891162630fa74a990 -Author: Gary Wong (BC Gov) -Date: Wed Jan 24 22:49:48 2018 -0800 - - Registry model v.2 - -commit d2793a90e0f0d060c573eaa001e60351b1edc994 -Merge: 8a384ac7e 9edfe209d -Author: garywong-bc -Date: Wed Jan 24 15:39:15 2018 -0800 - - Merge pull request #380 from garywong-bc/developer - - Documentation updates... - -commit 9edfe209d6213c8c92504a109ae68f48c4c20c65 -Author: Gary Wong (BC Gov) -Date: Wed Jan 24 15:32:46 2018 -0800 - - further hyperlinks - -commit d23e156972d84a318409b4a223ebdab2b091fe8d -Author: Gary Wong (BC Gov) -Date: Wed Jan 24 15:26:39 2018 -0800 - - references to related pages - -commit 1985ea6879495e37d1e149fad5e718603d7b3135 -Author: Gary Wong (BC Gov) -Date: Wed Jan 24 15:22:04 2018 -0800 - - Reformatted README - -commit ab58847730b984dbd2a8c6149ee218b87084b29f -Author: Gary Wong (BC Gov) -Date: Wed Jan 24 14:44:32 2018 -0800 - - Better describe the Environmental variables - -commit 8a384ac7e4f0bc7f47acae7c54a1fcd17ac4fe6d -Merge: 272ab1255 77bc440e7 -Author: garywong-bc -Date: Tue Jan 23 17:36:42 2018 -0800 - - Merge pull request #377 from rstens/developer - - Update Sonar-runner to correctly show version numbers. (date.build) - -commit 272ab1255f0e2eaf4d0ba0a52ff1604948368350 -Merge: 89e9a2f53 99f4c9cbf -Author: garywong-bc -Date: Tue Jan 23 17:36:31 2018 -0800 - - Merge pull request #378 from garywong-bc/developer - - Refactored Minio Access to public S3 - -commit 77bc440e7a1cf302a00e379bceca7f2a91e5aac7 -Author: Roland Stens -Date: Tue Jan 23 17:03:51 2018 -0800 - - Update sonar-runner readme to align with the new version. - -commit 99f4c9cbf2a41fc09723ed2e14f3729336de2a00 -Merge: 95d62a80f 89e9a2f53 -Author: Gary Wong (BC Gov) -Date: Tue Jan 23 17:00:56 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 95d62a80faee52893e5aade7925644318883ef55 -Author: Gary Wong (BC Gov) -Date: Tue Jan 23 17:00:34 2018 -0800 - - Removed credentials from S3 public access. - -commit 90e4df8b487faeb2dedf41ee85e49da8f5eded3a -Author: Roland Stens -Date: Tue Jan 23 16:55:19 2018 -0800 - - Update Sonar-runner to correctly show version numbers. (date.build) - -commit 89e9a2f5373712d27ef599f34e1c6064ada1813c -Merge: ca8625ef2 809af81b1 -Author: garywong-bc -Date: Tue Jan 23 15:11:29 2018 -0800 - - Merge pull request #376 from rstens/developer - - sonar-runner update to support the new version of SonarQube - -commit 809af81b1a331c592b078bcc42e8b69d31c79d74 -Author: Roland Stens -Date: Tue Jan 23 15:10:35 2018 -0800 - - SObar-runner update to support the new version of SonarQube - -commit ca8625ef2ad75e99524d43f3ebee4041e18da257 -Merge: 45821fdae cd868a636 -Author: garywong-bc -Date: Tue Jan 23 14:42:06 2018 -0800 - - Merge pull request #375 from garywong-bc/developer - - Refine S3 access for PROD Amazon S3 account - -commit cd868a636479dc30af3050658b7e6dc458fe510b -Author: Gary Wong (BC Gov) -Date: Tue Jan 23 14:40:58 2018 -0800 - - Refine S3 access for PROD Amazon S3 account - -commit 45821fdae1ef4c1716f8b4f10733c2ba397fb3b7 -Merge: feeb4ed6c 24ff13bd4 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Jan 23 11:12:28 2018 -0800 - - Merge pull request #373 from rstens/developer - - Add zap to our developer pipeline - -commit 24ff13bd45f604ba5b3bb2af3a9e41e8d6b1bbae -Author: Roland Stens -Date: Tue Jan 23 11:06:42 2018 -0800 - - Add zap to our developer pipeline - -commit 8803e3f93c734ef2b4d5b5a7a89555680619a2a1 -Merge: c7718516b feeb4ed6c -Author: Roland Stens -Date: Tue Jan 23 10:36:59 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit feeb4ed6c73875d16ecfca8d98ef39beb7aee050 -Merge: 6d18ab398 a6f99bee3 -Author: garywong-bc -Date: Mon Jan 22 16:59:21 2018 -0800 - - Merge pull request #372 from garywong-bc/developer - - Addition of placeholder 'registry' app - -commit a6f99bee3c12ebd7cb8c347b69784dce34aaf3e6 -Author: Gary Wong (BC Gov) -Date: Mon Jan 22 16:58:21 2018 -0800 - - First cut at registry app - -commit 3c7b2fdc25023fb782b2425248f3767a234b6abe -Merge: 6d18ab398 ce1cc2db1 -Author: Gary Wong (BC Gov) -Date: Mon Jan 22 16:32:23 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells into developer - -commit 6d18ab398dd9973fdbe340daf0b1bce6ebf3c1d9 -Merge: 1dfebece7 3ae219e66 -Author: garywong-bc -Date: Mon Jan 22 16:27:10 2018 -0800 - - Merge pull request #371 from fieranmason/LegacyRegistry - - Fixed a test for the modification of the registry view - -commit 3ae219e665dd09064a9d51d83c115a173ef389ef -Author: Fieran Mason -Date: Mon Jan 22 16:25:58 2018 -0800 - - Fixed a test for the modification of the registry view - -commit 1dfebece788f1ed8318bc0b580c6346ffe3aace1 -Merge: fbef1ded5 fc1df99c1 -Author: garywong-bc -Date: Mon Jan 22 16:18:00 2018 -0800 - - Merge pull request #370 from fieranmason/LegacyRegistry - - Modified registry url in preparation for registry devex project. - -commit fc1df99c1440ef49e7aadb7e6f8f951328f451e5 -Author: Fieran Mason -Date: Mon Jan 22 15:54:02 2018 -0800 - - Modified registry url in preparation for registry devex project. - -commit c7718516bc3725cfb928938cc9e5f3d337ff8fde -Author: Roland Stens -Date: Fri Jan 19 10:54:54 2018 -0800 - - update .gitignore to ignore certains files and dirs in functional tests - -commit ce1cc2db1874013336f6bdeedd15ef5abdf9bb06 -Merge: bda5b16b8 fbef1ded5 -Author: garywong-bc -Date: Fri Jan 19 10:13:39 2018 -0800 - - Merge pull request #369 from garywong-bc/master - - Back end changes (tests) - -commit fbef1ded59524c08ede96808e714beda1bc76db4 -Merge: e9d22eb88 f52ee50dc -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Jan 17 16:27:30 2018 -0800 - - Merge pull request #368 from fieranmason/ModelViewFormsRefactor - - removing tests that are causing issues between environments - -commit f52ee50dc0cc2512f91e27eeffd5cbad3ffa6f4d -Author: Fieran Mason -Date: Wed Jan 17 16:22:32 2018 -0800 - - removing tests that are causing issues between environments - -commit e9d22eb88eb4674d36f8f3dbf4dd896823228567 -Merge: ea39edf22 804122ae0 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Jan 17 15:59:57 2018 -0800 - - Merge pull request #367 from fieranmason/ModelViewFormsRefactor - - Added view tests. - -commit 804122ae0ea34c07a528a963ce53d6318fdc115b -Author: Fieran Mason -Date: Wed Jan 17 15:56:31 2018 -0800 - - Added view tests. - -commit ea39edf229f78629195b867328499de6c66352e3 -Merge: 10137a26f e3ca813fb -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Jan 17 10:11:07 2018 -0800 - - Merge pull request #366 from rstens/developer - - New jenkinsfile for the independent Test pipeline - -commit e3ca813fbfb99ae1fa7322dc376cf34d7bf14ca5 -Author: Roland Stens -Date: Wed Jan 17 10:09:47 2018 -0800 - - New jenkinsfile for the independent Test pipeline - -commit 10137a26fb4f8a1bae1eac951b039b875d261ff7 -Merge: d8813f2e1 4e170610f -Author: garywong-bc -Date: Tue Jan 16 14:24:05 2018 -0800 - - Merge pull request #365 from bcgov/revert-364-developer - - Revert "Sync'ing GW local repo with upstream" - -commit 4e170610fb6830adae290f4dc225d99a9dcdd305 -Author: garywong-bc -Date: Tue Jan 16 14:23:50 2018 -0800 - - Revert "Sync'ing GW local repo with upstream" - -commit d8813f2e1ba4e3d8a7c30d4a96129ec116d8dca4 -Merge: 86d2cd970 d2cdd6acc -Author: garywong-bc -Date: Tue Jan 16 13:55:32 2018 -0800 - - Merge pull request #364 from garywong-bc/developer - - Sync'ing GW local repo with upstream - -commit d2cdd6acc90d2e2590d6e67e7504fe247eedeb41 -Merge: 411a222ea 86d2cd970 -Author: Gary Wong (BC Gov) -Date: Tue Jan 16 13:52:08 2018 -0800 - - updated from master - -commit 411a222ea57b7196fb635cf226c3b1690d971eff -Merge: 3a1b5ddfc bda5b16b8 -Author: Gary Wong (BC Gov) -Date: Tue Jan 16 13:48:21 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells into developer - -commit 86d2cd970c4fa6983be38f8ed3b8456942e0fae3 -Merge: 0d58a805e 160937dce -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Jan 16 13:07:54 2018 -0800 - - Merge pull request #363 from rstens/developer - - Jenkinsfile for the ZAP pipeline - -commit 160937dce9099495e94d0ede26bd0206e9c437e2 -Author: Roland Stens -Date: Tue Jan 16 13:05:16 2018 -0800 - - Jenkinsfile for the ZAP pipeline - -commit 0d58a805ec970c0a42403bfd03592ad5341c588a -Merge: a3997c20e b5064ef37 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Jan 16 12:20:36 2018 -0800 - - Merge pull request #362 from fieranmason/ModelViewFormsRefactor - - Patched trailing path issues. - -commit b5064ef37036d40bfaeb92000f37766fbbad42cc -Author: Fieran Mason -Date: Tue Jan 16 12:08:26 2018 -0800 - - Patched trailing path issues. - -commit a3997c20e744d631893f2312308bba2b008b4e9f -Merge: 3a5ef53d3 f8ea40e1a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Jan 16 11:17:47 2018 -0800 - - Merge pull request #361 from fieranmason/ModelViewFormRefactor - - Model view form refactor - -commit f8ea40e1a462487d9487a1dfbcd079618612e0f1 -Merge: c378dc00c 3a5ef53d3 -Author: Fieran Mason -Date: Tue Jan 16 10:40:33 2018 -0800 - - Merge branch 'developer' into ModelViewFormsRefactor - -commit c378dc00c9f52012f0892fe9542c2532675e50d8 -Author: Fieran Mason -Date: Tue Jan 16 10:38:41 2018 -0800 - - Fixed path issues - -commit 8873304b11bdd99f16a339842c25fc4f0d6676bc -Author: Fieran Mason -Date: Mon Jan 15 18:24:16 2018 -0800 - - Finished split of view into one view per file. - -commit 7ae2cc693fdffed1a48639b2cf75a9a070b8d7be -Author: Fieran Mason -Date: Mon Jan 15 17:28:06 2018 -0800 - - Split views - -commit 0958e655410e5bada9713b5bb22757f0099e5124 -Author: Fieran Mason -Date: Mon Jan 15 15:39:48 2018 -0800 - - Added unit tests for instantiation of forms and models to verify correctness of the form and model packages. Corrected an error in the models package which was identified by these unit tests. - -commit 84fcb50c9176744639e7cf95a5c1f01bab231171 -Author: Fieran Mason -Date: Mon Jan 15 13:46:33 2018 -0800 - - Split models and forms into one class per file. Added tests for form instantiation to verify package correctness. - -commit 3a5ef53d38e7fdc52ec53c9f2f91976ca2ebae1f -Merge: 1ed41e8b7 3a1b5ddfc -Author: garywong-bc -Date: Fri Jan 12 16:18:15 2018 -0800 - - Merge pull request #360 from garywong-bc/developer - - Missed one relative path. - -commit 3a1b5ddfc5121d7107c3397a0f2fbf12cfe82211 -Author: Gary Wong (BC Gov) -Date: Fri Jan 12 16:17:40 2018 -0800 - - Missed one relative path. - -commit 1ed41e8b7c2ea202ed38af5c54f0da950873de1c -Merge: 1df99d49d 438bd575d -Author: garywong-bc -Date: Fri Jan 12 15:55:03 2018 -0800 - - Merge pull request #359 from garywong-bc/developer - - Relative paths don't work in pods auto-deploying. - -commit 438bd575d117c7668d917c3bd628985bcd7f9a56 -Author: Gary Wong (BC Gov) -Date: Fri Jan 12 15:53:05 2018 -0800 - - Relative paths don't work in pods auto-deploying. - -commit 1df99d49de09e072e0070e0a44e6597d556d1f56 -Merge: ce8ca5a64 6456f5e49 -Author: garywong-bc -Date: Fri Jan 12 15:22:53 2018 -0800 - - Merge pull request #358 from garywong-bc/developer - - Updating DB Replication scripts - -commit 6456f5e49402e61b4dd6cf8b4e4f74a4a249936b -Author: Gary Wong (BC Gov) -Date: Fri Jan 12 15:04:19 2018 -0800 - - Refactored DB Replication in preparation to move from gwells_full_replicate() to gwells_db_replicate(boolean) - -commit 0993dd5210ae130775b38e9a1938605a858e9970 -Author: Gary Wong (BC Gov) -Date: Thu Jan 11 21:50:50 2018 -0800 - - Refactored DB replicate to accept parameter in Stored Function. - -commit ce8ca5a6492803037d1560fa84c538cdaf32d0c1 -Merge: f1636e5bd 3e7ac9fbf -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Jan 11 15:53:45 2018 -0800 - - Merge pull request #357 from rstens/developer - - Publish test reports in Jenkins - -commit 3e7ac9fbfef23b27d04c5630ff9f93b0bbfaf6e9 -Author: Roland Stens -Date: Thu Jan 11 15:52:33 2018 -0800 - - Publish test reports in Jenkins - -commit f1636e5bdf3ef475689e18515d633ef06825cd36 -Merge: 862e74038 cf68051af -Author: garywong-bc -Date: Thu Jan 11 15:39:13 2018 -0800 - - Merge pull request #356 from garywong-bc/developer - - 1st crack at a Windows batch file version of db-replicate.sh - -commit cf68051af16517e8d0560f34481d909325b0dfb3 -Author: Gary Wong (BC Gov) -Date: Thu Jan 11 15:38:10 2018 -0800 - - 1st crack at a Windows batch file version of db-replicate.sh - -commit 862e740386417b6985f59ea429e12fbfa0d46804 -Merge: 1d2c870c0 58de3e17e -Author: garywong-bc -Date: Thu Jan 11 14:59:06 2018 -0800 - - Merge pull request #355 from rstens/developer - - Test report refinement - -commit 58de3e17ed19d9e3fc36b73f29ad0a73dc38344a -Author: Roland Stens -Date: Thu Jan 11 14:58:00 2018 -0800 - - Test report refinement - -commit 1d2c870c0090848d76c8d51ab75efd58370c6e42 -Merge: e8edb2f9b 5d3835108 -Author: garywong-bc -Date: Thu Jan 11 10:15:55 2018 -0800 - - Merge pull request #354 from rstens/developer - - Add (PDF) to Links - -commit 5d38351088a6f43e22ec40aabec5ea3a4ab85d35 -Author: Roland Stens -Date: Wed Jan 10 16:29:15 2018 -0800 - - Add (PDF) to Links - -commit bda5b16b80b9fa1225552cf6c33325a01e3d4574 -Merge: f1070ed7f 514584ca1 -Author: garywong-bc -Date: Wed Jan 10 15:42:54 2018 -0800 - - Merge pull request #353 from garywong-bc/master - - New features - -commit e8edb2f9b0f550a1dcaab3224ec1cf861bdf0b8a -Merge: f1f8b7a73 e6afbd009 -Author: garywong-bc -Date: Wed Jan 10 15:41:37 2018 -0800 - - Merge pull request #352 from garywong-bc/developer - - BCGS Hotfix (backport) - -commit 514584ca10a7f1e409b2de227284e110fb55ca19 -Merge: cfd2093f7 e6afbd009 -Author: Gary Wong (BC Gov) -Date: Wed Jan 10 15:39:53 2018 -0800 - - Merge branch 'developer' - -commit cfd2093f730c9aa5b6968444262334d7e56405a7 -Author: Gary Wong (BC Gov) -Date: Wed Jan 10 14:46:49 2018 -0800 - - reverting - -commit 8c8ebccd34bab87eb9bd732d20853eaf64854eaf -Merge: 9851582a6 f1f8b7a73 -Author: Gary Wong (BC Gov) -Date: Wed Jan 10 14:46:03 2018 -0800 - - Merged upstream and local Jenkinsfile changes. - -commit 9851582a68b2176e9b890888e419e6a721806d93 -Merge: a54b24011 f1070ed7f -Author: Gary Wong (BC Gov) -Date: Wed Jan 10 14:40:56 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit f1070ed7f51e8ed816cdf42d16b061693adedcf0 -Author: garywong-bc -Date: Wed Jan 10 14:30:30 2018 -0800 - - Revert to BUILD_ID - -commit f1f8b7a735c63a150b707cacc37e2e9e4f9e45ce -Author: garywong-bc -Date: Wed Jan 10 14:29:22 2018 -0800 - - Reverting to BUILD_ID - -commit e66e506f8b5194f9596966a3098e58d8f0185f3a -Author: garywong-bc -Date: Wed Jan 10 14:09:43 2018 -0800 - - Reverting back to BUILD_ID - - from IMAGE_HASH, as the FT's were failing. - -commit e6afbd0095a2405e5125c7319a91e0355e3cc3ec -Merge: afeb1e9cd 5b4a9196d -Author: Gary Wong (BC Gov) -Date: Wed Jan 10 14:07:45 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 5b4a9196d8144258ecd656b93cf7805e1ca3b0ab -Merge: 242298603 1e7d1b351 -Author: garywong-bc -Date: Wed Jan 10 13:31:03 2018 -0800 - - Merge pull request #351 from rstens/developer - - Fix to pass test. - -commit 1e7d1b3517668acbba3a2e0080079a0585f0eecf -Author: Roland Stens -Date: Wed Jan 10 13:27:53 2018 -0800 - - Fix to pass test. - -commit 2422986036a22fd679aa16c35d4f4acab89983b5 -Author: garywong-bc -Date: Wed Jan 10 13:11:43 2018 -0800 - - Backporting PROD deployment configuration - -commit bc4b18aa81f6acdd0c4a42a44eddc4d5bee79d49 -Author: garywong-bc -Date: Wed Jan 10 12:45:28 2018 -0800 - - Updated comments on IMAGE_HASH - -commit 2c7479a19f7b2ef4b73f9e0cb9154b418c024a75 -Merge: 7a2c8beae 986b57dc1 -Author: garywong-bc -Date: Wed Jan 10 12:19:34 2018 -0800 - - Merge pull request #350 from rstens/developer - - Fix IDs and update test scripts - -commit 986b57dc15ec37f11c87498d70faf2937521b3b6 -Author: Roland Stens -Date: Wed Jan 10 12:18:20 2018 -0800 - - Test scripts update - -commit afeb1e9cd4850ff6033d424e6679b68e3d955251 -Merge: 603fe5f9f 7a2c8beae -Author: Gary Wong (BC Gov) -Date: Wed Jan 10 12:15:35 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 89331ea2db8f8507d1ad7b17daaabb96ce79dfd4 -Author: Roland Stens -Date: Wed Jan 10 12:10:09 2018 -0800 - - Fix IDs in menu - -commit a54b240119e48505459b9cc6d0924c53b2d411e1 -Merge: 6ebdaba1a b5993b639 -Author: Gary Wong (BC Gov) -Date: Wed Jan 10 11:36:52 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit b5993b6394d949e0d26f4424fca6060f341199d2 -Author: garywong-bc -Date: Wed Jan 10 11:36:23 2018 -0800 - - Implementing IMAGE_HASH - -commit 6ebdaba1ab62b87dd7402ba842fdffb3ad24bc35 -Author: Gary Wong (BC Gov) -Date: Wed Jan 10 11:09:10 2018 -0800 - - Revert "Merge branch 'developer' of https://github.com/bcgov/gwells into developer" - - This reverts commit 603fe5f9f68d5575216d7b6aeee4f5fe7a9f1125, reversing - changes made to 49e5f04aa994884835055f2a1c47f96b8ae47459. - -commit 7a2c8beae818c4d3306d81411358fbc25e27eb49 -Merge: dba4e9ef3 f33cf6496 -Author: garywong-bc -Date: Wed Jan 10 09:38:55 2018 -0800 - - Merge pull request #348 from fieranmason/developer - - Patched error page behaviour. Removed debug prints from zeros filter. - -commit dba4e9ef34b2785651736a63b3bc463845a2fe45 -Merge: e24b22af9 318df90e8 -Author: garywong-bc -Date: Wed Jan 10 09:38:43 2018 -0800 - - Merge pull request #349 from rstens/developer - - Updated test - -commit 318df90e8a2315e43fb7b06d5015e4386dbda211 -Author: Roland Stens -Date: Wed Jan 10 09:35:00 2018 -0800 - - Updated test - -commit f33cf64965d2ddc5229d8775f687a13d6276cce7 -Author: Fieran Mason -Date: Tue Jan 9 17:27:39 2018 -0800 - - Patched error page behaviour. Removed debug prints from zeros filter. - -commit e24b22af90e261d7b652b73a8a754e5dfb69203e -Merge: 6a9174bff ef3a428ea -Author: garywong-bc -Date: Tue Jan 9 16:31:53 2018 -0800 - - Merge pull request #347 from fieranmason/developer - - Patching error files over from working branch - -commit ef3a428eac0bb46abfa1f6997c29f602a7b70ae0 -Author: Fieran Mason -Date: Tue Jan 9 16:25:24 2018 -0800 - - Patching error files over from working branch - -commit 603fe5f9f68d5575216d7b6aeee4f5fe7a9f1125 -Merge: 49e5f04aa 6a9174bff -Author: Gary Wong (BC Gov) -Date: Tue Jan 9 16:24:55 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 49e5f04aa994884835055f2a1c47f96b8ae47459 -Merge: 29f0b8db7 dd85f528e -Author: Gary Wong (BC Gov) -Date: Tue Jan 9 16:24:48 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells into developer - -commit 6a9174bff26b3bfadcb4ebd7abfaebe7b9445a9d -Author: garywong-bc -Date: Tue Jan 9 15:54:35 2018 -0800 - - Testing new IMAGE_HASH - -commit fe132dd44861263de68126c1f8adf7c85d405ad8 -Merge: 817b9b44b 4c279bc1c -Author: garywong-bc -Date: Tue Jan 9 15:42:33 2018 -0800 - - Merge pull request #346 from fieranmason/zerosFilter - - Now filtering numerics in the wells summary page to show decimals onl… - -commit 817b9b44b09fb6dc629164da0b295c9b1860ca6f -Merge: e2173aaf1 29f0b8db7 -Author: garywong-bc -Date: Tue Jan 9 15:39:55 2018 -0800 - - Merge pull request #345 from garywong-bc/developer - - Backporting HotFix - -commit 29f0b8db751cac8c3627af469b8783d1fed6a5c8 -Author: Gary Wong (BC Gov) -Date: Tue Jan 9 15:38:52 2018 -0800 - - Reconciled with DEVELOPER branch's use of gwells_observation_well_status table. - -commit 00ad2fda67dfeda8607cd17d50c27d4a6efbd833 -Author: Gary Wong (BC Gov) -Date: Tue Jan 9 15:28:56 2018 -0800 - - Backport fix from PRODUCTION hotfix - migrate_bcgs() moved out of static-code-refresh area to dynamic-tables-refresh area. - -commit 4c279bc1c972d0d6d6e0884d210f3ed1dfb85306 -Author: Fieran Mason -Date: Tue Jan 9 15:08:05 2018 -0800 - - Now filtering numerics in the wells summary page to show decimals only if they are not all zeros - -commit e2173aaf1eb888a913f808a4db99903151e5198d -Merge: f5a5e03eb 3b8b46755 -Author: garywong-bc -Date: Tue Jan 9 13:48:38 2018 -0800 - - Merge pull request #343 from fieranmason/DrillerRegistry - - Driller registry - Patched some typos. - -commit f5a5e03eb8ff1ae4ac0575a6a3369d8b4b6917d1 -Merge: 8ffec4c62 6e6c05f70 -Author: garywong-bc -Date: Tue Jan 9 13:48:25 2018 -0800 - - Merge pull request #341 from fieranmason/InternalServerErrorHeader - - Patched error handling for 500 and 404 - -commit 8ffec4c62b21d29b840196589d0c83a52a334d3e -Author: garywong-bc -Date: Tue Jan 9 13:47:09 2018 -0800 - - Updated with commented out 'pending changes' - - From $BUILD_ID and $IMAGE_HASH - -commit 3b8b46755022e45dae439383eee56cce855f8d53 -Author: Fieran Mason -Date: Tue Jan 9 12:20:30 2018 -0800 - - Patched typos - -commit dd85f528ed00bfc5ed67038bb7be7285337d8bea -Merge: b9af070cd 4f7c2785b -Author: garywong-bc -Date: Tue Jan 9 12:16:19 2018 -0800 - - Merge pull request #342 from garywong-bc/master - - Hotfix to ensure bcgs numbers are always updated. They are not a sta… - -commit 4f7c2785b3e86287f545267d0bff4aaa25e556b2 -Author: Gary Wong (BC Gov) -Date: Tue Jan 9 12:14:33 2018 -0800 - - Hotfix to ensure bcgs numbers are always updated. They are not a static code table. - -commit 6e6c05f706af7a62d9559312a84df718ec479c93 -Merge: 2674d7df5 8dd190467 -Author: Fieran Mason -Date: Tue Jan 9 12:09:26 2018 -0800 - - Merged developer - -commit 2674d7df50465b832d56ab3a154c2e0f2df9b279 -Author: Fieran Mason -Date: Tue Jan 9 12:02:51 2018 -0800 - - Patching error responses. - -commit 0c58e28818308c055bef9bf88150ca4f4e4c94c7 -Author: Fieran Mason -Date: Tue Jan 9 11:48:39 2018 -0800 - - Patching error pages - -commit 8dd190467dd3724e25c11d8c4e221866d8f2a74f -Author: garywong-bc -Date: Tue Jan 9 10:36:38 2018 -0800 - - Instantiated bldCfg value - -commit 135f24cfe338fb3328173541acf0e61f7d3ea3f3 -Author: Fieran Mason -Date: Tue Jan 9 10:26:02 2018 -0800 - - Added header to 500 page. - -commit baa89c805c61636532e497ad08a92e247f1d8f7c -Author: garywong-bc -Date: Tue Jan 9 10:17:51 2018 -0800 - - Initial changes to move to IMAGE_HASH - -commit c31db5cee3e2b3ff89825c0bde3e604de359346b -Merge: 9ac521023 5071e8c2a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Jan 9 10:07:40 2018 -0800 - - Merge pull request #339 from fieranmason/AdditionalDocumentsFeatureFlag - - Added additional documents feature flag - -commit 5071e8c2ab6b3b1c9a8778e542b7ea73d9ae157d -Author: Fieran Mason -Date: Tue Jan 9 09:44:37 2018 -0800 - - Added addtional documents feature flag - -commit 9ac5210231ff75d853e7f81b89fc7ad9370cc061 -Merge: 846977534 c6f543740 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Jan 9 09:25:57 2018 -0800 - - Merge pull request #338 from fieranmason/RegistryPage - - Registry page - -commit 8469775343ff23886168fb90e019a6d9ee2c6f3c -Merge: 4f0447b87 823dc770a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Jan 9 09:24:55 2018 -0800 - - Merge pull request #337 from fieranmason/developer - - Completed lithology hardness code set - -commit c6f5437409c7d76e1143719b986e2318ff92da2c -Author: Fieran Mason -Date: Tue Jan 9 09:10:39 2018 -0800 - - Added registry page - -commit 823dc770a3fe3c0e8d9342b360cc30245cb19ca8 -Merge: 045ba31e2 4f0447b87 -Author: Fieran Mason -Date: Tue Jan 9 07:58:14 2018 -0800 - - Merge remote-tracking branch 'upstream/developer' into developer - -commit 4f0447b87cdeb85098f2c5fbe5e634a1a4d70a23 -Author: garywong-bc -Date: Mon Jan 8 17:26:18 2018 -0800 - - Removing extraneous 'sleep 3m' - -commit 1f3fdd153ef8030b40746b5228e44d027a7e6100 -Author: garywong-bc -Date: Mon Jan 8 17:25:05 2018 -0800 - - Disabling Debug - -commit 8c5eaa0c512e21d3e4d08511cbb5714d9031353e -Author: garywong-bc -Date: Mon Jan 8 17:18:23 2018 -0800 - - Debugging - -commit 6738b5d18da6033a3bcc729f4046295d59c9051f -Author: garywong-bc -Date: Mon Jan 8 17:01:02 2018 -0800 - - Update to allow health checks to wait - - Until completion of openshiftVerifyDeployment - -commit 045ba31e2ae54d6f6388fc3c0f97c026509c87ae -Author: Fieran Mason -Date: Mon Jan 8 16:55:44 2018 -0800 - - Fixed script names - -commit 02cc7e0a17723ceb29676600823c00e7084469d9 -Author: Fieran Mason -Date: Mon Jan 8 16:48:06 2018 -0800 - - Completed lithology hardness code set. - -commit 41f0072753512d5db6cb3899b21bf3acc05093e1 -Merge: 90da636ab 3a6b416fb -Author: garywong-bc -Date: Mon Jan 8 15:25:56 2018 -0800 - - Merge pull request #336 from garywong-bc/developer - - Documented the new DB_REPLICATE enviroment variable. - -commit 90da636ab640cc8820b060dc3ed41cdef9f13c55 -Merge: 204c47734 6a07edd82 -Author: garywong-bc -Date: Mon Jan 8 15:01:15 2018 -0800 - - Merge pull request #334 from fieranmason/developer - - Patched unit test. Handled observation well status behaviour better. Handled aquifer id better. - -commit 204c47734233ea8b5cd18d49143c55ce2601a669 -Merge: 8dba19c6c 570bab3d3 -Author: garywong-bc -Date: Mon Jan 8 15:01:04 2018 -0800 - - Merge pull request #335 from garywong-bc/developer - - Updated Data Replication README - -commit 3a6b416fb9f0d483f21b413f2bc51183a4cda5fd -Author: Gary Wong (BC Gov) -Date: Mon Jan 8 15:00:13 2018 -0800 - - Documented the new DB_REPLICATE enviroment variable. - -commit 6a07edd8255056d9430104565aefb59328da2f43 -Merge: 18e4160bb 8dba19c6c -Author: Fieran Mason -Date: Mon Jan 8 14:54:35 2018 -0800 - - Merge remote-tracking branch 'upstream/developer' into developer - -commit 18e4160bb5a346ef58fa6ca8d9b0a3870f9d65c4 -Author: Fieran Mason -Date: Mon Jan 8 14:52:15 2018 -0800 - - Patching for a unit test. - -commit 8dba19c6c48ed544e06bc17817ac47515563cf16 -Merge: 3c58b4421 69bd6e4c4 -Author: garywong-bc -Date: Mon Jan 8 14:49:41 2018 -0800 - - Merge pull request #333 from fieranmason/developer - - Reverted aquifer/obswell behaviour for missing remote data. Corrected… - -commit e4b6715d6d0f67ba7fd40b562e1c127b1ae41bdb -Merge: 69bd6e4c4 3c58b4421 -Author: Fieran Mason -Date: Mon Jan 8 14:08:59 2018 -0800 - - Merge remote-tracking branch 'upstream/developer' into developer - -commit 3c58b4421c05e617da9369b64e8d1f21e534256a -Merge: 7cac10f0f 65654e96a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Jan 8 14:08:35 2018 -0800 - - Merge pull request #332 from rstens/developer - - Remove the waitFor, it is causing issues. - -commit 65654e96a7a139769d9a28eb16d4209cdeb20040 -Author: Roland Stens -Date: Mon Jan 8 14:07:12 2018 -0800 - - Remove the waitFor, it is causing issues. - -commit 69bd6e4c44d836803a53b8f40d8e92b3fcf685eb -Author: Fieran Mason -Date: Mon Jan 8 13:55:23 2018 -0800 - - Reverted aquifer/obswell behaviour for missing remote data. Corrected structure from obs well status. - -commit 7cac10f0f1687d4b11045539a6cc82ca0751b409 -Merge: da6f0fb6e cea9c7404 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Jan 8 11:21:46 2018 -0800 - - Merge pull request #331 from cwevans/developer - - Ignore VS files and folders. - -commit cea9c7404b8124adca55829906758d4eb9c5e512 -Author: Christian Evans -Date: Mon Jan 8 11:16:36 2018 -0800 - - Ignore MS Visual Studio specific files. - -commit da6f0fb6e2477cf0157826c56fb5442184d8a45f -Merge: 1f78fe5e7 5daea3c98 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Jan 8 11:11:53 2018 -0800 - - Merge pull request #330 from rstens/developer - - Add ID to the "No documentation" msg to improve testability - -commit 5daea3c981b52b636cc5796752fb84a656363c38 -Author: Roland Stens -Date: Mon Jan 8 10:47:20 2018 -0800 - - Updated Test scripts to work with the new msg ID. - -commit b57fbeef12cea736104dfe13bd573e5a01814a7d -Author: Roland Stens -Date: Mon Jan 8 10:41:27 2018 -0800 - - Add ID to the "No documentation" msg to improve testability - -commit 1f78fe5e7ab333020635afb73bd80cb016d3dcda -Merge: 0ef43ee19 42dd191ba -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Jan 5 14:25:05 2018 -0800 - - Merge pull request #329 from rstens/developer - - Updates to Well Summary tests to include the files, messages etc. - -commit 42dd191ba6911eb821d8ba0d10ab22898932e323 -Author: Roland Stens -Date: Fri Jan 5 14:23:13 2018 -0800 - - Updates to Well Summary tests to include the files, messages etc. - -commit 0ef43ee19d4dac342ce9ab4dd03966c93f053212 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Jan 5 09:11:36 2018 -0800 - - Create CODE_OF_CONDUCT.md - -commit c78f6de0056e7f8cec9016c55f41e7454f75e77c -Merge: 25656db24 5d65f01f0 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Jan 5 09:05:45 2018 -0800 - - Merge pull request #328 from fieranmason/obswelllink - - Aquifer ID links and small patch for additional documentation table id - -commit 570bab3d3f492cb6a6f609e399dc4ea4d9d1fa09 -Merge: 25656db24 b9af070cd -Author: Gary Wong (BC Gov) -Date: Thu Jan 4 22:55:42 2018 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells into developer - -commit 5d65f01f0546f893e1824c97917e5c187188c21b -Author: Fieran Mason -Date: Thu Jan 4 17:02:53 2018 -0800 - - moved disclaimer to bottom of page - -commit 8bee9c139a5d64aa6a15c9baae129480cca63641 -Author: Fieran Mason -Date: Thu Jan 4 17:00:26 2018 -0800 - - Added it to attached documents table - -commit 1a032b20ae1736d929c0b3e9a4f930ace759b197 -Merge: 1dbb773a1 25656db24 -Author: Fieran Mason -Date: Thu Jan 4 16:42:29 2018 -0800 - - Merge branch 'developer' into obswelllink - -commit 1dbb773a10c5809815c699ef537f3faa74f349bd -Author: Fieran Mason -Date: Thu Jan 4 16:41:14 2018 -0800 - - migration for field to support selective aquifer report linking based on data availability - -commit f7969d8ca56a091d68308506c1b89d23cc9d49ab -Author: Fieran Mason -Date: Thu Jan 4 16:40:20 2018 -0800 - - Aquifer report post-deploy script to set the data availability field - -commit 40474a4928a1196f753605378747be107944d9b0 -Author: Fieran Mason -Date: Thu Jan 4 16:39:25 2018 -0800 - - Support data to selectively link to aquifer reports - -commit cd9ae6ce42d50f20772904784ea1647221e0aaa7 -Author: Fieran Mason -Date: Thu Jan 4 16:38:55 2018 -0800 - - Moved logic for generating additional document links from minio client to the view class - -commit ccc973a305d32ef752093131c3dd7d7c52aa7ad9 -Author: Fieran Mason -Date: Thu Jan 4 16:37:39 2018 -0800 - - Selective aquifer data linking. Improved display of document links - -commit 04c7932fc157c4aa269842dd65752e2cf94752fa -Author: Fieran Mason -Date: Thu Jan 4 16:36:49 2018 -0800 - - added field to support selective linking for aquifer reports based on data availability - -commit 2cd403899d9c208cfdce22a606fc4bad6c930144 -Author: Fieran Mason -Date: Thu Jan 4 16:36:01 2018 -0800 - - moving the creation of the object model for the view to the view class and out of the model class - -commit 2852d7e1fa3f4f93d1c27be4aff88ebdd28ef4e7 -Author: Fieran Mason -Date: Thu Jan 4 16:35:05 2018 -0800 - - clean up on script to ensure that all records have the availability column populated - -commit fa8e0530375de93b6529595c4f57022e54f676bc -Author: Fieran Mason -Date: Thu Jan 4 16:34:14 2018 -0800 - - added aquifer report post config step for external data -- supports linking or not to external data source - -commit 25656db24016297fe44bcd510561ad82bce9b3e6 -Merge: f35a15a4b 8f02e250c -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Jan 4 15:21:32 2018 -0800 - - Merge pull request #327 from rstens/developer - - Update and simplification to pagination script - -commit 8f02e250cda956c34456f27faf361df61026e2fb -Author: Roland Stens -Date: Thu Jan 4 15:19:22 2018 -0800 - - Update and simplification to pagination script - -commit ee116f35c0ca572dafbb1c78e705fb36a3971837 -Author: Roland Stens -Date: Thu Jan 4 15:05:17 2018 -0800 - - Updates to simplify test script - -commit 1bf9b617df4956e2647cb02b4c44b95c39db95fc -Merge: 9f0d9d337 f35a15a4b -Author: Roland Stens -Date: Thu Jan 4 14:04:41 2018 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit f35a15a4bfc5703541887ba1fcc6fd331463698c -Merge: 04dd7184a d0ca15a5c -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Jan 4 13:54:15 2018 -0800 - - Merge pull request #326 from fieranmason/obswelllink - - Obswelllink - -commit d0ca15a5c359009b91c289ac3c675127c9282522 -Merge: ce24da085 4f4a1375b -Author: Fieran Mason -Date: Thu Jan 4 13:44:42 2018 -0800 - - Merge branch 'minio' into obswelllink - -commit 04dd7184ae8dc64a29247e0f2f6a551ae11c80e1 -Merge: efcf02db2 4f4a1375b -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Jan 4 13:18:20 2018 -0800 - - Merge pull request #325 from fieranmason/minio - - Minio and exceptional behaviour for minio client. - -commit 4f4a1375b9dbe23407e27cc61b4661d7aaff8b33 -Author: Fieran Mason -Date: Thu Jan 4 13:10:35 2018 -0800 - - Bootlint patch - -commit 9f0d9d3372faa3e58361e4d4702934c48b94510f -Author: Roland Stens -Date: Thu Jan 4 12:59:11 2018 -0800 - - Deleting unneccesary files - -commit 7260473c571222816320a212b03b2f3745062152 -Author: Fieran Mason -Date: Thu Jan 4 10:47:44 2018 -0800 - - Patched exceptional behaviour for minio client. - -commit ce24da08567e2787606a5950d3765d03670edeab -Author: Fieran Mason -Date: Wed Jan 3 15:20:42 2018 -0800 - - Added script to set obswell data availability flag. - -commit 48b10f6639c9e07d0f86bc1df826bfe1b92918d3 -Author: Fieran Mason -Date: Wed Jan 3 15:19:24 2018 -0800 - - Migrations for obswell no data patch. - -commit ad33f6fb92ce2f5af8edf024b5e1a10fcfff2786 -Author: Fieran Mason -Date: Wed Jan 3 15:18:13 2018 -0800 - - Adjusted the obs well field to link to map hub only if there is data to show and title text otherwise. - -commit c8500fa15ce690be4ee99383ddf705b787809381 -Author: Fieran Mason -Date: Wed Jan 3 15:17:03 2018 -0800 - - Added a field to indicate availability of data in map hub. - -commit 57a9a0cea4403662298b858751faede6083aebed -Author: Fieran Mason -Date: Wed Jan 3 15:13:01 2018 -0800 - - Added a step to populate a new field in the well model which indicates availability of data in map hub. - -commit b9af070cdba05d937969ff548ca9eefc63656ae4 -Merge: 713b8c1d6 efcf02db2 -Author: garywong-bc -Date: Tue Jan 2 13:57:05 2018 -0800 - - Merge pull request #323 from garywong-bc/master - - Minimize chance for DB corruption - -commit 1d6a22b51a13a439d6833e83b591890778b6245f -Author: Fieran Mason -Date: Tue Jan 2 13:18:28 2018 -0800 - - Revert method rename to satisfy test framwork. - -commit 77361aa77737d3bf34ea95eb012c3ec0f299b792 -Author: Fieran Mason -Date: Tue Jan 2 13:14:00 2018 -0800 - - Removed depricated test. Made style correction. - -commit b8c15202c1dbfcf8a3f2d0a99917cb8bc580cb1b -Author: Fieran Mason -Date: Tue Jan 2 13:08:54 2018 -0800 - - Style corrections. - -commit 45391d23e6f47bc65a57a5c831e0c7b4d335997c -Author: Fieran Mason -Date: Tue Jan 2 11:54:48 2018 -0800 - - Added Minio dependency - -commit ab020d970e5973a67bea390d1d88975875924f64 -Author: Fieran Mason -Date: Tue Jan 2 11:52:49 2018 -0800 - - Uncommented attachment related components of view and dependencies now that minio is set up. - -commit ec8e47e5bc7dc91d74c88c03c2cca602a21e9de1 -Author: Fieran Mason -Date: Tue Jan 2 11:51:54 2018 -0800 - - Uncommented attachments section now that minio is set up. - -commit 55d62a6b2426b9c88ca20f459537f2001a17c80e -Author: Fieran Mason -Date: Tue Jan 2 11:50:38 2018 -0800 - - Moved Minio Client to use environment variables. Removed debug output. - -commit efcf02db2f617dad6056484e205229d90dcc8a70 -Merge: 27586b957 856ca455f -Author: garywong-bc -Date: Thu Dec 28 15:30:05 2017 -0800 - - Merge pull request #322 from garywong-bc/developer - - Fixed wrong comment character. - -commit 856ca455faedbc70cc93714c3834adc168dab55f -Author: Gary Wong (BC Gov) -Date: Thu Dec 28 15:29:23 2017 -0800 - - Fixed wrong comment character. - -commit 27586b95739095de8e747fc43ee4e552859ee0e9 -Merge: cc52b5909 c38b0b077 -Author: garywong-bc -Date: Thu Dec 28 15:20:31 2017 -0800 - - Merge pull request #321 from garywong-bc/developer - - Fixed typo on stored function parameter - -commit c38b0b0771ad8519c0c861e50a21ba4750024e01 -Author: Gary Wong (BC Gov) -Date: Thu Dec 28 15:19:55 2017 -0800 - - Fixed typo on stored function parameter - -commit cc52b590927be36747ee6bd0874376713a9b5833 -Merge: eef9a49cb ef2cc279b -Author: garywong-bc -Date: Thu Dec 28 13:47:18 2017 -0800 - - Merge pull request #320 from garywong-bc/developer - - Broke apart the long DB transaction into two sessions. - -commit ef2cc279b5ec1a3ce41bd75298235e9244e8fafc -Author: Gary Wong (BC Gov) -Date: Thu Dec 28 13:44:34 2017 -0800 - - Breaking apart long transaction into two. - -commit 8043c99f0cf1da3ad8c2d0c25211bbe8b9c9d917 -Merge: 66bb913fa eef9a49cb -Author: Gary Wong (BC Gov) -Date: Thu Dec 28 11:59:02 2017 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit eef9a49cbf075f5d840efcdda30d6afa7d02fee0 -Merge: 3539d9e4c 75dd9c4a6 -Author: garywong-bc -Date: Thu Dec 28 11:58:51 2017 -0800 - - Merge pull request #319 from garywong-bc/developer - - Refacted DB Replication from *.sql files on disk - -commit 66bb913fab85844646fe7cb90af41789a5205ca4 -Merge: 75dd9c4a6 3539d9e4c -Author: Gary Wong (BC Gov) -Date: Thu Dec 28 11:57:26 2017 -0800 - - Merge branch 'developer' of https://github.com/bcgov/gwells into developer - -commit 75dd9c4a66763e480211840250adeb63d688eb57 -Author: Gary Wong (BC Gov) -Date: Thu Dec 28 11:56:47 2017 -0800 - - Moved SQL scripts to stored DB functions, for data replication, using new merged environment variable DB_REPLICATION - -commit 089a709eecb258a1d0b9d7b9debb1b2d07d1a51a -Author: Gary Wong (BC Gov) -Date: Thu Dec 28 10:48:00 2017 -0800 - - Interim save - refactored to DB calls - -commit 3539d9e4cccddbe7c871a1a9ebff25e124d3a7b0 -Merge: 10a3dedf2 6862cbbd2 -Author: garywong-bc -Date: Wed Dec 27 15:40:50 2017 -0800 - - Merge pull request #318 from garywong-bc/developer - - Fixed reference to a non-existent table in DEV. - -commit 6862cbbd26abba81e6edb5dc6f86f7bbd2d08ae2 -Author: Gary Wong (BC Gov) -Date: Wed Dec 27 15:40:10 2017 -0800 - - Fixed reference to a non-existent table in DEV. - -commit 10a3dedf2d833592d616fe1d1c5cc2fdb30158c5 -Merge: 2182e0a0e 2e5f0a65c -Author: garywong-bc -Date: Wed Dec 27 15:21:49 2017 -0800 - - Merge pull request #317 from garywong-bc/developer - - Merging Environment variables that control DB replication. - -commit 2e5f0a65c1dcc1ef71a57d6480b818fcabf1f764 -Author: Gary Wong (BC Gov) -Date: Wed Dec 27 15:20:25 2017 -0800 - - Merging Environment variables that control DB replication, reversed code for migrate.RunSQL() as it won't work for incrementatal changes to model. - -commit 2182e0a0ed1328e64a561ef75eafe85207e62df3 -Merge: 4ea536a7e f03db1f61 -Author: garywong-bc -Date: Wed Dec 27 14:01:51 2017 -0800 - - Merge pull request #316 from garywong-bc/developer - - Fixed Typo. - -commit f03db1f61e69a6d58c14cb2e20728f331f80a8da -Author: Gary Wong (BC Gov) -Date: Wed Dec 27 13:44:38 2017 -0800 - - Fixed Typo. - -commit 4ea536a7ec700689133303b58fa4b4ca97b9f5f5 -Merge: 65b9d321c 7e5a98b1a -Author: garywong-bc -Date: Wed Dec 27 13:30:08 2017 -0800 - - Merge pull request #315 from garywong-bc/developer - - Moving post-deploy SQL to out-of-the-box Django RunSQL - -commit 7e5a98b1ae213eff30e03ab3718124fe07e24eba -Merge: 65b9d321c 0d5eafdf9 -Author: Gary Wong (BC Gov) -Date: Wed Dec 27 13:27:04 2017 -0800 - - Merge branch 'post-deploy-sql-to-RunSQL' into developer - -commit 0d5eafdf9a403b87a1ca1b10ec1d44d2540497eb -Author: Gary Wong (BC Gov) -Date: Wed Dec 27 13:26:54 2017 -0800 - - As per https://trello.com/c/p44Sw67B/727-epicother-ensure-application-pods-are-scaled-down-prior-to-db-replicate-o-minimize-db-corruption-3 - -commit 65b9d321cfd8b3f8a927e515e03e7fc3e4916e7f -Merge: 21fcc6cea dc4560add -Author: garywong-bc -Date: Fri Dec 22 14:17:44 2017 -0800 - - Merge pull request #314 from garywong-bc/developer - - Backing off of DB disable connections as it won't work on OpenShift - -commit dc4560addc9b1ef3fb6977db25735d04afda41c7 -Author: Gary Wong (BC Gov) -Date: Fri Dec 22 13:42:24 2017 -0800 - - Backing off of DB disable connections as it won't work on OpenShift - -commit 21fcc6cea79984ec2ce95455e2dda43b59775000 -Merge: aaf6d127a 7b15fdae6 -Author: garywong-bc -Date: Fri Dec 22 12:41:45 2017 -0800 - - Merge pull request #313 from garywong-bc/developer - - No Op for now, until we find a way forward on preventing data corruption - -commit 7b15fdae643d5c12ba89782db3c7deb9cbc403ef -Author: Gary Wong (BC Gov) -Date: Fri Dec 22 12:40:32 2017 -0800 - - No Op for now, until we find a way forward on preventing data corruption due to python migrations during Deploy. - -commit aaf6d127abda55183bb14646e1781731926f9fdd -Merge: ff21299aa 018b52cbb -Author: garywong-bc -Date: Fri Dec 22 12:09:01 2017 -0800 - - Merge pull request #312 from garywong-bc/developer - - Bash script, hooked in from Pre Lifecycle Hook on the application ser… - -commit 018b52cbba207d302c5fd620f6a14c839f12214a -Author: Gary Wong (BC Gov) -Date: Fri Dec 22 12:07:52 2017 -0800 - - Bash script, hooked in from Pre Lifecycle Hook on the application server pod. - -commit ff21299aada36bb12f7019c89eac6ca203508a15 -Merge: afebaa88e fc817cb0c -Author: garywong-bc -Date: Fri Dec 22 11:24:21 2017 -0800 - - Merge pull request #311 from garywong-bc/developer - - Fixed typo on FILTER. - -commit fc817cb0c9b02a8c17df75b2557e944deb828652 -Author: Gary Wong (BC Gov) -Date: Fri Dec 22 11:23:07 2017 -0800 - - Fixed typo on FILTER. - -commit afebaa88eab17ab92e910b078ff6e97e65ac80f1 -Merge: 2f22571a5 4bb2b01f7 -Author: garywong-bc -Date: Fri Dec 22 11:17:00 2017 -0800 - - Merge pull request #310 from garywong-bc/developer - - Sync w main repo - -commit 4bb2b01f75ef567e3e50716b5c474fe4ea3a2e98 -Merge: 2f22571a5 713b8c1d6 -Author: Gary Wong (BC Gov) -Date: Fri Dec 22 11:15:40 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells into developer - -commit 2f22571a52218378a45bb3f5f52f68745cd66688 -Merge: 27a9251dd 44663466a -Author: garywong-bc -Date: Fri Dec 22 10:51:27 2017 -0800 - - Merge pull request #309 from garywong-bc/developer - - Minimizing DB Corruption (1 of 30 - -commit 44663466a1bfdfda0b26a3c42ccc81c95b3aa5d9 -Author: Gary Wong (BC Gov) -Date: Fri Dec 22 10:48:35 2017 -0800 - - Optimized replicate script and ensured DB connections are re-enabled post-deploy. - -commit 713b8c1d6baa7bd1c8cea8d28913181f62450339 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 20 15:15:45 2017 -0800 - - move the sleep 3m into node - -commit 181cd320e8ce83e9c926f66c5b8b47c7152e3716 -Merge: 54610600c 3cfe08de1 -Author: garywong-bc -Date: Wed Dec 20 14:54:29 2017 -0800 - - Merge pull request #308 from garywong-bc/master - - Merge of accepted PR's from developer branch - -commit 3cfe08de1ab687ef2672567951267bed14baa335 -Merge: 27a9251dd 8e402fda0 -Author: Gary Wong (BC Gov) -Date: Wed Dec 20 14:26:05 2017 -0800 - - Summary Page Print View - Merge branch 'developer' and test of new master branch deployment to PROD. - -commit 27a9251ddfed6cd6281aa449aebd08e05cf7db17 -Merge: b6b6aaa73 84eac4d45 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Dec 20 13:28:24 2017 -0800 - - Merge pull request #307 from rstens/developer - - Add the survey link to the detail page. - -commit 84eac4d4552c89bd1ec0bd321eff09e45fc67dd4 -Author: Roland Stens -Date: Wed Dec 20 13:24:54 2017 -0800 - - Add the survey link to the detail page. - -commit b6b6aaa73c7f92688c70fc63fb850676d81ace32 -Merge: 4342423db 7ebb90d89 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Dec 20 11:59:56 2017 -0800 - - Merge pull request #306 from rstens/developer - - "Fix the extra page break IE inserts in the print" - -commit 7ebb90d89e1d2cf0ca1b6f87b03985156c675edb -Author: Roland Stens -Date: Wed Dec 20 11:58:18 2017 -0800 - - "Fix the extra page break IE inserts in the print" - -commit 4342423dbff9fc7370b1db39978e1fe91b7f9f44 -Merge: ac76b6d62 972eba571 -Author: garywong-bc -Date: Tue Dec 19 17:39:10 2017 -0800 - - Merge pull request #305 from rstens/developer - - Test update - -commit 972eba571e7e180ca32945be048ebcddc1c7d8ec -Author: Roland Stens -Date: Tue Dec 19 17:38:10 2017 -0800 - - Test update - -commit ac76b6d62ebfe1f3699597f560b7b4e22cd679f8 -Merge: e0e169895 54830e688 -Author: garywong-bc -Date: Tue Dec 19 17:11:47 2017 -0800 - - Merge pull request #304 from rstens/developer - - Fix tested for fieldset id - -commit 54830e688383318e1955faa3da1fbe8b841b2127 -Author: Roland Stens -Date: Tue Dec 19 17:08:10 2017 -0800 - - Fix tested for fieldset id - -commit e0e1698958742d5cc73d1796416dbb506bd512b1 -Merge: c011ed9a2 d0e29ec74 -Author: garywong-bc -Date: Tue Dec 19 16:49:11 2017 -0800 - - Merge pull request #303 from fieranmason/minio - - Commenting out minio as dev is not setup to handle the dependency yet. - -commit d0e29ec744cdf3c2baf8d02fc2aea506026efecc -Author: Fieran Mason -Date: Tue Dec 19 16:47:04 2017 -0800 - - Commenting out minio as dev is not setup to handle the dependency yet. - -commit c011ed9a2e93c1ddd881b47c9c85db4163c583bc -Merge: 3932eca4e a63d5240f -Author: garywong-bc -Date: Tue Dec 19 16:40:39 2017 -0800 - - Merge pull request #302 from fieranmason/minio - - Attachment section added. Patches for print features and USGPM issues. - -commit a63d5240f74e3152df885162be2d783006b08ce9 -Merge: a5f44957d 3932eca4e -Author: Fieran Mason -Date: Tue Dec 19 16:38:28 2017 -0800 - - Merge branch 'developer' into minio - -commit a5f44957d85c4e0205e649525275959700ca9470 -Author: Fieran Mason -Date: Tue Dec 19 16:37:43 2017 -0800 - - Commenting out attachments fieldset while brakes are put in place for production release. - -commit 3932eca4ea24911058d34c0c6ad430a921276b3b -Merge: 38eb859c1 ec59fff3b -Author: garywong-bc -Date: Tue Dec 19 16:22:45 2017 -0800 - - Merge pull request #300 from rstens/developer - - Update Test Script for USGPM change. - -commit ec59fff3b838fd48c7814361a993374ea19991e9 -Author: Roland Stens -Date: Tue Dec 19 16:00:20 2017 -0800 - - Update Test Script for USGPM change. - -commit 965a244dffa98fb4b10340bf8deacc85cb79c052 -Author: Fieran Mason -Date: Tue Dec 19 15:28:17 2017 -0800 - - Patched print layout. - -commit b2b6626542416848c153e3f80cf91537de04ef5d -Author: Fieran Mason -Date: Tue Dec 19 14:33:22 2017 -0800 - - Patched issue with USGPM - -commit 2500ec06a6d745a22d8d0fdf23a8426eb9e581b6 -Merge: 65d520775 38eb859c1 -Author: Fieran Mason -Date: Tue Dec 19 13:55:57 2017 -0800 - - Merge branch 'developer' into minio - -commit 65d5207755c59d7059320b1990455effb140bac4 -Author: Fieran Mason -Date: Tue Dec 19 13:55:14 2017 -0800 - - Patched well subclass issue. Patched lithology water bearing units issue. - -commit 9a55e0f5f8024f50b33cdfdb76f5a5dfe8e87799 -Author: Fieran Mason -Date: Tue Dec 19 13:21:02 2017 -0800 - - Patched subclass issue. Patched yield unit codes for lithology. - -commit 38eb859c1eb50aa69c72703f78327683e8891740 -Merge: 815ba2795 e11ba8f9c -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Dec 19 13:01:17 2017 -0800 - - Merge pull request #299 from rstens/developer - - Update to test script - -commit 3de99dabc0275c3e615a33957da142fb456cbd17 -Author: Fieran Mason -Date: Tue Dec 19 12:45:49 2017 -0800 - - Patched subclass issue - -commit 5c92ae98f8eaf0ca3b73476716682fce59930af9 -Author: Fieran Mason -Date: Tue Dec 19 12:40:08 2017 -0800 - - Added attached documents feature to well details page. - -commit e11ba8f9c2ee9e2844562dbfff8db65009c1f324 -Author: Roland Stens -Date: Tue Dec 19 12:02:00 2017 -0800 - - Update to test script - -commit 815ba2795741856fcfa82436742ba557269642a4 -Merge: 732565348 012aaa731 -Author: garywong-bc -Date: Tue Dec 19 10:33:05 2017 -0800 - - Merge pull request #298 from AntonCoetzer/developer - - Update README.md - -commit 012aaa731abf575d423a5496a0c8b36f376edb3a -Author: Anton -Date: Tue Dec 19 10:30:49 2017 -0800 - - Update README.md - -commit 7325653484df6d14619734de5c780bf50b15ebd6 -Merge: 41be11d08 704507a9f -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Dec 19 09:23:41 2017 -0800 - - Merge pull request #297 from rstens/developer - - Add span to obs_well_number for testability purposes. - -commit 704507a9fd3c3e218eb5630729ac2eeda42a0d32 -Author: Roland Stens -Date: Tue Dec 19 09:21:23 2017 -0800 - - Add span to obs_well_number for testability purposes. - -commit 41be11d08578317bbe59bc254e2425b8f78e4ac8 -Merge: 55626701c ea053607b -Author: garywong-bc -Date: Mon Dec 18 15:48:51 2017 -0800 - - Merge pull request #296 from fieranmason/yield-unit-codes - - Fixed yield unit code value. - -commit 55626701cfc63901a3ed14bf3dbf949de039241b -Merge: bace38347 36e4c90eb -Author: garywong-bc -Date: Mon Dec 18 15:48:37 2017 -0800 - - Merge pull request #295 from fieranmason/well-class-legacy-null - - Patched well class legacy null. - -commit ea053607bf0401ec9aec7c22010e1662ed340bc8 -Author: Fieran Mason -Date: Mon Dec 18 15:35:27 2017 -0800 - - Fixing yield unit code. - -commit 36e4c90eb49ffd5eb9ad219905a5834fa46023a7 -Author: Fieran Mason -Date: Mon Dec 18 15:11:45 2017 -0800 - - Fixed a migration error. - -commit 5f3bc3acf21295ffd96d6a224e7b7b7f1b135074 -Merge: 8e00dddfa bace38347 -Author: Fieran Mason -Date: Mon Dec 18 15:05:39 2017 -0800 - - Fixed legacy null issue. - -commit 8e00dddfa3db395af7fd5a69c3e6df1d2a99a38f -Author: Fieran Mason -Date: Mon Dec 18 14:58:34 2017 -0800 - - Removed legacy null as an option for well class. Weakened model constraints to allow null for this field. - -commit bace383478a2cb80fa2f4c0d7a053b93f06d8379 -Merge: 72a0a880b 94522cc1a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Dec 18 14:45:26 2017 -0800 - - Merge pull request #294 from fieranmason/obs-well-link - - Obs well link - -commit 72a0a880b732920a1d79de62c8a1151f70139dec -Merge: 6c2baa8b7 be1f9b4e8 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Dec 18 14:44:17 2017 -0800 - - Merge pull request #293 from fieranmason/reorder-sections - - Reordered sections. Patched css. - -commit 94522cc1ad52c2f9ae985b575774e0c6c92f1873 -Author: Fieran Mason -Date: Mon Dec 18 14:31:57 2017 -0800 - - Added feature to link observation well number to government of bc maps - geobc. - -commit cf006165961992e605c77f3d8a46504fbd867d30 -Author: Fieran Mason -Date: Mon Dec 18 13:14:18 2017 -0800 - - Added observation well number link. - -commit be1f9b4e87cb8eb80b4b2f4d9000b8dbba860522 -Merge: 27932d9a8 6c2baa8b7 -Author: Fieran Mason -Date: Mon Dec 18 12:50:34 2017 -0800 - - Merge branch 'developer' into reorder-sections - -commit 27932d9a8939e7c12a49669a0af784725cdfe9e5 -Author: Fieran Mason -Date: Mon Dec 18 12:49:53 2017 -0800 - - Adjusted stling of offset column to satisfy bootlint. - -commit 6c2baa8b72d71b6236d22902b929185dc493663b -Merge: 26caff6b3 4d1602d1b -Author: garywong-bc -Date: Mon Dec 18 12:45:24 2017 -0800 - - Merge pull request #291 from rstens/developer - - Update to the test script - -commit 4d1602d1b463301afbf65c19137e28bc47655311 -Merge: e905d9349 26caff6b3 -Author: garywong-bc -Date: Mon Dec 18 12:45:18 2017 -0800 - - Merge branch 'developer' into developer - -commit e905d9349f95d8092805516fc3111304e40ab1de -Merge: 37e437235 26caff6b3 -Author: garywong-bc -Date: Mon Dec 18 12:43:04 2017 -0800 - - Merge branch 'developer' into developer - -commit 8e402fda088453854356ddb7417f785238c6364b -Merge: 3c0605b66 dbdf94112 -Author: Gary Wong (BC Gov) -Date: Mon Dec 18 12:35:05 2017 -0800 - - Merge branch 'rstens-dev' into developer - -commit dbdf94112261ddbc9c4371642d9efae21c94e770 -Merge: 3c0605b66 37e437235 -Author: Gary Wong (BC Gov) -Date: Mon Dec 18 12:33:38 2017 -0800 - - Merge branch 'developer' of https://github.com/rstens/gwells into rstens-dev - - As per (wierdly) conflicting files: - Jenkinsfile-developer - gwells/static/gwells/css/custom-main.css - gwells/templates/gwells/well_detail.html - -commit 37e43723596ebbc8af65fbbf77a8ed18fade4d94 -Author: Roland Stens -Date: Mon Dec 18 12:28:11 2017 -0800 - - Update - -commit e5fe599e08624b5bca0d37d1686f1686ea3bcd36 -Author: Roland Stens -Date: Mon Dec 18 12:26:03 2017 -0800 - - "Eleminate the red herring failure in the script" - -commit a02139fa29e19531ccaefbcafdf7b6ed64378b5e -Author: Fieran Mason -Date: Mon Dec 18 12:23:19 2017 -0800 - - Reordered sections in summary page. - -commit 26caff6b3f4f7e14061b4cfb2349fb4a29fcc2b4 -Merge: a48fe2dca 1c047d1e2 -Author: garywong-bc -Date: Mon Dec 18 11:59:59 2017 -0800 - - Merge pull request #290 from fieranmason/print-screen - - Patched print screen feature. - -commit 1c047d1e2d302178c634d1c894ad10a9fcd7447f -Merge: 109fb6537 a48fe2dca -Author: Fieran Mason -Date: Mon Dec 18 11:56:18 2017 -0800 - - Merge remote-tracking branch 'upstream/developer' into print-screen - -commit 109fb653709d1045e4eb05c0bf18cea25ee53f7d -Author: Fieran Mason -Date: Mon Dec 18 11:55:51 2017 -0800 - - Fixed bootlint problem. Adjusted layout to use css instead of nbsp. Introduced layout that fails in bootlint on account of bootlint not being sufficiently advanced - col-md-x-offset is not a valid child for bootlint 3. - -commit a48fe2dca982946b3f7e7ed45ba17244d6a8543e -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Mon Dec 18 11:50:31 2017 -0800 - - remove the email notification - -commit 5d43cb846faeb93b8b50b19e6e11799089410ce8 -Author: Fieran Mason -Date: Mon Dec 18 11:10:56 2017 -0800 - - Implemented print view - -commit 86e93a77cd586c0d5a73e88f4797f74170c2040f -Author: Kuan Fan -Date: Mon Dec 18 10:46:56 2017 -0800 - - add email function once FT failed - -commit 6a0f1788e16491a226d01620bff93ed3ddcc0e67 -Merge: 90717b246 a0b2ee029 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Dec 18 11:14:24 2017 -0800 - - Merge pull request #289 from fieranmason/print-screen - - Implemented print view - -commit a0b2ee029c4f11c0c59826a67a086d24ff94f79c -Author: Fieran Mason -Date: Mon Dec 18 11:10:56 2017 -0800 - - Implemented print view - -commit 90717b24693f932809ce61700d15dbab1daecf7d -Merge: d91901c44 aa81b558d -Author: Kuan Fan -Date: Mon Dec 18 10:47:15 2017 -0800 - - Merge remote-tracking branch 'refs/remotes/origin/developer' into developer - -commit d91901c44f753f9b08bbfce742815a49741dff29 -Author: Kuan Fan -Date: Mon Dec 18 10:46:56 2017 -0800 - - add email function once FT failed - -commit aa81b558d730000d7171773d87233c3188695361 -Merge: 3c0605b66 c9ddcedac -Author: garywong-bc -Date: Fri Dec 15 17:36:52 2017 -0800 - - Merge pull request #288 from rstens/developer - - Update to test to support the Aquifer lookup. - -commit c9ddcedac435aca66f8474cc80e524113e423310 -Author: Roland Stens -Date: Fri Dec 15 17:25:33 2017 -0800 - - Update - -commit c0779f699b5ff73cb5ee4a4c25a63bc4e1141195 -Author: Roland Stens -Date: Fri Dec 15 17:24:24 2017 -0800 - - Update to test to support the Aquifer lookup. - -commit 3c0605b660b1734a98a948b3ae888bb7d05efbe0 -Merge: f82850269 027c71353 -Author: garywong-bc -Date: Fri Dec 15 14:17:12 2017 -0800 - - Merge pull request #286 from rstens/developer - - Moved the admin url under the DEBUG section. - -commit 027c713538dc3472db6d249c66e63031eda23f11 -Author: Roland Stens -Date: Fri Dec 15 14:07:04 2017 -0800 - - Moved the admin url under the DEBUG section. - -commit f8285026916da3381f495231f28def6ce4a11d33 -Merge: 20e4b057a f4b31f0da -Author: garywong-bc -Date: Fri Dec 15 13:19:06 2017 -0800 - - Merge pull request #285 from rstens/developer - - Add link to aquifer report. - -commit f4b31f0daeb8be2bb7e2f465ea18c772684d02d9 -Author: Roland Stens -Date: Fri Dec 15 12:59:34 2017 -0800 - - Add link to aquifer report. - -commit 20e4b057ada90ad1c2e7bca4bcc65638cc1d745b -Merge: bf8e3dbc9 d3588937d -Author: garywong-bc -Date: Fri Dec 15 10:20:39 2017 -0800 - - Merge pull request #284 from rstens/developer - - Remove switch that shows the old well summary report - -commit d3588937de8746e9183053331e7e742dcd768d53 -Author: Roland Stens -Date: Fri Dec 15 10:13:05 2017 -0800 - - "Update indent" - -commit 4a2bc1e134d7a57b43267ef94ffe5e24d45c77b3 -Author: Roland Stens -Date: Fri Dec 15 10:11:26 2017 -0800 - - "Removal of Old Well Summary display" - -commit bf8e3dbc94b928db7e5fcf7626c87d1adb3d393a -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Thu Dec 14 09:59:18 2017 -0800 - - update phase name - -commit e29bbdca6eb4e05e5ffdfe98e529e60161823f45 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Thu Dec 14 09:27:49 2017 -0800 - - code clean up - -commit 98a0a3d975dc25645937843387f45fb80d84c2b1 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Thu Dec 14 09:23:41 2017 -0800 - - remove TBD as FT has been implemented - -commit 3c7bb195ec542f5bd6310286b470b0ea7e6c391b -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Thu Dec 14 09:12:06 2017 -0800 - - add missing } - -commit 3265352ceb3f52bb5265143eb738a9fcfe01a87a -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Thu Dec 14 09:10:14 2017 -0800 - - update functional test for dev - -commit 3067a8b1d24266795a52003dc5f989414bc4891e -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 17:21:36 2017 -0800 - - open functional test for dev - -commit cca09fd008b0f60c786b8d35484d2d7703ab7af8 -Merge: d7f34e38d da92ae840 -Author: garywong-bc -Date: Wed Dec 13 17:18:38 2017 -0800 - - Merge pull request #283 from garywong-bc/developer - - Developer update from stale developer branch - -commit da92ae840b58a58d4b75c02670628d027816d3a1 -Merge: 54610600c d7f34e38d -Author: Gary Wong (BC Gov) -Date: Wed Dec 13 17:06:38 2017 -0800 - - New branching strategy. - - Merge branch 'developer' of https://github.com/bcgov/gwells - -commit d7f34e38da02460773ba3a75b7e0d6bf43c644d1 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 16:41:04 2017 -0800 - - move deploy on dev after code quality check - -commit 24f009ad9f937e68d25d670aa23791c1edccca78 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 16:26:05 2017 -0800 - - Update Jenkinsfile-developer - -commit 1d21b7758221069f82a0e4b641d18d3c1444bb5a -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 16:16:21 2017 -0800 - - add maven node back when deploy on test - -commit 80447540dd03bd90c9e7e06322a278ab051f1efd -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 16:05:35 2017 -0800 - - temporary bypass functional test - -commit 608eb8ed3ec3ce637b0d6e305ec156cd24e98acd -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 16:02:52 2017 -0800 - - Update Jenkinsfile-developer - -commit 54610600ce4617109d7d94904b224d99d2ece4c2 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 15:49:22 2017 -0800 - - Update Jenkinsfile - -commit 8927e36907f09315e0a1029c875f4e77d8aad959 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 15:44:30 2017 -0800 - - update stage names - -commit b243b21d75e0b2d7694d1eca7d159238582e21ba -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 15:36:19 2017 -0800 - - Modify the pipeline according to the new workflow - -commit c4ebbe090829df3fbeb0d570b2a9ee9352634a0d -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 14:53:37 2017 -0800 - - add functional test for test environment - -commit dfb67e37b4f5143492b8620ec50040d0d24a3b5c -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 14:05:43 2017 -0800 - - use gwells-developer build config to build image - -commit 2ff4e9d4679e7ce5d4a020b3a345e62e973d908e -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 13:51:16 2017 -0800 - - Update Jenkinsfile-developer - -commit 6d2aabbb10fdb052f5f3663b31d6aa32bd4ac318 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Dec 13 13:49:52 2017 -0800 - - Create for developer branch - -commit 1090bcf6a0faa77f388d3836cb30059b43adb2d0 -Merge: 33e262d77 2c9659a06 -Author: garywong-bc -Date: Wed Dec 13 11:25:17 2017 -0800 - - Merge pull request #282 from fieranmason/master - - Fixing a couple of typos on decommission - -commit 2c9659a060d04221e41ca145f9425df40453ebcf -Author: Fieran Mason -Date: Wed Dec 13 11:22:24 2017 -0800 - - Fixing a couple of typos on decommission - -commit 33e262d770678001cd37e45462e0716bbbd0d552 (tag: v1.21.0) -Merge: b704a6296 b2299e204 -Author: garywong-bc -Date: Tue Dec 12 10:31:21 2017 -0800 - - Merge pull request #281 from fieranmason/disclaimer - - Added a gap between comments and disclaimer. - -commit b2299e20481f56bbb75d5977f5c40cdd10c34c5a -Merge: ca61ee290 b704a6296 -Author: Fieran Mason -Date: Tue Dec 12 10:17:55 2017 -0800 - - Merge branch 'master' into disclaimer - -commit ca61ee29058a66cb230d701fcc823779a98de163 -Author: Fieran Mason -Date: Tue Dec 12 10:17:23 2017 -0800 - - Added a gap between comments and disclaimer. - -commit b704a62962dae2071663c5b2650d52f76197ab21 -Merge: 66d38c277 15ec8fd6b -Author: garywong-bc -Date: Mon Dec 11 21:16:36 2017 -0800 - - Merge pull request #280 from garywong-bc/master - - Optimized truncates and updated BCGS codes from static CSV to dynamic… - -commit 15ec8fd6b0ee88a1b4c740d658482122574453ce -Author: Gary Wong (BC Gov) -Date: Mon Dec 11 21:15:11 2017 -0800 - - Optimized truncates and updated BCGS codes from static CSV to dynamic SQL - -commit 66d38c277c5453fa9b3efbf69ee15611c534e55a -Merge: 7a7da42c8 3ef9deeda -Author: garywong-bc -Date: Mon Dec 11 16:33:08 2017 -0800 - - Merge pull request #279 from rstens/master - - Update detail page scripts - -commit 7a7da42c8ba3164f1785369689437c51ef5be07b -Merge: 27912657a c8fb53ede -Author: garywong-bc -Date: Mon Dec 11 16:32:52 2017 -0800 - - Merge pull request #278 from fieranmason/disclaimer - - Added disclaimer - -commit 3ef9deeda6c35e07db0ec12a802a1403d80fed46 -Author: Roland Stens -Date: Mon Dec 11 14:18:34 2017 -0800 - - Update detail page scripts - -commit c8fb53ede215e07d4140926412b1ae074222c807 -Author: Fieran Mason -Date: Mon Dec 11 13:54:51 2017 -0800 - - Added disclaimer - -commit 27912657a9db7799da0e2e35f1fa04b87b8116ff -Merge: c5628b332 c49855ff5 -Author: garywong-bc -Date: Mon Dec 11 13:49:16 2017 -0800 - - Merge pull request #277 from fieranmason/layout - - Display tweeks for ticket693 - -commit c49855ff5cb3ee631bb0cef7227d3aaa0cfd2e4f -Author: Fieran Mason -Date: Mon Dec 11 13:42:12 2017 -0800 - - Display tweeks for ticket693 - -commit c5628b332672e731616b4ea09377e409cf4fbb72 -Merge: a55b7bde7 409ab953d -Author: garywong-bc -Date: Mon Dec 11 08:24:51 2017 -0800 - - Merge pull request #276 from garywong-bc/master - - To workaround DB crash when 'out of space'... - -commit 409ab953d73e2bdf6f82624e18ae5dd6db76482d -Author: Gary Wong (BC Gov) -Date: Sat Dec 9 20:25:27 2017 -0800 - - Optimize data replication - -commit 4346f9b8ce6f717d2cff21e922989c8a3d979930 -Author: Gary Wong (BC Gov) -Date: Sat Dec 9 20:25:11 2017 -0800 - - Optimize data replication - -commit a55b7bde71f269c98553b4bdf16cae04fa1a23d8 -Merge: f39ccf479 f91f7833f -Author: garywong-bc -Date: Fri Dec 8 18:32:23 2017 -0800 - - Merge pull request #275 from garywong-bc/master - - Optimized filter - -commit f91f7833fcc7ee4edfa2963b1486fb50627faf11 -Author: Gary Wong (BC Gov) -Date: Fri Dec 8 18:30:20 2017 -0800 - - Optimized filter - -commit f39ccf4793f0450e8b5cbc3e26f3fb8475c355a7 -Merge: 65214ed5e 7efd8fc26 -Author: garywong-bc -Date: Fri Dec 8 16:15:51 2017 -0800 - - Merge pull request #274 from garywong-bc/master - - Exceptions no longer necessary as data was fixed on legacy Oracle DB. - -commit 7efd8fc26ce742ac679bcfc6f75c1fb1eb08d569 -Merge: 953693cfb 65214ed5e -Author: Gary Wong (BC Gov) -Date: Fri Dec 8 16:13:27 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 953693cfbfb38193d830783a51fae3952a2e5a40 -Author: Gary Wong (BC Gov) -Date: Fri Dec 8 16:13:09 2017 -0800 - - Data was fixed in legacy Oracle PROD. - -commit 65214ed5e8dccc4900ffcb570d5ec51f2369487e -Merge: 8a42b24c9 f45df478f -Author: garywong-bc -Date: Fri Dec 8 15:29:37 2017 -0800 - - Merge pull request #273 from garywong-bc/master - - Break into three steps... - -commit 8a42b24c9557e6d955f017149c88d4f35a89b415 -Merge: 3c7b0ee02 8942da042 -Author: garywong-bc -Date: Fri Dec 8 15:28:52 2017 -0800 - - Merge pull request #272 from rstens/master - - Casing diameter update - -commit ca4d0b52fc3677ca22d6971bab37261f1be5e783 -Merge: f45df478f 3c7b0ee02 -Author: Gary Wong (BC Gov) -Date: Fri Dec 8 15:28:29 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit f45df478f07617a08c6e3d341177501273489fc3 -Author: Gary Wong (BC Gov) -Date: Fri Dec 8 15:27:53 2017 -0800 - - Break into three steps... - -commit 8942da042b6086ab12e48e5a6904d449611bfd8f -Author: Roland Stens -Date: Fri Dec 8 15:26:33 2017 -0800 - - Casing diameter update - -commit 3c7b0ee028e188dc9debd448c4c285881fa5773f -Merge: 999dda1df 0656d02e6 -Author: garywong-bc -Date: Fri Dec 8 15:09:25 2017 -0800 - - Merge pull request #271 from rstens/master - - Casing diameter update - -commit 999dda1df6843bce4ae5622bc00ff0de4e32679d -Merge: c08848ae6 51474abaf -Author: garywong-bc -Date: Fri Dec 8 15:09:09 2017 -0800 - - Merge pull request #270 from fieranmason/master - - Patch to casing internal diameter change - -commit 0656d02e694b87058a87616f3d0cf6714c7f10d9 -Author: Roland Stens -Date: Fri Dec 8 15:06:55 2017 -0800 - - Casing diameter update - -commit 51474abaff96f5d7b82cd780cf74ec7ef716f1d9 -Merge: 257791225 c08848ae6 -Author: Fieran Mason -Date: Fri Dec 8 14:33:53 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 257791225b4b5e9eec681516af2600922cab94ad -Author: Fieran Mason -Date: Fri Dec 8 14:33:21 2017 -0800 - - Patch for casing diameter name change - -commit c08848ae6350bb7b19efae230c905f85d882a9b3 -Merge: 7443d677b 72b0b042b -Author: garywong-bc -Date: Fri Dec 8 13:43:11 2017 -0800 - - Merge pull request #269 from fieranmason/master - - Patch for internal_diameter to diameter change - -commit 72b0b042bd8ed66d26da9967660e1796c1ca22ea -Author: Fieran Mason -Date: Fri Dec 8 13:40:58 2017 -0800 - - Patch for internal_diameter to diameter change - -commit 7443d677bd43a4d70b552e29746c7b123ddbfc1f -Merge: 7a573ae62 bb74a43ac -Author: garywong-bc -Date: Fri Dec 8 12:52:03 2017 -0800 - - Merge pull request #268 from fieranmason/ticket#658 - - Layout fixes and changed display name for backfill - -commit bb74a43ac2287e475c5f2f7ceba0c788bd944179 -Merge: beae96016 7a573ae62 -Author: Fieran Mason -Date: Fri Dec 8 12:23:54 2017 -0800 - - Merge branch 'master' into ticket#658 - -commit beae96016f64668b99be8a53d3f95e816be24cfb -Author: Fieran Mason -Date: Fri Dec 8 12:22:57 2017 -0800 - - Fixed layout and changed display name for backfill - -commit 7a573ae6292f27fe2bc5d1e972a6f7d9155ffd36 -Merge: 6b424ebb1 28585b32a -Author: garywong-bc -Date: Fri Dec 8 11:56:44 2017 -0800 - - Merge pull request #266 from fieranmason/master - - Renamed casing internal_diameter to diameter as per po request - -commit 6b424ebb17aaaa574803656ff9750c09069d990e -Merge: 398d5a138 8369a3cd5 -Author: garywong-bc -Date: Fri Dec 8 10:29:48 2017 -0800 - - Merge pull request #267 from garywong-bc/master - - Lessening DB resources during data replication - -commit 8369a3cd5530030781b5749448be384b3e627ca5 -Merge: 627e8ff6a 398d5a138 -Author: Gary Wong (BC Gov) -Date: Fri Dec 8 10:28:08 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 627e8ff6a4394b7ea72e248c4c0a6cc2db773154 -Author: Gary Wong (BC Gov) -Date: Fri Dec 8 10:27:55 2017 -0800 - - Now with AUTOCOMMIT off. - -commit 28585b32ae61919e43bbca7b3eb26f01f2f66266 -Merge: c7e965d1f 398d5a138 -Author: Fieran Mason -Date: Fri Dec 8 10:06:17 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit c7e965d1fd309504d0e84b5760760dca7046263c -Author: Fieran Mason -Date: Fri Dec 8 10:06:05 2017 -0800 - - Renamed casing internal diameter to diameter as per PO request. - -commit 398d5a1384a9fecb27539810896634e4e7ca2773 -Merge: 5249e70d4 d64d9f19a -Author: garywong-bc -Date: Fri Dec 8 09:56:38 2017 -0800 - - Merge pull request #265 from garywong-bc/master - - Separating the replication into two steps, in an effort to workaround… - -commit d64d9f19aec2424a3795e22a754c77d1e3d907a5 -Author: Gary Wong (BC Gov) -Date: Fri Dec 8 09:53:32 2017 -0800 - - Separating the replication into two steps, in an effort to workaround the DB error. - -commit 5249e70d4d58a81c907494f473276cbf0cae52d5 -Merge: b70559e47 e77036372 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Dec 8 08:41:39 2017 -0800 - - Merge pull request #264 from fieranmason/master - - Corrected migration of casings - -commit e770363728bcb8b99d4d4769a4345ce1aff2dab7 -Merge: bc4ff2f0a b70559e47 -Author: Fieran Mason -Date: Thu Dec 7 17:38:16 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit bc4ff2f0a532bb8c36200784986ac965c2d6574e -Author: Fieran Mason -Date: Thu Dec 7 17:37:52 2017 -0800 - - Correction of the casings replication script - -commit b70559e4772485c9b4c43c96f1670f4948b7bd03 -Merge: 1bf923d94 f827c8370 -Author: Angelika Ehlers -Date: Thu Dec 7 16:17:40 2017 -0800 - - Merge pull request #263 from rstens/master - - Add jUnit to parse results - -commit f827c8370f27038965841c48af1ec9c161905f94 -Author: Roland Stens -Date: Thu Dec 7 16:15:26 2017 -0800 - - Add jUnit to parse results - -commit 1bf923d94deac55861b6a27e1abf0c8a4cefeada -Merge: 7d907b7b5 282763986 -Author: garywong-bc -Date: Thu Dec 7 16:02:18 2017 -0800 - - Merge pull request #262 from rstens/master - - Test updates - -commit 7d907b7b599df97b22d0dab2a7dc78775a184138 -Merge: 1c5203468 b772744aa -Author: garywong-bc -Date: Thu Dec 7 16:01:59 2017 -0800 - - Merge pull request #261 from fieranmason/master - - Added a missing code to the casing material table - -commit 28276398688da2e0a18e71a74caa33099edf16ee -Author: Roland Stens -Date: Thu Dec 7 15:54:33 2017 -0800 - - Test updates - -commit b772744aaebef6229dd0cfa19b1390b58134e2cc -Merge: 5569101a3 1c5203468 -Author: Fieran Mason -Date: Thu Dec 7 13:13:59 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 5569101a376ac79a18761ac722fcc13e367dbeab -Author: Fieran Mason -Date: Thu Dec 7 13:13:41 2017 -0800 - - Added missing code - -commit 1c5203468d415d78fd3368e5b7851e65b70c9386 -Merge: 48e656beb 206118d62 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Dec 7 11:47:18 2017 -0800 - - Merge pull request #260 from rstens/master - - Search Test updates - -commit 206118d62b186a41ad9c5ae33a57df32962d972b -Author: Roland Stens -Date: Thu Dec 7 11:44:55 2017 -0800 - - Search Test updates - -commit 48e656beb66510c429081623d268451a0cb043ca -Merge: 42fbac81a a58e7506e -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Dec 7 11:33:11 2017 -0800 - - Merge pull request #259 from rstens/master - - Archive the xUnit test results - -commit a58e7506ed73723401718a1c0458141a69be8b6c -Author: Roland Stens -Date: Thu Dec 7 11:31:23 2017 -0800 - - Archive the xUnit test results - -commit 42fbac81a420330b7cbcdd0ea24c97c560237732 -Merge: cd00ca412 f262d6d98 -Author: garywong-bc -Date: Thu Dec 7 10:23:24 2017 -0800 - - Merge pull request #258 from rstens/master - - Update PID unit Test- second try - -commit f262d6d98833a612259cd65bed98cae3ff1c9e4b -Author: Roland Stens -Date: Thu Dec 7 10:20:04 2017 -0800 - - Update PID unit Test- second try - -commit cd00ca4124cb3547dd4bc8af7726d615c35cc84e -Merge: f46386ce3 4371fafec -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Dec 7 10:11:36 2017 -0800 - - Merge pull request #257 from rstens/master - - Update PID unit Test - -commit 4371fafec0ae9c888679bb3a9ba1af7fcd1ff229 -Author: Roland Stens -Date: Thu Dec 7 10:10:40 2017 -0800 - - Update PID unit Test - -commit f46386ce3792cbf2085e91023c49655c775ae96f -Merge: 961d280e4 d3b51ff6f -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Dec 7 09:00:52 2017 -0800 - - Merge pull request #256 from fieranmason/master - - Fixed search bug which arose because of the transition to PID padding. - -commit d3b51ff6fee96e8d68c2ab2b451aa29b61247d71 -Author: Fieran Mason -Date: Thu Dec 7 08:56:09 2017 -0800 - - Fixed search bug which arose because of the transition of PIDs from numerics to strings which include the left zero pad - -commit 961d280e411cda4c3aa762fc4273c52320a5bc28 -Merge: fc4f77237 b26ec6cdb -Author: garywong-bc -Date: Wed Dec 6 19:55:23 2017 -0800 - - Merge pull request #255 from garywong-bc/master - - Refactored SQL to filter replication based upon Environment Variable - -commit b26ec6cdbb60b1347ab5ff89ad10698df762c211 -Author: Gary Wong (BC Gov) -Date: Wed Dec 6 19:53:42 2017 -0800 - - Refactored SQL to filter replication based upon Environment Variable - -commit fc4f772370c47ca8d6762404329227757eeec845 -Merge: a195dcffd 4ff9ee807 -Author: Angelika Ehlers -Date: Wed Dec 6 16:48:46 2017 -0800 - - Merge pull request #254 from rstens/master - - Test updates + JenkinsFile update - -commit 4ff9ee807e9a3676619fc34af541b2c5efd44e80 -Author: Roland Stens -Date: Wed Dec 6 16:45:46 2017 -0800 - - Test updates - -commit 157791d89879375a248b49c3c5eff33a757cc4aa -Author: Roland Stens -Date: Wed Dec 6 15:53:20 2017 -0800 - - Last? Switch back to the standard shell line. - -commit a195dcffdac4b8594fbcc5335075686b193de2a3 -Merge: 3047a2f70 888ea1ec3 -Author: garywong-bc -Date: Wed Dec 6 15:17:14 2017 -0800 - - Merge pull request #253 from AntonCoetzer/master - - Merge pull request #3 from bcgov/master - -commit 3047a2f703fce82b98254e88d69556599e35e41f -Merge: b1a5f4adf 7bd401477 -Author: garywong-bc -Date: Wed Dec 6 13:34:48 2017 -0800 - - Merge pull request #251 from fieranmason/ticket#658 - - Improved handling of empty data for display and corrected some html issues. - -commit 49273620fcfaa5a8b5047055e69e8f4427c8b154 -Author: Roland Stens -Date: Wed Dec 6 12:53:17 2017 -0800 - - Fixing the fallout from the database sub-setting. - -commit b1a5f4adfa1ebb2e96166a26597810b03b029183 -Merge: 4b113f067 ca94733c6 -Author: Angelika Ehlers -Date: Wed Dec 6 11:48:31 2017 -0800 - - Merge pull request #252 from rstens/master - - Update to align with new Jenkins Slave image. - -commit ca94733c66ac202766d8fdbbcca11a167857bf9e -Author: Roland Stens -Date: Wed Dec 6 11:46:30 2017 -0800 - - Update to align with new Jenkins Slave image. - -commit 7bd401477062fc7483bab2f355490075f214205e -Merge: 68f16f306 4b113f067 -Author: Fieran Mason -Date: Wed Dec 6 10:50:15 2017 -0800 - - Merge branch 'master' into ticket#658 - -commit 68f16f30617a2edc3c84779654df96c073cd98b0 -Author: Fieran Mason -Date: Wed Dec 6 10:48:24 2017 -0800 - - Cleaned up handling of empty data. - -commit 4b113f067bf9d2eeae078c26ea2bcf3e309a48db -Merge: a41d29d05 17538d723 -Author: Angelika Ehlers -Date: Wed Dec 6 10:18:12 2017 -0800 - - Merge pull request #250 from rstens/master - - Removal of NavUnit, we are now on BDDStack! - -commit 17538d72338750f5fd4d038fc493a351d5470b5e -Author: Roland Stens -Date: Wed Dec 6 10:15:31 2017 -0800 - - Update to align with new Jenkins Slave image. - -commit 593ab4fc54966959939b413ad0a08ebd1b331e7c -Merge: 72faa2c44 a41d29d05 -Author: Roland Stens -Date: Wed Dec 6 10:14:47 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit bd9b122857703c122790f03c833bdd2a0e46e552 -Merge: b155492a6 a41d29d05 -Author: Fieran Mason -Date: Wed Dec 6 09:01:08 2017 -0800 - - Merge branch 'master' into ticket#658 - -commit b155492a6dbcc06d98d33dddf0da3b268fd4cab5 -Author: Fieran Mason -Date: Wed Dec 6 08:50:35 2017 -0800 - - Fixed some layout issues - -commit 72faa2c440a80db64e18ca1362566b247376f753 -Author: Roland Stens -Date: Tue Dec 5 17:11:31 2017 -0800 - - Removal of NavUnit, we are now on BDDStack - -commit a41d29d05910551afe55f25d901b73013625d65f -Merge: 540924cee 6b0b6b837 -Author: garywong-bc -Date: Tue Dec 5 16:31:47 2017 -0800 - - Merge pull request #249 from garywong-bc/master - - Simplified shell logic. - -commit 6b0b6b837524963a4e3079bb7eb8a9e0c6e409b3 -Merge: 0085587ea 540924cee -Author: Gary Wong (BC Gov) -Date: Tue Dec 5 16:29:43 2017 -0800 - - Updated from 'master' branch of https://github.com/bcgov/gwells - -commit 0085587ea430db63ebfd962548fce61686202134 -Author: Gary Wong (BC Gov) -Date: Tue Dec 5 16:29:05 2017 -0800 - - Simplying shell logic. - -commit 540924cee34ef1c6292aea8f825ad444abf7f40a -Merge: d224ebb4e 1fcbb0d84 -Author: Angelika Ehlers -Date: Tue Dec 5 15:14:07 2017 -0800 - - Merge pull request #248 from rstens/master - - Add environment vars - -commit 1fcbb0d84ae14889a52e55e20efb5e5ae9df0faa -Author: Roland Stens -Date: Tue Dec 5 15:13:36 2017 -0800 - - Add environment vars - -commit d224ebb4edda6286a3b9b4cb9f498f5805f5d3a2 -Merge: 5cf834c5e 85c91e833 -Author: Angelika Ehlers -Date: Tue Dec 5 14:53:55 2017 -0800 - - Merge pull request #247 from rstens/master - - Add environment vars - -commit 85c91e833f01375d27d0a9bf58ce7b26aa9fd546 -Author: Roland Stens -Date: Tue Dec 5 14:43:28 2017 -0800 - - Add environment vars - -commit 5cf834c5e9e7c28406f50d9b038dfd58ed43645d -Merge: 74c878dc6 158c9ee60 -Author: garywong-bc -Date: Tue Dec 5 14:20:34 2017 -0800 - - Merge pull request #246 from rstens/master - - set execute bit - -commit 158c9ee602f3d251ffc45506634d462022305f20 -Author: Roland Stens -Date: Tue Dec 5 14:03:01 2017 -0800 - - set execute bit - -commit 74c878dc617c39bf710b5ca6b66eeb1604d5db92 -Merge: 738f5c2c0 0cdc7f489 -Author: garywong-bc -Date: Tue Dec 5 13:24:20 2017 -0800 - - Merge pull request #245 from rstens/master - - Test framework changes - -commit 0cdc7f4899fa725873bfb6db2de4d64be041a8b2 -Author: Roland Stens -Date: Tue Dec 5 13:13:00 2017 -0800 - - Testframework files - -commit 8fee46369cd00f004ddffbf76f93ace16e88b5eb -Author: Roland Stens -Date: Tue Dec 5 13:04:35 2017 -0800 - - Test framework changes - -commit 47a6f15d751bc2fcee893ee10f8f50518ffa89ee -Merge: 2b249493d 738f5c2c0 -Author: Roland Stens -Date: Tue Dec 5 13:00:15 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 738f5c2c0f1414d0473a959b11f38e16fb57e5cc -Merge: fc3c5a4c1 3fafed1dd -Author: garywong-bc -Date: Tue Dec 5 11:21:01 2017 -0800 - - Merge pull request #244 from fieranmason/master - - Reverted changes to db-replicate, and includes the new filters on the queries to reduce memory consumption. - -commit 3fafed1dd14bd3b3208af1acaca6442c6d8a0f61 -Author: Fieran Mason -Date: Tue Dec 5 11:11:22 2017 -0800 - - Reverting changes to the replicate script - -commit 83d07a38bd6b9300d65a416c1b0663bfb302c4fb -Merge: 807c4d2bc fc3c5a4c1 -Author: Fieran Mason -Date: Tue Dec 5 10:32:19 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 807c4d2bc8f65038245d72e07de309ee650ac9d5 -Author: Fieran Mason -Date: Tue Dec 5 10:32:03 2017 -0800 - - Addressed memory issue with replication. - -commit fc3c5a4c1ed1e3db7c00ec9eca1b3241a8630354 -Merge: d8603f639 548ff9289 -Author: garywong-bc -Date: Tue Dec 5 10:04:25 2017 -0800 - - Merge pull request #242 from fieranmason/master - - Addressing a memory issue with the db-replicate script - -commit 548ff9289f4b7669a01bb949743178ae6755739c -Author: Fieran Mason -Date: Tue Dec 5 10:01:52 2017 -0800 - - Addressing a memory issue with the db-relicate script - -commit 2b249493db0c6521bcb6cc31df44b8dceaf27428 -Merge: 1307b50fd d8603f639 -Author: Roland Stens -Date: Mon Dec 4 16:28:40 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit d8603f6394997b7509303df15f254326db2a2747 -Merge: 3f719b614 549b90565 -Author: garywong-bc -Date: Mon Dec 4 16:21:30 2017 -0800 - - Merge pull request #241 from fieranmason/ticket#656 - - Addressing display issues on ticket #656 - -commit 3f719b6143d0b8c03158927c0fd16a1500bb08c8 -Merge: f756dd116 b9eba4050 -Author: garywong-bc -Date: Mon Dec 4 16:21:18 2017 -0800 - - Merge pull request #240 from fieranmason/ticket#341 - - Added comments section. - -commit f756dd116115f234aa858675f238d2a43e477e79 -Merge: 1eb908256 cff8d4f72 -Author: garywong-bc -Date: Mon Dec 4 16:21:03 2017 -0800 - - Merge pull request #239 from fieranmason/master - - Removed survey monkey link from search. - -commit 549b905658eef67e8111b9b6a58df148dd1d588a -Author: Fieran Mason -Date: Mon Dec 4 12:57:27 2017 -0800 - - Addressing a number of display issues from ticket 656 - -commit 1307b50fdc1cd4e7cf0d70c89d5e7255ac90f701 -Merge: 639b4e602 1eb908256 -Author: Roland Stens -Date: Mon Dec 4 12:58:08 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit b9eba40507c9795b47992430bdecb327f1e1acac -Author: Fieran Mason -Date: Mon Dec 4 11:53:34 2017 -0800 - - Added comments section. - -commit cff8d4f721869b82ee7f750466e11f131e946568 -Merge: 01bebf4b4 1eb908256 -Author: Fieran Mason -Date: Mon Dec 4 11:21:29 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 01bebf4b452dbec673a8e479b80b8eb43a153c65 -Author: Fieran Mason -Date: Mon Dec 4 11:21:11 2017 -0800 - - Removed survey monkey link from search. - -commit 1eb9082564dcb1ef78f5088ebbdc0ed0da114f4c -Merge: 8150882c7 0ebb94783 -Author: garywong-bc -Date: Mon Dec 4 11:17:53 2017 -0800 - - Merge pull request #237 from rstens/master - - Updates to well summary test after fix from Fieran - -commit 8150882c721fd6ccc27d483c1b229a9df3e6e414 -Merge: 5cb94c85b 1b2ffb69c -Author: garywong-bc -Date: Mon Dec 4 11:17:39 2017 -0800 - - Merge pull request #238 from fieranmason/master - - Google analytics moved from body to head in application pages and also added to error pages. - -commit 1b2ffb69c877c7a9c98ed16e1b6b630aed55948b -Author: Fieran Mason -Date: Mon Dec 4 11:11:14 2017 -0800 - - Added google analytics script to error pages. - -commit e4e6072c4947f3a4725ec6dd39285e7f2a43d8cc -Author: Fieran Mason -Date: Mon Dec 4 11:08:02 2017 -0800 - - Moved google analytics script from body to head. - -commit 639b4e60221a788cd10137f9ac8fde63f15b53f1 -Merge: 0ebb94783 5cb94c85b -Author: Roland Stens -Date: Mon Dec 4 11:07:48 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 0ebb9478382c0d209c305a144ab71c64c9fabc7a -Author: Roland Stens -Date: Mon Dec 4 11:00:46 2017 -0800 - - Updates to well summary test after fix from Fieran - -commit 5cb94c85b320fb68d66905cf2b0a54b832c2debe -Merge: 9ff3e5003 8e043befd -Author: garywong-bc -Date: Mon Dec 4 10:32:50 2017 -0800 - - Merge pull request #236 from fieranmason/master - - Patch for backfill_material - -commit 888ea1ec305394ccdf0503c54c3989a0a6acb9d2 -Merge: acc87c8af 9ff3e5003 -Author: Anton -Date: Mon Dec 4 10:03:22 2017 -0800 - - Merge pull request #3 from bcgov/master - - Update from Remote Master - -commit 8e043befd343d3a7ee1f7e1575b6827f4d67caeb -Merge: 2d082001e 9ff3e5003 -Author: Fieran Mason -Date: Mon Dec 4 08:57:49 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 2d082001eea5a974af0ee87acf36be22d0067d76 -Author: Fieran Mason -Date: Mon Dec 4 08:53:18 2017 -0800 - - Patchd backfill material - -commit 9ff3e5003ee2ca29175db6337689c425c594c650 -Merge: 507f4ec66 192b017d0 -Author: garywong-bc -Date: Sun Dec 3 23:31:37 2017 -0800 - - Merge pull request #235 from rstens/master - - Addition of the new updated test framework. - -commit 192b017d046da5c03ba29c6cfcf5f89714680921 -Author: Roland Stens -Date: Sun Dec 3 17:12:42 2017 -0800 - - Add lithology and decommission tests - -commit 5801db0ad1e3b448d45aefa887fb33f252c966b9 -Merge: 969f68705 507f4ec66 -Author: Roland Stens -Date: Sun Dec 3 15:09:31 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 969f68705853245f3ce1e3ab577a0a2b502bcac6 -Author: Roland Stens -Date: Sun Dec 3 15:08:34 2017 -0800 - - New test framework upload. - -commit 507f4ec66a393226669ba3ecc91c91a98732659d -Merge: 8f5441494 895112456 -Author: garywong-bc -Date: Fri Dec 1 11:23:32 2017 -0800 - - Merge pull request #234 from fieranmason/master - - Fixed licenced status bug. - -commit 895112456fbb0f272c747224b3749b707c0d781d -Author: Fieran Mason -Date: Fri Dec 1 10:43:26 2017 -0800 - - Fixed licenced status bug. - -commit 8f5441494849e9ef0fb0f31adde2cdcd7b591e17 -Merge: 57358cfe7 d8b5bdc16 -Author: garywong-bc -Date: Fri Dec 1 10:05:26 2017 -0800 - - Merge pull request #233 from fieranmason/master - - Fixed legal land district bug - -commit d8b5bdc16d3c46dd99cfd2c5ae4612c952d71ca5 -Author: Fieran Mason -Date: Fri Dec 1 09:08:21 2017 -0800 - - Fixed legal land district bug - -commit 1ac513d862f2137964658ea539bdf97be1535a45 -Merge: 486e9a39d 57358cfe7 -Author: Roland Stens -Date: Thu Nov 30 14:01:49 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 57358cfe7e77d742768a87318d5486514ce6fed0 -Merge: 5ec1b0081 15833551c -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 30 11:23:00 2017 -0800 - - Merge pull request #232 from fieranmason/ticket#336 - - Decommission and Lithology - -commit 15833551cf2f250ce388e543498167c5277a6d22 -Merge: fc1ea56f7 5ec1b0081 -Author: Fieran Mason -Date: Thu Nov 30 11:16:47 2017 -0800 - - Merge branch 'master' into ticket#336 - -commit fc1ea56f7488ad83518f11ca256854fb41e40c07 -Author: Fieran Mason -Date: Thu Nov 30 11:14:27 2017 -0800 - - Completed lithology and decommission sections. - -commit 5ec1b00819c26b2c0432cbe4d6791c9cda413167 -Merge: ed6843619 ff995b0fb -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 30 08:18:15 2017 -0800 - - Merge pull request #231 from garywong-bc/master - - Adding log output messages. - -commit ff995b0fba89105eca2546f19b434e2d446423da -Merge: ed6843619 c5c6d459d -Author: Gary Wong (BC Gov) -Date: Wed Nov 29 16:32:51 2017 -0800 - - Merge branch 'enable_db_replication' - -commit c5c6d459d2d5ba45acdbc49546f1b8ce824e24c7 -Author: Gary Wong (BC Gov) -Date: Wed Nov 29 16:32:38 2017 -0800 - - Adding log message, for viewing in Console output. - -commit 486e9a39dce8c732941eedf0eef73acb4b3082ed -Merge: 0c6e61651 ed6843619 -Author: Roland Stens -Date: Wed Nov 29 13:47:50 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit ed68436197a161637412ceed214e01c27f89e5f3 -Merge: d9723c3e8 10a32cd75 -Author: garywong-bc -Date: Wed Nov 29 12:10:25 2017 -0800 - - Merge pull request #230 from garywong-bc/master - - Enable refresh of DB upon deployment - -commit 10a32cd75a98b8a299c6f10d8b5c3b771d5c6577 -Author: Gary Wong (BC Gov) -Date: Wed Nov 29 12:08:38 2017 -0800 - - Keying on Environment Variable to kick off replication. - -commit 2bf05c8df102db3d49d587947a7e820e6280b159 -Merge: c13658a3a d9723c3e8 -Author: Gary Wong (BC Gov) -Date: Tue Nov 28 21:51:56 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 49943996f238bfbdcfd59e12e8f0ddfa860252d1 -Author: Fieran Mason -Date: Tue Nov 28 16:43:02 2017 -0800 - - Populated template with decommission details specified in the wireframe. - -commit 272ca92b752f6490338f8084ee77895d123ba5ca -Author: Fieran Mason -Date: Tue Nov 28 16:32:42 2017 -0800 - - Technical clean up of well details page. - -commit b9137a790807016ce6418c947f084f513bce3b33 -Author: Fieran Mason -Date: Tue Nov 28 16:09:53 2017 -0800 - - Moved subclass join up the replication pipeline. - -commit 0783ee27022cecf4479628fc00ca3c4a0f1b281b -Author: Fieran Mason -Date: Tue Nov 28 15:50:04 2017 -0800 - - Moved join of intended wate use upstream in the replication pipeline. - -commit 8757c179313edf6541cf6521e7e0d746e87f5727 -Author: Fieran Mason -Date: Tue Nov 28 13:49:48 2017 -0800 - - Corrected lithology description migration script. Moved licenced status joins upstream in replication pipeline - -commit e47df6a0e20675c806bdd4ce9e5ee4d7e8ab64aa -Author: Fieran Mason -Date: Tue Nov 28 13:28:45 2017 -0800 - - Fixed erroneous join for well status. Corrected issue with acitivty submission for lithology - -commit 83ffd6c88145307e6e95f0fd9af69aee8948d042 -Author: Fieran Mason -Date: Tue Nov 28 11:35:36 2017 -0800 - - Correction to replication script. - -commit 6098865d6a577441b4b7261a10d4802be6a89a35 -Merge: 61f42580e d9723c3e8 -Author: Fieran Mason -Date: Tue Nov 28 11:32:57 2017 -0800 - - Merge branch 'master' into ticket#336 - -commit 61f42580ecee509acfcf5544542557137d7dcfaa -Author: Fieran Mason -Date: Tue Nov 28 11:30:43 2017 -0800 - - Incorporated the land disctirct code into the location information. - -commit d9723c3e87f60b8da789f1b95e3343d69193b11a -Merge: e01bf8d3d fa1fc31ae -Author: garywong-bc -Date: Mon Nov 27 18:56:30 2017 -0800 - - Merge pull request #229 from rstens/master - - Well disinfected test updated. - -commit 0c6e616514e052c2eb6c2ee0ace305945b925072 -Merge: fa1fc31ae e01bf8d3d -Author: Roland Stens -Date: Mon Nov 27 18:05:39 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit fa1fc31aed6e3149bc032c0f9ebf0f098686ebde -Author: Roland Stens -Date: Mon Nov 27 18:04:25 2017 -0800 - - Well disinfected test updated. - -commit e01bf8d3d2deea5446d4f967c9731d4977514ce8 -Merge: 25adfbb85 b3ec9711e -Author: garywong-bc -Date: Mon Nov 27 17:41:18 2017 -0800 - - Merge pull request #228 from fieranmason/ticket#664 - - Setting well disinfected status on the ui to use the display name - -commit b3ec9711e16c023efd4f6a113ebe320d78136545 -Merge: be71a27be 25adfbb85 -Author: Fieran Mason -Date: Mon Nov 27 17:36:56 2017 -0800 - - Merge branch 'master' into ticket#664 - -commit be71a27be9354418cf1f31f1db40a076af1bdebd -Author: Fieran Mason -Date: Mon Nov 27 17:36:04 2017 -0800 - - Set well disinfected to use the display value in the ui. - -commit 5e4d4f46a52da9088274bbdd005697962b9cf4af -Author: Fieran Mason -Date: Mon Nov 27 17:18:08 2017 -0800 - - Moving towards completion of lithology data. - -commit 25adfbb85f6487b2933b47bbdaa1c03cb51af287 -Merge: 4327079b8 355e2564c -Author: garywong-bc -Date: Mon Nov 27 16:43:46 2017 -0800 - - Merge pull request #227 from rstens/master - - updates to test scripts post database update - -commit 355e2564c2afca32593b2506306a81a003eec89d -Author: Roland Stens -Date: Mon Nov 27 16:41:45 2017 -0800 - - updates to test scripts post database update - -commit 4327079b8a67d2aeeeab9a550c7a668837022864 -Merge: 8cf498021 748da83f6 -Author: garywong-bc -Date: Mon Nov 27 15:46:54 2017 -0800 - - Merge pull request #226 from rstens/master - - Another update well summary test scripts - -commit 748da83f68dcb9117e1c6af8f306decb4bd08656 -Author: Roland Stens -Date: Mon Nov 27 15:45:38 2017 -0800 - - Update well summary test scripts - -commit 8cf498021bb512b9051a3a2fbc77549dba3e3350 -Merge: 3c8bae3b4 419701d97 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Nov 27 15:38:39 2017 -0800 - - Merge pull request #225 from rstens/master - - Update well summary test scripts - -commit 419701d9795632ace267293fad829bb0b2616358 -Author: Roland Stens -Date: Mon Nov 27 15:34:02 2017 -0800 - - Update well summary test scripts - -commit db169a071ddbee9ca766a889fd593de293d1e2f1 -Author: Fieran Mason -Date: Mon Nov 27 15:01:43 2017 -0800 - - Adjusted layout to used rows for each section - -commit 67497560970483d58344daca8a3308ac8904c643 -Author: Fieran Mason -Date: Mon Nov 27 14:56:11 2017 -0800 - - Moved screen sorting to model. - -commit c13658a3a9e5ae2d297a793912885aa512c90758 -Merge: 832998189 3c8bae3b4 -Author: Gary Wong (BC Gov) -Date: Mon Nov 27 13:48:49 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 3c8bae3b4466fbdba08f7ee0d97d27168bef9a44 -Merge: 11b670ef7 d976ca001 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Nov 27 13:26:43 2017 -0800 - - Merge pull request #224 from fieranmason/master - - Fixing typo on liners table - -commit d976ca001919def1750bf9e65654e2aea1cfcc11 -Author: Fieran Mason -Date: Mon Nov 27 13:24:20 2017 -0800 - - Fixing typo on liners table - -commit 11b670ef7cb552028ed0b9be33023704a4c3fcee -Merge: 7686224aa b4e29a676 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Nov 27 12:50:32 2017 -0800 - - Merge pull request #223 from fieranmason/ticket#329 - - Added disinfected status. Corrected final_stickup in well details page. - -commit b4e29a676f6361bba7635d6d1947a7a365f6af57 -Author: Fieran Mason -Date: Mon Nov 27 12:32:18 2017 -0800 - - Added disinfected status. Corrected final_stickup in well details page. - -commit 7686224aaa817fb1ae5f64becc67a9e2b3965341 -Merge: cb0fac852 b98fde898 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Nov 27 11:50:00 2017 -0800 - - Merge pull request #222 from fieranmason/ticket#337 - - Corrected Casings/Liner/Surface Seal details - -commit b98fde8988080031b99961ca7f875912634277a9 -Merge: ba885acd8 cb0fac852 -Author: Fieran Mason -Date: Mon Nov 27 11:45:25 2017 -0800 - - Merge branch 'master' into ticket#337 - -commit ba885acd8c38143159e2f5eacd40dc00d6fee89e -Author: Fieran Mason -Date: Mon Nov 27 11:44:12 2017 -0800 - - Fixed casings migration. Corrected layout. Made a bootlint correction. Fixed ordering. - -commit 7f6774459c5a7d8bb79a231c909fd5bbf8349b84 -Author: Fieran Mason -Date: Fri Nov 24 16:45:38 2017 -0800 - - Created code tables for surface seal material and method. Adjusted migration scripts accordingly. Corrected error in screen migration script. - -commit cb0fac852d24204f213e172f4f4061c100212edb -Merge: c25bb92ee bbd479794 -Author: garywong-bc -Date: Fri Nov 24 15:56:29 2017 -0800 - - Merge pull request #221 from rstens/master - - Making the script pass - -commit bbd479794795827f99b7ccb78845823296cb786a -Author: Roland Stens -Date: Fri Nov 24 15:54:22 2017 -0800 - - Making the script pass - -commit c25bb92ee0493768a01d5beadc29b8f84b33dcda -Merge: 7675ce7ee f0aad9497 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Nov 24 15:11:26 2017 -0800 - - Merge pull request #220 from rstens/master - - Well Summary test script update - -commit f0aad9497fbc642c3869975d3168fc33654fdaf1 -Author: Roland Stens -Date: Fri Nov 24 15:06:47 2017 -0800 - - Well Summary test script update - -commit 7675ce7eecb7e2fe7d97fc3c1c62911509eff3e2 -Merge: c3cf8e683 7c0baa4e3 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Nov 24 14:55:00 2017 -0800 - - Merge pull request #219 from fieranmason/master - - Cleaned up html for table heading. Cleaned up layout of geo coordinates. - -commit 7c0baa4e30039290800757e1c478883ff74f8e40 -Author: Fieran Mason -Date: Fri Nov 24 14:38:26 2017 -0800 - - Cleaned up html for table heading. Cleaned up layout of geo coordinates. - -commit c3cf8e68300efc49de8df581ac0aa84fca177599 -Merge: 0325cf6a9 7ef0fcae4 -Author: garywong-bc -Date: Fri Nov 24 13:16:46 2017 -0800 - - Merge pull request #218 from rstens/master - - Navunit build config update - -commit 0325cf6a9f64c6f1df4720b2263113f48ad05680 -Merge: a8aeb9b47 af1a76030 -Author: garywong-bc -Date: Fri Nov 24 13:16:36 2017 -0800 - - Merge pull request #217 from fieranmason/master - - Bootstrap/layout tweeking. - -commit 7ef0fcae403c890cc22b10b6ab218c38047612e5 -Author: Roland Stens -Date: Fri Nov 24 13:13:42 2017 -0800 - - Navunit build config update - -commit af1a760308d5ff44b33b2d2e2e885be85e74fe45 -Author: Fieran Mason -Date: Fri Nov 24 12:45:56 2017 -0800 - - Bootstrap/layout tweeking. - -commit a8aeb9b47a39798b19b570649de4df9c469b1be5 -Merge: 7da758b9d f4f2bed87 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Nov 24 12:23:18 2017 -0800 - - Merge pull request #216 from fieranmason/ticket#338 - - Improved Well Activity section - -commit f4f2bed87bc73ba027461d2bf3a651da5b68d39a -Author: Fieran Mason -Date: Fri Nov 24 12:20:39 2017 -0800 - - Fixed a typo - -commit 6266f96f7d193e8ea6ecb48e2486904f9db67dd8 -Author: Fieran Mason -Date: Fri Nov 24 11:56:34 2017 -0800 - - Addressed accessibility concern - -commit 660d065e74da525ece18134067e23110ea0e0b4b -Author: Fieran Mason -Date: Fri Nov 24 11:55:29 2017 -0800 - - Addresseed accessibility concern - -commit b9c02f7affd5ce8dace5f0aaa741b4471c81eb26 -Author: Fieran Mason -Date: Fri Nov 24 11:22:12 2017 -0800 - - Bootlint cleanup - -commit 06b6686d2711f4e7599882cebee076e42c26cd68 -Merge: bb3e8c118 7da758b9d -Author: Fieran Mason -Date: Fri Nov 24 10:50:42 2017 -0800 - - Merge branch 'master' into ticket#338 - -commit bb3e8c11810b1b0cae2d4dece0e2294a76364041 -Author: Fieran Mason -Date: Fri Nov 24 10:49:29 2017 -0800 - - sonarqube cleanup --- removed unnecessary parentheses and removed commented out code - -commit 7e0db6277d739b38f9013cd3f8fde6aa5e77dc39 -Author: Fieran Mason -Date: Fri Nov 24 10:38:28 2017 -0800 - - Removed commented out code - -commit b31aaea27d4209dc3567e2011d26feb7c4b2ad98 -Author: Fieran Mason -Date: Fri Nov 24 10:21:16 2017 -0800 - - Removed uneeded paretheses - -commit 559ec4db6e26578fa32d159b3c067bddcb270672 -Author: Fieran Mason -Date: Fri Nov 24 10:19:39 2017 -0800 - - removed unneeded parentheses - -commit 7da758b9da88ebf81f2562c1d13cd9e4a28564b9 -Merge: ea0c9034a 9c482f57d -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Nov 24 10:17:02 2017 -0800 - - Merge pull request #214 from rstens/master - - Updates - -commit 42acf2904aab4f6fa166e0f5da94bab3e875804b -Author: Fieran Mason -Date: Fri Nov 24 10:15:38 2017 -0800 - - removing commented out code - -commit 632227e004208663ec93fa948b184ae2ed4b4dc7 -Author: Fieran Mason -Date: Fri Nov 24 09:49:25 2017 -0800 - - Fixed issues with html and accessibility verfification. - -commit d8d8385589a3d6527517b62716fbfe9424671944 -Author: Fieran Mason -Date: Fri Nov 24 09:47:57 2017 -0800 - - fixed logical error resulting from editing in commit b8a76d24d69f09648e9898975f5a907f9621c33a - -commit 9c482f57de35845228f159155075a89b650db56a -Author: Roland Stens -Date: Fri Nov 24 09:38:52 2017 -0800 - - Bug fixing of SonarQube reported Bugs - -commit dba59940177398e07ac53ad348aa614fa7480e85 -Merge: 2ee1c29e3 ea0c9034a -Author: Roland Stens -Date: Fri Nov 24 08:49:29 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 2ee1c29e30a4ca2fa358a78e7576b24dc8de7728 -Author: Roland Stens -Date: Thu Nov 23 16:44:00 2017 -0800 - - Well Summary additions - -commit 2ef5d06e74f770656472042e759fecc000fb6e23 -Author: Roland Stens -Date: Thu Nov 23 16:38:27 2017 -0800 - - Sonar runner readme update 2 - -commit ea0c9034a6e666ea440b49333011bd84f5c03d3a -Merge: 04af79b00 6f66d0012 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 23 16:25:47 2017 -0800 - - Merge pull request #213 from rstens/master - - Sonar runner readme update - -commit 6f66d00127b1bcc12ade8cdefbb9abf9bd9a60bd -Author: Roland Stens -Date: Thu Nov 23 16:23:50 2017 -0800 - - Sonar runner readme update - -commit 04af79b007db6ff11e8397dee4916848497457ee -Merge: 85bddd31d 8f12c08fb -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 23 15:23:15 2017 -0800 - - Merge pull request #212 from rstens/master - - WellPageSummary updates to add data checking. - -commit 85bddd31d2e57ec8e98d12b7261cc82e694f173f -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 23 15:21:08 2017 -0800 - - Added more detail to local installation in readme. - -commit 8f12c08fbfed7ff5c1b04339d48b22c7311d1660 -Author: Roland Stens -Date: Thu Nov 23 13:07:09 2017 -0800 - - WellPageSummary updates to add data checking. - -commit 221b3703f3838412ad73f37ed9090e1c32ebbf72 -Author: Fieran Mason -Date: Thu Nov 23 12:48:06 2017 -0800 - - Fixed well actiity section. Added comment for transition to activity submission. Changed field labels. Changes to display names in model. - -commit de77ec48a1c6faa24dba7dda5c0bcdb0df7b8164 -Merge: 8faaa8c2c 10ef1dfe7 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 23 10:09:39 2017 -0800 - - Merge pull request #210 from fieranmason/master - - Corrected screen replication script. - -commit 8faaa8c2ca6fc11c26e703cfb2fe803da2891f77 -Merge: 965cd00e7 acc87c8af -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 23 09:28:10 2017 -0800 - - Merge pull request #211 from AntonCoetzer/master - - Update SET APP_CONTEXT_ROOT - -commit acc87c8af2bb4a80231ca9ca4f509c180e7cc382 -Author: Anton -Date: Thu Nov 23 09:13:22 2017 -0800 - - Update README.md - -commit 10ef1dfe779101e7f9a59300434bfa27387d960b -Author: Fieran Mason -Date: Thu Nov 23 09:10:45 2017 -0800 - - Corrected screen replication script. - -commit 813a600a239a0d8f48e3256a5d2271a90782a08c -Merge: 2fb7e2b3c 965cd00e7 -Author: Anton -Date: Thu Nov 23 07:59:17 2017 -0800 - - Merge pull request #2 from bcgov/master - - Sync with upstream - -commit 965cd00e7661d0be034ab99e48d4613098264c61 -Merge: cbb61d6ee 739a902e5 -Author: garywong-bc -Date: Wed Nov 22 20:47:53 2017 -0800 - - Merge pull request #209 from fieranmason/master - - Fixed behaviour of artesian pressure with values of 0 - -commit cbb61d6eeb4716c3576850a25fa24c43f9ba0481 -Merge: 44467ce35 75d2d46c9 -Author: garywong-bc -Date: Wed Nov 22 20:47:37 2017 -0800 - - Merge pull request #208 from rstens/master - - Well Summary test script updates - -commit 739a902e58ca868afc395972a818ecfe4e69e388 -Merge: a184e851c 44467ce35 -Author: Fieran Mason -Date: Wed Nov 22 16:39:21 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit a184e851c4daea4751fd520fc6eb954c4a5a66b3 -Author: Fieran Mason -Date: Wed Nov 22 16:39:07 2017 -0800 - - Fixed behaviour of empty or zero artesian pressure display - -commit 75d2d46c97096e7c6753a69ae57ecda182cdd12f -Author: Roland Stens -Date: Wed Nov 22 16:18:28 2017 -0800 - - Well Summary test script updates - -commit 5ecde983344c12b2583ef3e41cc56800aacdfc52 -Merge: 79c239a1b 44467ce35 -Author: Roland Stens -Date: Wed Nov 22 16:08:55 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 44467ce35fa304729a2ba78652e9813a5f691a64 -Merge: e240c5edc 12d82cf43 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 16:04:52 2017 -0800 - - Merge pull request #207 from fieranmason/master - - Removed leading 'screen' from labels. - -commit 12d82cf434e8c5a6b79e2a3cea94ffc933f581b9 -Merge: 429ecf9eb e240c5edc -Author: Fieran Mason -Date: Wed Nov 22 16:03:19 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 429ecf9ebb6b71b0c8aa88bc01e6b91e7dcfdd48 -Author: Fieran Mason -Date: Wed Nov 22 16:03:08 2017 -0800 - - Removed leading 'screen' from label - -commit 79c239a1b146d049310b204b37706dcc07e1e3a9 -Merge: 9900c28ce e240c5edc -Author: Roland Stens -Date: Wed Nov 22 16:03:00 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit e240c5edcb1fef4bf8c66172590393b7cb072626 -Merge: f6fbd52ac 812fc4e7f -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 15:58:42 2017 -0800 - - Merge pull request #206 from fieranmason/master - - Fixed layout issue. Improved consistency of template usage. - -commit 812fc4e7f245fe87308d20c2d3d6e9df72e45137 -Author: Fieran Mason -Date: Wed Nov 22 15:57:13 2017 -0800 - - Fixed layout issue. Improved consistency of template usage. - -commit 9900c28ceef0a30a74baaca1e0e0cb44d58ac8a2 -Merge: cf3d95d8b f6fbd52ac -Author: Roland Stens -Date: Wed Nov 22 15:39:25 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit f6fbd52accaee1873ac7f814c10edff15029f50c -Merge: a6feb008b c9c0529f9 -Author: garywong-bc -Date: Wed Nov 22 15:23:28 2017 -0800 - - Merge pull request #205 from fieranmason/master - - Fixed some id problems and added styles to casing and liner tables. - -commit c9c0529f9948ca9a5ba0813caef6aba7873515a1 -Merge: 091719561 a6feb008b -Author: Fieran Mason -Date: Wed Nov 22 15:20:40 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 091719561b32fde8c19a8c8f629f8a8f2d8e9459 -Author: Fieran Mason -Date: Wed Nov 22 15:20:17 2017 -0800 - - Fixed id problems and added styles to tables. - -commit cf3d95d8bf1da8b53a8421974123eeadf8e6309d -Merge: d03a5ff34 a6feb008b -Author: Roland Stens -Date: Wed Nov 22 15:05:45 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit a6feb008bad05c19b23702f4968484fe7fd83e94 -Merge: 6aee0eb19 cb480651b -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 14:47:05 2017 -0800 - - Merge pull request #204 from fieranmason/ticket#329 - - Fixed display of well cap in well completion details. - -commit 8a8d80d8cc74a689e8eee2db12384ec5d7c6096f -Merge: cb480651b 6aee0eb19 -Author: Fieran Mason -Date: Wed Nov 22 14:43:00 2017 -0800 - - Merge branch 'master' into ticket#329 - -commit cb480651bd2f35013647352bff15f82a4c713620 -Author: Fieran Mason -Date: Wed Nov 22 14:41:41 2017 -0800 - - space prevents display of value - -commit 6aee0eb19f40df90fed56179b8ebcf833b7b0c46 -Merge: 6774a11cc c6fed8f82 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 14:23:22 2017 -0800 - - Merge pull request #203 from fieranmason/ticket#329 - - Adjusting display of well completion data. - -commit 6774a11cc775d4e734e286bac4145d1377710294 -Merge: fbcd025d3 011f1cca9 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 14:23:14 2017 -0800 - - Merge pull request #202 from rstens/master - - Wells Summary test script update - -commit 4f3a9b7074eb22f6eb062e929c6a3b8989bbe905 -Merge: c6fed8f82 fbcd025d3 -Author: Fieran Mason -Date: Wed Nov 22 14:17:30 2017 -0800 - - Merge branch 'master' into ticket#329 - -commit c6fed8f8218d5f7de07b59bee82ede4fc39953d1 -Author: Fieran Mason -Date: Wed Nov 22 14:16:46 2017 -0800 - - Tweeking layout of well completion data - -commit d03a5ff34123e7d526129ef772abbde33aa4662a -Merge: 011f1cca9 fbcd025d3 -Author: Roland Stens -Date: Wed Nov 22 14:14:36 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 0d0b25cc25e72f8eba7ceb288875aeb5dc9bc565 -Author: Fieran Mason -Date: Wed Nov 22 14:10:52 2017 -0800 - - Fixing trailing labels in model. - -commit 011f1cca97974da0d1ddf1e6d7be0aea0c539260 -Author: Roland Stens -Date: Wed Nov 22 14:09:45 2017 -0800 - - Wells Summary test script update - -commit 8ac738aba43341596fbff9f58d79cf3d284fb305 -Author: Fieran Mason -Date: Wed Nov 22 14:06:57 2017 -0800 - - including migrations for label changes - -commit 9ad07d85575d2cd8612d943cbfeb69e715f49378 -Author: Fieran Mason -Date: Wed Nov 22 14:05:47 2017 -0800 - - fine tuning display - -commit fbcd025d366d442b5c334250fecf73e9c26b4842 -Merge: 3a6240ba2 2fb7e2b3c -Author: garywong-bc -Date: Wed Nov 22 13:55:45 2017 -0800 - - Merge pull request #201 from AntonCoetzer/master - - Add remote upstream as part of setup - -commit 2fb7e2b3c7f0241f4dacc0f473a6d7d58c0c6daf -Author: Anton -Date: Wed Nov 22 13:53:20 2017 -0800 - - Update README.md - -commit 3a6240ba2319d5405e2b5a2eb5aaf8d7be8e185d -Merge: 9cb5de4df 7ad153950 -Author: garywong-bc -Date: Wed Nov 22 13:42:17 2017 -0800 - - Merge pull request #200 from fieranmason/master - - Corrected screen opening for label - -commit 7ad153950a42f2f973d0bb7e23eeac88d2b0c235 -Author: Fieran Mason -Date: Wed Nov 22 13:41:25 2017 -0800 - - Corrected screen opening for label - -commit 9cb5de4df6d0506ff8557f3c2033a93c2fbe84ec -Merge: 48db1bd02 c7ab267b4 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 13:35:52 2017 -0800 - - Merge pull request #199 from fieranmason/ticket#329 - - Adjusted layout for well completion data. Small technical fix for id. - -commit c7ab267b45fb802a9aab7bcda4c6b38305565a92 -Author: Fieran Mason -Date: Wed Nov 22 13:30:56 2017 -0800 - - Adjusted layout for well completion data. Small technical fix for id. - -commit e8eee7e2bf796e71a86031591d87b11eaaa88152 -Merge: 2e1de0527 48db1bd02 -Author: Anton -Date: Wed Nov 22 12:59:53 2017 -0800 - - Merge pull request #1 from bcgov/master - - Update from original bcgov\gwells master - -commit 48db1bd022170e220c6840d7919159afb36f80ca -Merge: 1527e7156 b24ba5a16 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 12:56:58 2017 -0800 - - Merge pull request #198 from fieranmason/ticket#329 - - Made layout changes to well completion data section as per PO request. - -commit b24ba5a1642cd82e55091fa814121cc77ab7a80b -Merge: f1a771dae 1527e7156 -Author: Fieran Mason -Date: Wed Nov 22 12:54:49 2017 -0800 - - Merge branch 'master' into ticket#329 - -commit f1a771daefee2deb97b741c4fb39624f3974dda4 -Author: Fieran Mason -Date: Wed Nov 22 12:54:01 2017 -0800 - - changes to information organization as per PO request - -commit 1527e715668c1a9fd05a4d7ff6481f55fd828a81 -Merge: 5f06ec850 4e54c7323 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 11:43:15 2017 -0800 - - Merge pull request #197 from fieranmason/ticket#339 - - corrected yield id naming issue and added missing span ids - -commit 4e54c732370fe6e005511b0e8bf1feb9f552247f -Author: Fieran Mason -Date: Wed Nov 22 11:40:20 2017 -0800 - - corrected typo - -commit 9ceda49c9db55253a2437da351921b8049096135 -Merge: 4f42b4013 5f06ec850 -Author: Fieran Mason -Date: Wed Nov 22 11:37:55 2017 -0800 - - Merge branch 'master' into ticket#339 - -commit 4f42b401307635c1b309ad9be7cb652d81e8948b -Author: Fieran Mason -Date: Wed Nov 22 11:37:12 2017 -0800 - - corrected span id and name issue - -commit 5f06ec8509d092c5622242eb2a0fafd997005287 -Merge: 503579044 a8551865e -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Nov 22 11:28:03 2017 -0800 - - Merge pull request #196 from fieranmason/ticket#338 - - Ordered screens - -commit a8551865ee689413dd269637bef84ed11a9f220b -Merge: 11fab221a 503579044 -Author: Fieran Mason -Date: Wed Nov 22 11:24:12 2017 -0800 - - Merge branch 'master' into ticket#338 - -commit 11fab221a2e9677fbfb4180b2dda659b3bd3ab98 -Author: Fieran Mason -Date: Wed Nov 22 11:23:06 2017 -0800 - - sorted screens table - -commit 5035790443a9e4b0398237f2de4d51f1ed9e214a -Merge: c4b249731 77cb117b8 -Author: garywong-bc -Date: Wed Nov 22 11:00:47 2017 -0800 - - Merge pull request #195 from fieranmason/ticket#329 - - Improvements to Well CompletionData - -commit 77cb117b829be59d49f5cbce5ac12abf6ec86af2 -Author: Fieran Mason -Date: Wed Nov 22 09:42:55 2017 -0800 - - changed where_attached to well_attached as per specification - -commit 6879c4da608ec1367dd281dc86df8783544feb5c -Author: Fieran Mason -Date: Wed Nov 22 09:20:08 2017 -0800 - - cleaning up well completion data - -commit e89cef1d18c1f09b5790a75463e8094ad47ce6cc -Author: Fieran Mason -Date: Tue Nov 21 17:51:11 2017 -0800 - - working towards inclusion of all fields for ticket#339 - -commit c4b2497314a6e338f04b47d2220c7b89e913446c -Merge: 31428f28d 5a4c708fd -Author: garywong-bc -Date: Tue Nov 21 16:40:57 2017 -0800 - - Merge pull request #194 from rstens/master - - Update test counts - -commit 5a4c708fd4a75cd3c65f8bfea9227c488ce77269 -Merge: 0ac7a5835 31428f28d -Author: Roland Stens -Date: Tue Nov 21 16:39:40 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 0ac7a5835e4eb12f1e60b6a46897534c473abf39 -Author: Roland Stens -Date: Tue Nov 21 16:37:38 2017 -0800 - - Update record count - -commit 31428f28d87882f9a3f8c1915336f202ec35f555 -Merge: 0129669a6 e8d4dfd4c -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Nov 21 14:52:48 2017 -0800 - - Merge pull request #193 from fieranmason/fixYield - - removed yield prefixes from yield estimation fields - -commit e8d4dfd4c8cefc1841ebabe9e3e24f99fc55b005 -Author: Fieran Mason -Date: Tue Nov 21 14:51:54 2017 -0800 - - removed yield prefixes from yield estimation fields - -commit 8329981898ef934840736795ac2b298c5c38a21d -Merge: d6b3da4a7 0129669a6 -Author: Gary Wong (BC Gov) -Date: Tue Nov 21 10:03:06 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 0129669a6d151dda6a7bebc8485f83f35aeedfef -Merge: 380b1bb66 9c468afd0 -Author: garywong-bc -Date: Tue Nov 21 10:02:23 2017 -0800 - - Merge pull request #192 from rstens/master - - Test updates - -commit 9c468afd00fe5adec6e387882434e55c638bfef5 -Merge: 94a87f5e9 380b1bb66 -Author: garywong-bc -Date: Tue Nov 21 10:02:13 2017 -0800 - - Merge branch 'master' into master - -commit d6b3da4a744f0f45c171d4fb054122dd2737898e -Merge: 380b1bb66 94a87f5e9 -Author: Gary Wong (BC Gov) -Date: Tue Nov 21 09:44:58 2017 -0800 - - Merge branch 'rstens-master' - -commit 94a87f5e9e418c908f3138f6032efee1da24c603 -Merge: f62fb3247 380b1bb66 -Author: garywong-bc -Date: Tue Nov 21 09:39:32 2017 -0800 - - Merge branch 'master' into master - -commit f62fb3247b55272df81bde99351dc390954dd313 -Author: Roland Stens -Date: Tue Nov 21 09:28:17 2017 -0800 - - Test location update - -commit 380b1bb6674659068e636cd75f7a8a37cdb55a66 -Merge: 8d1d34601 61d66b01f -Author: garywong-bc -Date: Tue Nov 21 09:24:18 2017 -0800 - - Merge pull request #191 from fieranmason/ticket#322 - - Layout changes for summary details - -commit 61d66b01f85e256bdf4235600665965c931b940f -Merge: 60e5e35e5 8d1d34601 -Author: Fieran Mason -Date: Tue Nov 21 09:16:09 2017 -0800 - - Merge branch 'master' into ticket#322 - -commit 60e5e35e53415b5d0bb41caf6add3c3c30b10241 -Author: Fieran Mason -Date: Tue Nov 21 09:11:56 2017 -0800 - - corrections for ticket#322 - -commit 8d1d3460180c490848a4f338d722bc4f540be1dc -Merge: 7b123987e c7723c94e -Author: garywong-bc -Date: Mon Nov 20 16:58:23 2017 -0800 - - Merge pull request #190 from fieranmason/ticket#339 - - Fixes for well development section - -commit 7b123987ea2b032784c72a6c5fa35947500d71cc -Merge: 511350543 f63101bb4 -Author: garywong-bc -Date: Mon Nov 20 16:58:11 2017 -0800 - - Merge pull request #189 from rstens/master - - Well Details Test scripts updates. - -commit c7723c94ea8822a1599becc06c05c159b3bcbe36 -Merge: f3f3ba4f5 511350543 -Author: Fieran Mason -Date: Mon Nov 20 16:48:12 2017 -0800 - - Merge branch 'master' into ticket#339 - -commit f3f3ba4f5f319ae851c5817a95ce4eae3f7a00e9 -Author: Fieran Mason -Date: Mon Nov 20 16:46:45 2017 -0800 - - corrected production data migration script. cleaned up layout. added rate units - -commit 62f185225f4c34bc36b48fd8e1078f5fd7d90233 -Merge: f63101bb4 511350543 -Author: Roland Stens -Date: Mon Nov 20 15:53:47 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit f63101bb4640aad94fdf7370c111ff557580d00f -Author: Roland Stens -Date: Mon Nov 20 14:31:24 2017 -0800 - - Well Summary test update Ticket#322 - -commit 511350543cdc466c4edf3783e9ed08297c187523 -Merge: 12eb4b09f 55819efe5 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Nov 20 13:50:09 2017 -0800 - - Merge pull request #188 from fieranmason/ticket#322 - - Ticket#322 - -commit 55819efe5ba91a3d323fe6d4e4e8d7031fd09299 -Merge: 838b4a813 12eb4b09f -Author: Fieran Mason -Date: Mon Nov 20 13:43:22 2017 -0800 - - Merge branch 'master' into ticket#322 - -commit 838b4a813ba8041904637f5a4f9d2b56cbce68dc -Author: Fieran Mason -Date: Mon Nov 20 13:42:29 2017 -0800 - - added aquifer number to well details. corrected perforations query. moved to using cron job for replicatoin and dropping loaddb. fixed table name for aquiferwell - -commit 3defc1e6d354375909d8264737769df41f1c4772 -Merge: 22718d1a6 12eb4b09f -Author: Roland Stens -Date: Mon Nov 20 09:45:23 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 22718d1a6436e63fdaabeb5f096de2fe0e9c03c4 -Author: Roland Stens -Date: Mon Nov 20 09:44:53 2017 -0800 - - readme update - -commit c673c26c3a3d3a013a8c3036ccf5c7969f14268a -Merge: 6f3512a2e a9d258592 -Author: Fieran Mason -Date: Mon Nov 20 09:20:50 2017 -0800 - - Merge branch 'master' into ticket#322 - -commit 6f3512a2e2935da01dd2f855372d21df36b8593d -Author: Fieran Mason -Date: Mon Nov 20 09:20:46 2017 -0800 - - committing changes before merging master - -commit 12eb4b09f31b05f813f652e61422baf705c12151 -Merge: a9d258592 3ca54e9de -Author: garywong-bc -Date: Fri Nov 17 16:12:43 2017 -0800 - - Merge pull request #187 from rstens/master - - Update to counteract the failure in test due to.. - -commit 3ca54e9decd7339862c37e18178ebb1570e98400 -Author: Roland Stens -Date: Fri Nov 17 15:57:40 2017 -0800 - - Update to counteract the failure in test due to.. - - The removal of a HTML table. - -commit 1ab165513cfbccd95c77112c72c98f5e5ee9d620 -Author: Roland Stens -Date: Fri Nov 17 15:54:40 2017 -0800 - - Update to WellDetails test script to make it sure does not fail after a change on the yields HTML table - -commit a9d258592d6edb7dd5835368b55f557d2f165559 -Merge: 52b070d8c f3a3f932f -Author: garywong-bc -Date: Fri Nov 17 13:37:08 2017 -0800 - - Merge pull request #186 from fieranmason/ticket#338 - - Well Development and Screens Sections - -commit f3a3f932f85a3430b6293960143cc64f82cb9a28 -Merge: c6a52653d 52b070d8c -Author: Fieran Mason -Date: Fri Nov 17 10:28:49 2017 -0800 - - fixing merge conflict over delta between erroneous and correct way of fetching production data - -commit ac75344abd82a7929c08e04b72c934401fe54574 -Author: Fieran Mason -Date: Fri Nov 17 10:24:50 2017 -0800 - - layout changes -- starting aquifer id work -- stopped for technical spike - -commit 52b070d8c376bb38b3fe6badc95470d55310b04e -Merge: d432ba456 dc37b3d53 -Author: garywong-bc -Date: Fri Nov 17 09:59:28 2017 -0800 - - Merge pull request #185 from rstens/master - - GWELLS HTML page Metadata - -commit d432ba456445c72e7c694eb019203ee8a4432440 -Merge: b04009671 88185bcd0 -Author: garywong-bc -Date: Fri Nov 17 09:58:30 2017 -0800 - - Merge pull request #181 from fieranmason/ticket#619 - - Ticket#619 - -commit dc37b3d53b16172e76a2d138b3c49b50906c38b3 -Author: Roland Stens -Date: Fri Nov 17 09:37:37 2017 -0800 - - Small typo, missed a space in the description - -commit 12921c6f5dd2f235e25041176a61483005b290f0 -Author: Roland Stens -Date: Fri Nov 17 09:18:07 2017 -0800 - - GWELLS HTML page Metadata - -commit c6a52653d2ddc0e87106941daf5ce861cb25ca91 -Author: Fieran Mason -Date: Fri Nov 17 08:13:10 2017 -0800 - - adding data migration scripts to deployment scripts - -commit 1a178728724a5cac084f7626b7e42b357de3babe -Author: Fieran Mason -Date: Thu Nov 16 14:37:24 2017 -0800 - - formatting tweek to better match wire frame - -commit 44e95af73c4a54a9ddeb807945d9d991bd1254d7 -Merge: 109c19098 838a04b8e -Author: Fieran Mason -Date: Thu Nov 16 14:33:26 2017 -0800 - - Merge branch 'ticket#339' into ticket#338 - -commit 109c1909868a15ae706c9303b4f38956469c1288 -Merge: 6c87af22d 3d96ff433 -Author: Fieran Mason -Date: Thu Nov 16 14:24:55 2017 -0800 - - Merge branch 'master' into ticket#338 - -commit 6c87af22dc288dfbb2d8cb1c2035b40cc54a152d -Author: Fieran Mason -Date: Thu Nov 16 14:24:42 2017 -0800 - - tweeks for PO - -commit 88185bcd0f7eff6a1ef456046d0b74059fe8efa9 -Merge: 15ea64691 3d96ff433 -Author: Fieran Mason -Date: Thu Nov 16 13:50:01 2017 -0800 - - Merge branch 'master' into ticket#619 - -commit 3d96ff433e776369103f54aa095954093f4c29d0 -Merge: 5544a6467 b04009671 -Author: Fieran Mason -Date: Thu Nov 16 13:49:41 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 15ea64691d61ce4555399eb53ce54d62f8e3f78d -Author: Fieran Mason -Date: Thu Nov 16 13:48:42 2017 -0800 - - changing selection criteria -- used logical inversion to improve performance - -commit b04009671b2f8ff18d00ecd8b5f747a9b9476a7a -Merge: a3a237858 3a45ea4ba -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 16 13:11:36 2017 -0800 - - Merge pull request #180 from rstens/master - - SHow the old detail page - -commit 3a45ea4bad13a8fc77a0007e1f329590862aea1e -Author: Roland Stens -Date: Thu Nov 16 13:10:13 2017 -0800 - - SHow the old detail page - -commit a3a2378580579ed09d549185503b437a35f533f8 -Merge: c1a8fedeb 45e834ca4 -Author: garywong-bc -Date: Thu Nov 16 12:06:12 2017 -0800 - - Merge pull request #179 from rstens/master - - Tests update for well summary page. - -commit 45e834ca48af7981ef7f6731a7cc2c616ab61b38 -Author: Roland Stens -Date: Thu Nov 16 12:04:50 2017 -0800 - - Tests update for well summary page. - -commit 31dfdf49ffea9e8233d2208e52e6a588c29992d3 -Author: Fieran Mason -Date: Thu Nov 16 11:23:42 2017 -0800 - - correcting output - -commit 835ac8a2915332194a4bab429bb59ab1fbc3baf9 -Author: Fieran Mason -Date: Thu Nov 16 11:21:42 2017 -0800 - - filtering on accepted instead of not rejected for import - -commit 838a04b8e70ac965ac8eea323e9a0c3944cbd418 -Merge: f1bc3f48c b2079d4eb -Author: Fieran Mason -Date: Thu Nov 16 11:03:13 2017 -0800 - - Merge branch 'ticket#338' into ticket#339 - -commit b2079d4eb17cb2144cfbdfd1eec10407fb3921c9 -Author: Fieran Mason -Date: Thu Nov 16 10:59:58 2017 -0800 - - formattting changes - -commit 4db017cd0b6a79e6d6e199a4d05c66fc7058cebf -Merge: 959ee49b9 5544a6467 -Author: Fieran Mason -Date: Thu Nov 16 10:46:02 2017 -0800 - - Merge branch 'master' into ticket#338 - -commit 5544a64673599e368e008d0484d2298bbb2608e2 -Merge: 30f009ff4 c1a8fedeb -Author: Fieran Mason -Date: Thu Nov 16 10:42:36 2017 -0800 - - Merge remote-tracking branch 'upstream/master' - -commit 959ee49b9cc74f7b06b34b2dcbc351deb4462e18 -Author: Fieran Mason -Date: Thu Nov 16 10:41:57 2017 -0800 - - clean up on screen details. addressing QA reported details - -commit f1bc3f48cd517a28894a61488d206803fa6d2f94 -Merge: e22919c65 7c286db61 -Author: Fieran Mason -Date: Thu Nov 16 08:59:36 2017 -0800 - - Merge branch 'ticket#338' into ticket#339 - -commit 7c286db61252b777a9046e2633529756ed7ad8db -Author: Fieran Mason -Date: Thu Nov 16 08:42:29 2017 -0800 - - converging on correct implementation with PO - -commit c1a8fedeb1d991830746e36fcb3242e89caf4dac -Merge: 09ca68656 b1a9b28b4 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 16 08:00:21 2017 -0800 - - Merge pull request #176 from rstens/master - - old Detail Status/New Detail status - -commit b1a9b28b4b9fc036bdef91e07e435c3fe0d66a26 -Author: Roland Stens -Date: Wed Nov 15 17:20:05 2017 -0800 - - old Detail Status/New Detail status - -commit a9d17c019e0538a59c5fe7da0eb64b8f9881eb46 -Author: Fieran Mason -Date: Wed Nov 15 11:52:20 2017 -0800 - - swapped column order and moved table beside common fields - -commit e22919c652729f84f39c24fb6005a070cf77162c -Author: Fieran Mason -Date: Wed Nov 15 09:05:17 2017 -0800 - - field label correction for ticket#339 - -commit 30f009ff45bc72ef2580b5adf62911f1a5fe76f5 -Author: Fieran Mason -Date: Wed Nov 15 08:32:56 2017 -0800 - - removed technical tracking comment - -commit 09ca686564237304d32eeccba03f694aaf0d257c -Merge: 4fc192b40 cd8752a5b -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Nov 14 13:41:06 2017 -0800 - - Merge pull request #175 from fieranmason/ticket#337 - - patch for ticket#632 - -commit cd8752a5b8dc341f4e1adb1cd8701151ee6dd8b8 -Author: Fieran Mason -Date: Tue Nov 14 13:37:43 2017 -0800 - - patch for ticket#632 - -commit 4fc192b40be83342a9e4e5e753ef741dc937fe9c -Merge: 6cdf7dbff d5cc9b661 -Author: garywong-bc -Date: Tue Nov 14 12:03:20 2017 -0800 - - Merge pull request #174 from fieranmason/ticket#337 - - Ticket#337 - -commit d5cc9b661d59ff6e2b06ed616bdcee42e284c0f8 -Author: Fieran Mason -Date: Tue Nov 14 10:24:47 2017 -0800 - - fixed bug for ticket #625 - -commit 6cdf7dbff43c3f407b934daffa0c6fec82caa0a0 -Merge: 60d6b1951 70ab28644 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Nov 14 08:19:06 2017 -0800 - - Merge pull request #173 from rstens/master - - Fixed the counts expected. - -commit 70ab286449140e2e55a827a8804b60d6365d45e4 -Author: Roland Stens -Date: Mon Nov 13 20:45:16 2017 -0800 - - Fixed the counts expected. - -commit 570b120a2a9a1164ec997023602c76234d0e8972 -Merge: 840c63b4b 60d6b1951 -Author: Fieran Mason -Date: Mon Nov 13 14:04:55 2017 -0800 - - Merge branch 'master' into ticket#337 - -commit 840c63b4be950ba4acc6c7c613d61532c8c708c2 -Author: Fieran Mason -Date: Mon Nov 13 14:03:46 2017 -0800 - - completed most of the liner work on ticket#337 --- need a couple of code tables to wrap this up so that it is ready for team QA - -commit 60d6b1951946d623c82c09cdee5d6383c1aacf09 -Merge: b4878cb59 a7da557be -Author: garywong-bc -Date: Fri Nov 10 12:37:45 2017 -0800 - - Merge pull request #172 from rstens/master - - Tests - -commit a7da557be63e5c71c7e2851c920758666c4ea0c1 -Author: Roland Stens -Date: Fri Nov 10 12:33:10 2017 -0800 - - page defnition for Wells Summary - -commit 26946d10bb128e26c7c20dd728c4e2b161c9bb0a -Author: Roland Stens -Date: Fri Nov 10 12:31:53 2017 -0800 - - First new test + testabaility updates - -commit b4878cb593bcefd502d11fc4164148dd96afc153 -Merge: d0c531322 a8005eb9a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Nov 10 10:08:32 2017 -0800 - - Merge pull request #171 from rstens/master - - Automatic jump to map, trello #296 - -commit a8005eb9ad793c8a4783fd53b2ccea191eae0b8e -Author: Roland Stens -Date: Fri Nov 10 10:04:54 2017 -0800 - - Automatic jump to map, trello #296 - -commit d0c5313220e36140675b26cf96d3bac17cca069f -Merge: 0b0fc2500 e994e64f7 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Nov 10 09:06:26 2017 -0800 - - Merge pull request #170 from rstens/master - - Another Testability update, forgot to change a few more things - -commit e994e64f72e2f8712495364cf18c56f794356377 -Author: Roland Stens -Date: Fri Nov 10 09:04:56 2017 -0800 - - Another Testability update, forgot to change a few more things - -commit 0b0fc25006fc680b3b126be2873177cc20dc5973 -Merge: 4d68f585d cea80486c -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Nov 10 08:38:58 2017 -0800 - - Merge pull request #169 from rstens/master - - Testability updates to the wells summary page. - -commit cea80486c08a15b0512d917aed3eaeba43df94c3 -Author: Roland Stens -Date: Fri Nov 10 08:35:05 2017 -0800 - - Testability updates to the wells summary page. - -commit 4d68f585daa8d54e9c7b09754971d08c3218c981 -Merge: 9cfdccf2d 7c10d4f35 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 9 16:21:57 2017 -0800 - - Merge pull request #168 from fieranmason/ticket#337 - - Ticket#337 - casings stuff - -commit 7c10d4f35d94822f0d65213490ac45c53d97eebb -Merge: f20e9325b 9cfdccf2d -Author: Fieran Mason -Date: Thu Nov 9 16:17:36 2017 -0800 - - Merge branch 'master' into ticket#337 - -commit f20e9325b0916dabac511d50015596e73572122e -Author: Fieran Mason -Date: Thu Nov 9 16:16:03 2017 -0800 - - ticket#337 casing section done and dev QAed - -commit 9cfdccf2d418aafe2f04770c2e1165648e5ba9bc -Merge: 84f221dca 453125ae5 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 9 14:38:43 2017 -0800 - - Merge pull request #167 from rstens/master - - Django version directive update and update to wellserach test - -commit 453125ae5fc9844e70df7229e7e7ce6bb27eca50 -Author: Roland Stens -Date: Thu Nov 9 14:35:39 2017 -0800 - - Django update directive + updated test script - -commit 84f221dca078211ce1fe57db63ffd2a6b140668a -Merge: ea00696fe 820f15129 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 9 14:22:09 2017 -0800 - - Merge pull request #166 from fieranmason/ticket#339 - - Ticket#339 - -commit 820f15129f3f86b5a8ae8b835f9ad33691702031 -Author: Fieran Mason -Date: Thu Nov 9 12:33:34 2017 -0800 - - QAed the UI --- all data shows when it it suppose to - -commit 6f7d1f72b52e09575d74f77c2592ddef534582a2 -Merge: ca825df0b ea00696fe -Author: Fieran Mason -Date: Thu Nov 9 12:11:46 2017 -0800 - - Merge branch 'master' into ticket#339 - -commit ca825df0bf79ebe2c6967eb8e6016a3bc175d0ab -Author: Fieran Mason -Date: Thu Nov 9 12:07:52 2017 -0800 - - mostly done production data stuff - -commit ea00696fe7fcf5877f32c5d39f9e79077a28b611 -Merge: 202b9d17a b5effa4f1 -Author: garywong-bc -Date: Thu Nov 9 09:50:01 2017 -0800 - - Merge pull request #165 from garywong-bc/master - - Refactored driver script to replicate legacy data. - -commit b5effa4f16878705723320e4165ee66a9a9f0ec3 -Author: Gary Wong (BC Gov) -Date: Thu Nov 9 09:49:15 2017 -0800 - - Refactored driver script to replicate legacy data. - -commit da1972fbd466e1fef5fc4ce2207cd0046d94cdc4 -Merge: f0297197a 202b9d17a -Author: Roland Stens -Date: Wed Nov 8 16:44:12 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 202b9d17a2f173d16b7c204132f991d77ad94ac4 -Merge: d3a8f0b9b 821a7b845 -Author: garywong-bc -Date: Wed Nov 8 16:43:39 2017 -0800 - - Merge pull request #164 from garywong-bc/master - - cron path and Roland's merge - -commit 821a7b84595096785d43a4e3b29a5cc53f210f9a -Merge: 16e42aca4 ece1463d2 -Author: Gary Wong (BC Gov) -Date: Wed Nov 8 16:42:12 2017 -0800 - - Merge branch 'rstens-master' - -commit ece1463d2f50340484085b2a5fc95cda92e89c6a -Merge: 16e42aca4 c15714a01 -Author: Gary Wong (BC Gov) -Date: Wed Nov 8 16:41:49 2017 -0800 - - Merge branch 'master' of git://github.com/rstens/gwells into rstens-master - -commit 16e42aca43bc7ef2f39202cfb62ff707740ab9d3 -Merge: 585683215 d3a8f0b9b -Author: Gary Wong (BC Gov) -Date: Wed Nov 8 16:41:21 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 585683215269ea844c4923a43d5099d42047e2c3 -Author: Gary Wong (BC Gov) -Date: Wed Nov 8 16:40:43 2017 -0800 - - Harcoded OpenShift script path. - -commit f0297197ace26046b14bcf911dcc888a217a3ed8 -Merge: c15714a01 d3a8f0b9b -Author: Roland Stens -Date: Wed Nov 8 16:38:30 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit c15714a0170dcd2900e41628222a1524d03b183a -Author: Roland Stens -Date: Wed Nov 8 16:30:55 2017 -0800 - - Updates to the counst in the test scripts - -commit d3a8f0b9bfb9ec6a433527745b39b5bfaca48f0d -Merge: 55fa4cf8e de6e5be55 -Author: garywong-bc -Date: Wed Nov 8 15:38:07 2017 -0800 - - Merge pull request #162 from fieranmason/ticket#338 - - Ticket#338 - -commit de6e5be55e4a0698083bb13547ae78a33cf19a73 -Author: Fieran Mason -Date: Wed Nov 8 15:09:31 2017 -0800 - - final cleanup on #338 - -commit 7cc816d57fcfc422bebdf6f1c6a61304c74eeece -Author: Fieran Mason -Date: Wed Nov 8 10:39:47 2017 -0800 - - removed empty file - -commit 39565049ce4b076b14756d347940630f171d545e -Author: Fieran Mason -Date: Wed Nov 8 10:38:46 2017 -0800 - - removed legacy setup script - -commit 35eed2bdf769fbf31ec1ab9fc2f3afc1371d3bb7 -Author: Fieran Mason -Date: Wed Nov 8 10:37:41 2017 -0800 - - removed one time use migration file - -commit 52ee8f760c4d72ca2e858ae91b7cb38c83357491 -Author: Fieran Mason -Date: Wed Nov 8 10:35:08 2017 -0800 - - simplified db construction - -commit c65023857fc333b2ed519040ccfffb49e1b6d863 -Author: Fieran Mason -Date: Wed Nov 8 09:49:35 2017 -0800 - - cleaning up dev QA issues with screens section - -commit a46483e736e77cb0d9f366ed5b6a8818f2806640 -Author: Fieran Mason -Date: Tue Nov 7 17:41:44 2017 -0800 - - screens stuff working - -commit ffb0578140957aa65aadfc87a637d7b44f8250ea -Merge: 4f138db4d 55fa4cf8e -Author: Fieran Mason -Date: Tue Nov 7 14:31:04 2017 -0800 - - merged master - -commit 4f138db4dd66e388408a7e3525921e5adc871817 -Author: Fieran Mason -Date: Tue Nov 7 14:18:02 2017 -0800 - - working towards migrating screen data - -commit 547b46703efe924fd83f9d46a746f0005acd0e9a -Author: Fieran Mason -Date: Tue Nov 7 14:12:47 2017 -0800 - - fixed licence naming issue - -commit 55fa4cf8e997ccedb952bf2d7a40717688dc68e4 -Merge: 5144675f4 e68156abe -Author: garywong-bc -Date: Tue Nov 7 12:51:41 2017 -0800 - - Merge pull request #161 from fieranmason/ticket#323 - - Ticket#323 - -commit e68156abe2727c41a086603a1ce130e5bacd2d97 -Author: Fieran Mason -Date: Tue Nov 7 12:17:16 2017 -0800 - - first migration - from nothing to everything - -commit 5a395d69fdc6cec37e2d10284eaf766adb504630 -Author: Fieran Mason -Date: Tue Nov 7 12:11:49 2017 -0800 - - remove squash because it broke - -commit a6b14eed716c717bd45fabacd134c4532be468b4 -Author: Fieran Mason -Date: Tue Nov 7 11:55:20 2017 -0800 - - starting screen migrations - -commit efe07b70768152dfb12e2be8e66f5aa7fb08f91e -Author: Fieran Mason -Date: Tue Nov 7 11:21:27 2017 -0800 - - removing presquash migrations - -commit 70eee024ebc7ea8fd53b0e0d61458400add633d4 -Merge: f3f83c6a2 5144675f4 -Author: Fieran Mason -Date: Tue Nov 7 11:13:38 2017 -0800 - - Merge branch 'master' into ticket#323 - -commit f3f83c6a2964815617ed7a6596f2757ebac4de64 -Author: Fieran Mason -Date: Tue Nov 7 11:11:55 2017 -0800 - - added migrations and squashed 1-20 - -commit 08fea14552e405e565de8c8626975cd3c8b594a0 -Author: Fieran Mason -Date: Tue Nov 7 11:10:20 2017 -0800 - - we will now use a single squashed migration + a delta - -commit b8a76d24d69f09648e9898975f5a907f9621c33a -Author: Fieran Mason -Date: Tue Nov 7 10:54:51 2017 -0800 - - ticket 338 all but screen - -commit 5144675f48dd7a0885d18f720affa9e28f53e815 -Merge: dc88783e7 ff09225b4 -Author: garywong-bc -Date: Mon Nov 6 16:13:25 2017 -0800 - - Merge pull request #159 from garywong-bc/master - - Ticket299 - -commit ff09225b4475839ed89453c717dd30d2a51a930c -Author: Gary Wong (BC Gov) -Date: Mon Nov 6 16:09:44 2017 -0800 - - Ticket #299 - -commit 32612030d4c1fd2655b46d0d993707225733f29b -Merge: ff37bb8d5 dc88783e7 -Author: Gary Wong (BC Gov) -Date: Mon Nov 6 14:28:32 2017 -0800 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit b6856ddd2d8d56dbbf4fe377c2d2de72bfdc18b3 -Merge: df57aaae7 dc88783e7 -Author: Fieran Mason -Date: Fri Nov 3 17:04:57 2017 -0700 - - Merge branch 'master' into ticket#323 - -commit df57aaae729ac5f955283e259052db7a5b1b0a21 -Merge: e4a44cf92 3f22c32e8 -Author: Fieran Mason -Date: Fri Nov 3 17:03:11 2017 -0700 - - finished mappings for ticket#323 - -commit dc88783e7310878662ca245a0371f30438f5e3e1 -Merge: 5c212b90c 3f22c32e8 -Author: garywong-bc -Date: Fri Nov 3 16:13:20 2017 -0700 - - Merge pull request #157 from fieranmason/ticket#517 - - Ticket#517 - -commit e4a44cf9257cfcf9e505ab186ed593e4711d6a06 -Author: Fieran Mason -Date: Fri Nov 3 15:09:11 2017 -0700 - - patrially added utm_zone_code -- need to merge some new changes before continuing - -commit 3f22c32e8f4198d7c8cdf80e92e7a9c1cc0c8c68 -Merge: 3f37c0da0 2bb4d026d -Author: Fieran Mason -Date: Fri Nov 3 14:02:58 2017 -0700 - - Merge branch 'master' into ticket#517 - -commit 2bb4d026d4064e2df961a02d9f4b5d697bb59fd2 -Author: Fieran Mason -Date: Fri Nov 3 14:01:42 2017 -0700 - - added deactivate to git ignore - -commit 3f37c0da0973a3b45fa575f89c639b5ea415741b -Author: Fieran Mason -Date: Fri Nov 3 13:56:19 2017 -0700 - - using verbose names in well details page - -commit 5c212b90ca2636d033be091a90cc6824f2cb3d89 -Merge: 3ebfb7fc4 0f0d749c2 -Author: garywong-bc -Date: Fri Nov 3 12:45:04 2017 -0700 - - Merge pull request #156 from fieranmason/ticket#328#ticket#329 - - Moved to FDW. Importing Drilling Company. Displaying Drilling Company on wells details - -commit d149e1aea824cb70fe29e1e79ee75808715d8fe8 -Merge: 0f0d749c2 3ebfb7fc4 -Author: Fieran Mason -Date: Fri Nov 3 11:09:09 2017 -0700 - - Merge branch 'master' into ticket#328#ticket#329 - -commit 0f0d749c225601a07c90d2c29d2b0472e2383617 -Author: Fieran Mason -Date: Fri Nov 3 11:00:55 2017 -0700 - - added migrations to git ignore as makemigrations and migrate should be run as part of deployment - -commit 934882b6e33e7930250805f1422867588f9d6026 -Author: Fieran Mason -Date: Fri Nov 3 10:55:21 2017 -0700 - - imported drilling company - -commit 3ebfb7fc4d8bef4b9dda0a33d2756c24679ce5b5 -Merge: c1b663c04 f46761f1d -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Fri Nov 3 10:28:12 2017 -0700 - - Merge pull request #155 from rstens/master - - Step by step and GEB config update - -commit 212d3971dd1774f01ae4e0a9017e77e170ae9f63 -Merge: f46761f1d c1b663c04 -Author: Roland Stens -Date: Thu Nov 2 17:10:03 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit f46761f1d9ca892d811108fbd8064e1226fab711 -Author: Roland Stens -Date: Thu Nov 2 17:07:54 2017 -0700 - - GEB config update - -commit 61c0383b54373d8af46f7fc0035260c8adb5fcb6 -Author: Roland Stens -Date: Thu Nov 2 16:44:32 2017 -0700 - - Step by step - -commit c1b663c0478c1c9f2d2eba489a3de8c966e2e8f5 -Merge: dd34d64aa 3eeebcd30 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 2 16:08:40 2017 -0700 - - Merge pull request #154 from rstens/master - - Further changes to get the pipeline running again - -commit 3eeebcd309e650254f048028d8856b4b757b7aa0 -Author: Roland Stens -Date: Thu Nov 2 16:06:24 2017 -0700 - - Further changes to get the pipeline ruuning again - -commit dd34d64aa9e709e3a1771eeba207032f0de8c730 -Merge: 09c94bc16 a4a32c12e -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Nov 2 15:57:05 2017 -0700 - - Merge pull request #153 from rstens/master - - Remove the css file, to avoid pipeline issues. - -commit a4a32c12e59ca33d0b4088bdd337399aaaaef724 -Author: Roland Stens -Date: Thu Nov 2 15:54:03 2017 -0700 - - Remove the css file, to avoid pipeline issues. - -commit 5a4c60e0d9137945594b6a328af9cfa9b52dd28f -Author: Fieran Mason -Date: Thu Nov 2 14:58:03 2017 -0700 - - got foreign data wrapper working. fixed a gwells_ prefix in the model - -commit 753d3fc4ed85119240813b8741b4039d394871e9 -Author: Fieran Mason -Date: Wed Nov 1 16:57:40 2017 -0700 - - loading from dump which includes schema and FDW - -commit 09c94bc16607b4a7b60d99e972999b3c0f9ef040 -Merge: 3b3e60b1c 2c85cfb5e -Author: garywong-bc -Date: Wed Nov 1 16:05:34 2017 -0700 - - Merge pull request #152 from fieranmason/ticket#328#ticket#329 - - Ticket#328#ticket#329 - -commit 2c85cfb5e0d9009d8a75645dda6c4c3416e9d664 -Merge: 1486fb088 3b3e60b1c -Author: Fieran Mason -Date: Wed Nov 1 15:17:15 2017 -0700 - - merged master - -commit 1486fb0882ee3bd1567bb0f37e0450ffbb47a100 -Author: Fieran Mason -Date: Wed Nov 1 14:49:59 2017 -0700 - - adjustments for tickets 322/328/329 - -commit 3b3e60b1c31b6758e676b0aeb0b6074b29a06437 -Merge: b5dace33f bd29975e1 -Author: garywong-bc -Date: Wed Nov 1 14:48:40 2017 -0700 - - Merge pull request #151 from rstens/master - - one CSS file back to pointing to the CDN - -commit bd29975e1761ae3131f54f730ae76b3910cda4e4 -Author: Roland Stens -Date: Wed Nov 1 14:48:01 2017 -0700 - - one CSS file back to pointing to the CDN - -commit b5dace33f0da1af0df05038ef92d343018ba6054 -Merge: 3ddc79dc6 3c2a3c1ca -Author: garywong-bc -Date: Wed Nov 1 14:40:23 2017 -0700 - - Merge pull request #150 from rstens/master - - Bringing all JS and CSS files locally to counteract race conditions, ... - -commit 3c2a3c1cab3cf29b933ed26e4d43b5903fb8e3c3 -Author: Roland Stens -Date: Wed Nov 1 14:34:35 2017 -0700 - - Bringing all JS and CSS files locally to counteract race conditions - -commit f1a2b91c6edecf74560050de227a66b38075a97c -Author: Fieran Mason -Date: Wed Nov 1 11:41:28 2017 -0700 - - addressing more fields in ticket #329. cleaning up load script to be more convenient for developers - -commit ff37bb8d50987050b3c3a7e7a3ec311159e0b1ba -Author: Gary Wong (BC Gov) -Date: Tue Oct 31 20:23:20 2017 -0700 - - updated documentation - -commit 3ddc79dc60ea270337187b0721bd48f7c4a7b9ba -Merge: ac302cd59 90c780e81 -Author: garywong-bc -Date: Tue Oct 31 20:11:58 2017 -0700 - - Merge pull request #149 from rstens/master - - Robots.txt is too restrictive - -commit ac302cd591c97407f53b863f3d112194388a9b4e -Merge: 153441d07 95ae08170 -Author: garywong-bc -Date: Tue Oct 31 20:11:44 2017 -0700 - - Merge pull request #148 from garywong-bc/master - - Interim save of cron work. - -commit 95ae0817076fd2a2da518416758186ebf7f2a624 -Author: Gary Wong (BC Gov) -Date: Tue Oct 31 20:11:02 2017 -0700 - - Refactored cron *.yaml to simple shell script run on gwells pod. - -commit 90c780e8168416145657635914a6ddf9f03723ef -Author: Roland Stens -Date: Tue Oct 31 17:35:30 2017 -0700 - - Robots.txt is too restrictive - -commit 153441d072cbc218b9502aa6018681fcee6060c4 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Tue Oct 31 17:05:30 2017 -0700 - - update to phantomjsTest - -commit 80f9df6934cbc82e86093e789673c8546ff7f71a -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Tue Oct 31 16:03:23 2017 -0700 - - Update Jenkinsfile - -commit abf1ac1fe488d5a131c8ed5baaedc73016f03f28 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Tue Oct 31 15:51:02 2017 -0700 - - remove debug - -commit 10cff2e53a4092242ca02297ccb92ae826bcbcae -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Tue Oct 31 15:07:45 2017 -0700 - - back to master - -commit ed2445ef85de0c8d1b0cdca403d0293e9e869b00 -Author: Fieran Mason -Date: Mon Oct 30 17:47:11 2017 -0700 - - removing problematic entries from load script - -commit 7d1e875ad9255c6a003ce5b6c9bdd2e5e8a25dee -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Tue Oct 31 13:55:45 2017 -0700 - - switch master to maven for functional test as master received jQuery issue again - -commit 33d7524d3e043394381cb7f0eb7bcc61ddaf0166 -Author: Fieran Mason -Date: Mon Oct 30 16:16:31 2017 -0700 - - reverting changes to keep gwells prefix --- adjusting scripts towards completion of tickets -- reload script is in a stable state - -commit 1ec29091c6463bf541b3e2a59393addcee7d9858 -Merge: 769c05189 7c832a7c5 -Author: Gary Wong (BC Gov) -Date: Mon Oct 30 12:24:20 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 769c05189d689c56c7ee4cfc04d778d428c65a2d -Author: Gary Wong (BC Gov) -Date: Mon Oct 30 12:20:06 2017 -0700 - - Interim save of cron work. - -commit 7c832a7c5d3e1c646d8137a52786bc3e9c1f924d (tag: v1.17.0) -Merge: 8d82d552f 7ea727286 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Oct 30 09:16:22 2017 -0700 - - Merge pull request #147 from rstens/master - - Update path in Test Scripts.... - -commit 7ea727286ede5c46a634c80e0a52245e88841a49 -Author: Roland Stens -Date: Mon Oct 30 09:11:52 2017 -0700 - - Update path in Test Scripts to align with the strong suggestion in GEB Manual. - -commit eefa8711c40cf495f42a3cf9351773e195ec2c06 -Author: Fieran Mason -Date: Fri Oct 27 16:13:28 2017 -0700 - - fixing typo - -commit 8d82d552f3e84828285a734aa9b4f13f3282a18e -Merge: 368251a65 e542ce67b -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Oct 27 16:12:41 2017 -0700 - - Merge pull request #146 from rstens/master - - updated the esri leaflet library - -commit e542ce67b1e0ee295b754c45dcbe0d0e341e016a -Author: Roland Stens -Date: Fri Oct 27 16:11:30 2017 -0700 - - updated the esri leaflet library - -commit 754d364db1b8a6423e0ed3a24259a0cd9b8cba24 -Author: Fieran Mason -Date: Fri Oct 27 14:37:44 2017 -0700 - - fixing a couple bugs and backing up enough that this can be branched for some temporary work - -commit d6c62987e41404f5ca8f67957a6324cd5b98a083 -Author: Fieran Mason -Date: Fri Oct 27 13:22:45 2017 -0700 - - working through replication work - have partitioned scripts - working towards populating drilling company table - -commit 368251a65733c4dff95d707a4a7026449f2acf21 -Merge: 46bad94e7 ed56f3fa1 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Oct 27 11:34:03 2017 -0700 - - Merge pull request #145 from rstens/master - - update to Leafjet JS and CSS - -commit ed56f3fa160466303008646b04dade3723d47ed9 -Author: Roland Stens -Date: Fri Oct 27 11:28:01 2017 -0700 - - update to Leafjet JS and CSS - -commit 46bad94e708d77f438ffc22ee91b21e7c4384414 -Merge: 35b419c36 eed48b185 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Oct 27 09:41:54 2017 -0700 - - Merge pull request #144 from rstens/master - - See details below. - -commit eed48b185466e2c7d2046b2258d56f9670406c0d -Author: Roland Stens -Date: Fri Oct 27 09:39:30 2017 -0700 - - Changes to the load files for local DB deployment - -commit f02f07421597934c37e875ff0b778547b6c8327a -Author: Roland Stens -Date: Thu Oct 26 12:47:36 2017 -0700 - - Compressing the most complained about images - -commit 35b419c363fd81be8c94356acd5d298c4eb0aadc -Merge: dc418bc0e 36b61b5e3 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Oct 26 11:30:50 2017 -0700 - - Merge pull request #143 from rstens/master - - Fix database setting - -commit 36b61b5e33337218acf8c1ec127ed9d1b122ae19 -Author: Roland Stens -Date: Thu Oct 26 11:14:35 2017 -0700 - - Fix database setting - -commit dc418bc0e51e0944e7c8a9cd23e249435059c0fd -Merge: b2db95184 e5faf1690 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Oct 26 11:05:17 2017 -0700 - - Merge pull request #142 from rstens/master - - Make the new well summary page available in dev. - -commit e5faf16907c61f9b65d51be730dc63d93e3d62a7 -Author: Roland Stens -Date: Thu Oct 26 10:24:40 2017 -0700 - - Put the new details page back. - -commit fc2a5ab25ebe070dedeeca42c843074afe3aa10a -Merge: dea642764 b2db95184 -Author: Roland Stens -Date: Wed Oct 25 15:21:33 2017 -0700 - - Merge pull request #1 from bcgov/master - - Big merge - -commit b2db9518421f1544977423e69ba1a115c42dd16c -Merge: 787a33c32 2c266ed67 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Oct 25 15:06:04 2017 -0700 - - Merge pull request #141 from fieranmason/master - - replication scripting and tickets 563, 328 and 329 - -commit 2c266ed67914fa1c92edccfa5fb953ee764e3fdc -Author: Fieran Mason -Date: Wed Oct 25 12:55:27 2017 -0700 - - ticket #563 https://trello.com/c/PZkxmzQE fixed paths to android icons - -commit 5a8a7ec5ba7fdbb680b8653c7f2bd2a83b62bd61 -Merge: 711a5fff3 787a33c32 -Author: Fieran Mason -Date: Wed Oct 25 11:01:42 2017 -0700 - - merged upstream + fixed column names as per PO's requests - -commit 4a5883416839ab4987b39d4e5eeeff8c3ec032fa -Merge: 73c1c5991 711a5fff3 -Author: Fieran Mason -Date: Wed Oct 25 10:48:50 2017 -0700 - - merged master and dealth with column names - -commit 711a5fff34b0d4189e72399001c7f7ae875fbd85 -Merge: 50845c5ea bd01bb841 -Author: Fieran Mason -Date: Wed Oct 25 08:27:20 2017 -0700 - - Merge branch 'master' into ticket#546/547 - -commit 787a33c32f26b6e3b4a674433102b000cc733d7e -Merge: 719d0865c 50845c5ea -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Oct 24 15:53:57 2017 -0700 - - Merge pull request #140 from fieranmason/ticket#546/547 - - tweeking error pages #546/547 - -commit 50845c5ea1d72cab8484883ea255e5714ea20b8b -Author: Fieran Mason -Date: Tue Oct 24 15:52:44 2017 -0700 - - tweeking error pages #546/547 - -commit 719d0865cfd26aa32ccc67c5ff48550731dde801 -Merge: 2c7345a9f e88239aa9 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Oct 24 15:38:56 2017 -0700 - - Merge pull request #139 from fieranmason/ticket#546/547 - - Used absolute paths for referenced files instead of templating Follow up for #546/547 - -commit e88239aa9dde2f35b2b9f7105a97a4d62c40427a -Author: Fieran Mason -Date: Tue Oct 24 15:37:02 2017 -0700 - - Used absolute paths for refrenced files instead of templating - -commit 2c7345a9f064bb8dd88dab718e24fcf4c6d03d33 -Merge: 17e38af6d 50ce3b82d -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Oct 24 14:21:33 2017 -0700 - - Merge pull request #138 from fieranmason/ticket#546/547 - - ticket#547 https://trello.com/c/PM2CCfg7 added 404 and 500 - -commit 50ce3b82d1c878d8914f0eef76254a07e31d248d -Author: Fieran Mason -Date: Tue Oct 24 14:11:15 2017 -0700 - - ticket#547 https://trello.com/c/PM2CCfg7 added 404 and 500 - -commit 17e38af6dd7e6b54441c33a0dcaa0bf6454c25f5 -Merge: 920624917 dea642764 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Oct 24 13:25:51 2017 -0700 - - Merge pull request #137 from rstens/master - - Added survey link: https://trello.com/c/AhEO1bag - -commit dea642764b641e689094cd54337ac0f698373ad3 -Author: Roland Stens -Date: Tue Oct 24 12:47:16 2017 -0700 - - Added survey link - -commit 920624917390ea622c7c1aef3a3514e2fb0a0f94 -Merge: 5f71a6938 1ba7731c8 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Oct 24 11:41:32 2017 -0700 - - Merge pull request #136 from rstens/master - - robots.txt https://trello.com/c/1zQWncKE - -commit 1ba7731c8c07deb1fda98c6c46095e356645377f -Author: Roland Stens -Date: Tue Oct 24 11:39:18 2017 -0700 - - robots.txt - -commit bd01bb841f86fd7450311d5381a9a34220eb6b5a -Author: Fieran Mason -Date: Tue Oct 24 09:33:27 2017 -0700 - - completed replication scripting - -commit 5f71a69383527435848d3a62757da1e80673532d -Merge: cb121e700 f688f9a0a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Oct 24 09:30:38 2017 -0700 - - Merge pull request #135 from rstens/master - - security changes - -commit f688f9a0a748be3163ad085c3b5bc71d1152e288 -Author: Roland Stens -Date: Tue Oct 24 09:28:58 2017 -0700 - - security changes - -commit cb121e7002b295367095727474a909c5d034b1d9 -Merge: 83128b21b 34a1a5de1 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Oct 23 11:44:14 2017 -0700 - - Merge pull request #134 from rstens/master - - Fixes for gwells url change, new detail page, eliminate spinner.... - -commit 34a1a5de19be581bf609bce039453f8997b4d634 -Author: Roland Stens -Date: Mon Oct 23 11:40:46 2017 -0700 - - Fixes for gwells url change, new detail page, eliminate spinner, update test scripts - -commit 83128b21bb3bc229029973c9f5f6924c29e142f2 -Merge: 2fe35ab39 6b06714f9 -Author: garywong-bc -Date: Fri Oct 20 18:41:09 2017 -0700 - - Merge pull request #133 from rstens/master - - Security Settings - -commit 6b06714f9a7dee915b1872ed99336402d3baaf66 -Merge: 3c6858993 2fe35ab39 -Author: Roland Stens -Date: Fri Oct 20 16:31:08 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 3c68589932f53539d65a823eebcb5d7f75d6ebc1 -Author: Roland Stens -Date: Fri Oct 20 16:28:13 2017 -0700 - - Security settings added - -commit 2fe35ab39261fd42bb2b4e83105f2159260810de -Merge: 850b755a1 b51189ebe -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Fri Oct 20 13:11:59 2017 -0700 - - Merge pull request #132 from rstens/master - - re-enable call to old detail page - -commit 5862440f0496388b0feabfd5297396829a0346b6 -Merge: b51189ebe 850b755a1 -Author: Roland Stens -Date: Fri Oct 20 13:09:35 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit b51189ebe5f97beaca143c95323ef89cd8751150 -Author: Roland Stens -Date: Fri Oct 20 13:06:26 2017 -0700 - - re-enable call to old detail page - -commit 850b755a13ee80672589c13f10455d0d4822247e -Merge: 38d47809b fa8fc803f -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Fri Oct 20 11:55:33 2017 -0700 - - Merge pull request #131 from rstens/master - - updates to the way we deal with env variables in our templates - -commit fa8fc803f88431935eb63294bbd1b104d85933ab -Author: Roland Stens -Date: Fri Oct 20 11:16:15 2017 -0700 - - updates to the way we deal with env variables in our templates, eliminates repeated code - -commit 38d47809b44de80139cba42a5d554a030a27d8c5 -Merge: dcccb0da0 f3cadbbb9 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Oct 19 15:41:50 2017 -0700 - - Merge pull request #130 from rstens/master - - settings update - -commit f3cadbbb92b86e6c357ea946ec72dcb4fd125c79 -Author: Roland Stens -Date: Thu Oct 19 15:41:02 2017 -0700 - - settings update - -commit dcccb0da0c6571529002d33c09ef4031e099187e -Merge: d8754eb36 e3c124719 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Oct 19 13:23:07 2017 -0700 - - Merge pull request #129 from rstens/master - - Fix url - -commit e3c1247197c116f142d055ce518c5c197a8f9020 -Author: Roland Stens -Date: Thu Oct 19 13:22:15 2017 -0700 - - Pre-fix all urls - -commit d510853c1df9bdb03c19949f84a47da2c9b8bb28 -Author: Roland Stens -Date: Thu Oct 19 13:20:04 2017 -0700 - - Pre-fix all urls - -commit d8754eb3690c03defdf369663d26d63b4a2b3abc -Merge: fdb05586b 393b190e8 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Oct 19 13:08:29 2017 -0700 - - Merge pull request #128 from rstens/master - - Fix for getting the environmnet variables work properly - -commit 393b190e81e288c055e547a9e699bdb9ca8f27db -Author: Roland Stens -Date: Thu Oct 19 13:07:35 2017 -0700 - - Fix for getting the environmnet variables work properly - -commit c89ed1c8f6b1dbd887c658710af258ab0215f71a -Author: Fieran Mason -Date: Wed Oct 18 17:54:39 2017 -0700 - - scripted database drop, creation, addition of stored functions, and population of wells data - -commit fdb05586b3b836a4218009ab9b98c9d008c2ddfd -Merge: 52ebff3f6 a60febd24 -Author: garywong-bc -Date: Wed Oct 18 17:36:37 2017 -0700 - - Merge pull request #127 from garywong-bc/master - - replication now has temporary logging table, and next draft of cron job. - -commit a60febd248b68d37fc4fa10ecbba5c9d8c28a35c -Author: Gary Wong (BC Gov) -Date: Wed Oct 18 17:35:54 2017 -0700 - - replication now has temporary logging table, and next draft of cron job. - -commit 52ebff3f6cc045f3cf02a948c8f343bf8fbff426 -Merge: 2649bd323 6c413d110 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Oct 18 14:33:22 2017 -0700 - - Merge pull request #126 from rstens/master - - Change application landing page: https://trello.com/c/D9zDcr91 - -commit 6c413d110d6a18d8810f1ac55e88c16942d4dcca -Author: Roland Stens -Date: Wed Oct 18 14:30:28 2017 -0700 - - Change application landing page: https://trello.com/c/D9zDcr91 - -commit 2649bd3236f0a89db610560ff2ac0bd5ad82b8e6 -Merge: 185ff40f5 1b0181eb9 -Author: garywong-bc -Date: Wed Oct 18 13:38:46 2017 -0700 - - Merge pull request #125 from rstens/master - - update to properties - -commit 1b0181eb9a47bdc3688436af4edb8be7935560dd -Author: Roland Stens -Date: Wed Oct 18 13:37:33 2017 -0700 - - missing files - -commit 7081b9dfa12d84d71f400c87ba03c09a84248898 -Author: Roland Stens -Date: Wed Oct 18 13:26:50 2017 -0700 - - update to properties - -commit 185ff40f53575210933f631333a9574fd27c085a -Merge: c530b3a68 a2658658e -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Wed Oct 18 12:35:50 2017 -0700 - - Merge pull request #124 from rstens/master - - pointing back to the openshift machine urls - -commit a2658658edc65b7534bc4149b50ff3f369648276 -Author: Roland Stens -Date: Wed Oct 18 12:29:38 2017 -0700 - - pointing back to the openshift machine urls - -commit c530b3a68c8563df56ca5dc3bebd06b61bce5c69 -Merge: d288280ce f95bff762 -Author: garywong-bc -Date: Wed Oct 18 11:17:36 2017 -0700 - - Merge pull request #123 from rstens/master - - DEBUG Tests - -commit f95bff762e0a923d85f5e38554bca75c91161807 -Author: Roland Stens -Date: Wed Oct 18 11:15:23 2017 -0700 - - DEBUG Tests - -commit d288280ce5b6b7c66debf2aa6c44ad3e35d26761 -Merge: bab4a6934 8b26e0513 -Author: garywong-bc -Date: Tue Oct 17 22:55:04 2017 -0700 - - Merge pull request #122 from garywong-bc/master - - Script to support FDW export, and latest attempt for cron replicate job - -commit 8b26e0513ec46ea813705530447dd51db6bb63e4 -Author: Gary Wong (BC Gov) -Date: Tue Oct 17 22:53:44 2017 -0700 - - Script to support FDW export, and latest attempt for cron replicate job - -commit bab4a6934c7f19b2f4a3fbe295b04b07169bdb8f -Merge: f79be1e7c 3e6e33965 -Author: garywong-bc -Date: Tue Oct 17 22:45:08 2017 -0700 - - Merge pull request #121 from rstens/master - - Update to test scripts - -commit 3e6e33965b880901dfb4564df6d9061d29e044c0 -Merge: 4fa0b6332 881fb0539 -Author: Roland Stens -Date: Tue Oct 17 17:33:00 2017 -0700 - - Merge branch 'master' of https://github.com/rstens/gwells - -commit 4fa0b63322f6628dd17ed21c23a3eea9c87778b8 -Merge: 5bb8661f1 f79be1e7c -Author: Roland Stens -Date: Tue Oct 17 17:30:12 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 5bb8661f11fb7952a77ee7cba6e22f2cd0d7f933 -Author: Roland Stens -Date: Tue Oct 17 17:28:17 2017 -0700 - - Test script updates to account for today's changes - -commit 881fb05396a795543d1bd72c0301701ca6541046 -Author: Roland Stens -Date: Tue Oct 17 16:40:21 2017 -0700 - - Delete os1.png - -commit 8aa8d9c00070dc50bf751e75840770cf8f4a6d26 -Author: Roland Stens -Date: Tue Oct 17 16:40:01 2017 -0700 - - Delete os2.png - -commit b83ae70a24ab5e87df42f4b4b2e207dad877d678 -Author: Roland Stens -Date: Tue Oct 17 16:39:12 2017 -0700 - - Delete os3.png - -commit a9c421248016567b6a7d7057ab056c213fc81eae -Author: Roland Stens -Date: Tue Oct 17 16:08:59 2017 -0700 - - overwrite file - -commit d33a7fa7f82613b6d593c2d7d8f3f1692141746a -Author: Roland Stens -Date: Tue Oct 17 15:43:49 2017 -0700 - - pictures for wiki - -commit f79be1e7c96eaa136ecb53d77b020512ad07f576 -Author: kuanfandevops -Date: Tue Oct 17 15:43:37 2017 -0700 - - add sleep 3 minutes to wait dev deployment complete - -commit f4caa706c7b9f5650a7d70afb49ec162963724b3 -Merge: 4a5aee6a2 600da8563 -Author: garywong-bc -Date: Tue Oct 17 15:13:54 2017 -0700 - - Merge pull request #119 from rstens/master - - Change DJANGO-DEBUG Retrieval - -commit 600da85632dc498c9513182e7c3a2f1d74181cd4 -Author: Roland Stens -Date: Tue Oct 17 15:09:57 2017 -0700 - - Change DJANGO-DEBUG Retrieval - -commit 4a5aee6a25028b13892ce611273b55efdd3d4c4a -Merge: bee9fd9db f159b0c0b -Author: garywong-bc -Date: Tue Oct 17 14:15:38 2017 -0700 - - Merge pull request #118 from fieranmason/master - - Tickets #518 and #523 - -commit f159b0c0b64739c735ff9665c4a30b0abe5df550 -Merge: eed27ff44 b54da2b58 -Author: Fieran Mason -Date: Tue Oct 17 13:53:59 2017 -0700 - - resolved conflict with additional information rename to groundwater information and changes to deal with pipeline deployment addresses - -commit bee9fd9db929427d2d393f265ef5a9efda3fa087 -Merge: b54da2b58 740575e76 -Author: garywong-bc -Date: Tue Oct 17 13:52:21 2017 -0700 - - Merge pull request #116 from garywong-bc/master - - added ems to ETL and next iteration of cron job - -commit eed27ff44da3f98047b4003d2ab0e639b97c8310 -Author: Fieran Mason -Date: Tue Oct 17 13:44:45 2017 -0700 - - ticket #518 https://trello.com/c/HOGQB36l and ticket #523 https://trello.com/c/BhCm6cfZ - -commit 37d76fed4147cb71edf31799a44c4c498f333ac2 -Merge: 4ab21417f 439645d3d -Author: Fieran Mason -Date: Tue Oct 17 13:14:15 2017 -0700 - - Merge branch 'ticket#523' into ticket#518 - -commit b54da2b58192e555d7d692d378aa152eb7bb2421 -Merge: e53358726 e9e5e5cce -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Oct 17 13:12:20 2017 -0700 - - Merge pull request #117 from rstens/master - - a more efficient way of dealing with the new environment variable - -commit 439645d3da715bfdf6b2328c4a99015fdd695299 -Author: Fieran Mason -Date: Tue Oct 17 09:55:17 2017 -0700 - - #523 - https://trello.com/BhCm6cfZ -- fixed search page - -commit e9e5e5ccee183da7fd9f9b0d6f1727bd4b72dc5c -Author: Roland Stens -Date: Tue Oct 17 08:59:03 2017 -0700 - - a more efficient way of dealing with the new environmnet variable - -commit 740575e761335d664e5b781cf74d853ef58733c1 -Author: Gary Wong (BC Gov) -Date: Mon Oct 16 23:41:25 2017 -0700 - - added ems to ETL and next iteration of cron job - -commit e53358726f02ba346138a53553d48361eb22dd7b -Merge: 7811e587c 610d4ad1b -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Oct 16 15:52:44 2017 -0700 - - Merge pull request #115 from rstens/master - - typo in requirements.txt - -commit 610d4ad1b8f72b9068f64fcc90846adfdd7bb551 -Author: Roland Stens -Date: Mon Oct 16 15:51:27 2017 -0700 - - typo in requirements.txt - -commit 7811e587c8ca458cbb5813a6bb6bdc5eb6ae5603 -Merge: caaaeb662 8dcc54213 -Author: garywong-bc -Date: Mon Oct 16 15:37:51 2017 -0700 - - Merge pull request #114 from rstens/master - - groundwater-wells setting is now controlled by environment settings - -commit 8dcc54213c9c266bd7b90cbb9715eaa4acc344aa -Author: Roland Stens -Date: Mon Oct 16 15:34:39 2017 -0700 - - groundwater-wells setting is now controlled by environment settings - -commit 4ab21417f684d99fee2627d888bc33be1ef15fce -Author: Fieran Mason -Date: Mon Oct 16 15:19:45 2017 -0700 - - #518 - fixed navbar - -commit 73c1c599131fa5fdc721b0c5a926841f067463d5 -Author: Fieran Mason -Date: Mon Oct 16 14:20:46 2017 -0700 - - #323 Well Activity - https://trello.com/c/XoilLdsZ - -commit caaaeb662751f95478e89104ef691832b32a4ffa -Merge: 5f69bde2d 4c755bb7d -Author: garywong-bc -Date: Mon Oct 16 13:27:54 2017 -0700 - - Merge pull request #113 from rstens/master - - static file pointer updated - -commit 4c755bb7d7018e8d09a9f76bb3e8ad02ca603b8f -Author: Roland Stens -Date: Mon Oct 16 13:26:37 2017 -0700 - - static file pointer updated - -commit 5f69bde2d8db66fcdb3c1210ab247d4d89dfe803 -Merge: f9ef44705 3048c522b -Author: garywong-bc -Date: Mon Oct 16 12:06:14 2017 -0700 - - Merge pull request #112 from garywong-bc/master - - Updated health check to follow new context url - -commit 3048c522bf2e42f7444d4889d3f84fdc45763968 -Author: Gary Wong (BC Gov) -Date: Mon Oct 16 12:04:00 2017 -0700 - - Updated health check to follow new context url - -commit f9ef4470521e82b1381d79ae8417ef349641b213 -Merge: 4db5477ee 1c616c930 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Oct 16 09:03:09 2017 -0700 - - Merge pull request #108 from fieranmason/master - - #515 https://trello.com/c/BhtXtt9o boolint errors fixed - -commit 4db5477ee9236191e6b24b2ea3b8bb507b1daf79 -Merge: 3a9234f02 ed4ea9392 -Author: garywong-bc -Date: Mon Oct 16 08:58:43 2017 -0700 - - Merge pull request #111 from rstens/master - - Missed the url call from the wellsmap.js - -commit ed4ea9392ae642c61e79dd106737cb34d59fcece -Author: Roland Stens -Date: Sat Oct 14 17:32:09 2017 -0700 - - Missed the url call from the wellsmap.js - -commit 3a9234f022ea093de0ffd23990e2a293b9e1fa86 -Merge: 493e624d6 cc678ad92 -Author: garywong-bc -Date: Fri Oct 13 19:17:24 2017 -0700 - - Merge pull request #110 from garywong-bc/master - - New Well Summary page columns, and draft cron setup files. - -commit cc678ad92ccd8a6c5ccfd6d977d584f80deb6dbf -Author: Gary Wong (BC Gov) -Date: Fri Oct 13 19:16:26 2017 -0700 - - New Well Summary page columns, and draft cron setup files. - -commit 493e624d6e5f328f41c458d405825aca9b71da28 -Author: kuanfandevops -Date: Fri Oct 13 17:19:32 2017 -0700 - - commented the sleep - -commit 6b48c46b226298c2d1b0f89f7bf76ee559176e3d -Author: kuanfandevops -Date: Fri Oct 13 17:14:32 2017 -0700 - - add sleep function to wait deployment completes - -commit 482aa206b445f4931c24dc7a3f6e621d8463f746 -Merge: 6e8cfe013 94efc5c58 -Author: garywong-bc -Date: Fri Oct 13 16:24:28 2017 -0700 - - Merge pull request #109 from rstens/master - - url change + test script updates - -commit 94efc5c581576cab527852dd1b552277cf6b4bbf -Author: Roland Stens -Date: Fri Oct 13 16:21:49 2017 -0700 - - url change + test script updates - -commit 6e8cfe0136b5404fa3535302933d4e6e9786b9cb -Merge: 234fa8c90 8d8bdddc8 -Author: garywong-bc -Date: Fri Oct 13 16:19:33 2017 -0700 - - Merge pull request #107 from rstens/master - - Document IEExplorer set up - -commit 1c616c930be19637a3318e9321117388c7a3decd -Merge: ab1916698 234fa8c90 -Author: Fieran Mason -Date: Fri Oct 13 16:10:43 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit ab191669894f795ae349ebc47dcbb5ab30b4b357 -Author: Fieran Mason -Date: Fri Oct 13 16:10:33 2017 -0700 - - #515 BootLint errors fixed https://trello.com/c/BhtXtt9o - -commit 234fa8c90b3605912aba0c12427c88b1d2435c7f -Author: kuanfandevops -Date: Fri Oct 13 16:02:12 2017 -0700 - - update stage names and move checkout inside stage - -commit 8d8bdddc8ca4302b4678139124c4102a3bab1457 -Author: Roland Stens -Date: Fri Oct 13 15:01:40 2017 -0700 - - Document IEExplorer set up 2 - -commit ec0a1757974ba4737e6189a849c0bbaf5fdbda05 -Author: Roland Stens -Date: Fri Oct 13 14:41:09 2017 -0700 - - Document IEExplorer set up - -commit cc827348bdeef75e7964531eac69aea0cf51faae -Merge: 9ff6d6775 7f7fd62a9 -Author: garywong-bc -Date: Fri Oct 13 14:37:54 2017 -0700 - - Merge pull request #106 from fieranmason/master - - #322 - https://trello.com/c/p8umE8a1 - Well Summary Information - -commit 7f7fd62a9214d492098b2b98512a42389e22eac1 -Author: Fieran Mason -Date: Fri Oct 13 14:07:02 2017 -0700 - - fixing migrations - -commit 51f3aa6b1a2cfb57959ada3b419876537eb4ab57 -Merge: 16ae3629d 9ff6d6775 -Author: Fieran Mason -Date: Fri Oct 13 14:02:36 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 16ae3629dd259e7d6662c11e54e52025db948694 -Author: Fieran Mason -Date: Fri Oct 13 14:01:45 2017 -0700 - - well summary completion #322 https://trello.com/c/p8umE8a1 - -commit 9ff6d67754ca3eaa0c60fb9f0ca89af42e9660db -Merge: 36570b3da b6d1071a1 -Author: garywong-bc -Date: Fri Oct 13 13:53:26 2017 -0700 - - Merge pull request #105 from garywong-bc/master - - New gwells_wells colums and supporting code tables. - -commit b6d1071a1a90a06a1b85e5a9e895c0203db00c2c -Author: Gary Wong (BC Gov) -Date: Fri Oct 13 13:48:46 2017 -0700 - - New gwells_wells colums and supporting code tables. - -commit 36570b3daa9d106464fc6e59e7eab4ccebd1fa5c -Author: kuanfandevops -Date: Fri Oct 13 12:07:32 2017 -0700 - - update "\" to "/" - -commit 1b641d7cdb8e3388c50d4cab36731440fc725cd9 -Merge: d15fb96ca d921f84d7 -Author: kuanfandevops -Date: Fri Oct 13 10:57:54 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit d15fb96ca59f619d37119ba86d9ec69f3080effb -Author: kuanfandevops -Date: Fri Oct 13 10:26:59 2017 -0700 - - Add bin folder for phantomJs file, it resolves missing file issue. - phantomJs is extracted under bin folder, on linux it is - /var/lib/jenkins/jobs/moe-gwells-tools-gwells-pipeline/workspace/navunit/build/webdriver/phantomjs/bin/phantomjs. - The -Dphantomjs.binary.path refers to the location and provides to gradle. - -commit d921f84d7be15a1f3fc8730a64f2cbbbe587e1f9 -Merge: adbed91d8 a764b57d1 -Author: garywong-bc -Date: Fri Oct 13 09:32:35 2017 -0700 - - Merge pull request #104 from garywong-bc/master - - README update - -commit a764b57d1d8e4798a1ee682d69558075fd5d7418 -Author: Gary Wong (BC Gov) -Date: Fri Oct 13 09:30:48 2017 -0700 - - refined explanation of oracle-fdw re-deploy. - -commit 3b972dfb3f79083b56b981f9cb80914812efb945 -Author: Gary Wong (BC Gov) -Date: Fri Oct 13 09:27:36 2017 -0700 - - adding lock file mechanism to force oracle-fdw credentials to be re-created with new Environment variable values, upon re-deploy. - -commit 568d6cbec575bfc546fff377827ce94660347a81 -Author: Fieran Mason -Date: Thu Oct 12 16:54:02 2017 -0700 - - Added status of well. Added licenced status. Cleaned up missing result display. Rejigged details page to properly access fields out of the well object - -commit adbed91d8a05dd20de05f40ab8b2940f8acd7ab0 -Merge: 6cfd920d6 645eb464d -Author: garywong-bc -Date: Thu Oct 12 16:50:04 2017 -0700 - - Merge pull request #103 from garywong-bc/master - - Added new legacy data columns for Well Details. - -commit 0a9a7cf97036e8970e826c4dfad1bb2b1a22cfe8 -Merge: 645eb464d 6cfd920d6 -Author: Gary Wong (BC Gov) -Date: Thu Oct 12 16:48:36 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 645eb464d8e6ec1426d6b33afdcac2f1e8756c50 -Author: Gary Wong (BC Gov) -Date: Thu Oct 12 16:48:25 2017 -0700 - - Added new legacy data columns for Well Details. - -commit 6cfd920d62f28b8104e2fe7f36d65b7e6dcd1fe8 -Merge: 662422544 c3caf58e4 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Oct 12 14:26:27 2017 -0700 - - Merge pull request #102 from rstens/master - - Test script updates and config files update to support IE testing - -commit c3caf58e4e3af834b0941e2772d6db1bd3eb9cf0 -Author: Roland Stens -Date: Thu Oct 12 14:20:37 2017 -0700 - - Test script updates and config files update to support IE testing - -commit 6624225449a03c5ec6ec0a7ab37f26c0e79cb62e -Merge: c45fa075c ac717a0f6 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Oct 12 12:54:02 2017 -0700 - - Merge pull request #101 from fieranmason/master - - Increased well marker dot size (blue dot). Addressing ticket: #325: https://trello.com/c/MspFPAH3 - -commit ac717a0f61f63e15fd87bb07940f529f5268cdaf -Merge: 7e849dc91 c45fa075c -Author: Fieran Mason -Date: Thu Oct 12 09:43:48 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 7e849dc9133cd5d4654cd903d039b5c611f226ea -Author: Fieran Mason -Date: Thu Oct 12 09:41:30 2017 -0700 - - Increaed well marker dot size (blue dot). Addressing ticket #325: https://trello.com/c/MspFPAH3 - -commit c45fa075c520d6ba122f94fe2c53de55f60664ad -Merge: 9eccc4ca7 fba813231 -Author: garywong-bc -Date: Wed Oct 11 22:16:13 2017 -0700 - - Merge pull request #100 from garywong-bc/master - - Documented new Data Replication mechanism (oracle_fdw) - -commit fba813231a4cdb066965b3c7073f4b2a1b79ac2a -Author: Gary Wong (BC Gov) -Date: Wed Oct 11 22:03:18 2017 -0700 - - Updated docs. - -commit ae07b048d2e97a7898300224063e762d0902396d -Author: Gary Wong (BC Gov) -Date: Wed Oct 11 21:20:35 2017 -0700 - - Added acceptance_status_code column. - -commit 5bc65c76804c8bd7b51bd07e280236b8a0d89abb -Author: Gary Wong (BC Gov) -Date: Wed Oct 11 20:37:10 2017 -0700 - - Test of Markdown syntax. - -commit dfab69e4a69c4a73e0b9309c4c507ed77fe71e8c -Author: Gary Wong (BC Gov) -Date: Wed Oct 11 20:33:43 2017 -0700 - - Test of Markdown syntax. - -commit 005d270bd771f83034ed27cdd77ce7230a642f5c -Author: Gary Wong (BC Gov) -Date: Wed Oct 11 20:29:00 2017 -0700 - - Test of Markdown syntax. - -commit 1abd48a6f231cc3b66f6a21273f20f061ea58274 -Author: Gary Wong (BC Gov) -Date: Wed Oct 11 20:25:34 2017 -0700 - - Test of Markdown syntax. - -commit 9eccc4ca7bfce1c504e19dc56c020f7aa92a0b2e -Merge: fd3fb42ea 968ff4fa9 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Oct 11 15:14:25 2017 -0700 - - Merge pull request #99 from fieranmason/master - - Fixes for ticket #512 - table sort + misc - -commit fd3fb42eaa373ac325be62d46c6355a3fa09ddf1 -Merge: 37c431442 4cceb209a -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Oct 11 15:12:26 2017 -0700 - - Merge pull request #98 from rstens/master - - new tests added, this test currently fails due to a bug - -commit 968ff4fa91c391a018eb92a2211ede613132a3c4 -Merge: d06dfe67a 6d0cd84b3 -Author: Fieran Mason -Date: Wed Oct 11 15:06:24 2017 -0700 - - Merge branch 'master' of github.com:fieranmason/gwells - -commit d06dfe67af936470b1932fc18ae63ae2f71d3a71 -Author: Fieran Mason -Date: Wed Oct 11 15:05:34 2017 -0700 - - corrections for table sorting - Ticket #512: https://trello.com/c/ykXE84pb - -commit 4cceb209a645aab1176509ada96ae9d9b72a2286 -Author: Roland Stens -Date: Wed Oct 11 13:53:34 2017 -0700 - - Update to navunit readme - -commit 82ae2b70517f40af4b4eae72f66f69fbc3034491 -Author: Roland Stens -Date: Wed Oct 11 11:52:10 2017 -0700 - - new tests added, this test currently fails due to a bug - -commit 37c431442e96b280f8e4cb117dbe79ae7b24a246 -Merge: 754c8a463 89dd33fb4 -Author: garywong-bc -Date: Tue Oct 10 16:40:27 2017 -0700 - - Merge pull request #96 from rstens/master - - new tests added - -commit 754c8a4634b2deebac1522451d9a02271738fee1 -Merge: cca8aa6ab 580c75e83 -Author: garywong-bc -Date: Tue Oct 10 16:40:15 2017 -0700 - - Merge pull request #97 from garywong-bc/master - - Refactored data replication and documented the new process. - -commit 580c75e8398ece4eed9e05bde7533cd9ab5b5bf7 -Author: garywong-bc -Date: Tue Oct 10 16:22:25 2017 -0700 - - Update README.md - -commit accd6168be8793389fce6539a6b409021d303bee -Author: garywong-bc -Date: Tue Oct 10 16:21:32 2017 -0700 - - Update README.md - -commit 1d9a79bd42d4dc621ffd7890ec9192be55411be9 -Author: garywong-bc -Date: Tue Oct 10 16:20:59 2017 -0700 - - Update README.md - -commit d231de9817d1e7f25dfefb2a5acd8588a210beb5 -Author: garywong-bc -Date: Tue Oct 10 16:15:50 2017 -0700 - - Update README.md - -commit 36ef0e3ac68602a6335ae33b3742bd5555a6661c -Author: garywong-bc -Date: Tue Oct 10 16:15:03 2017 -0700 - - Update README.md - -commit c79c36ff205d7cb8054296f76fc614555d676b7a -Author: garywong-bc -Date: Tue Oct 10 16:12:51 2017 -0700 - - Update README.md - -commit b4a611f74b48cd28f5a5a52aaeac4a302b60f83e -Author: garywong-bc -Date: Tue Oct 10 16:11:51 2017 -0700 - - Update README.md - -commit cb42ff1c5e9c0642b1342441eaf4c84ec27ec973 -Author: garywong-bc -Date: Tue Oct 10 16:11:11 2017 -0700 - - Update README.md - -commit 43af00ed31c0889c8889a6e4dd88b6d327d8c7e8 -Author: garywong-bc -Date: Tue Oct 10 16:08:46 2017 -0700 - - Update README.md - -commit 1ff587a640b054c9b30911e09fb474314997aef5 -Author: garywong-bc -Date: Tue Oct 10 16:08:11 2017 -0700 - - Update README.md - -commit ab379da948bf4d0d4391b979748a30a4aeccdd8e -Author: Gary Wong (BC Gov) -Date: Tue Oct 10 16:03:40 2017 -0700 - - Refactored & documented new PostgreSQL functions. - -commit 89dd33fb4953ec720a67f3528d735f82137a99bd -Author: Roland Stens -Date: Tue Oct 10 12:18:20 2017 -0700 - - new tests added - -commit 6d0cd84b3d505929e494005b5c30f2121656ee2b -Author: fieranmason -Date: Tue Oct 10 12:07:44 2017 -0700 - - Updated README.md - - fixed typo - -commit ef7534df8e25108fc26b850075bd573e2806e415 -Author: fieranmason -Date: Tue Oct 10 12:06:22 2017 -0700 - - Updated README.md fixed a type - -commit cca8aa6abde3158f3e1f665cc09e3c3b533c59ab -Merge: 6b425a8b8 91b1262cc -Author: garywong-bc -Date: Mon Oct 9 23:03:05 2017 -0700 - - Merge pull request #95 from garywong-bc/master - - Interim commit for PostgreSQL stored procedure(s) - -commit 6b425a8b84a1f57753eb163bfbf40dcd0ea73ff5 -Merge: 81a4e0a32 88ce651b1 -Author: garywong-bc -Date: Mon Oct 9 23:02:52 2017 -0700 - - Merge pull request #94 from rstens/master - - One fix that I forgot - -commit 91b1262cc5e792b0744e0ae49b54c78b441fda5e -Author: Gary Wong (BC Gov) -Date: Mon Oct 9 22:57:47 2017 -0700 - - Legacy data migration via stored procedures. - -commit f8ac272cfdb380e739dd65759d849e264b00bc95 -Author: Gary Wong (BC Gov) -Date: Sun Oct 8 23:59:12 2017 -0700 - - Interim backup for Oracle replication - -commit 9bfff13d12866b910208a6e3848efbcd0dd0f4b8 -Merge: 7b54729d5 81a4e0a32 -Author: Gary Wong (BC Gov) -Date: Sun Oct 8 23:12:34 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 88ce651b136edb8c2220596fb3effcb2e05d218c -Author: Roland Stens -Date: Fri Oct 6 16:48:24 2017 -0700 - - One fix that I forgot - -commit 81a4e0a32c4806e67965fe8cbe1730ef928ceabf -Merge: bc92f7244 bc25e6bc3 -Author: garywong-bc -Date: Fri Oct 6 16:34:54 2017 -0700 - - Merge pull request #93 from rstens/master - - Updates in scripts for expected counts - -commit bc25e6bc372715e5ce1ee9f4b005ac672a513561 -Author: Roland Stens -Date: Fri Oct 6 16:31:45 2017 -0700 - - Updates in scripts for expected counts - -commit bc92f72440e1817ffc4afc99f890a7e85fa8de88 -Merge: c6150636f 44b652537 -Author: garywong-bc -Date: Fri Oct 6 16:17:41 2017 -0700 - - Merge pull request #92 from rstens/master - - Update to search scripts to account for changed database content. - -commit 44b65253737284d6820b4176ebe397a3c68a4fd6 -Author: Roland Stens -Date: Fri Oct 6 11:57:00 2017 -0700 - - Update to search scripts to account for changed database content. - -commit c6150636fefa456d16a2521898e367f68da325aa -Merge: 576d94ecc b289aa307 -Author: garywong-bc -Date: Fri Oct 6 09:49:48 2017 -0700 - - Merge pull request #91 from rstens/master - - Test script additions and small updates to application for testability - -commit b289aa307509ea7d940e0e2297974e34c0c2dce7 -Author: Roland Stens -Date: Fri Oct 6 09:48:48 2017 -0700 - - Update test scripts - -commit 1bda25714cea6069de959c77bef2be0cdb1b7d6e -Author: Roland Stens -Date: Wed Oct 4 14:14:21 2017 -0700 - - wellsearch update - -commit 739a2f9a73d3262e3a085ab817b41d8c8878d487 -Author: Roland Stens -Date: Wed Oct 4 14:08:35 2017 -0700 - - Test script additions and small updates to application for testability - -commit 7b54729d532118a1f71665bc82987cc69dfb9e4e -Merge: 3fda8d44b 576d94ecc -Author: Gary Wong (BC Gov) -Date: Wed Oct 4 09:34:46 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 576d94ecc44a89cf24b8d446b45c859ebbdadb6b -Merge: d99a2f561 3e9c663a8 -Author: garywong-bc -Date: Tue Oct 3 18:43:45 2017 -0700 - - Merge pull request #90 from rstens/master - - accessibility fixes and review - -commit 3e9c663a8fc15fac9be7482bdca4576d3893031f -Author: Roland Stens -Date: Tue Oct 3 17:47:49 2017 -0700 - - Location button popup text change - -commit 145c385f1d508b27870f8e6be275042af3a87d7f -Author: Roland Stens -Date: Tue Oct 3 17:38:55 2017 -0700 - - accessibility fixes and review - -commit d99a2f561414916d6b74627aacdff0b315091f74 -Merge: 6e1544dd0 d5088abd9 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Oct 3 13:34:55 2017 -0700 - - Merge pull request #89 from rstens/master - - Updates to search.html and scripts + updated config file - -commit d5088abd90bd123adf43eb996295802c9a7a8675 -Author: Roland Stens -Date: Tue Oct 3 13:30:52 2017 -0700 - - updated config - -commit 095c336d7a6f824fa722b2f53db8d1c674894022 -Author: Roland Stens -Date: Tue Oct 3 13:29:04 2017 -0700 - - Remove from error message + updates to test scripts - -commit 6e1544dd03080d7d934317ca5a364645a159c638 -Merge: 1b26a59a1 1f773d723 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Mon Oct 2 13:12:40 2017 -0700 - - Merge pull request #88 from rstens/master - - Test Script updates - -commit 1f773d7235a370dc651b4ba049fe999cac90720b -Author: Roland Stens -Date: Mon Oct 2 11:37:26 2017 -0700 - - Test Script updates - -commit 1b26a59a17e0662eff62ac7fd421a0c7f3507ca6 -Merge: 2c4058d4d 92f958e88 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Sep 29 11:10:44 2017 -0700 - - Merge pull request #87 from GeorgeWalker/map-search-improvements - - Added documentation for Oracle FDW, added oracle fdw to the build.json - -commit 92f958e885f3c37e1c1875c5861d99a97b4f0f3b -Author: GeorgeWalker -Date: Fri Sep 29 11:07:49 2017 -0700 - - Added documentation for Oracle FDW, added oracle fdw to the build.json - -commit 2c4058d4d3e540ce9fda0fb4cc6ca04ebdb2e8d6 -Merge: 2d4f78bd1 9288c85cf -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Fri Sep 29 08:52:51 2017 -0700 - - Merge pull request #86 from rstens/master - - FIx for previous issue - -commit 9288c85cfddb9de6bcf0fc000c8b6f22e4f82460 -Author: Roland Stens -Date: Thu Sep 28 17:19:08 2017 -0700 - - sorry, second fix for the same thing - -commit 4ccae8e9ed81c8c4b391ba443f8202313baab212 -Author: John Doe -Date: Thu Sep 28 17:08:53 2017 -0700 - - increase wait repeat time to 1 second - -commit 2d4f78bd12861f8ab03cafeddfc7fcbd62027c50 -Merge: 48a35393d 3a6cc1e96 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Thu Sep 28 16:59:04 2017 -0700 - - Merge pull request #84 from rstens/master - - Increase wait repeat to 1 second to eleminate race conditions. - -commit 3a6cc1e96d010306fe8308c61ad2b9735e7fd54f -Author: John Doe -Date: Thu Sep 28 16:52:34 2017 -0700 - - increase wait repeat time to 1 second - -commit 48a35393da65888d96d37fceaf258f0116a53164 -Author: kuanfandevops -Date: Thu Sep 28 16:18:07 2017 -0700 - - add try block to make sure archive can run - -commit 06b5d9a4eb22b95861bbe4a3b29bda51fa9515c8 -Merge: c19628846 dd4c40cfa -Author: kuanfandevops -Date: Thu Sep 28 16:15:38 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit c19628846be46e92147db243fd75cf3fb0d40e5d -Author: kuanfandevops -Date: Thu Sep 28 15:47:08 2017 -0700 - - add try/finally block to make sure run archive even test failed - -commit dd4c40cfa6869b185204359c99fa0fa5a53d66c6 -Merge: 5082120e3 95c09f70f -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Thu Sep 28 15:46:24 2017 -0700 - - Merge pull request #82 from GeorgeWalker/flag-documentation - - Documentation on feature flags - -commit 95c09f70f9219e83ced2ae9f13458d8766c3eb21 -Author: GeorgeWalker -Date: Thu Sep 28 15:42:34 2017 -0700 - - Consolidate search code - -commit 5082120e37b7588bb7230c28ca121f40c92f88d7 -Author: kuanfandevops -Date: Thu Sep 28 15:20:32 2017 -0700 - - move functional test back to master - -commit cf9645d8dd9076089a12d5187ea3dbbf2aeb1dce -Merge: c8f161bb6 2e700221d -Author: GeorgeWalker -Date: Thu Sep 28 10:53:04 2017 -0700 - - Merge remote-tracking branch 'upstream/master' into flag-documentation - -commit 2e700221d86be7b60d1bb64f0d4a695a86129483 -Author: kuanfandevops -Date: Wed Sep 27 16:18:48 2017 -0700 - - add debug and stacktrace back to valication and add source code check out. - -commit fda617532e4840715bd41889853a20c1dc094c43 -Author: kuanfandevops -Date: Wed Sep 27 11:00:35 2017 -0700 - - Increased memory for maven node and move functional test stage from master node back to maven node. - -commit c03fe47530b202f49a2b6e16d550c66f53bcac9a -Merge: 8f271dc9b e7aaf6172 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Tue Sep 26 15:33:00 2017 -0700 - - Merge pull request #83 from rstens/master - - Test Script reorg. No conflicts found, merge is approved. - -commit 94c40d3baf53c1a3cf9405a5ea1d748d50468dfd -Merge: e7aaf6172 8f271dc9b -Author: John Doe -Date: Tue Sep 26 13:25:22 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit e7aaf6172c8c7a41b9294c73a71c44b55b1730c7 -Author: John Doe -Date: Tue Sep 26 13:20:34 2017 -0700 - - Test Script reorg - -commit c8f161bb600f41172032155ba0d9d89a1907bd7b -Author: GeorgeWalker -Date: Tue Sep 26 11:23:44 2017 -0700 - - Documentation on feature flags - -commit 8f271dc9b35ff515f700a182d451716592683c0d -Merge: b27bcbcda 0e3027456 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Tue Sep 26 09:59:51 2017 -0700 - - Merge pull request #81 from GeorgeWalker/additional-information-changes - - Add line breaks to long table headers. - -commit 0e3027456a857f2c6cd7ac01a9380d5707898a32 -Author: GeorgeWalker -Date: Tue Sep 26 09:24:33 2017 -0700 - - Add line breaks to long table headers. - -commit 3fda8d44b8b262bbd9fb94c52ff9f88aa4004062 -Author: Gary Wong (BC Gov) -Date: Mon Sep 25 22:44:49 2017 -0700 - - Undid temporary SQL file - -commit 0b644d83ef14fb44f8c766be20ac5ba011ea12cd -Author: Gary Wong (BC Gov) -Date: Mon Sep 25 22:40:12 2017 -0700 - - draft SQL script to configure Oracle Foreign Data Wrapper to envprod1 - -commit a28bf4ef36daf8f55be2a5fc8a436023301f1f30 -Merge: 356329a81 b27bcbcda -Author: Gary Wong (BC Gov) -Date: Mon Sep 25 22:37:50 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit b27bcbcdac490a4fd87188581f157eb696c87065 -Merge: 5fbd21920 be180ef3b -Author: garywong-bc -Date: Mon Sep 25 22:36:53 2017 -0700 - - Merge pull request #80 from rstens/master - - Updates to the test file structure + Adding ids to the search page links - -commit be180ef3b3319eb1bbe49b97a87b3ba16b9b2d9e -Author: John Doe -Date: Mon Sep 25 17:01:23 2017 -0700 - - New test files - -commit 0b43b7032a6dcf881ba8d1701c8cb9bc9849b4f5 -Author: John Doe -Date: Mon Sep 25 16:57:52 2017 -0700 - - restructure of the tests and adding IDs to links in the search page - -commit 5fbd219200de24b09cf7133d7e0e882426ee2119 -Merge: 4ef5b01c4 44f06dcb3 -Author: garywong-bc -Date: Mon Sep 25 10:20:31 2017 -0700 - - Merge pull request #79 from GeorgeWalker/additional-information-changes - - Search page changes - -commit 44f06dcb3265231a2e293e2269d3d13d4efd9058 -Author: GeorgeWalker -Date: Mon Sep 25 10:14:39 2017 -0700 - - Search page changes - -commit 4ef5b01c4d1751b7e6c6c6598bbebd079468a225 -Merge: f0918b1f2 1065347c3 -Author: garywong-bc -Date: Fri Sep 22 15:41:35 2017 -0700 - - Merge pull request #78 from GeorgeWalker/additional-information-changes - - Adjust title of search page - -commit 1065347c34a8aa97956543e965e84ec22c9bb969 -Author: GeorgeWalker -Date: Fri Sep 22 15:00:27 2017 -0700 - - Adjust title of search page - -commit f0918b1f2e2ce3fd93350101531371c03d0e957b -Merge: 3b503bc8c dff4ba812 -Author: garywong-bc -Date: Fri Sep 22 14:23:17 2017 -0700 - - Merge pull request #76 from GeorgeWalker/additional-information-changes - - Update text - -commit 3b503bc8c2915a38bad0fde669ddd355a229e4a4 -Merge: 7277ad657 6bb7a6d82 -Author: garywong-bc -Date: Fri Sep 22 14:15:23 2017 -0700 - - Merge pull request #77 from rstens/master - - Update of test scripts - -commit 6bb7a6d82aa8109a2c236dfbc9e6299c429350cc -Author: John Doe -Date: Fri Sep 22 14:00:59 2017 -0700 - - Update of test scripts - -commit dff4ba812736d4aa48baed77f1d1d6bbd26859c2 -Author: GeorgeWalker -Date: Fri Sep 22 13:41:48 2017 -0700 - - New content for additional information and search page. - -commit 6b5db2a8a4299cae54dfa9a9f029fe12178a7879 -Author: GeorgeWalker -Date: Thu Sep 21 16:42:15 2017 -0700 - - Update text - -commit 7277ad65792673ba3f6fb6b57adb7cdd83c0994f -Merge: e309c8cc5 b6093b677 -Author: garywong-bc -Date: Thu Sep 21 15:51:31 2017 -0700 - - Merge pull request #75 from GeorgeWalker/additional-information-changes - - Updated content for additional information page - -commit b6093b6771f279fcd18b9934a2371106cfc0bc3a -Author: GeorgeWalker -Date: Thu Sep 21 15:44:38 2017 -0700 - - Updated content for additional information page - -commit e309c8cc58f4a5f8f31412660d483939ad5c9c36 -Merge: 44cced688 7304f2457 -Author: Chris <32139014+cwevans@users.noreply.github.com> -Date: Wed Sep 20 16:01:48 2017 -0700 - - Merge pull request #74 from GeorgeWalker/add-google-analytics-flag - - Fix for issues with detail and other views - -commit 7304f2457a85469c1ec0a3c4687f885413b25036 -Author: GeorgeWalker -Date: Wed Sep 20 15:59:46 2017 -0700 - - Fix for issues with detail and other views - -commit 44cced688d38d28d0d73c1fbf84e0e3f18790a75 -Merge: c29314f61 d92f3e092 -Author: garywong-bc -Date: Wed Sep 20 15:22:44 2017 -0700 - - Merge pull request #73 from rstens/master - - Avoid searching an int field with a string as this caused a 500 error - -commit c29314f61e692abe1ad232d56a542f168bf2ea53 -Merge: f518ecab0 516b8a129 -Author: garywong-bc -Date: Wed Sep 20 15:22:32 2017 -0700 - - Merge pull request #72 from GeorgeWalker/add-google-analytics-flag - - Add flag for Google Analytics - -commit d92f3e092709383e6a01e9e916f09332495a8993 -Author: John Doe -Date: Wed Sep 20 15:16:38 2017 -0700 - - Avoid searching an int field with a string as this caused a 500 error - -commit 516b8a1291dd112196a2f54d5c3a059caab344bb -Author: GeorgeWalker -Date: Wed Sep 20 15:10:56 2017 -0700 - - Add flag for Google Analytics - -commit f518ecab04f549d3619682db12e6264950580529 -Merge: 2c42b4d00 1f19a4f31 -Author: garywong-bc -Date: Wed Sep 20 13:38:41 2017 -0700 - - Merge pull request #71 from GeorgeWalker/improved-logging - - Improved logging - -commit 1f19a4f3176f611953dc6bc088337adce51d8090 -Author: GeorgeWalker -Date: Wed Sep 20 13:30:59 2017 -0700 - - Improved logging - -commit 27b1e6dd56eca9a09b452f912fb66cb8e3ddb3e6 -Author: GeorgeWalker -Date: Wed Sep 20 11:14:34 2017 -0700 - - Add flag to control availability of data entry. - -commit 2c42b4d00ae6855daeac96859e3c43fa022aba35 -Merge: 775695969 9f514f4c4 -Author: garywong-bc -Date: Wed Sep 20 10:00:45 2017 -0700 - - Merge pull request #69 from GeorgeWalker/map-performance-db-fix - - Map performance db fix - -commit 9f514f4c43b03927d8ae6f6f92867c2d07abd25a -Author: GeorgeWalker -Date: Tue Sep 19 16:59:09 2017 -0700 - - Improve database performance for the map search - -commit 2bae1268025cd1d311e4b0c6cdb554188b3534c5 -Author: GeorgeWalker -Date: Tue Sep 19 15:52:04 2017 -0700 - - Enable logging to stdout - -commit 775695969243f08a5a752ac3c4fbe5f00df3ae01 -Author: kuanfandevops -Date: Tue Sep 19 14:45:45 2017 -0700 - - remove debug and stacktrace option for functional test - -commit 356329a8111771808fb427f2814b039972edfd6c -Merge: f7cefd144 f47368685 -Author: Gary Wong (BC Gov) -Date: Tue Sep 19 14:13:44 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit f47368685175262b43dde3fc585b571e0fa73599 -Author: kuanfandevops -Date: Tue Sep 19 11:47:32 2017 -0700 - - restore the validation phase back to master node. - -commit a353feb47f3e6b0bc5e1c735ad8788b9730e0d17 -Author: kuanfandevops -Date: Tue Sep 19 11:05:01 2017 -0700 - - put validation phase back to maven node as it failed on master for "Can't find variable: jQuery" - -commit 26119f1e57f3c149363ad92ae4c54302fd114eeb -Author: kuanfandevops -Date: Tue Sep 19 10:39:15 2017 -0700 - - update the archiving parameter in order to include all files/dirs under build directory - -commit c6a78473178b10ba1502bda08ad683c05a06a57d -Merge: da5c05235 1c6eb7a84 -Author: garywong-bc -Date: Tue Sep 19 10:22:12 2017 -0700 - - Merge pull request #67 from rstens/master - - Finalized Search Testing Scripts - -commit 1c6eb7a84ecce8ff50404947fe97bcf99df15fe0 -Author: John Doe -Date: Tue Sep 19 09:45:14 2017 -0700 - - Finalized Search Testing Scripts - -commit da5c05235f69f8e42084f5c5473575dabbe04f3c -Merge: 85e9238dd c3b89f439 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Mon Sep 18 09:20:32 2017 -0700 - - Merge pull request #66 from rstens/master - - BDD Tests Update and restructure. - -commit c3b89f439c8f161b3d190bd4c9b58470e50cd576 -Author: John Doe -Date: Mon Sep 18 09:09:39 2017 -0700 - - Update to admin.py to dynamically register all models so you can see them in the admin interface. - -commit d35969b9d3822c5afdf3fb7e5e525aa9ca2b4f8a -Author: John Doe -Date: Fri Sep 15 14:15:04 2017 -0700 - - BDD Tests Update and restructure - -commit 85e9238dd5525b477e397ac9887cae229931c758 -Author: kuanfandevops -Date: Fri Sep 15 11:31:20 2017 -0700 - - Add archiveArtifacts to stage('validation') in order to archive the phantumJsTest result, so that the report can be either viewed or downloaded from Jenkins site. - -commit 1a65447b2e95b9b201f5f55662a6e45473b4e39e -Merge: 67720258c a950a9c37 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Thu Sep 14 16:51:58 2017 -0700 - - Merge pull request #64 from rstens/master - - Update to Test search Scripts - -commit 67720258cca03489b5181deef28de291f064633e -Merge: 9823acc0b 806cfc8e4 -Author: kuanfandevops <31664961+kuanfandevops@users.noreply.github.com> -Date: Thu Sep 14 16:51:02 2017 -0700 - - Merge pull request #65 from GeorgeWalker/test-fix - - Updated Jenkinsfile to correct issue running the new BDD tests - -commit 806cfc8e4c89b729488df78508a5a100da0c6490 -Author: GeorgeWalker -Date: Thu Sep 14 16:47:01 2017 -0700 - - Updated Jenkinsfile - -commit 5ecdb8e5ec918ffb5364e9fdffa3db06d7ac416d -Author: GeorgeWalker -Date: Thu Sep 14 16:34:49 2017 -0700 - - Undo environment variable - -commit 9823acc0beef40a0a3e724ae08ee98667d25b56d -Author: kuanfandevops -Date: Thu Sep 14 16:32:48 2017 -0700 - - Rollback the previous change as changing to master node cause the pipeline failed at 'code quality check' phase. The reason for that is master node doesn't have maven environment which maven node has. The maven node use the maven image from GitHub which has all maven setups. - -commit 4bea60baf112bcff036eab3b42b25dd53f09e13b -Author: GeorgeWalker -Date: Thu Sep 14 16:31:02 2017 -0700 - - set java home - -commit 838e139df3b8fa820701192f43cec6eaa3b51fce -Author: GeorgeWalker -Date: Thu Sep 14 16:25:06 2017 -0700 - - Change node to master - -commit ac6008f2d84cd846c0a28ccfcf9ac8ea28dc2443 -Author: kuanfandevops -Date: Thu Sep 14 16:12:10 2017 -0700 - - The validation always fail with error of jQuery.js can not be found. Update the maven node from 'maven' to 'master' to let the test run on Jenkins master node with out creating a new maven pod. - -commit a950a9c374551efc4c10360763dd1292b47359d9 -Merge: f48dcf9d6 541bf9042 -Author: John Doe -Date: Thu Sep 14 14:47:48 2017 -0700 - - Merge branch 'master' of https://github.com/rstens/gwells - -commit f48dcf9d67f39227bd720174a9f4a40dca229cde -Author: John Doe -Date: Thu Sep 14 14:46:19 2017 -0700 - - Search Test Scripts update - -commit 0439b6704df01c99ea2b9a797d1fefea8071e244 -Author: GeorgeWalker -Date: Thu Sep 14 09:47:35 2017 -0700 - - BDD Jenkinsfile for testing - -commit f7cefd1447a43705064ee0d75a21c992acbdffc7 -Merge: bb9988d5a 028e767e8 -Author: Gary Wong (BC Gov) -Date: Wed Sep 13 14:23:05 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 028e767e8ff5749296138c4e92ddcde1c929602d -Merge: 230b3afee 541bf9042 -Author: garywong-bc -Date: Wed Sep 13 14:22:30 2017 -0700 - - Merge pull request #63 from rstens/master - - Comment out Google Analytics - -commit 541bf90421014a09fee08c05cdf79fa9934d8bcb -Merge: 73c4a95af 230b3afee -Author: garywong-bc -Date: Wed Sep 13 14:21:19 2017 -0700 - - Merge branch 'master' into master - -commit 73c4a95af7886e9d9d1bee434de9398ed1b0bac7 -Author: John Doe -Date: Wed Sep 13 10:54:16 2017 -0700 - - Comment out Google analytics - -commit 4f6a101b024271189f631cdc6459aafecec88651 -Author: John Doe -Date: Tue Sep 12 11:24:42 2017 -0700 - - Remove old test script - -commit 230b3afeeacb42f4e839d5efcd920e3e81755000 -Merge: 3934a2663 3c81e20c6 -Author: garywong-bc -Date: Tue Sep 12 11:23:37 2017 -0700 - - Merge pull request #62 from rstens/master - - Testability Improvement and updated test scripts - -commit 9ba1d524b09f82cfd512d54ef0f7a7d7ea0b0e7f -Merge: 3c81e20c6 3934a2663 -Author: John Doe -Date: Tue Sep 12 11:18:18 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 3c81e20c6553314195bc15dd275c8650e48a5ddd -Author: John Doe -Date: Tue Sep 12 11:06:55 2017 -0700 - - Testability Improvement and updated test scripts - -commit 3934a26638927fff70edcc4809623cb9fbb6b529 -Author: Louie -Date: Mon Sep 11 15:39:30 2017 -0700 - - Ensure there is no subclass for closed-loop geoexchange. - -commit aa212549a9a333e68e662915e8f942e0c5ba260b -Author: calouie -Date: Mon Sep 11 11:44:54 2017 -0700 - - Made final casing stick up required for water supply, injection, recharge. - -commit 0b42408161f8b10b4516c97121bf36472f7b44c8 -Merge: 852c5acbb bcd520a33 -Author: calouie -Date: Mon Sep 11 09:36:39 2017 -0700 - - Merge pull request #61 from rstens/master - - Add Scenario 1 Search BDD Tests - -commit bcd520a332dd92e47ad98f8cf74c41569cfa4bf0 -Author: John Doe -Date: Mon Sep 11 09:30:19 2017 -0700 - - Updates to Navunit Test Suite - -commit 829dfb04b7ecc00be0d98ec879da0f5079924eef -Author: John Doe -Date: Mon Sep 11 09:10:46 2017 -0700 - - navunit/src/test/groovy/SearchResultsSpec.groovy - -commit 852c5acbb33149f0045eed5dfaf03cddc994d173 -Author: calouie -Date: Fri Sep 8 14:19:07 2017 -0700 - - Added analytics. - -commit b94ed7d88304306151af6c504a46c2c9ad0fc059 -Author: calouie -Date: Fri Sep 8 14:02:26 2017 -0700 - - Added ids to error messages. - -commit 40f520e1f246ce614d40f9066f406d4d9f52369c -Author: calouie -Date: Fri Sep 8 11:34:46 2017 -0700 - - Update README.md - -commit bb9988d5a5514a6941742a356cd94940595ac218 -Author: Gary Wong (BC Gov) -Date: Fri Sep 8 11:05:06 2017 -0700 - - As per https://trello.com/c/NJKuuDU8/265-po-feedback-related-to-lithology-table-prototype-epicsubmission - -commit 7d74c0f065549a729bcc374c9a119551f69d34ac -Merge: eebe91e7a 555b7e0cf -Author: garywong-bc -Date: Fri Sep 8 10:46:15 2017 -0700 - - Merge pull request #60 from garywong-bc/master - - Updated Data Load instru - -commit 5f75ea386a9cf82cee63a020ecb8afeaf5f5fec6 -Merge: 555b7e0cf eebe91e7a -Author: Gary Wong (BC Gov) -Date: Fri Sep 8 10:06:19 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit eebe91e7a1a9326d6d4ba705eaa0ae4fa5b82e1d -Merge: afa88e931 6f394a2d7 -Author: calouie -Date: Fri Sep 8 09:21:04 2017 -0700 - - Merge pull request #59 from rstens/master - - Update to navunit src files - -commit 6f394a2d7df71c59dbeed5f736ead736483095e2 -Author: John Doe -Date: Fri Sep 8 09:17:44 2017 -0700 - - Update to navunit src files - -commit afa88e931ba3544052fd18f60c0c70107bf548dd -Author: calouie -Date: Thu Sep 7 09:36:07 2017 -0700 - - Changed leaflet js source to dist version that doesn't download the debug files. See https://trello.com/c/JTafjYNa - -commit 1e8ae68e547256104cb43cbfd291aa03ffc5c8e5 -Author: calouie -Date: Thu Sep 7 09:23:04 2017 -0700 - - Used datatables for search results to replace webstack-django-sorting and dj-pagination. - -commit 555b7e0cfb5d56ecfa4d6f925ef291a454c4151e -Merge: e757b2b5f 592407345 -Author: Gary Wong (BC Gov) -Date: Wed Sep 6 14:12:29 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit e757b2b5ff33e0d55f9a17fe6476270c606befcc -Author: Gary Wong (BC Gov) -Date: Wed Sep 6 14:12:14 2017 -0700 - - updated list of CSV xform files - -commit 52a215670d6b2123d947393717135769ef636560 -Author: calouie -Date: Wed Sep 6 11:20:56 2017 -0700 - - Moved error messages to the top of the page and turned results into an html table. - -commit 592407345eebeb9cfba0a1e684035de7fcfcaef0 -Author: calouie -Date: Wed Sep 6 09:10:26 2017 -0700 - - Update README.md - -commit 7eacf4e2fddb5f52b39ca2d7d0a1c1a0284f775c -Author: calouie -Date: Tue Sep 5 16:17:38 2017 -0700 - - Update README.md - -commit 623f67170bc4b669002dac7408a71bc6df56cf99 -Author: calouie -Date: Tue Sep 5 16:15:25 2017 -0700 - - Update README.md - -commit cf63ea587f97b49d1a98f7e415cbcad78861f366 -Author: calouie -Date: Tue Sep 5 09:37:25 2017 -0700 - - Partial progress on well summary. - -commit 9832421cfcdef69a4a20286e7431d291af037ede -Author: calouie -Date: Fri Sep 1 14:32:26 2017 -0700 - - Partial progress on well summary. - -commit d36b1ced28f6004ff436009cd1f36e4314e1a394 -Author: calouie -Date: Fri Sep 1 14:31:51 2017 -0700 - - Added where plate attached autocomplete suggestions. - -commit 93cf9671e8dad9a70c3e4a05f9236d8536d9ecc6 -Author: calouie -Date: Fri Sep 1 11:24:59 2017 -0700 - - Changed Tar to Tan. - -commit 013788dc8e17124f773a74ae35c6ff37633f6230 -Author: calouie -Date: Fri Sep 1 09:29:22 2017 -0700 - - Removed the word Other from the rock types. - -commit 5b026f26eb98d06780caf3c9345f05cc3d85b037 -Author: calouie -Date: Fri Sep 1 09:26:13 2017 -0700 - - Removed reference to lithology weathering code table. - -commit 36887e7b65bad2a1ec338034c984ebb1305e2b79 -Author: calouie -Date: Fri Sep 1 09:19:04 2017 -0700 - - Added validation for lat/long to have at least 5 decimal places. - -commit 812145e149a606bebc84010bbbfb2f4e11b8d382 -Author: calouie -Date: Fri Sep 1 09:04:15 2017 -0700 - - Lithology changes as requested by PO. - -commit eac7b0b9c2ba9644c7d92553b3e514b9a0d14d61 -Author: calouie -Date: Fri Sep 1 09:03:28 2017 -0700 - - Set UTM Easting/Northing to 0 precision to move past this step. Validation already exists on the HTML5 control limiting the range of acceptable values. - -commit b804bd1e1563743786fbbc0657c67e87b6a20722 -Merge: 8058efacd 3a03e2e8a -Author: calouie -Date: Thu Aug 31 15:18:09 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 3a03e2e8ad13eb89a8a428a140a0b131eaca8e1c -Merge: fe5ccc436 b92b7c991 -Author: calouie -Date: Thu Aug 31 15:17:54 2017 -0700 - - Merge pull request #58 from SethGreylyn/master - - Pushpin Error Correction and UTM Validation Generalisation - -commit b92b7c991d60732a36751d66f62248806ac2b476 -Merge: 303d50f74 fe5ccc436 -Author: sgreylyn -Date: Thu Aug 31 14:59:32 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 303d50f748df5fab42c99ace3b4d523bf38f14e3 -Author: sgreylyn -Date: Thu Aug 31 14:58:26 2017 -0700 - - Refinement of pushpin behaviour and UTM validation message. - -commit 8058efacd0cae90a2842c4de47e922a85dab16c8 -Merge: 9f752e49c fe5ccc436 -Author: calouie -Date: Thu Aug 31 13:44:42 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit fe5ccc4363d73c06f21e55d4329340448fbb49d8 -Merge: ac492d6f9 072d8266c -Author: calouie -Date: Thu Aug 31 13:44:02 2017 -0700 - - Merge pull request #57 from SethGreylyn/master - - Activity Submission Precision - -commit 072d8266c813943862fcd7955fded0bcf176b673 -Author: sgreylyn -Date: Thu Aug 31 13:30:45 2017 -0700 - - Refinement and correction of field precision on user entry for activity submission map. - -commit c7d676f101a0c64a42a11d48db89fcb9aa44b062 -Merge: a83437773 ac492d6f9 -Author: sgreylyn -Date: Thu Aug 31 12:21:15 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 9f752e49c8218fc9e1715cdc5ec9c7a6ccd5c8b9 -Author: calouie -Date: Wed Aug 30 14:22:55 2017 -0700 - - put additional information into navigation bar and added a placeholder for profile. - -commit ac492d6f9382e12a916c4172fa0d7fd0015ac4e8 -Author: calouie -Date: Wed Aug 30 09:51:17 2017 -0700 - - Removed check for lat/long req field in clean methods as it is handled in init. - -commit 1640001ddf3f05ccfddbbfa1f8d1e7e7129c2290 -Author: calouie -Date: Wed Aug 30 09:06:45 2017 -0700 - - Made where plate attached required when specifiying identification plate number. - -commit 04ec5a4863dbe7a3fbaaeb118c18d2522a747727 -Merge: e9a5091f6 44784ce97 -Author: calouie -Date: Tue Aug 22 09:43:30 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit e9a5091f69b446562ec516e801d91d9824b00ce0 -Author: calouie -Date: Tue Aug 22 09:27:41 2017 -0700 - - Adjusted well cap type autocomplete suggestions. - -commit 8739d1faf7d36334ed436a78eda361f46b1b151d -Author: calouie -Date: Tue Aug 22 09:24:36 2017 -0700 - - Added alternative specs checkbox to comments form. - -commit 44784ce97a90ecec7f4566367f54b0d742d9c22f -Author: Gary Wong (BC Gov) -Date: Mon Aug 21 16:59:57 2017 -0700 - - with additional code tables and new WELLS columns; note I had to set some GWELLS_WELLS to null in boolean columns. - -commit 20c2fc6276832390097fec6c59548659c1c2191a -Author: calouie -Date: Mon Aug 21 11:49:55 2017 -0700 - - Added autocomplete suggestions to well cap type. - -commit a39ebf52c6e7f1e3c84a47c922b08ace369fcff2 -Author: calouie -Date: Mon Aug 21 11:35:10 2017 -0700 - - Increased comment field length. - -commit 7860b2e9c9b7e5a0cf03d1cfdbcebd2045fec2e2 -Author: calouie -Date: Mon Aug 21 11:28:35 2017 -0700 - - Moved well completion after water quality. Added comments form. - -commit 32c680d111132922e5010241f4a7c132cc8df130 -Author: calouie -Date: Fri Aug 18 15:53:10 2017 -0700 - - added validation for total depth drilled and finished well depth. - -commit d36fbc0f9941d5b060d5144b8365d588daf35f05 -Author: calouie -Date: Fri Aug 18 15:31:31 2017 -0700 - - Changed order of yes/no radio buttons so forms can be navigated via keyboard more intuitively. Added comments to models. - -commit 1dac1c7c5f96834803aef871ec2189dd1fb4cde2 -Author: calouie -Date: Fri Aug 18 15:07:51 2017 -0700 - - Added well completion form. - -commit 460a40fcddbd379c06c16ce7c0591c24090b36cd -Author: calouie -Date: Fri Aug 18 14:12:25 2017 -0700 - - Added well completion details to models. - -commit c16e6b0dce915c1eb9067e2154bb4652b0f21c3c -Author: calouie -Date: Fri Aug 18 10:24:36 2017 -0700 - - Added water quality fields when creating a well from an acitvity submission. - -commit 4bf437a386a627dcedeace14a2b40b5fb98694ba -Author: calouie -Date: Fri Aug 18 09:36:02 2017 -0700 - - Made postal code required on the form. - -commit f90d2214f4c8b043d7bbebc44f8046436791bf41 -Author: calouie -Date: Fri Aug 18 09:15:00 2017 -0700 - - Removed verbose warning messages when casing is specified and surface seal fields are required as requested by PO. - -commit c9d63198ff68dfb5a9118c66913ab08cea9b5353 -Author: calouie -Date: Fri Aug 18 08:53:31 2017 -0700 - - Added water quality characteristics. - -commit a3888c4fde56bda1fb6b894297cb272f55db9653 -Author: calouie -Date: Thu Aug 17 10:20:35 2017 -0700 - - Changed tooltip text to match similar functionality in iMap. - -commit 05a87bb3ce29952b480b7b82cdb0a9fec78a1e7c -Author: calouie -Date: Thu Aug 17 10:10:06 2017 -0700 - - Changed well marker styles. - -commit 10de430ca3226c5a6bc1c3bc1af17e65bd4283b7 -Author: calouie -Date: Thu Aug 17 09:24:17 2017 -0700 - - Changed production data fieldset title and made radio buttons inline as per PO feedback. - -commit 22f0cf7bb4eaaaaf45bd7de113127ca1973c65f2 -Merge: e8844d15c a83437773 -Author: calouie -Date: Thu Aug 17 08:51:26 2017 -0700 - - Merge pull request #56 from SethGreylyn/master - - Select-Zoom Event Refactor - -commit a8343777372f0a85e530530f9961830a7237de32 -Merge: 2d04f2774 e8844d15c -Author: sgreylyn -Date: Wed Aug 16 18:20:23 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 2d04f2774ea0fdac6b09fd786238f758745077fe -Author: sgreylyn -Date: Wed Aug 16 18:20:18 2017 -0700 - - Rearchitecting the event flow of select-zoom to rely on clicks. - - Chrome doesn't play well with mousedown and mouseup. - -commit e8844d15c3418cf0f6122732f85ea16808b4c678 -Author: calouie -Date: Wed Aug 16 15:48:44 2017 -0700 - - Changed navigation ribbon to contain a list of items to fix vertical display of navigation on first load. - -commit dd8b3cb3ce8b7d40fa2418a0527dd89e22594983 -Merge: 974b4083a 3b8928c74 -Author: sgreylyn -Date: Wed Aug 16 14:57:53 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 3b8928c7491fe6996c8b71c6c088aea2192ac8f2 -Author: calouie -Date: Wed Aug 16 10:18:06 2017 -0700 - - Adjusted button alignment and tooltip text. - -commit d5e2d80a748ade5e6af9bbb51a05de0ef7172616 -Author: calouie -Date: Wed Aug 16 09:47:15 2017 -0700 - - Added well production form. - -commit e4426bd2428915c4ebf7508f9704373277ec0537 -Merge: dda5a84ed 63aef3562 -Author: calouie -Date: Wed Aug 16 09:20:37 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 63aef3562d282e1b444085cf5ba710409abf0b2b -Merge: 3b60b7add 974b4083a -Author: calouie -Date: Wed Aug 16 09:12:41 2017 -0700 - - Merge pull request #55 from SethGreylyn/master - - Control Move and Fix for Select Zoom Mouseout Bug - -commit 974b4083a23b280567374bdb32b7eb6c31fd7dea -Author: sgreylyn -Date: Tue Aug 15 19:40:53 2017 -0700 - - Comment cleanup - -commit 2cff4fd9233945f458bb3854611a1e121df910cd -Author: sgreylyn -Date: Tue Aug 15 19:37:50 2017 -0700 - - Fix for dragging zoom off the map. - -commit 7741a5aef2d8d08950471e3813454617973b871c -Author: sgreylyn -Date: Tue Aug 15 17:37:18 2017 -0700 - - Altering control position slightly to the right - -commit 0f6386320e23a97403fd6ced17aebda3edc579cd -Merge: 9b40448a3 3b60b7add -Author: sgreylyn -Date: Tue Aug 15 17:07:58 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit dda5a84edfa06ebd6cf2e21d5f6b8d9461dd9d48 -Merge: 3c0e46f1c 3b60b7add -Author: calouie -Date: Tue Aug 15 09:25:52 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 3b60b7add39645c519dd8009b8efcec8d7dd84ac -Merge: 03ca1a1a5 9b40448a3 -Author: calouie -Date: Tue Aug 15 09:10:10 2017 -0700 - - Merge pull request #54 from SethGreylyn/master - - Custom Control Refinements - -commit 9b40448a3689a25ac134f1bc7863616cf4c335dd -Author: sgreylyn -Date: Mon Aug 14 18:43:45 2017 -0700 - - CSS tweaks and second-click disengagement - -commit f2e4de6516b07ce4bcae7428e280aa4314d2e244 -Author: sgreylyn -Date: Mon Aug 14 17:52:38 2017 -0700 - - Icon and CSS changes to controls - -commit 22f0ea4ea7f13ac48e7b3ff5f3d87b9e758ea2a1 -Author: sgreylyn -Date: Mon Aug 14 17:11:31 2017 -0700 - - Adding tooltips to controls - -commit cd6bc039987bb26d6d5c8291e16f7bc8d8bd47f1 -Merge: decb5b5a7 03ca1a1a5 -Author: sgreylyn -Date: Mon Aug 14 15:33:49 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 3c0e46f1c7f5ca8ba34b022c1ab12762b843c4ef -Author: calouie -Date: Mon Aug 14 15:06:57 2017 -0700 - - Added models for well production. - -commit 03ca1a1a542d7b64fe91a07fadee5182062a28c4 -Merge: eaad49e20 decb5b5a7 -Author: garywong-bc -Date: Thu Aug 10 12:06:45 2017 -0700 - - Merge pull request #53 from SethGreylyn/master - - Icon and Protocol Updates - -commit decb5b5a7df5b13b31ba0287163b79ac56ed198a -Author: sgreylyn -Date: Thu Aug 10 11:39:03 2017 -0700 - - Changing map tile protocol and select-zoom.png. - -commit 45dc221edc9830421224339f0d26bad839088ff0 -Merge: 21c8a5979 eaad49e20 -Author: sgreylyn -Date: Thu Aug 10 11:08:33 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit eaad49e2090e8032fcc0691db82318d72fa2bdd2 -Author: Gary Wong (BC Gov) -Date: Wed Aug 9 16:58:55 2017 -0700 - - Switched to https:// for JQuery CSS, minimized too - -commit f755b11c6e2c0191890669037a2eae18d2443621 -Author: Gary Wong (BC Gov) -Date: Wed Aug 9 16:45:14 2017 -0700 - - Switched to https:// for JQuery CSS - -commit d5b15c1ad4eafbc848ea115bbc2edf8f0e313c66 -Merge: 28eb97b43 21c8a5979 -Author: garywong-bc -Date: Tue Aug 8 15:40:37 2017 -0700 - - Merge pull request #52 from SethGreylyn/master - - Control Improvements - -commit 21c8a59790c3423ba218f59ad5c73299439b4f2f -Author: sgreylyn -Date: Tue Aug 8 15:38:30 2017 -0700 - - Comments. - -commit 6e40947083d684f435cafb681a43e78d87f76cd0 -Author: sgreylyn -Date: Tue Aug 8 15:37:13 2017 -0700 - - Geolocation error handling. - -commit fe15ea05951948f860f4aec845560ecf122d0267 -Author: sgreylyn -Date: Tue Aug 8 13:51:49 2017 -0700 - - Aesthetic changes to select-zoom icon and cursor; new custom controls show up only on search map. - -commit c64c124fb883560b360fe2041d903dda1509de23 -Merge: 2cf3a0534 28eb97b43 -Author: sgreylyn -Date: Tue Aug 8 10:14:53 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 28eb97b433ad63ffef63daa23ff413c8d0694433 -Merge: 71b6458df 2cf3a0534 -Author: garywong-bc -Date: Tue Aug 8 10:12:21 2017 -0700 - - Merge pull request #51 from SethGreylyn/master - - Rectangle Zoom And Geolocation Controls - -commit 2cf3a05348715b502621ee2c2a6b54023b16700c -Merge: 19f6d05f0 3eee60383 -Author: sgreylyn -Date: Sat Aug 5 19:30:00 2017 -0700 - - Merge branch 'geolocation' - -commit 3eee60383d512f9dee1ac1d7a618a5133d9f6c5f -Author: sgreylyn -Date: Sat Aug 5 19:29:15 2017 -0700 - - Geolocation control - -commit 19f6d05f05e71c3b1a44437590031316487ab9fe -Author: sgreylyn -Date: Sat Aug 5 18:09:03 2017 -0700 - - Change to zoom animation - -commit 40d825ab2ca64e4a6857e6aa3abb9e233b9d8cfb -Author: sgreylyn -Date: Sat Aug 5 01:17:51 2017 -0700 - - Rectangle zoom functionality finished. - -commit 35017c7ecc3f8a8557bc57609118797231d12a4f -Author: sgreylyn -Date: Fri Aug 4 20:29:27 2017 -0700 - - Beginning of rectangleZoomControl - -commit de3b8013af6b5b7cc28d37a7abb610ec9bf3c69a -Merge: 4ca4112b3 71b6458df -Author: sgreylyn -Date: Fri Aug 4 19:26:07 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 71b6458df47598ddb7a9bd6b22aa9993d02406d4 -Author: Gary Wong (BC Gov) -Date: Fri Aug 4 17:00:57 2017 -0700 - - Added new code tables to truncate 'reset' script - -commit 6ef4ee84073f7ecf694a47dcdbb4f0edb3b59aae -Author: Gary Wong (BC Gov) -Date: Fri Aug 4 16:44:25 2017 -0700 - - Udpate all OTH to OTHER in code tables. - -commit a61f102f42b41256a293abb383bde4f5169866b6 -Merge: 462a51b84 dca2d2235 -Author: Gary Wong (BC Gov) -Date: Fri Aug 4 16:36:16 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 462a51b84af33d5ac1c17c5e388c42750889bc0e -Author: Gary Wong (BC Gov) -Date: Fri Aug 4 16:36:10 2017 -0700 - - Add additional code table (screen, filter, liner, etc.) - -commit dca2d2235b36b7c07acc4071d4dddd3b29ccfdb9 -Author: calouie -Date: Fri Aug 4 16:13:32 2017 -0700 - - Added screen material to well. - -commit 95778eeae26387c616bb0d000460cbae0cda89a5 -Author: calouie -Date: Fri Aug 4 16:09:46 2017 -0700 - - Moved health check within gwells app and removed welcome app. - -commit 4ca4112b392836944203fa5a2f2b26efaa313661 -Merge: 3858391a0 8c378fb67 -Author: sgreylyn -Date: Fri Aug 4 16:09:09 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 8c378fb67fc584342875cc124f632b28f22d4deb -Author: calouie -Date: Fri Aug 4 16:02:09 2017 -0700 - - Moved health check within gwells app and removed welcome app. - -commit 7baab38682e87a9432c1a24faa9ba8ead8256e26 -Merge: fa266ae87 3858391a0 -Author: calouie -Date: Fri Aug 4 15:52:22 2017 -0700 - - Merge pull request #50 from SethGreylyn/master - - Search Map Preserves Searched Extent on Failure - -commit 3858391a038142ad431098468e87881d11f5fea5 -Author: sgreylyn -Date: Fri Aug 4 15:48:17 2017 -0700 - - Cleanup unused class, addition of class for search control - -commit 50c68d9f5ebcb53650e16be09fa6e668bba16a28 -Merge: 77aabedcc 6b27a4b3e -Author: sgreylyn -Date: Fri Aug 4 15:03:58 2017 -0700 - - Merge branch 'bad-search-preserve-extent' - -commit 6b27a4b3eaf1cff125181cf804fb8eb5d304afb6 -Author: sgreylyn -Date: Fri Aug 4 15:03:15 2017 -0700 - - The app now returns and parses the lat_long_box in any case, when it exists. - -commit 77aabedcc59a55b3bbbcf25c23dd8a9ab9f8554c -Merge: 815661124 fa266ae87 -Author: sgreylyn -Date: Fri Aug 4 15:03:33 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit fa266ae873b45591559c7cb4de08b5395b0df5a1 -Merge: 357eea6e7 c4c86de07 -Author: calouie -Date: Fri Aug 4 14:51:33 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 357eea6e753ec96858aecacbe4f59233d9cedd3b -Author: calouie -Date: Fri Aug 4 14:50:19 2017 -0700 - - Added screen intake validation. - -commit 81566112452d67c91e8cd114e9b4a6b86b2e495f -Merge: 1174ccc5a c4c86de07 -Author: sgreylyn -Date: Fri Aug 4 14:18:18 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit c4c86de0700ed8e2f445cbceaf69a29ddd5c2e91 -Merge: 2796339ed 1712d7473 -Author: Gary Wong (BC Gov) -Date: Fri Aug 4 11:45:32 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 2796339ed03b2620179bdfa073ded94ac5ea067c -Author: Gary Wong (BC Gov) -Date: Fri Aug 4 11:45:27 2017 -0700 - - Added additional development_notes column - -commit 1712d7473cd8feeaa0151dfb939ebeb22ec128ce -Merge: 67b564a07 1174ccc5a -Author: calouie -Date: Fri Aug 4 08:47:45 2017 -0700 - - Merge pull request #49 from SethGreylyn/master - - Trivial Adjustments to Latest Feedback - -commit 1174ccc5a71d90cd010f6686268b07c0e506240e -Author: sgreylyn -Date: Thu Aug 3 22:47:15 2017 -0700 - - Code reorganisation ahead of more substantive functionality improvements - -commit a774f65cf13629f4555a3b923e3a7a6f0cf8d634 -Author: sgreylyn -Date: Thu Aug 3 22:24:24 2017 -0700 - - Divorcing AJAX search minimum zoom from external query min zoom - -commit b6ad56a7be21db599e4e0d28fdfade417184001d -Author: sgreylyn -Date: Thu Aug 3 21:56:18 2017 -0700 - - Icons for impending functionality - -commit cb096fc787095678be883a1fea5f1d148343a3dc -Author: sgreylyn -Date: Thu Aug 3 21:38:59 2017 -0700 - - Investigation of map freezing on pushpin removal, incidental cleanup - -commit 5e9e9da4ae2267fff5f4be3f3d9ff1890ef44e4c -Merge: 3d9d2ad59 67b564a07 -Author: sgreylyn -Date: Thu Aug 3 21:15:27 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 67b564a078d978c0a8a59ee1273cd8b4bbd776bb -Author: Gary Wong (BC Gov) -Date: Thu Aug 3 17:42:05 2017 -0700 - - with new columns - -commit ea1d3d8b97b1517aaa246c53a1efc300883f8c8f -Author: calouie -Date: Thu Aug 3 15:41:40 2017 -0700 - - Added where plate attached. - -commit 683d9ea57af21ae1654a195153e599c5ab6663b0 -Author: calouie -Date: Thu Aug 3 15:04:34 2017 -0700 - - Added form for well development. - -commit 6e055daef55c18cee5b8e1d4e8461c1558bfa64f -Author: calouie -Date: Thu Aug 3 14:42:18 2017 -0700 - - Changed styles for alerts. - -commit c19c03683aa392d0fa6f23576e00766acc43f0e3 -Author: calouie -Date: Wed Aug 2 14:46:41 2017 -0700 - - Added well development to models. - -commit 72fab95d11d34f1c7e937449e52005273a7a1539 -Author: calouie -Date: Wed Aug 2 10:31:31 2017 -0700 - - Fixed casing drive shoe radio button default not displaying on subsequent roles. Fixed django-dynamic-formset js issue #81 https://github.com/elo80ka/django-dynamic-formset/issues/81. - -commit f7cc6a1214bd5af326a36d15f053435f8f88b486 -Author: calouie -Date: Tue Aug 1 11:40:43 2017 -0700 - - Made at least 1 screen entry required if Screen Intake is Screen. - -commit 793e8593aa6e7e6717639f49f76281fb1fb16dbc -Merge: f161eb462 3d9d2ad59 -Author: calouie -Date: Tue Aug 1 08:33:40 2017 -0700 - - Merge pull request #48 from SethGreylyn/master - - Fix for search bug - -commit 3d9d2ad59cf029b905261f8ce55280f3f534c0fc -Merge: dd50f5334 f161eb462 -Author: sgreylyn -Date: Mon Jul 31 21:23:14 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit f161eb4624300de8dc603c45334886eeddba6c7e -Author: Gary Wong (BC Gov) -Date: Mon Jul 31 17:11:15 2017 -0700 - - Updated README - -commit dd50f533417cf5cf9281de27299df3dc47ce100c -Author: sgreylyn -Date: Mon Jul 31 14:56:36 2017 -0700 - - Fix for search bug not fitting form-searched wells correctly. - -commit 5254486cd8950d8618499ec9c00d2b24c69cfb6e -Merge: 4e235ae60 3bc783142 -Author: sgreylyn -Date: Mon Jul 31 14:31:58 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 3bc783142695e4f8efc8205713406d72f83b4363 -Author: calouie -Date: Mon Jul 31 12:06:07 2017 -0700 - - Combined surface seal, backfill and liner information into the same step. - -commit bb930fa45c9c8a0570766ebdde4c08344ee1eef2 -Author: calouie -Date: Mon Jul 31 11:21:19 2017 -0700 - - Added filter pack form. - -commit af740245ab4dcca3054990e14a6fb6efe3ce67c6 -Author: calouie -Date: Mon Jul 31 09:29:30 2017 -0700 - - Aligned all form buttons left since it was floating on the search screen. - -commit 562bd80bb339d7655eb816f512b92a4481afa6f0 -Author: calouie -Date: Mon Jul 31 09:23:20 2017 -0700 - - Adjusted map size. - -commit 46a638abba1a0f7c741bffec10c9155190b03e40 -Merge: 6d7d89e06 4e235ae60 -Author: calouie -Date: Mon Jul 31 08:40:13 2017 -0700 - - Merge pull request #47 from SethGreylyn/master - - Search Map Control and Refactors - -commit 4e235ae6093be50d07dda6212d0f3352dbbcd9c2 -Author: sgreylyn -Date: Sat Jul 29 23:19:54 2017 -0700 - - Removing duplicate call to clear wells. - -commit 8f40831e4e25f721b83433f9ab82b52e1325d071 -Merge: 327a51b79 df8f45a11 -Author: sgreylyn -Date: Sat Jul 29 23:11:32 2017 -0700 - - Merge branch 'well-search-control-refactor' - -commit df8f45a11244283950b8081e470eed197b0675ef -Author: sgreylyn -Date: Sat Jul 29 23:10:58 2017 -0700 - - Control placement and attendant search behaviour finalised. - -commit 6f1200c2eec4fd6a0cc9abd38cff27df5127d8ba -Author: sgreylyn -Date: Sat Jul 29 21:47:33 2017 -0700 - - Functionality refactor in progress - -commit 2d464e14b01643f7e98335365356bfd08a1def28 -Author: sgreylyn -Date: Sat Jul 29 20:18:49 2017 -0700 - - Basic button functionality - -commit f822a6113b8e784a8a7649db83dd8fb1dcbd696f -Author: sgreylyn -Date: Fri Jul 28 20:43:13 2017 -0700 - - Start of custom control code - -commit b140608d2dd30069ebbfb175718f72f4def90605 -Merge: 9dea2a5f0 914be6741 -Author: sgreylyn -Date: Fri Jul 28 19:17:15 2017 -0700 - - Merge remote-tracking branch 'origin/well-search-control-refactor' into well-search-control-refactor - -commit 9dea2a5f00a47a373720049dd5f09419bc3d0834 -Author: sgreylyn -Date: Thu Jul 27 16:39:26 2017 -0700 - - Basic extent search on button. Control logic to come. - -commit ed369eec540f87162c8313025a4b3a9a20b0bda2 -Author: sgreylyn -Date: Thu Jul 27 16:33:53 2017 -0700 - - In-progress changes to search map functionality - -commit 327a51b7988fee0bbc2940a2264d210e3831319f -Merge: afa7392aa 6d7d89e06 -Author: sgreylyn -Date: Fri Jul 28 19:16:36 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 6d7d89e06a65cc76ac3170aa805ea81b2da9d277 -Author: calouie -Date: Fri Jul 28 15:32:04 2017 -0700 - - Added forms for screen. - -commit 8fe576ffb060d64f762e799d90361a08ca437129 -Author: calouie -Date: Fri Jul 28 14:04:10 2017 -0700 - - Removed unique contraint on identification_plate_number for activity_submission. It is unique for a well, but there could be many submissions with this plate. - -commit 57c5b122d178ecbe4eba80c8b49217cd069f11e6 -Author: calouie -Date: Fri Jul 28 11:53:32 2017 -0700 - - Added screen and filter pack information. - -commit 5b18132e1f98022fc11f6df05a76d039506f7f86 -Author: calouie -Date: Fri Jul 28 09:57:19 2017 -0700 - - Added liner and perforation steps. - -commit 914be67418fdaaadd892d8b8c35fa0e4255753e6 -Author: sgreylyn -Date: Thu Jul 27 16:39:26 2017 -0700 - - Basic extent search on button. Control logic to come. - -commit edd5d4e0271ff3c4b6ddc6877d68ced042fa9f73 -Author: sgreylyn -Date: Thu Jul 27 16:33:53 2017 -0700 - - In-progress changes to search map functionality - -commit afa7392aafa6c79104efe501393a34c684746fd8 -Merge: 0c8cdf187 5aa03e3ce -Author: sgreylyn -Date: Thu Jul 27 16:32:24 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 5aa03e3ced85b61e422dabb05115c4492967d135 -Merge: f6b3c1638 0c8cdf187 -Author: calouie -Date: Thu Jul 27 16:29:04 2017 -0700 - - Merge pull request #46 from SethGreylyn/master - - Returning WellPushpin's WellMarker In All Pushpin Maps - -commit 0c8cdf187eb50139c53be1a7ce3be9485f92a8c6 -Author: calouie -Date: Thu Jul 27 16:28:08 2017 -0700 - - fixed typo - -commit 8ddc16f56931c4a395e78945e7c14a31492b978a -Merge: ac9ee92e5 f6b3c1638 -Author: sgreylyn -Date: Thu Jul 27 15:27:29 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit ac9ee92e5afe3ac1c544b5794c47f359bf2c97f1 -Author: sgreylyn -Date: Thu Jul 27 15:27:17 2017 -0700 - - Re-enable wellPushpin's wellMarker, with an outline colour for distinction - -commit f6b3c163871cd3d887eda0fb22fbd0d00221488c -Merge: 8c31b8eb4 cae719c52 -Author: calouie -Date: Thu Jul 27 15:09:29 2017 -0700 - - Merge pull request #45 from SethGreylyn/master - - Cosmetic Changes to Code and Search Map - -commit cae719c522bd2f54a69de299969187baf227e73f -Author: sgreylyn -Date: Thu Jul 27 14:43:19 2017 -0700 - - Making the detail map scrollwheel zoom stay centred - -commit af14bff82250412101e94bafce12a1031cc4fd3b -Merge: 960743fa1 8c31b8eb4 -Author: sgreylyn -Date: Thu Jul 27 14:36:51 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 960743fa1d2daba784c2dcaee77c28759c7318a0 -Author: sgreylyn -Date: Thu Jul 27 14:36:40 2017 -0700 - - Cosmetic changes in the code, search map, and changing 'canZoom' param to 'centreZoom' - -commit 8c31b8eb43fae46ed593407d79837804bb269900 -Author: calouie -Date: Thu Jul 27 14:12:19 2017 -0700 - - Renamed backfill_depth to backfill_above_surface_seal_depth. - -commit e885697a36f74212afcb563a3b464ad6cbdf1fea -Author: calouie -Date: Thu Jul 27 14:04:24 2017 -0700 - - Renamed backfill_depth to backfill_above_surface_seal_depth. - -commit 19c2fbc631b67699cc49ed34c7236cbae0fc9c25 -Merge: e38c2cacb eb4c344c7 -Author: calouie -Date: Thu Jul 27 13:59:39 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit eb4c344c709f14b10844b9bdc2aba482dc36c4c3 -Merge: 51493a39a c09e616ae -Author: calouie -Date: Thu Jul 27 13:59:20 2017 -0700 - - Merge pull request #44 from SethGreylyn/master - - Refinements for Well Pushpin's Well Marker - -commit c09e616aecd302073b107b23bba0f7dda8bfe479 -Author: sgreylyn -Date: Thu Jul 27 13:25:00 2017 -0700 - - Fix for pushpin move (since wellMarker should not be moved) - -commit 81fe161c82ad9376c1e0b0ee3c4fa67f74f253f5 -Merge: 6e290a48c 51493a39a -Author: sgreylyn -Date: Thu Jul 27 13:22:48 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 6e290a48c1cc8d5ad24f77bac604e67a175f7074 -Author: sgreylyn -Date: Thu Jul 27 13:22:37 2017 -0700 - - Refining the wellPushpin's wellMap to only show when the pin cannot be moved. - -commit e38c2cacb09a69cd40723b8a666ab5ec3e16afe5 -Author: calouie -Date: Thu Jul 27 11:46:26 2017 -0700 - - Added autocomplete suggestions to backfill material above surface seal. - -commit 51493a39a85723f0017ad9fb9233739cfa6da712 -Author: calouie -Date: Thu Jul 27 09:04:27 2017 -0700 - - Renamed surface_seal_type to surface_seal_material. Changed backfill type (backfill material above surface seal) to a text field. - -commit 83d4ca7ee417ee6da2cb6a5dd843b98599a93b67 -Merge: a30ad6549 9d7d2337f -Author: calouie -Date: Thu Jul 27 08:42:04 2017 -0700 - - Merge pull request #43 from SethGreylyn/master - - Returning WellMarker to WellPushpin - -commit 9d7d2337fff3f9726e6811b865b82d3c94dca453 -Author: sgreylyn -Date: Wed Jul 26 19:03:46 2017 -0700 - - Re-adding wellMarker to wellPushpin. - -commit 28ba81e83763a43c9c0d7a3fa5224263d152b694 -Merge: 8655870c7 a30ad6549 -Author: sgreylyn -Date: Wed Jul 26 17:04:27 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit a30ad6549c65151050ee11fe2f9cd389e344591b -Author: Gary Wong (BC Gov) -Date: Tue Jul 25 16:59:59 2017 -0700 - - surface_seal_type revision - -commit 25ae51a1467353c1880fa6461941b01056b4437a -Author: calouie -Date: Tue Jul 25 16:06:49 2017 -0700 - - Made lat/long fields blank=True in model but enforced requirement in the form. - -commit 90677a12fd4f2f88c47fcdea293c615d49f1c8dc -Author: calouie -Date: Tue Jul 25 15:13:45 2017 -0700 - - Changed Surface Seal Material to Surface Seal Type. - -commit 88d99728920d1c55a4b8f60d973a21c0bfb8fe75 -Author: Gary Wong (BC Gov) -Date: Tue Jul 25 13:23:54 2017 -0700 - - Got rid of duplicate \copy commands. - -commit 9fafd8be4a07f5cf2f003d1f700209743027c352 -Author: Gary Wong (BC Gov) -Date: Tue Jul 25 12:54:23 2017 -0700 - - loading backfill type, surface method and surface material. - -commit 6d9067a60cc94158ec9a342494785ef2e6a3b7b5 -Author: Gary Wong (BC Gov) -Date: Mon Jul 24 16:44:54 2017 -0700 - - New audit columns. - -commit 5908f005066eb6a7217cf7e3d7270140e8eba99f -Merge: 773cdbeec 8655870c7 -Author: calouie -Date: Mon Jul 24 16:06:46 2017 -0700 - - Merge pull request #42 from SethGreylyn/master - - Pushpin Maps Now Have Rectangle Delimiting Minimum Zoom Extent - -commit 773cdbeec472c6f1474886f9ec8341c19111a4da -Author: calouie -Date: Mon Jul 24 16:05:19 2017 -0700 - - Moved static code analysis after build and deploy to dev since validation navigates the dev url and it was doing so before openshift finished deploying. - -commit a507e9da312892e9cc3537d8b30e1981bfe37997 -Author: calouie -Date: Mon Jul 24 15:42:39 2017 -0700 - - Added validation to check that wall thickness is required if casing is not open hole. - -commit 8655870c707fa5c6cdb445414b83540c65e22a58 -Merge: b310217e9 e858db471 -Author: sgreylyn -Date: Mon Jul 24 15:30:40 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit b310217e9c8f075cfc64a8927cc417e24acae98c -Author: sgreylyn -Date: Mon Jul 24 15:30:22 2017 -0700 - - Altered functionality for pushpin-bearing maps, altered min zoom level for detail map - -commit e858db471e4abc752e6b4b85ec1f6e08dff4390d -Merge: 9abdb2b77 128577b5b -Author: calouie -Date: Mon Jul 24 15:17:14 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 9abdb2b772efe56d49206676a4d6e6b34c3daeec -Author: calouie -Date: Mon Jul 24 15:14:13 2017 -0700 - - Added validation to check that wall thickness is required if casing is not open hole. - -commit 128577b5b21c4e068665dd1946bb1157109f54b2 -Merge: f9d51bd2c 282b82a62 -Author: Gary Wong (BC Gov) -Date: Mon Jul 24 15:04:51 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit f9d51bd2ce4dbf41f4c02cde154874274a6592c9 -Author: Gary Wong (BC Gov) -Date: Mon Jul 24 15:04:47 2017 -0700 - - Reconciling with new data tables and columns. - -commit 282b82a62d9e906b809ebc82bd815454abfd1127 -Author: calouie -Date: Mon Jul 24 14:47:22 2017 -0700 - - Added validation to check that wall thickness is required if casing is not open hole. - -commit e415d0ce183a3726a06e31c4a0699260f154dea6 -Author: calouie -Date: Mon Jul 24 14:34:44 2017 -0700 - - Update README.md - -commit 369a04db08976c82871230d7fbdfcb9c75e52088 -Author: calouie -Date: Mon Jul 24 13:51:28 2017 -0700 - - Make well subclass code unique per well class. - -commit 94f8f106ac29b03689a8042757ce846c2008b231 -Merge: e4d34ac87 e982b1362 -Author: sgreylyn -Date: Mon Jul 24 12:39:11 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit e982b136200cd1874a8fc68e7c8d833ff8118c00 -Author: calouie -Date: Mon Jul 24 11:39:36 2017 -0700 - - Added uniqueness to code field in code table models. - -commit 4bdd4c171daa873d47accd6f4718c8c97b479ec5 -Author: Gary Wong (BC Gov) -Date: Fri Jul 21 22:18:22 2017 -0700 - - Added 4 audit column fields to data load - -commit e4d34ac87f20978be35360c283cc420fd4a2491f -Merge: b4b3aea3a 2b5191657 -Author: sgreylyn -Date: Fri Jul 21 15:53:11 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 2b5191657e0ab17f7d75ab11b4010ed3e6f51af2 -Author: calouie -Date: Fri Jul 21 15:46:06 2017 -0700 - - Added test to check Construction is the default activity type when entering a new submission out of the context of an existing well. - -commit 1e368078e47d8630a54356e6256d4268ce7fb2d2 -Merge: cd1a89a20 b4b3aea3a -Author: calouie -Date: Fri Jul 21 15:44:04 2017 -0700 - - Merge pull request #41 from SethGreylyn/master - - DMS Validation and Stepper Fix - -commit b4b3aea3a88187284f127a0e0096b7cc34193eec -Merge: f849149ae cd1a89a20 -Author: sgreylyn -Date: Fri Jul 21 15:25:13 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit f849149ae5ed62cd3bf6289485b511a85b2f6bde -Author: sgreylyn -Date: Fri Jul 21 15:24:38 2017 -0700 - - Restricting the stepper bounds to be (just) within the actual map bounds - -commit cd1a89a2025f92521e7278ea3a164f61468e2057 -Author: calouie -Date: Fri Jul 21 15:18:14 2017 -0700 - - Added id to enter new report link. - -commit 4f93ef04c541c73145e72a87ebbfbf2b4cfbfc49 -Merge: 851b8fce3 0ecdb6921 -Author: sgreylyn -Date: Fri Jul 21 14:37:26 2017 -0700 - - Merge branch 'dms-validation-improvements' - -commit 0ecdb6921e326a6dbe692658082397f8ff6e01f2 -Merge: ff2fe8d3d 5696fa4ba -Author: sgreylyn -Date: Fri Jul 21 14:37:13 2017 -0700 - - Merge remote-tracking branch 'origin/dms-validation-improvements' into dms-validation-improvements - -commit ff2fe8d3dbca8e4b77f942ed9a23bda63ba5aaa9 -Author: sgreylyn -Date: Fri Jul 21 14:36:27 2017 -0700 - - Reordering pin removal to be after event unsubscription. - -commit 9084192e1f6d35196a4b3da40040ad0f1cb84772 -Author: sgreylyn -Date: Thu Jul 20 14:23:09 2017 -0700 - - First go at loosening DMS validation to only kick in when all fields exist - -commit 77a3729a87a8aad583701c12bf510c453aa916cd -Author: sgreylyn -Date: Thu Jul 20 13:59:49 2017 -0700 - - Reverting 'use strict' changes. - -commit 851b8fce3d005d6af0556d3879f15354fd531caf -Merge: 48231dcdd 64f5ab21a -Author: sgreylyn -Date: Fri Jul 21 14:36:57 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 5696fa4ba9b4d741406c8d9b575101fb1f2afeab -Author: sgreylyn -Date: Fri Jul 21 14:36:27 2017 -0700 - - Reordering pin removal to be after event unsubscription. - -commit 72b23e83870c2cb17e02b72534c12a23d9a5db03 -Author: calouie -Date: Fri Jul 21 13:57:38 2017 -0700 - - Added report output to ignore file. - -commit 64f5ab21a60a75bdfc686355f017982fa4f8d0eb -Author: calouie -Date: Fri Jul 21 13:32:46 2017 -0700 - - Added unit tests for bounding box. - -commit 16edd56bb4f3c5daf2d675b4f4101ba5d6999d60 -Author: calouie -Date: Fri Jul 21 11:40:22 2017 -0700 - - Ignore output from navunit execution. - -commit be7759328dce41f29d270792a7be3c97eb10f1de -Merge: bea97b9ff 0cec18b37 -Author: sgreylyn -Date: Fri Jul 21 10:29:27 2017 -0700 - - Merge remote-tracking branch 'origin/dms-validation-improvements' into dms-validation-improvements - -commit bea97b9fff06d14b1e1f49055d3ba44d80ba2121 -Author: sgreylyn -Date: Thu Jul 20 14:23:09 2017 -0700 - - First go at loosening DMS validation to only kick in when all fields exist - -commit ccd9e3e331ecd41d8ff08a953c3fa893a09bd197 -Author: sgreylyn -Date: Thu Jul 20 13:59:49 2017 -0700 - - Reverting 'use strict' changes. - -commit 48231dcddb4350dde5b9444ad6d754d27c821c9d -Merge: 14842c4e3 f15b8c1a1 -Author: sgreylyn -Date: Fri Jul 21 10:29:08 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit f15b8c1a123dc34b3d0d1b2b79eda8df90bd8836 -Author: Louie -Date: Fri Jul 21 10:23:33 2017 -0700 - - Removed navigation check for mobile links since they are not visible on the screen in a standard browsing session. - -commit c81de369c0982095a30b13eb85ed1f1e8c679251 -Author: Louie -Date: Fri Jul 21 10:10:51 2017 -0700 - - Added mobile navigation links to tests. - -commit 2651487ce5f7569b36e87b78938c3b721974f6b5 -Author: Louie -Date: Fri Jul 21 10:07:54 2017 -0700 - - Separated deploy to dev into its own stage to more accurately track build time and debug future issues. - -commit 830b85294a38bd56c65379dd29db2e1bc11c520e -Author: Louie -Date: Fri Jul 21 09:56:34 2017 -0700 - - Renamed folder. - -commit cb7e8a37bf6f49498b480d34d44c6d8cb3365afb -Author: Gary Wong (BC Gov) -Date: Thu Jul 20 16:58:21 2017 -0700 - - Explicity column specifications in \copy - -commit fd5a71736dedc162fbdce1092ed06c9844c5c527 -Merge: 2ee9fd564 7f7846f6d -Author: Gary Wong (BC Gov) -Date: Thu Jul 20 16:40:27 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 2ee9fd5647ffe0affe5460a713cee99f0c61cbc8 -Author: Gary Wong (BC Gov) -Date: Thu Jul 20 16:40:23 2017 -0700 - - Additional Code tables, with audit columns and reformatted README - -commit 7f7846f6d5f94c36957c19b97945a3eca1382cd1 -Author: Louie -Date: Thu Jul 20 16:23:14 2017 -0700 - - Changed FlowSpecs to use id attribute as text was too fragile. - -commit 867b371e8302aa94a685d43973136f489ed1103f -Author: Louie -Date: Thu Jul 20 16:01:09 2017 -0700 - - Put back external link checking in validation. - -commit 87d094df050099ba9e332865f79f0d9d39df01c4 -Merge: 4f02f21dd 1824804f4 -Author: Gary Wong (BC Gov) -Date: Thu Jul 20 15:11:34 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 49c846c3fbe6487f570c9f175d0054aa7837b805 -Author: Louie -Date: Thu Jul 20 14:50:52 2017 -0700 - - Changed error message when casing open hole has a material specified. - -commit 14842c4e304bbed6bc12cd732cb58228c1d6a3ef -Merge: f27364739 1824804f4 -Author: sgreylyn -Date: Thu Jul 20 14:44:36 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 1824804f427bbddb8a79850fccf8c81b25e171b9 -Merge: 9c2fb0929 f27364739 -Author: calouie -Date: Thu Jul 20 14:34:04 2017 -0700 - - Merge pull request #40 from SethGreylyn/master - - Fix for missing details map. - -commit 0cec18b3752788bbaac7d1d094187e87b51fefe6 -Merge: b7dfa11f0 e439a8f95 -Author: sgreylyn -Date: Thu Jul 20 14:29:36 2017 -0700 - - Merge remote-tracking branch 'origin/dms-validation-improvements' into dms-validation-improvements - -commit b7dfa11f01ed1301c62af9925caa0a1f7a0482a2 -Author: sgreylyn -Date: Thu Jul 20 14:23:09 2017 -0700 - - First go at loosening DMS validation to only kick in when all fields exist - -commit d4e08b40b5cf6304e6db02cf83e835fa9e57e842 -Author: sgreylyn -Date: Thu Jul 20 13:59:49 2017 -0700 - - Reverting 'use strict' changes. - -commit f2736473929553d338d79ce3ff3eabd767cee311 -Author: sgreylyn -Date: Thu Jul 20 14:26:17 2017 -0700 - - Fix for checking mapBounds existence before attempting to set it. - -commit 4a778df12302503dfc712d82d248b43b036717c4 -Merge: 0688bd1e2 9c2fb0929 -Author: sgreylyn -Date: Thu Jul 20 14:23:25 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit e439a8f95e89c67f8549fcfd855840c2bf4a725a -Author: sgreylyn -Date: Thu Jul 20 14:23:09 2017 -0700 - - First go at loosening DMS validation to only kick in when all fields exist - -commit 9c2fb0929833bfb18291eaf5adaf820623dff31c -Author: Louie -Date: Thu Jul 20 14:07:46 2017 -0700 - - Removed autocomplete from wall thickness as it should have been for liner thickness. - -commit 9816933e67edfd5f44ff766ec4aa740dfe0e86b7 -Author: Louie -Date: Thu Jul 20 14:07:08 2017 -0700 - - Added validation for casing material. - -commit d4d9dba7341204f2bb7af0a93ab8a6d2a0c433c2 -Author: sgreylyn -Date: Thu Jul 20 13:59:49 2017 -0700 - - Reverting 'use strict' changes. - -commit b8c1f35efa889fe7ae4bf66ac7dcd6945a15290e -Merge: 494ff15d0 0688bd1e2 -Author: calouie -Date: Thu Jul 20 13:46:05 2017 -0700 - - Merge pull request #39 from SethGreylyn/master - - Code Quality Improvements - -commit 0688bd1e27e24400d26b2958363c49d47aab175e -Author: sgreylyn -Date: Thu Jul 20 13:44:11 2017 -0700 - - Fix. - -commit a70948198907545ee5e4389f8736e7235e306fdd -Merge: f17b76adb 891d21385 -Author: sgreylyn -Date: Thu Jul 20 13:36:37 2017 -0700 - - Merge branch 'code-quality-improvements' - -commit 891d21385dddda8926686a997dfb961e27cc4a2c -Author: sgreylyn -Date: Thu Jul 20 12:39:24 2017 -0700 - - Most of the code quality improvements for WellsMap. - -commit 87396f434078bfcf5d8cf686e3db7f9820fded46 -Author: sgreylyn -Date: Thu Jul 20 12:07:55 2017 -0700 - - CoordSync quality issues. - -commit f17b76adb2262b21aee13b06732f36ec470e959c -Merge: 8a1e99ae3 494ff15d0 -Author: sgreylyn -Date: Thu Jul 20 13:36:12 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 494ff15d08edf71102d54933e28b339071c4714c -Merge: 43b20a11c 8a1e99ae3 -Author: calouie -Date: Thu Jul 20 13:24:04 2017 -0700 - - Merge pull request #38 from SethGreylyn/master - - Map Now Fits to Identify Rectangle - -commit 8a1e99ae304c887b27b1faed2f0386b45c2f0038 -Merge: ddeab9006 55ccb7e5e -Author: sgreylyn -Date: Thu Jul 20 11:39:26 2017 -0700 - - Merge branch 'search-box-refinement' - -commit 55ccb7e5e29e4cba2624e7d4134c3f862ec181c4 -Author: sgreylyn -Date: Thu Jul 20 11:38:53 2017 -0700 - - drawAndFitBounds now fits to the _identifyWellsRectangle, if it exists. - -commit ddeab9006e9d3bb62787a2a600d7d065664cb1b6 -Merge: 6e3862e77 43b20a11c -Author: sgreylyn -Date: Thu Jul 20 11:39:05 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 43b20a11cfe3bba84374a03a3d7cfed1212ff740 -Author: Louie -Date: Thu Jul 20 10:58:13 2017 -0700 - - Fixed formatting. - -commit 4f02f21dd9a32bf2416448f30e7dbfbad57b613e -Author: Gary Wong (BC Gov) -Date: Thu Jul 20 10:38:42 2017 -0700 - - New code tables. - -commit 4d2060a49cd0e6cfc3f62a5c0c01b0213c52ab71 -Author: Louie -Date: Thu Jul 20 10:20:20 2017 -0700 - - Code cleanup. - -commit 17de124d93362065e2826d65616b2d5c793f80d9 -Merge: b2007f1a0 b25e85f34 -Author: Louie -Date: Thu Jul 20 10:10:06 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit b2007f1a0ae22f1bbd2cfe3ac341f65ab21b0c93 -Author: Louie -Date: Thu Jul 20 10:08:34 2017 -0700 - - Removed unused variables. - -commit 8cf5826ed04766d7c7d4f65efff87921cb6b5eae -Author: Louie -Date: Thu Jul 20 09:33:21 2017 -0700 - - Fixed return value of __str__ in Well. - -commit 3f940f91ce4da67edcd1c1c3da2c3eee5b8daafc -Author: Louie -Date: Thu Jul 20 09:28:56 2017 -0700 - - Added suggested values for casing wall thickness. - -commit b25e85f34ea2216c70491b13406d59fc70b08481 -Merge: 19e1182eb 6e3862e77 -Author: calouie -Date: Thu Jul 20 09:21:41 2017 -0700 - - Merge pull request #37 from SethGreylyn/master - - Search Identify Rectangle Improvements - -commit 6e3862e77d132eb324964654b793bbc60278b5b7 -Merge: ed32cdcd1 9f9635e3e -Author: sgreylyn -Date: Wed Jul 19 18:46:38 2017 -0700 - - Merge branch 'search-box-refinement' - -commit 9f9635e3e02f09114d15d9d943c197d2ba2f1f8d -Author: sgreylyn -Date: Wed Jul 19 18:46:01 2017 -0700 - - The search map now draws an initial rectangle on the map only if it was drawn by the user previously. - -commit 8ab1c6bf111e6558e54a6dc0220a15b03fa46623 -Author: sgreylyn -Date: Wed Jul 19 16:16:59 2017 -0700 - - Beginning of search-map rectangle persistence - -commit ed32cdcd1b29d5ff6395b1d784cf4eb4478a907b -Merge: b649b3fef 19e1182eb -Author: sgreylyn -Date: Wed Jul 19 18:46:16 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 19e1182ebd002d572f363c457324ef1563460a17 -Author: Louie -Date: Wed Jul 19 16:24:04 2017 -0700 - - Added casing validation. - -commit b649b3fef1004809b0118d3372677ae07ee4d8da -Merge: 1b0c7dbf3 5f2b9e38e -Author: sgreylyn -Date: Wed Jul 19 16:15:47 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 5f2b9e38e2e262bd682901f3b38fce011fe73507 -Merge: dcd135b17 c4691c3c7 -Author: calouie -Date: Wed Jul 19 16:01:37 2017 -0700 - - Merge pull request #36 from GeorgeWalker/master - - Documentation improvements - -commit c4691c3c729d5873066651d636c90ffa5af06482 -Author: GeorgeWalker -Date: Wed Jul 19 16:00:54 2017 -0700 - - Documentation improvements - -commit dcd135b17879f08edf81511fb2024c20616596f7 -Merge: 4d219dac3 eaef43e38 -Author: calouie -Date: Wed Jul 19 15:55:58 2017 -0700 - - Merge pull request #35 from GeorgeWalker/master - - Add execute for script - -commit eaef43e38bdd522a1563750efda61800d9f10a60 -Author: GeorgeWalker -Date: Wed Jul 19 15:54:42 2017 -0700 - - Add execute for script - -commit 4d219dac36ce881e108a5e9b28ffe30b6dbeb14b -Merge: 429745685 1b0c7dbf3 -Author: garywong-bc -Date: Wed Jul 19 15:47:22 2017 -0700 - - Merge pull request #33 from SethGreylyn/master - - Attribution Control Now Outside Map - -commit 429745685a44358a993dc5d050491f5639508e51 -Merge: bede007f6 adb10c0c9 -Author: calouie -Date: Wed Jul 19 15:44:17 2017 -0700 - - Merge pull request #34 from GeorgeWalker/master - - Enable functional test - -commit adb10c0c9ec7f869ae882486a337b924026150ae -Author: GeorgeWalker -Date: Wed Jul 19 15:36:00 2017 -0700 - - Enable functional test - -commit 1b0c7dbf308f3db6736546cb63844d447abddddd -Author: sgreylyn -Date: Wed Jul 19 15:35:57 2017 -0700 - - Cosmetic fix to well detail map attribution placement. - -commit 5f96064fd63bf410744852442cb0cd2f4621b6fd -Merge: 0af49c7a0 bede007f6 -Author: sgreylyn -Date: Wed Jul 19 15:33:34 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 0af49c7a099984c04e7e1832f3079193f8397c90 -Merge: 253b4aefd eb443319a -Author: sgreylyn -Date: Wed Jul 19 15:32:53 2017 -0700 - - Merge branch 'attribution-control-extraction' - -commit eb443319a9bd188684f3efd33892d85771d130ee -Author: sgreylyn -Date: Wed Jul 19 15:32:41 2017 -0700 - - Attribution succesfully (and robustly) extracted. - -commit bede007f668fe640bcb29040348fcad57bf4fde9 -Merge: aa725f613 3578ea22f -Author: calouie -Date: Wed Jul 19 15:31:51 2017 -0700 - - Merge pull request #32 from GeorgeWalker/master - - Restructure Jenkinsfile - -commit 3578ea22f9538c2f5fcdd9757a26c0a96efb0c83 -Author: GeorgeWalker -Date: Wed Jul 19 15:30:43 2017 -0700 - - Restructure Jenkinsfile - -commit aa725f6139a14ee1051b24d39f6486b769121a72 -Merge: ea21e12ca 6a57ba916 -Author: calouie -Date: Wed Jul 19 15:13:51 2017 -0700 - - Merge pull request #31 from GeorgeWalker/master - - Alternate syntax for Jenkinsfile - -commit 6a57ba9164de1b92a40cc6be39dbab7542120c9e -Author: GeorgeWalker -Date: Wed Jul 19 15:12:53 2017 -0700 - - Alternate syntax for Jenkinsfile - -commit ea21e12cae1286d688a12df19ca939871ecfd54e -Merge: 6aff84c81 07f7a1dcc -Author: calouie -Date: Wed Jul 19 15:09:41 2017 -0700 - - Merge pull request #30 from GeorgeWalker/master - - Change to Jenkinsfile - -commit 07f7a1dcc6a01ecc2bfa81558ed8b2b89ed5d7a2 -Author: GeorgeWalker -Date: Wed Jul 19 15:08:02 2017 -0700 - - Change to Jenkinsfile - -commit 6aff84c812cdb7ce4aa858f6114e11f3af21d678 -Merge: 1dec9c031 1848700e5 -Author: calouie -Date: Wed Jul 19 14:38:34 2017 -0700 - - Merge pull request #29 from GeorgeWalker/master - - Updated BDD for GWELLS - now works on Windows with chromeTest - -commit 253b4aefd27887f7ef0c2f4679ac9561d14990ca -Merge: be15e7ed0 1dec9c031 -Author: sgreylyn -Date: Wed Jul 19 14:13:19 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 1848700e5a9c6b9d26daa3f115e045ef43105a58 -Author: GeorgeWalker -Date: Wed Jul 19 10:57:12 2017 -0700 - - Updated BDD for GWELLS - now works on Windows with chromeTest - -commit 1dec9c03195bcb506afe91e9e3d7201ba1c4c526 -Author: Louie -Date: Wed Jul 19 10:51:22 2017 -0700 - - Updated search instructions as per UX resarch feedback. - -commit bc62362c09ce94649967223ef8681ebfb4629e15 -Merge: dfde39752 6d519b27d -Author: calouie -Date: Tue Jul 18 13:52:53 2017 -0700 - - Merge pull request #28 from GeorgeWalker/master - - Jenkinsfile fix - -commit 6d519b27d0726ac532e4182bbf13366b70b4b25a -Author: GeorgeWalker -Date: Tue Jul 18 13:51:54 2017 -0700 - - Jenkinsfile fix - -commit dfde39752d4b358c3edf113b5d8d465f941c667b -Merge: a6cec861a 35bdf49ba -Author: calouie -Date: Tue Jul 18 13:32:56 2017 -0700 - - Merge pull request #27 from GeorgeWalker/master - - Add service for sonarqube - -commit be15e7ed0d35c42936b3389e4aa0871661ea6fa1 -Merge: 7525456d8 a6cec861a -Author: sgreylyn -Date: Tue Jul 18 13:25:33 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 35bdf49bab060cebb6bbf832f3ddf7d295ac58bc -Author: GeorgeWalker -Date: Tue Jul 18 13:23:51 2017 -0700 - - Add service for sonarqube - -commit a6cec861abf628b5e6890fd9c7270f27d7bafeb2 -Merge: 8883207f2 21372cfa6 -Author: calouie -Date: Tue Jul 18 12:09:47 2017 -0700 - - Merge pull request #26 from GeorgeWalker/master - - Fixes for Sonar deployment - -commit 21372cfa605921b12676f0f1fbb7e137426098a1 -Author: GeorgeWalker -Date: Tue Jul 18 12:08:14 2017 -0700 - - Fix for sonar database user - -commit d790176694c8842280b903f146374190d057d7ec -Author: GeorgeWalker -Date: Tue Jul 18 11:55:00 2017 -0700 - - Fix health check for postgres - -commit 8883207f2fd86cb6cf0321c3c633006729862022 -Merge: 769b9367d 48bfdc8be -Author: calouie -Date: Tue Jul 18 11:39:39 2017 -0700 - - Merge pull request #25 from GeorgeWalker/master - - Secret fixes - -commit 48bfdc8be2bf9968aebbc6ecdfdc80ced31eed65 -Author: GeorgeWalker -Date: Tue Jul 18 11:37:29 2017 -0700 - - Fix secret - -commit 81ab90abd806353036bab2c48498e6b49ff5efdb -Author: GeorgeWalker -Date: Tue Jul 18 11:29:54 2017 -0700 - - Fix secret - -commit 769b9367d803238a17a3b2bab41e307303f5b7a0 -Merge: 3fa5d9e47 6ccaf183b -Author: calouie -Date: Tue Jul 18 11:22:38 2017 -0700 - - Merge pull request #24 from GeorgeWalker/master - - Fix syntax in json file - -commit 6ccaf183b47392535d4e65a6d176a24e047ce466 -Author: GeorgeWalker -Date: Tue Jul 18 11:21:35 2017 -0700 - - Fix syntax in json file - -commit 3fa5d9e47957bcdb07f74ce02fbc3a92657b5165 -Merge: d89f83b87 9375965d9 -Author: calouie -Date: Tue Jul 18 11:19:12 2017 -0700 - - Merge pull request #23 from GeorgeWalker/master - - Changes for BDD and OpenShift - -commit 9375965d964dc7dc59596a0bcc00e5884ff07655 -Author: GeorgeWalker -Date: Tue Jul 18 11:18:22 2017 -0700 - - Fix page name - -commit 1b5738e37d2f1c0c369ecea7df62d27d9578ea6a -Author: GeorgeWalker -Date: Tue Jul 18 11:17:40 2017 -0700 - - Updated page definitions - -commit 67b908393ae09b42dd6d9448a05ca0831494e7bc -Author: GeorgeWalker -Date: Tue Jul 18 11:16:00 2017 -0700 - - Fix commit - -commit 433625c1542848ed0596107cd27870c11ef9dd0d -Merge: 32d8f6a9b d89f83b87 -Author: GeorgeWalker -Date: Tue Jul 18 11:13:07 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - - # Conflicts: - # functional-tests/Readme.md - # functional-tests/src/test/groovy/pages/app/HomePage.groovy - # functional-tests/src/test/groovy/pages/app/SearchPage.groovy - -commit 32d8f6a9b992ea36ca5c9ab24910e6f018b59572 -Author: GeorgeWalker -Date: Tue Jul 18 11:08:43 2017 -0700 - - Updated BDD tests - -commit 2612690de421051b6907b1633d37ff286998b49f -Author: GeorgeWalker -Date: Tue Jul 18 11:07:08 2017 -0700 - - Add secrets to postgres deployment for sonarqube database - -commit d89f83b87663a5588b83b37ae3b0d66fe2bd142c -Merge: 7924ac948 7525456d8 -Author: calouie -Date: Mon Jul 17 13:10:52 2017 -0700 - - Merge pull request #22 from SethGreylyn/master - - Search Map Feedback Refinement and Attribution Reset - -commit 7525456d8924b712ebcc4147a772da5c31ea9efe -Merge: e9d89088f 381844f78 -Author: sgreylyn -Date: Mon Jul 17 12:23:40 2017 -0700 - - Merge branch 'refining-feedback' - -commit 381844f782aa5c73307048bbb66d60efbc7766eb -Author: sgreylyn -Date: Mon Jul 17 12:23:24 2017 -0700 - - Searching now leaves map's maxBounds alone; attribution reset pending decision. - -commit e9d89088f4a761926bdcc1d3982f97beee012cac -Merge: 7a4f3a908 7924ac948 -Author: sgreylyn -Date: Mon Jul 17 12:07:35 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 7924ac9483041a912f58f5bb8328aa3d5047a129 -Author: Louie -Date: Mon Jul 17 09:04:37 2017 -0700 - - Adjusted lat/long boundaries to match values specified in js. - -commit 449d5dcfdd4da48dec5d087746b1b56543c4840a -Merge: bb9405e62 7a4f3a908 -Author: garywong-bc -Date: Mon Jul 17 07:23:11 2017 -0700 - - Merge pull request #21 from SethGreylyn/master - - Feedback on Search, Attribution, and Accessibility - -commit 7a4f3a9088fc1ced85918aeda479151ebebb4bab -Author: sgreylyn -Date: Sat Jul 15 17:26:43 2017 -0700 - - Removing obviated TODO comments. - -commit b917c376b9d8755b2a140b7a41adc942bc8af3dc -Merge: 9a14f375a ecd6687b5 -Author: sgreylyn -Date: Sat Jul 15 17:19:41 2017 -0700 - - Merge branch 'aria-labels' - -commit ecd6687b5c20900a1259f3df3603a58eb065ad16 -Author: sgreylyn -Date: Sat Jul 15 17:19:17 2017 -0700 - - Hard-coded ARIA labels added to map divs. - -commit 9a14f375ad38339681bb1b2c159c30edb9dd9ca7 -Merge: 09caa9936 deede7cb2 -Author: sgreylyn -Date: Sat Jul 15 16:23:55 2017 -0700 - - Merge branch 'attribution-control-intrusiveness' - -commit deede7cb2a3434367e01f8d7e4ee7b6cccb4b8f2 -Author: sgreylyn -Date: Sat Jul 15 16:14:46 2017 -0700 - - Commentary cleanup - -commit 251fbb8e80c5bfabad2fd3c1bbdc3a7850f3e22d -Author: sgreylyn -Date: Sat Jul 15 16:07:02 2017 -0700 - - Refined padding for searchMap - -commit a79bb7ba860fafd8afc5ab5c325e460638d0a657 -Author: sgreylyn -Date: Sat Jul 15 16:06:41 2017 -0700 - - Refined initial bounds and padding of addMap and searchMap, moved attribution control to top right. - -commit 09caa993632ed56643a3ee46ba056fea5e2703d1 -Author: sgreylyn -Date: Fri Jul 14 20:09:48 2017 -0700 - - Changed name of _maxBoundsRectangle to _drawAndFitBoundsRectangle - -commit 24ebdae95a2de097997a402d89360835320e4291 -Author: sgreylyn -Date: Fri Jul 14 20:07:24 2017 -0700 - - Clarifying comment in WellsMap doc. - -commit 50b902ef2d5e264fb787f3679e8c5722a06efd49 -Merge: 9a3bc79d9 e4586028a -Author: sgreylyn -Date: Fri Jul 14 20:03:53 2017 -0700 - - Merge branch 'search-map-feedback' - -commit e4586028a59871b6b39be94aef69d2ee639b6c7c -Merge: 146a5d5ba 173fada34 -Author: sgreylyn -Date: Fri Jul 14 20:03:07 2017 -0700 - - Merge remote-tracking branch 'origin/search-map-feedback' into search-map-feedback - -commit 146a5d5ba07c65654736c6a9d4f639effe6b45c0 -Author: sgreylyn -Date: Fri Jul 14 19:54:57 2017 -0700 - - More code cleanup - -commit f1a729c8aa406671b8194fda9f97998bd51560ba -Author: sgreylyn -Date: Fri Jul 14 19:50:02 2017 -0700 - - Code cleanup and addition of bounding rectangle for identifyWells. - -commit 3c15228c59c062e853c1a3fd53c65e57bc920564 -Author: sgreylyn -Date: Mon Jul 10 19:28:42 2017 -0700 - - Comments on well_search - -commit 448a508874d53acb69e51c4b6c8eddb4d3598467 -Author: sgreylyn -Date: Mon Jul 10 14:19:42 2017 -0700 - - More general/informative too-many-results message. - -commit e50dbe1003a693203d3edb87011eddae29098cec -Author: sgreylyn -Date: Mon Jul 10 14:03:36 2017 -0700 - - Breaking space added between map-search button and map - -commit 9a3bc79d99f1497aa445154a73e2ec02052fb4a5 -Author: sgreylyn -Date: Fri Jul 14 20:01:02 2017 -0700 - - Proposed fix for intermittent spurious 'zero results returned' bug - -commit 173fada34625620b7d1a5886fb85ce2ef8120956 -Author: sgreylyn -Date: Fri Jul 14 19:54:57 2017 -0700 - - More code cleanup - -commit c91ca6d64244268df90aeca12e3f3a07f815f654 -Author: sgreylyn -Date: Fri Jul 14 19:50:02 2017 -0700 - - Code cleanup and addition of bounding rectangle for identifyWells. - -commit 6bd96244aecd9b29951e1152a86712055272916b -Merge: 4e0eb1da8 b6796e148 -Author: sgreylyn -Date: Fri Jul 14 16:01:33 2017 -0700 - - Merge remote-tracking branch 'origin/search-map-feedback' into search-map-feedback - -commit 4e0eb1da8192da6e93d33cf2d2c8cb733803caeb -Author: sgreylyn -Date: Mon Jul 10 19:28:42 2017 -0700 - - Comments on well_search - -commit a2e0a3f4c529b6b3da17d0dc1f14225a9105e0cc -Author: sgreylyn -Date: Mon Jul 10 14:19:42 2017 -0700 - - More general/informative too-many-results message. - -commit ce2d0fecadaee7644cd5c9e4ff2c1600513ca968 -Author: sgreylyn -Date: Mon Jul 10 14:03:36 2017 -0700 - - Breaking space added between map-search button and map - -commit a8f2e765c479c9c1480d7a4dbb4a16f3301e4874 -Merge: b35287c1b bb9405e62 -Author: sgreylyn -Date: Fri Jul 14 16:01:15 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit bb9405e62ff6f3cc5038fa0c56330cdf47ec8703 -Author: Louie -Date: Fri Jul 14 15:43:41 2017 -0700 - - Start of casing form. - -commit c618e6c6590914f110e23ff442fc1c0c1542e7df -Author: Gary Wong (BC Gov) -Date: Fri Jul 14 13:47:27 2017 -0700 - - Added lithology analysis to the SQL Developer User Reports - -commit 20a11772fb85234b954b52070e32bb05332a4d44 -Author: Louie -Date: Fri Jul 14 11:38:13 2017 -0700 - - Added models for surface seal and backfill. - -commit 6e010363f28f93be9b009a24f7e9e07fdd37f9e7 -Author: Louie -Date: Fri Jul 14 11:01:38 2017 -0700 - - Added models for casing. - -commit b6796e14804a65da12a96c5663090eed7bf0872d -Merge: 06f1361e2 70e12a3aa -Author: sgreylyn -Date: Fri Jul 14 10:52:12 2017 -0700 - - Merge remote-tracking branch 'origin/search-map-feedback' into search-map-feedback - -commit 06f1361e2bc4d7894d7debd1c781b951110ebf88 -Author: sgreylyn -Date: Mon Jul 10 19:28:42 2017 -0700 - - Comments on well_search - -commit 9d3563b10c2bb39b8c6b0c31dbdefa3ef015c3fe -Author: sgreylyn -Date: Mon Jul 10 14:19:42 2017 -0700 - - More general/informative too-many-results message. - -commit dd7380d802fb0896f9ea7acbddcee5895a5ee605 -Author: sgreylyn -Date: Mon Jul 10 14:03:36 2017 -0700 - - Breaking space added between map-search button and map - -commit b35287c1bb9710d04a2ab6f9962462cdbc7309cd -Merge: cc181586c 85a4edf87 -Author: sgreylyn -Date: Fri Jul 14 10:51:46 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit c65d591e165afbd8402aba37f94bd9fbb2dcb2f4 -Author: Louie -Date: Fri Jul 14 09:55:00 2017 -0700 - - Added lithology units of measurement. - -commit 85a4edf874258948cc3c0a425575ae4a0ea08a63 -Author: Gary Wong (BC Gov) -Date: Thu Jul 13 16:27:19 2017 -0700 - - Enhanced SQL Developer User Reports - -commit 4ac55993f1c80674cf7df3798295e0f3d9cfa37f -Author: Louie -Date: Thu Jul 13 15:55:40 2017 -0700 - - Fix for IE bug reporting You must enter a valid value incorrectly when step if specified. - -commit 9ff8e88b2dff33cf4377e43e3e77373848baf4bd -Author: GeorgeWalker -Date: Thu Jul 13 12:31:04 2017 -0700 - - Readme for functional tests - -commit 1e08b9de3c60e5c2ba6e49ff840618a750586fc7 -Author: Louie -Date: Thu Jul 13 12:06:36 2017 -0700 - - Added readme and sample pages for functional tests. - -commit 7d09b6e9d215f23d7100d0d34d84070afb36d73e -Merge: 78f77679d 9147c501f -Author: calouie -Date: Thu Jul 13 11:52:00 2017 -0700 - - Merge pull request #20 from GeorgeWalker/master - - Functional tests, added missing PV - -commit 9147c501f9f1069122b5dc49131a9bf8df67a4b9 -Author: GeorgeWalker -Date: Thu Jul 13 11:41:19 2017 -0700 - - Add PV for sonarqube-data - -commit 74c08d606c2a74cbcbb97d74c54f17a66dd7b1da -Author: GeorgeWalker -Date: Thu Jul 13 11:21:57 2017 -0700 - - Functional tests initial commit - -commit 78f77679dc5fda55713910d22e29d17cabc331e9 -Merge: 024096cfd f8962ca59 -Author: calouie -Date: Thu Jul 13 11:19:27 2017 -0700 - - Merge pull request #19 from GeorgeWalker/master - - Changes necessary to support new pipeline - -commit f8962ca59f1813f193378a0082e94043e9b5045f -Author: GeorgeWalker -Date: Thu Jul 13 11:18:31 2017 -0700 - - Update URL for sonarqube route - -commit 024096cfd63532b8c473a07d25dfe972c5dd3a1f -Author: Louie -Date: Thu Jul 13 11:00:31 2017 -0700 - - Squashed migration to clean up warnings on unit tests. - -commit d2cc7ee409889fd1e9ea2604262ae82c37b324fa -Author: GeorgeWalker -Date: Thu Jul 13 10:58:02 2017 -0700 - - Updated Jenkinsfile, templates and readme - -commit d586708732b33540705638c3f9db37924a7a5b5d -Author: Louie -Date: Thu Jul 13 10:43:30 2017 -0700 - - Search ordering with new audit fields. - -commit f9044e2060d837d18e190f0e2376b10905b23a73 -Merge: abd210c79 04fcb106c -Author: Louie -Date: Thu Jul 13 10:15:31 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit abd210c795927083e8a4d31f7d47e2c54150fadd -Author: Louie -Date: Thu Jul 13 10:12:14 2017 -0700 - - Added audit fields to models. - -commit 04fcb106c2b9d5be096ae517f5f33c9bdad778eb -Author: Gary Wong (BC Gov) -Date: Tue Jul 11 17:14:41 2017 -0700 - - New SQL script to create lat/long index - -commit 25c82aab936c8e60b14254e852cb39ad5d078228 -Merge: 0c49c49a5 f6dcc4107 -Author: georgelwalker -Date: Tue Jul 11 09:51:01 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 70e12a3aa6a677a1e2ea5935705d6333b95bb6d2 -Author: sgreylyn -Date: Mon Jul 10 19:28:42 2017 -0700 - - Comments on well_search - -commit f319eab621d2f5f25aa229124aa9e0e096f26c13 -Merge: a9f858fe8 d685acd27 -Author: sgreylyn -Date: Mon Jul 10 18:48:39 2017 -0700 - - Merge remote-tracking branch 'origin/search-map-feedback' into search-map-feedback - -commit a9f858fe8ec994435adb665408a47ba01958b1e4 -Author: sgreylyn -Date: Mon Jul 10 14:19:42 2017 -0700 - - More general/informative too-many-results message. - -commit 63f7049794abfa9d0b5535053bdebccbcd9432aa -Author: sgreylyn -Date: Mon Jul 10 14:03:36 2017 -0700 - - Breaking space added between map-search button and map - -commit cc181586c478bf4b9926b226d67d0c0f6dce0736 -Merge: bb0393536 f6dcc4107 -Author: sgreylyn -Date: Mon Jul 10 18:45:17 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit f6dcc410722d9b8f0a7d725eeba1a04648459031 -Author: Louie -Date: Mon Jul 10 16:23:23 2017 -0700 - - Cleaned up existing well search test cases. - -commit 62c6e555bac86f9643e7a3f05ec45335336aece0 -Author: Louie -Date: Mon Jul 10 15:31:23 2017 -0700 - - Added boilerplate license. - -commit d3a3addbe55682576ce8ff2c83702ba6464bb6a6 -Author: Louie -Date: Mon Jul 10 15:21:10 2017 -0700 - - Create related well record up to lithology when construction report submitted. - -commit d685acd274c42c726f8b946c428de88b08c24c0c -Author: sgreylyn -Date: Mon Jul 10 14:19:42 2017 -0700 - - More general/informative too-many-results message. - -commit 7c2ec8d93a9cdaa107e290636fee4dd1f08bffaf -Author: sgreylyn -Date: Mon Jul 10 14:03:36 2017 -0700 - - Breaking space added between map-search button and map - -commit bb0393536f004b758ed11529930a54853f177d12 -Merge: 5fb04ef5d bfddfec89 -Author: sgreylyn -Date: Mon Jul 10 13:59:43 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit bfddfec895107d06d4efc524fca109290d8bf5d1 -Merge: bcca8fa18 5fb04ef5d -Author: calouie -Date: Mon Jul 10 13:50:17 2017 -0700 - - Merge pull request #18 from SethGreylyn/master - - Add/Edit Map Feedback and Bug Fixes - -commit 5fb04ef5d31b2e0f799deb396d0db372623661cf -Merge: 7c0149896 53b9dee5f -Author: sgreylyn -Date: Mon Jul 10 13:40:23 2017 -0700 - - Merge branch 'add-edit-feedback' - -commit 53b9dee5f72178575eeb714e401cf34a524e7665 -Author: sgreylyn -Date: Mon Jul 10 13:39:31 2017 -0700 - - Map now clears AJAX-queried wells when zoomed out below the search minimum and re-centres on pin after zoom - -commit d563b6a4afe639e421a007e6d65c665423de5a2e -Author: sgreylyn -Date: Mon Jul 10 13:05:10 2017 -0700 - - addMap now places a pin automatically if lat/long fields are populated - -commit bba3bce796e42e35b4d9a408cc38841c43f1d432 -Author: sgreylyn -Date: Mon Jul 10 12:51:38 2017 -0700 - - Excising wellMarkers from code until and unless UX research countermands. - -commit ae0b53c370966d46e864df11e993c4989fb677cd -Author: sgreylyn -Date: Mon Jul 10 12:45:22 2017 -0700 - - Extraneous wellMarker was throwing error. - -commit 7c01498964598d16583adab354aa4341ab1fbcaf -Merge: d9885aa09 bcca8fa18 -Author: sgreylyn -Date: Mon Jul 10 11:12:53 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit bcca8fa18e37bffb7718994ed67b27f941fa7fd7 -Author: Louie -Date: Mon Jul 10 09:49:50 2017 -0700 - - Tightened up lithology table entry fields. - -commit 1f621c8e9f3fa8803c8cfee3292a53d6769ea99a -Author: Louie -Date: Mon Jul 10 09:22:44 2017 -0700 - - Adjusted error messages. - -commit 50c54a05ef4f7189822e597a7a492635d60414d4 -Merge: c207fa324 d9885aa09 -Author: garywong-bc -Date: Sat Jul 8 09:23:30 2017 -0700 - - Merge pull request #17 from SethGreylyn/master - - Commentary Updates for Maintainability - -commit d9885aa09df7aa36ad548a4b060b929a5fc1dbf8 -Merge: 999c4096b c207fa324 -Author: sgreylyn -Date: Fri Jul 7 18:39:08 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 999c4096b87655f0426eb49fe9cfd80cc0692d39 -Author: sgreylyn -Date: Fri Jul 7 18:38:39 2017 -0700 - - Commentary fixes, especially to map instances and the overall WellsMap. - -commit c207fa324a6424f91855651a7c44ddffbcfcf8fd -Author: Louie -Date: Fri Jul 7 16:32:19 2017 -0700 - - Adjusted some required field checking. - -commit 2207e68b5dfc13b93e0c71907d2ca8db3872469b -Author: Louie -Date: Fri Jul 7 15:48:37 2017 -0700 - - Changed map size and button styling. - -commit e436b7c1908e92b2ba10c7d677088acb0afe20a9 -Author: Louie -Date: Fri Jul 7 15:19:03 2017 -0700 - - Made Drilling Method mandatory for new submissions. - -commit 00d4a216bd2036704ea126286afd56b5636053d1 -Author: Gary Wong (BC Gov) -Date: Fri Jul 7 14:33:01 2017 -0700 - - Reformated - -commit 9727f4bf8a7b7987f6b00435bdb2d639c3a851a3 -Author: Gary Wong (BC Gov) -Date: Fri Jul 7 14:31:56 2017 -0700 - - Corrected Search to Submit on the README - -commit a69d46364c45d3ab9892e6e2538a738cc0b00743 -Author: Gary Wong (BC Gov) -Date: Fri Jul 7 14:25:48 2017 -0700 - - Reformatted so that backticks show up correctly in README - -commit 397770197197ae9c7c839b714c1bda8be84210c2 -Author: Gary Wong (BC Gov) -Date: Fri Jul 7 14:19:28 2017 -0700 - - Reformatted. - -commit 2cce056fcc56d8be577fc7a468377c2d24b250d3 -Author: Gary Wong (BC Gov) -Date: Fri Jul 7 14:14:18 2017 -0700 - - Reformatted. - -commit 0627c118276e05428e1272176b38e3d4cf9d4f2c -Author: Gary Wong (BC Gov) -Date: Fri Jul 7 14:06:28 2017 -0700 - - Correct backtick formatting issues - -commit ca6f84b8942946dfb9cb053fd82910c32e0ebda3 -Author: Gary Wong (BC Gov) -Date: Fri Jul 7 13:58:20 2017 -0700 - - Updated README for new location of code table load scripts - -commit 5c426abc4e9b26942d5e7bedcb1badad5eaf8bae -Author: Gary Wong (BC Gov) -Date: Fri Jul 7 13:46:16 2017 -0700 - - Added code table scripts to gitHub - -commit bf5cfae2f0f9e195f31d319cc24addcbb76f21d3 -Author: Louie -Date: Fri Jul 7 12:02:57 2017 -0700 - - Changed lithology to check if Bedrock is specified and Moisture is Water Bearing then Water Bearing Est. Flow is required. - -commit 76e0c14bd07750b8c64205aaa1c3fe79e7a35e33 -Author: Louie -Date: Fri Jul 7 11:10:51 2017 -0700 - - Changed province drop down to display code instead of description. - -commit 879674ba418629208581929bdc777feb6e15d3cb -Merge: 105932db8 6dbbc4aca -Author: sgreylyn -Date: Thu Jul 6 16:23:29 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 6dbbc4aca9a11f40c7f6a3e37a1a7e1d08170c9d -Merge: 6680a9a29 105932db8 -Author: calouie -Date: Thu Jul 6 16:23:10 2017 -0700 - - Merge pull request #16 from SethGreylyn/master - - Query Refactors to Limit Well Display in Map and Table - -commit 105932db82aa57b6bac46c68e8b3f98f66e73c83 -Author: sgreylyn -Date: Thu Jul 6 16:15:50 2017 -0700 - - String formatting - -commit e5ed5650912e2cf5ba558f95b9ee885470a2e8aa -Merge: 7fb0ccdf1 058ba7466 -Author: sgreylyn -Date: Thu Jul 6 16:13:00 2017 -0700 - - Merge branch 'query-cleanup-server' - -commit 058ba7466ac62b100fb5b6fc8ae36341c042e7e8 -Author: sgreylyn -Date: Thu Jul 6 16:11:05 2017 -0700 - - Python refactors to not display any wells on search overflow. - -commit 7fb0ccdf1f73cc1ec503e6a56ebf38fe952dfda5 -Merge: a9766afb9 6680a9a29 -Author: sgreylyn -Date: Thu Jul 6 16:11:22 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 6680a9a29f9400333cc1cd638ec34331409b750f -Author: Louie -Date: Thu Jul 6 15:50:12 2017 -0700 - - Added functionality to add/remove lithology rows. - -commit cc7b530b3ab17932630401b1b0aad40abe2a2b5a -Author: Louie -Date: Thu Jul 6 14:18:21 2017 -0700 - - Save the related lithology information. - -commit a9766afb97f5ad36d01cfd2f9018717d677b5caa -Merge: 9fa7773f4 b734ac288 -Author: sgreylyn -Date: Thu Jul 6 13:42:03 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit b734ac2885990ba0504de3451dac395d7c954092 -Merge: 9596fb6a4 9fa7773f4 -Author: calouie -Date: Thu Jul 6 13:41:31 2017 -0700 - - Merge pull request #15 from SethGreylyn/master - - Changes to nomenclature and presentation of popup data, with search and detail map improvements. - -commit 9fa7773f4323b88ac323caf5b10f4f3bb23306bf -Merge: a2324a767 510e43c5d -Author: sgreylyn -Date: Thu Jul 6 13:36:51 2017 -0700 - - Merge branch 'abs-val-removal-client' - -commit 510e43c5de3ea22a9c1b86c9e0aa7af9de727749 -Author: sgreylyn -Date: Thu Jul 6 13:30:52 2017 -0700 - - Positive longitude values are now negated on the fly in DD and DMS, obviating need to do any abs-checking during validation. - -commit a2324a767be4f84dec4c825d29c94ed6876bf26e -Author: sgreylyn -Date: Thu Jul 6 11:59:18 2017 -0700 - - Mousewheel zoom now preserves centre of map if zoom is enabled. - -commit 9a655d579437a897a4eebdff083544581ad2b0a3 -Merge: 546a9e437 ae8ea96cb -Author: sgreylyn -Date: Thu Jul 6 11:39:57 2017 -0700 - - Merge branch 'search-map-feedback' - -commit ae8ea96cba65114dacc37a1711bd92a0ccd06296 -Author: sgreylyn -Date: Thu Jul 6 11:20:11 2017 -0700 - - 'Select Area on Map' button style commensurate with other buttons. - -commit f05d42b779b806032036ac032ba5ed9ee6277dca -Author: sgreylyn -Date: Thu Jul 6 11:11:07 2017 -0700 - - Move wellsJson to its own zero-height div, curtail width of search-map. - -commit de327a440951f074301af8e71fddd7779e732112 -Author: sgreylyn -Date: Thu Jul 6 11:01:07 2017 -0700 - - GUID moved to its own zero-height div, wellMarker commented out pending feedback. - -commit 546a9e43775af8af5a0efcceac778d229f550009 -Merge: b3e125a3a 9596fb6a4 -Author: sgreylyn -Date: Thu Jul 6 10:18:36 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit b3e125a3a47c096c659528bddf562475072cbb8a -Author: sgreylyn -Date: Thu Jul 6 10:17:20 2017 -0700 - - Changes to nomenclature and presentation of popup data. - -commit 9596fb6a43fe26f2310dbdc2694f3c003894270b -Merge: 5c28b1702 bf1a6712d -Author: calouie -Date: Thu Jul 6 09:29:23 2017 -0700 - - Merge pull request #14 from SethGreylyn/master - - Popups on Search Page - -commit bf1a6712dcf7296677fd5042694a5dc6cb19446d -Merge: 6065950d2 b3bb50abb -Author: sgreylyn -Date: Wed Jul 5 23:29:11 2017 -0700 - - Merge branch 'map-feedback' - -commit b3bb50abb44ea0fcd9c3a31a870fe851a8111ddd -Author: sgreylyn -Date: Wed Jul 5 23:26:54 2017 -0700 - - Workaround for circleMarker zoom bug. - -commit c55b100e77ea55275e97e5f6f47cd7570699a107 -Author: sgreylyn -Date: Wed Jul 5 20:05:09 2017 -0700 - - Details map placement and circleMarker beneath wellPushpin (with zoom bug) - -commit 6065950d2ef3539e867a76c905db1e299f59b752 -Author: sgreylyn -Date: Wed Jul 5 17:26:51 2017 -0700 - - Constants/params in WellsMap and CoordSync sligtly altered. - -commit 7f1444fa5553371d000659ca05e22d0c790e7344 -Merge: a575346e9 25a6b598a -Author: sgreylyn -Date: Wed Jul 5 17:15:38 2017 -0700 - - Merge branch 'search-map-popups' - -commit 25a6b598aa4c514544d6e27f979f5f9fabd70ad4 -Merge: 15ca8ac30 991ec3de1 -Author: sgreylyn -Date: Wed Jul 5 17:13:24 2017 -0700 - - Merge remote-tracking branch 'origin/search-map-popups' into search-map-popups - -commit 15ca8ac30d0deae2c04e5573222583cd810f8f06 -Author: sgreylyn -Date: Wed Jul 5 17:12:20 2017 -0700 - - More explicit and extensible sifting of well data into popup content. - -commit 6460fa8e8492549bb2e02166ecb7a8484e552f28 -Author: sgreylyn -Date: Wed Jul 5 15:44:10 2017 -0700 - - Basic data transfer and consumption of popup info - -commit b8fbdd23c123e31d88ea1aa245814a8c2e6bf3db -Author: sgreylyn -Date: Wed Jul 5 14:37:57 2017 -0700 - - POC works with well guid. - -commit a575346e9e92cee6e8f669b2a186bd22adb9f85a -Merge: cc0f42122 5c28b1702 -Author: sgreylyn -Date: Wed Jul 5 17:12:47 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 991ec3de1422dd9eac12c20709d729c0f28a356d -Author: sgreylyn -Date: Wed Jul 5 17:12:20 2017 -0700 - - More explicit and extensible sifting of well data into popup content. - -commit 5c28b1702b5a340c35da1bd236bd6e34ed4b2ac2 -Author: Louie -Date: Wed Jul 5 16:32:11 2017 -0700 - - Separate Geographic Coordinates and Method of Drilling into separate fieldsets. - -commit 22263ecf6fef552f19a92a710e9360fdb84b7d27 -Merge: 4cdb8b313 500d0a2c3 -Author: Louie -Date: Wed Jul 5 16:25:56 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 4cdb8b31336a9782534af7ce42e47732c2c98cdc -Author: Louie -Date: Wed Jul 5 16:25:43 2017 -0700 - - Added validation for lat, long, ground elevation, drilling method. - -commit 6186cc6ed8f55e6b26c245df56f053ee9e7a815b -Author: sgreylyn -Date: Wed Jul 5 15:44:10 2017 -0700 - - Basic data transfer and consumption of popup info - -commit 500d0a2c39e49e5866c26aacd127fb199a481dc1 -Author: Gary Wong (BC Gov) -Date: Wed Jul 5 15:42:32 2017 -0700 - - corrected backtick Markdown issue - -commit 09cfbf6985a4f8c787c464597e2f90db8367c0b0 -Author: Gary Wong (BC Gov) -Date: Wed Jul 5 15:39:28 2017 -0700 - - -ve longitude values and removed duplicate drillers - -commit 9345b18ea45f466c65d8d482df094aee3067c4a5 -Author: sgreylyn -Date: Wed Jul 5 14:37:57 2017 -0700 - - POC works with well guid. - -commit cc0f42122d4f315a205d9bef533fd6482c39afde -Merge: 2d54e077f 69aa6b56a -Author: sgreylyn -Date: Wed Jul 5 13:37:52 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 0c49c49a5156d87e96cfb1f957f44292f64d0abd -Author: georgelwalker -Date: Wed Jul 5 11:16:12 2017 -0700 - - Update jenkinsfile - -commit b85eef84f3ce1a842551c905fffc9d6193c00c68 -Author: georgelwalker -Date: Wed Jul 5 10:46:17 2017 -0700 - - Update permissions - -commit eaa2aff62c17e0a63e5d223094f5250e01787935 -Author: georgelwalker -Date: Wed Jul 5 09:59:09 2017 -0700 - - GWells pipeline initial version - -commit 69aa6b56af711a696cd0c2a55146d338cc5aaeb2 -Merge: f50a3834d 2d54e077f -Author: calouie -Date: Wed Jul 5 08:43:43 2017 -0700 - - Merge pull request #13 from SethGreylyn/master - - Add/Edit Map Refactors - -commit 2d54e077fdf07e263381d42fd1dd7536271d4af4 -Merge: 21ef9871f abdff6270 -Author: sgreylyn -Date: Tue Jul 4 18:20:08 2017 -0700 - - Merge branch 'refactor-add-template' - -commit abdff6270a87e3ade08ba593b080021035790f5f -Author: sgreylyn -Date: Tue Jul 4 18:19:21 2017 -0700 - - Refactor to remove pushpin buttons and clarify autopop only on user input - -commit 21ef9871f592255a71eaced9fd613a8ba92b2346 -Merge: e6c89ded8 f50a3834d -Author: sgreylyn -Date: Tue Jul 4 18:19:42 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit f50a3834d5b940b65ca14c03b351c8a52a5fae64 -Author: Louie -Date: Tue Jul 4 17:09:44 2017 -0700 - - Resized method of drilling fields. - -commit e6c89ded8b5a3e9f052f2f4df6f2f3b4d42a133d -Author: sgreylyn -Date: Tue Jul 4 16:38:45 2017 -0700 - - Fairly trivial refactors caught during code overview. - -commit 6536325de7898e4b41d98b8e91f2d5eff27ca2db -Merge: 159c9a710 07de9c3e6 -Author: calouie -Date: Tue Jul 4 16:17:58 2017 -0700 - - Merge pull request #12 from SethGreylyn/master - - Leaflet Update - -commit 07de9c3e64373181e8491598181109feaa401c81 -Merge: 7585ab110 486f44c3b -Author: sgreylyn -Date: Tue Jul 4 14:58:25 2017 -0700 - - Merge branch 'leaflet-update' - -commit 486f44c3b83c220d7bd81226c731b837e231d969 -Author: sgreylyn -Date: Tue Jul 4 14:57:54 2017 -0700 - - Leaflet updated on June 27th. There are no evident breaking changes, so I'm updating the references. - -commit 7585ab1104c53cde730486b9047ca46326ea595d -Merge: 166db51e6 159c9a710 -Author: sgreylyn -Date: Tue Jul 4 13:52:43 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 159c9a7109486246e33eff0b182d765a4b3f8205 -Author: Louie -Date: Tue Jul 4 13:48:58 2017 -0700 - - Put back smaller form fields. - -commit 166db51e68b2ba29afca255f26c8a8c1f78dd44c -Merge: 20b30a3e0 a06836780 -Author: sgreylyn -Date: Tue Jul 4 13:27:18 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit a068367801f4b503da74334717a9556e6784ac0b -Merge: 2cc558b90 20b30a3e0 -Author: calouie -Date: Tue Jul 4 13:26:32 2017 -0700 - - Merge pull request #11 from SethGreylyn/master - - Add/Edit Map Functionality and Bug Fixes - -commit 20b30a3e0b2ab96b5c3579776d6d4dfcecc849c5 -Merge: 6ff3d0b5e b32539497 -Author: sgreylyn -Date: Tue Jul 4 12:55:24 2017 -0700 - - Merge branch 'more-search-query-functionality' - -commit b32539497add343888befc4e116d88fa7dea68c5 -Merge: ba3e735dd b5d382f79 -Author: sgreylyn -Date: Tue Jul 4 12:54:50 2017 -0700 - - Resolved conflict by accepting incoming changes. - -commit ba3e735ddd594d70ba87da6d86917a4ad10a016b -Author: sgreylyn -Date: Tue Jul 4 12:38:45 2017 -0700 - - Redoing CSS for validation warnings. - -commit 1c9c276dcdb9b9652ec8d9c311b53b9172017680 -Author: sgreylyn -Date: Mon Jul 3 23:07:02 2017 -0700 - - Attempt to support field synching with mouse move updates. Still needs work. - -commit 1e38cf6d0e4023ab24a6211e77952a38e4fba27d -Author: sgreylyn -Date: Mon Jul 3 21:45:16 2017 -0700 - - Validation now used as proxy to move pin on add/edit maps, with custom events to denote programmatic changes to lat/long coordinates (e.g., when the pushpin is moved) - -commit b45458716d9c7f01cb8205d6381c4df1cea9d264 -Author: sgreylyn -Date: Sun Jul 2 21:25:06 2017 -0700 - - More intuitive querying behaviour when a pin exists on the map. Attempt to have pin autopop at valid lat/long field change. - -commit 15dee8768532077fd7b66933c18cd47e54b7029f -Author: sgreylyn -Date: Sun Jul 2 00:12:20 2017 -0700 - - Work on pinpoint panning logic - -commit ce4988f0a7d39970331c0b88ea5beefd8f4630a1 -Author: sgreylyn -Date: Sat Jul 1 15:47:24 2017 -0700 - - Initial refactors to have map handle querying for all surrounding wells of a well pushpin - -commit ff9dc9f46accc79a5bcdf1b1de9db5aa9af5b5c3 -Author: sgreylyn -Date: Tue Jul 4 12:01:43 2017 -0700 - - Abstract precision to template, minor bug fix. - -commit a82e036ca3325c4904b8bc8514c1fb888abb00f9 -Author: sgreylyn -Date: Tue Jul 4 11:20:31 2017 -0700 - - Map now places/moves pin when coordinate fields are changed and valid. - - Refactors include only moving pin if latLng is different, separating logic for validation errors and validation success. - -commit 39928b564703f88a8ced076dbfe93465524f9b20 -Author: sgreylyn -Date: Mon Jul 3 23:07:02 2017 -0700 - - Attempt to support field synching with mouse move updates. Still needs work. - -commit 323e8a55a6b00674a11b4d8e62ddd0bbe2042260 -Author: sgreylyn -Date: Mon Jul 3 21:45:16 2017 -0700 - - Validation now used as proxy to move pin on add/edit maps, with custom events to denote programmatic changes to lat/long coordinates (e.g., when the pushpin is moved) - -commit ac3146eeb3dd00ecbfbe46f1c1601903fb4821cb -Author: sgreylyn -Date: Sun Jul 2 21:25:06 2017 -0700 - - More intuitive querying behaviour when a pin exists on the map. Attempt to have pin autopop at valid lat/long field change. - -commit d95e82154240a9ad06927234111a3317a4a25d3b -Author: sgreylyn -Date: Sun Jul 2 00:12:20 2017 -0700 - - Work on pinpoint panning logic - -commit 0c06e894ad6fd94ae635e53643bd47578df35a1f -Author: sgreylyn -Date: Sat Jul 1 15:47:24 2017 -0700 - - Initial refactors to have map handle querying for all surrounding wells of a well pushpin - -commit 6ff3d0b5ef469b9afd24f2af74b9676c92ef66bf -Merge: e20f1b73b 2cc558b90 -Author: sgreylyn -Date: Tue Jul 4 12:39:12 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit b5d382f794d671e026318598140d118ff8a1a2b7 -Author: sgreylyn -Date: Tue Jul 4 12:38:45 2017 -0700 - - Redoing CSS for validation warnings. - -commit 2cc558b9009af1d5a5d4ae55f3c7e8c3a28d8f8c -Author: Louie -Date: Tue Jul 4 12:30:06 2017 -0700 - - Partial progress on lithology. - -commit 5764f81ac19ee09e36ef157d6968d8b0b533930b -Author: sgreylyn -Date: Tue Jul 4 12:16:25 2017 -0700 - - Resetting custom-forms.css - - Reset to 36a919d28092d837fdf8c839578c8ecfe7fdd25f - -commit 62aaa9ccdec664db852c26a30f45bcb6fe0564b7 -Merge: 20cee957e bb2edc395 -Author: sgreylyn -Date: Tue Jul 4 12:02:38 2017 -0700 - - Merge remote-tracking branch 'origin/more-search-query-functionality' into more-search-query-functionality - -commit 20cee957e6b29a8da68b03035e5ec42bda5fd27d -Author: sgreylyn -Date: Tue Jul 4 12:01:43 2017 -0700 - - Abstract precision to template, minor bug fix. - -commit e9ebb0ad1e837783a8a57813a0fbb0e48ff55873 -Author: sgreylyn -Date: Tue Jul 4 11:20:31 2017 -0700 - - Map now places/moves pin when coordinate fields are changed and valid. - - Refactors include only moving pin if latLng is different, separating logic for validation errors and validation success. - -commit b0ccf929efb7b33fa836f161c062bc17d4c77998 -Author: sgreylyn -Date: Mon Jul 3 23:07:02 2017 -0700 - - Attempt to support field synching with mouse move updates. Still needs work. - -commit 6f6662be0eae809fde541c78e567d6990dcdf3f8 -Author: sgreylyn -Date: Mon Jul 3 21:45:16 2017 -0700 - - Validation now used as proxy to move pin on add/edit maps, with custom events to denote programmatic changes to lat/long coordinates (e.g., when the pushpin is moved) - -commit 9028313a36a86a6df019edf0100c3a25613935be -Author: sgreylyn -Date: Sun Jul 2 21:25:06 2017 -0700 - - More intuitive querying behaviour when a pin exists on the map. Attempt to have pin autopop at valid lat/long field change. - -commit 9aba0ae7a9f2b1115ac149c444f09b66041a32d6 -Author: sgreylyn -Date: Sun Jul 2 00:12:20 2017 -0700 - - Work on pinpoint panning logic - -commit c651e4bca0b6624d350316493caeaab7d93299fe -Author: sgreylyn -Date: Sat Jul 1 15:47:24 2017 -0700 - - Initial refactors to have map handle querying for all surrounding wells of a well pushpin - -commit e20f1b73b8d86c6fe6b6cb7c70636e2ca2204dd5 -Merge: 15fd4f8e0 8219c9f0f -Author: sgreylyn -Date: Tue Jul 4 12:02:13 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit bb2edc3952cfc6f997cf6739048eca317aecc3df -Author: sgreylyn -Date: Tue Jul 4 12:01:43 2017 -0700 - - Abstract precision to template, minor bug fix. - -commit 8219c9f0f396bc04c87ea2fa3d733ccaebb73f2a -Merge: 5549d24ff 15fd4f8e0 -Author: garywong-bc -Date: Tue Jul 4 11:35:25 2017 -0700 - - Merge pull request #10 from SethGreylyn/master - - Well Entry Client Warnings - -commit f7744f01b9c473087733d9356d7e98e08f2da419 -Author: sgreylyn -Date: Tue Jul 4 11:20:31 2017 -0700 - - Map now places/moves pin when coordinate fields are changed and valid. - - Refactors include only moving pin if latLng is different, separating logic for validation errors and validation success. - -commit 79828dee88c3e7bab3a24c85c901644e317bda5c -Author: sgreylyn -Date: Mon Jul 3 23:07:02 2017 -0700 - - Attempt to support field synching with mouse move updates. Still needs work. - -commit 23c87a1288c295b916e62eb017ec808486406b87 -Author: sgreylyn -Date: Mon Jul 3 21:45:16 2017 -0700 - - Validation now used as proxy to move pin on add/edit maps, with custom events to denote programmatic changes to lat/long coordinates (e.g., when the pushpin is moved) - -commit 2f6a889178a40db997efbdc0c85cc248ccdfc216 -Author: sgreylyn -Date: Sun Jul 2 21:25:06 2017 -0700 - - More intuitive querying behaviour when a pin exists on the map. Attempt to have pin autopop at valid lat/long field change. - -commit 67a4eaf6af003a26394773ffc755e67c48cb76a4 -Author: sgreylyn -Date: Sun Jul 2 00:12:20 2017 -0700 - - Work on pinpoint panning logic - -commit 2d6cc4f6c969912202fc9aea7d0626d8d9c0d61d -Author: sgreylyn -Date: Sat Jul 1 15:47:24 2017 -0700 - - Initial refactors to have map handle querying for all surrounding wells of a well pushpin - -commit 15fd4f8e086b79dd5f4057c7af2fd52a60dd2597 -Merge: d4561bd7c 725981d7e -Author: sgreylyn -Date: Fri Jun 30 22:19:50 2017 -0700 - - Merge branch 'validation-warning-display' - -commit 725981d7ee24cb20f386d099291ab08fe7c22bb4 -Merge: 05c783dd6 bf422b590 -Author: sgreylyn -Date: Fri Jun 30 22:19:23 2017 -0700 - - Merge remote-tracking branch 'origin/validation-warning-display' into validation-warning-display - -commit 05c783dd60896fa4cf4ba91a77c42155e0a4542c -Author: sgreylyn -Date: Fri Jun 30 22:17:31 2017 -0700 - - Validation logic refactored and refined for a smoother and more thorough UX. - -commit e8eaec218b5625776f720df5af629638e3ed0328 -Author: sgreylyn -Date: Fri Jun 30 11:23:35 2017 -0700 - - Work on UTM verification. Needs verifying. (Heh.) - -commit 4eab1865d1036f21eb141f01c7ec87f46cac8076 -Author: sgreylyn -Date: Thu Jun 29 18:19:00 2017 -0700 - - Warning banner now appears for coordinate validaiton errors for DD and DMS. - -commit d4561bd7c907e7563e8c23676b4bac1e61476133 -Merge: 76fe227c9 5549d24ff -Author: sgreylyn -Date: Fri Jun 30 22:17:56 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit bf422b590893923fa203ca36785dc5acb0f2de07 -Author: sgreylyn -Date: Fri Jun 30 22:17:31 2017 -0700 - - Validation logic refactored and refined for a smoother and more thorough UX. - -commit 5549d24ff13f797d93025688bbcea643b8ca34e1 -Author: Gary Wong (BC Gov) -Date: Fri Jun 30 17:22:12 2017 -0700 - - New DB columns, and refactored to be a simpler load process (i.e. no subfolders) for local DB dev - -commit a567fc8e7b40b2e525b4c429d61177c9d758629b -Author: sgreylyn -Date: Fri Jun 30 11:23:35 2017 -0700 - - Work on UTM verification. Needs verifying. (Heh.) - -commit 7726fe7e3ca4878bc5eaa178710c00bd28e22a73 -Author: sgreylyn -Date: Thu Jun 29 18:19:00 2017 -0700 - - Warning banner now appears for coordinate validaiton errors for DD and DMS. - -commit 76fe227c9ff1d264898cba57334a7eaac056642f -Merge: 4dc5c2288 8df8243ef -Author: sgreylyn -Date: Thu Jun 29 16:05:41 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 8df8243ef56927d914dbabf1edd2a5e9024c3b61 -Merge: 4d91fb6d6 4dc5c2288 -Author: calouie -Date: Thu Jun 29 16:05:16 2017 -0700 - - Merge pull request #9 from SethGreylyn/master - - Details Summary Map - -commit 4dc5c22888b90fad9e3c04f4dedd2b77985abe56 -Merge: 6983ca26e 8efb40ca3 -Author: sgreylyn -Date: Thu Jun 29 15:22:31 2017 -0700 - - Merge branch 'summary-map' - -commit 8efb40ca37990c4b8265da40c3cbe1a2a56a2804 -Author: sgreylyn -Date: Thu Jun 29 15:03:00 2017 -0700 - - Details map doesn't pan with keyboard - -commit efbc72586bb60a38f27489cef631d2b1eeeb482c -Author: sgreylyn -Date: Thu Jun 29 14:56:03 2017 -0700 - - More linting fixes, map now does not draw pushpin well. - -commit c60a700121b6c429a31c9b2464974f8ae7f6a3e6 -Author: sgreylyn -Date: Thu Jun 29 12:06:34 2017 -0700 - - Start of AJAX query for wells; jsLint corrections - -commit ddb82b16b08c4157d99e3c475639e6a87bdce397 -Author: sgreylyn -Date: Wed Jun 28 18:26:48 2017 -0700 - - Summary detail map beginning - - Map refactoring includes options for static map (no zoom/pan from initial centre), pushpin can be set with draggability keyed to presence of appropriate callback. Request architecture still to do. - -commit 6983ca26e2ed6981049c2f136572dd7508081264 -Merge: 7f94375a5 4d91fb6d6 -Author: sgreylyn -Date: Wed Jun 28 16:07:02 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 4d91fb6d6e0cc1204bab36e56f47bbdb4b6c1b4b -Merge: 6b4d762e4 7f94375a5 -Author: calouie -Date: Wed Jun 28 15:26:21 2017 -0700 - - Merge pull request #8 from SethGreylyn/master - - Style Changes to Search Map With Further Refactors to WellsMap - -commit 7f94375a59d37d86be6df9b4fa185684872372e1 -Merge: 94c64f1f5 69376386e -Author: sgreylyn -Date: Wed Jun 28 15:11:15 2017 -0700 - - Merge branch 'search-map-cosmetics' - -commit 69376386ea13019aa6bb13a2d5e387d3916c6ce7 -Author: sgreylyn -Date: Wed Jun 28 15:09:53 2017 -0700 - - More refactors for WellsMap for ease of future development, style changes to search map. - -commit 94c64f1f59d412df0f8a50d2228694032b71224f -Merge: e914a4c62 6b4d762e4 -Author: sgreylyn -Date: Wed Jun 28 13:56:46 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 6b4d762e40faf74fc30082ba9bb95d1675fdc16f -Author: Louie -Date: Wed Jun 28 13:43:20 2017 -0700 - - Added values for GPS Zone. - -commit e914a4c62737adfe471a19dd4ae8375738894a6a -Merge: e11b60f39 855a29806 -Author: sgreylyn -Date: Wed Jun 28 13:31:41 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 855a29806d191c28b129341228416fc7a664dfcd -Author: Louie -Date: Wed Jun 28 13:30:58 2017 -0700 - - Updated gitignore. - -commit e11b60f39995d9692cccb78bf56ee3d738fdf575 -Merge: 3f154eb12 19e24d37d -Author: sgreylyn -Date: Wed Jun 28 13:17:28 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit 19e24d37d5f78653b3f2a8c046da38210a5acb68 -Merge: a8ea2cc65 3f154eb12 -Author: calouie -Date: Wed Jun 28 13:17:03 2017 -0700 - - Merge pull request #7 from SethGreylyn/master - - Validation and Longitude Correction - -commit 3f154eb120d18f0ae8a13646f0a1c07f412bf4a6 -Merge: e41446c62 37b02697d -Author: sgreylyn -Date: Wed Jun 28 13:08:50 2017 -0700 - - Merge branch 'coordinate-coordination' - -commit 37b02697db871a18d8a24f50e4c0d9d924c86836 -Author: sgreylyn -Date: Wed Jun 28 13:02:10 2017 -0700 - - coordSync now validates the lat and long DD fields, negating the long field if it's above zero. - -commit ccf8c2a8342eaea88b87e4dc8999b29e23ef32ce -Author: sgreylyn -Date: Tue Jun 27 19:31:17 2017 -0700 - - Beginning of coordSync validation. - -commit d11a57573d3d6c20f35add60a6136443d89adc36 -Author: sgreylyn -Date: Tue Jun 27 19:16:00 2017 -0700 - - Search map refactored to reflect class pattern - -commit 0ba686688720b4c4968f8361e06a3065e9411d66 -Author: sgreylyn -Date: Tue Jun 27 18:40:55 2017 -0700 - - WellsMap refactored fully into class pattern for abstraction of options (and other benefits) - - Still need to update Search map to reflect these changes - -commit 3ad6566845d32447fa8de2bbcae20a9a5f59abf9 -Author: sgreylyn -Date: Mon Jun 26 17:35:23 2017 -0700 - - Finished harmonising fields on the client. TODO: Guard against positive longs. - -commit 27ec307cc4f32baf4d0f2c762361e88c37e66ea3 -Author: sgreylyn -Date: Mon Jun 26 14:14:40 2017 -0700 - - DD and DMS now convert freely. TODO: UTM, once zones are done. - -commit defced074f70e1b55b0913535917a7579fb921a5 -Author: sgreylyn -Date: Mon Jun 26 12:31:51 2017 -0700 - - Beginning of coordinate conversion (DD to DMS). - -commit e41446c62b0aa25d1181de9d844e6ebb6621e1bf -Merge: 752ee198b a8ea2cc65 -Author: sgreylyn -Date: Mon Jun 26 09:11:40 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit a8ea2cc652eeadc0f1fbdc08328234cb0b31b75c -Merge: beca594bb 752ee198b -Author: garywong-bc -Date: Fri Jun 23 22:58:32 2017 -0700 - - Merge pull request #6 from SethGreylyn/master - - Search Map MVP - -commit 752ee198bde5061c7bb55fb1770cabb45e66c193 -Author: sgreylyn -Date: Fri Jun 23 17:57:03 2017 -0700 - - Comment cleanup. - -commit c2d0f99e218d9b5b26aedbc678d538be3995e571 -Merge: 3584698f7 6fedcbd3b -Author: sgreylyn -Date: Fri Jun 23 17:46:14 2017 -0700 - - Merge branch 'search-page' - -commit 6fedcbd3bf0023c39d0fb59840b0600583d3a4ad -Author: sgreylyn -Date: Fri Jun 23 17:45:24 2017 -0700 - - Commentary and minor cleanup of python and JS - -commit ec91c98aaf38442f424c02efe484d6d4f2308042 -Merge: 6f8c205bf dde35a334 -Author: sgreylyn -Date: Fri Jun 23 15:37:54 2017 -0700 - - Merge remote-tracking branch 'origin/search-page' into search-page - -commit 6f8c205bf1389975bdaa360317844faf34ebf4e4 -Author: sgreylyn -Date: Fri Jun 23 15:34:15 2017 -0700 - - Drawing a rectangle now submits a search, including any form fields filled in. - - This necessitates a custom query transform to add the 'abs' operator to the query, since longitudeis only reliable up to sign. - -commit b9b25e7339ef4cefb3e7d02ca237c22b52123c85 -Author: sgreylyn -Date: Thu Jun 22 18:32:52 2017 -0700 - - Finished UI for identifyWells operation. - -commit abfc191658b3a42d2c2e9832c0c5fa4d798cd72a -Author: sgreylyn -Date: Thu Jun 22 17:05:05 2017 -0700 - - Basic UI for identifyWells operation. - -commit 464beda871cef7c340ccfe346b1eda5f5e2386b1 -Author: sgreylyn -Date: Thu Jun 22 12:42:51 2017 -0700 - - Search map now loads circleMarkers for every well result returned in standard form search. - -commit 73a4555bc25aac5268400dddc8641b3a6ec40ef7 -Author: sgreylyn -Date: Wed Jun 21 19:58:36 2017 -0700 - - Parse JSON and begin map display POC. - -commit 9216960475c0da494323035f993051ca373f1e6f -Author: sgreylyn -Date: Wed Jun 21 19:12:27 2017 -0700 - - Add JSON parsability to Wells model, pass Wells JSON to client for map processing. - -commit 85d2d7e8c33572cd5dd32db144eb074b72cbf820 -Author: sgreylyn -Date: Wed Jun 21 11:51:04 2017 -0700 - - Experiments on capturing wells data safely in JS - -commit 3584698f783c19ecd7724a3dc01b4b0c0ac2e9f1 -Merge: caf32c789 beca594bb -Author: sgreylyn -Date: Fri Jun 23 15:35:38 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit dde35a334e96dbe1c87b195210ea40dfa18acd18 -Author: sgreylyn -Date: Fri Jun 23 15:34:15 2017 -0700 - - Drawing a rectangle now submits a search, including any form fields filled in. - - This necessitates a custom query transform to add the 'abs' operator to the query, since longitudeis only reliable up to sign. - -commit beca594bb60730aa65778850d3c267bd8c2a513e -Author: Gary Wong (BC Gov) -Date: Fri Jun 23 15:14:29 2017 -0700 - - Added insertion of drillers, but not quite 100% but just enough to populate the dropdown list - -commit 84a4b7e30dc37faf4b9236f1ffd4d8da4ada22a6 -Author: sgreylyn -Date: Thu Jun 22 18:32:52 2017 -0700 - - Finished UI for identifyWells operation. - -commit 39f6df49b461858f49fdb82680e0887adb5ec581 -Author: sgreylyn -Date: Thu Jun 22 17:05:05 2017 -0700 - - Basic UI for identifyWells operation. - -commit 41ae7f76a1c12b0f6954ef91359d96fe2e085778 -Author: sgreylyn -Date: Thu Jun 22 12:42:51 2017 -0700 - - Search map now loads circleMarkers for every well result returned in standard form search. - -commit aae2ae768f09b76c31bdd28ebaf317bf3fc43ac7 -Author: sgreylyn -Date: Wed Jun 21 19:58:36 2017 -0700 - - Parse JSON and begin map display POC. - -commit e0b49092e06e5796dd2a089894be618fae2f0a77 -Author: sgreylyn -Date: Wed Jun 21 19:12:27 2017 -0700 - - Add JSON parsability to Wells model, pass Wells JSON to client for map processing. - -commit d7dee96f2fee0255fd0b3964d15f26cf4d720c5b -Author: sgreylyn -Date: Wed Jun 21 11:51:04 2017 -0700 - - Experiments on capturing wells data safely in JS - -commit caf32c789aab4565f2948df94ea1d105b699b7a3 -Merge: 270b4fb60 e398134d7 -Author: sgreylyn -Date: Wed Jun 21 10:26:04 2017 -0700 - - Merge remote-tracking branch 'upstream/master' - -commit e398134d77476bb6f481e82e6cf92f57e799f452 -Merge: 0d4f74728 270b4fb60 -Author: garywong-bc -Date: Tue Jun 20 17:29:30 2017 -0700 - - Merge pull request #5 from SethGreylyn/master - - Improvements to Activity Submission Map and Placement of Search Map - -commit 270b4fb605ef798f4c3fdea7616315f5a190d534 -Merge: 2bfd7c5c8 07fa68b0a -Author: sgreylyn -Date: Tue Jun 20 17:16:05 2017 -0700 - - Merge branch 'search-page' - -commit 07fa68b0a5cf93773f56d27c9ae7671e760f9319 -Author: sgreylyn -Date: Tue Jun 20 17:14:01 2017 -0700 - - Map correctly placed and sized on search page. - -commit 41bd58b3c41a8af18a4ffbf1de8d66d13a170919 -Author: sgreylyn -Date: Tue Jun 20 16:34:50 2017 -0700 - - Refactoring wellsMap to keep map within prescribed bounds on marker placement. - -commit 1695185fae1b123c9b92e191c819b2fe3c9da6ad -Author: sgreylyn -Date: Tue Jun 20 14:29:51 2017 -0700 - - Fixing script template to only load map code for GPS page in submission workflow. - -commit acbac7a7b32d59553fbb4a8aa5ea293f9f0e5819 -Author: sgreylyn -Date: Tue Jun 20 13:37:23 2017 -0700 - - WellsMap refinement on ActivityCreation page. - -commit c46f6fe200bf5abfec6435a554cd4c958a344abc -Merge: 00fa2b6e6 b09e93490 -Author: sgreylyn -Date: Tue Jun 20 11:27:44 2017 -0700 - - Merge remote-tracking branch 'origin/search-page' into search-page - -commit 00fa2b6e626be26c745925162b60bec63a218099 -Author: sgreylyn -Date: Mon Jun 19 17:00:21 2017 -0700 - - Start of search page. - -commit 53b6bb2f4d82ecdfcc75a0df88eb0337f4a24a81 -Author: sgreylyn -Date: Mon Jun 19 12:44:27 2017 -0700 - - Minor improvement to wellsMap decoupling. - -commit 2bfd7c5c8dc9f55a370b97e8d039cf73370ca455 -Author: sgreylyn -Date: Tue Jun 20 11:27:06 2017 -0700 - - Adding local mods to gitignore - -commit b09e934909b2a1e00a33bd8ef6eff9674851a62b -Author: sgreylyn -Date: Mon Jun 19 17:00:21 2017 -0700 - - Start of search page. - -commit 708dfb99b30da709612368d9c53a17271cff756d -Author: sgreylyn -Date: Mon Jun 19 12:44:27 2017 -0700 - - Minor improvement to wellsMap decoupling. - -commit 0d4f7472865cc0012b873983aa27bc423f882bf4 -Merge: 36a919d28 514917416 -Author: garywong-bc -Date: Fri Jun 16 20:35:37 2017 -0700 - - Merge pull request #4 from SethGreylyn/master - - Map Infrastructure and Activity Submission Marker Refinement - -commit 514917416588a522467843d10dd5a98cc5337494 -Merge: 36a919d28 68192cb68 -Author: Seth Greylyn -Date: Fri Jun 16 17:44:55 2017 -0700 - - Merge branch 'leaflet-infrastructure' - -commit 68192cb68ae3f03df4911bb6e2dab742367aa6be -Author: Seth Greylyn -Date: Fri Jun 16 17:40:31 2017 -0700 - - Final meaningful infrastructure commit. - - Replicates MAP_TEST functionality in activity_submission_form, obviating the need for MAP_TEST. Branch ready for merge, squash, and pull request. - -commit a0bdd00878c15cb4352f0377138bb1df7b1f85af -Author: Seth Greylyn -Date: Fri Jun 16 16:43:21 2017 -0700 - - Add/remove marker functionality beginning; minor refactoring of WellsMap method destructuring. - -commit a09dbd835c206835538fb0ba83c2ed969ff8ceab -Author: Seth Greylyn -Date: Fri Jun 16 15:45:46 2017 -0700 - - add-map now added. - -commit 2958e1816fe39e11e2743793aa0777cf041581ae -Author: Seth Greylyn -Date: Fri Jun 16 15:37:53 2017 -0700 - - Anchoring div for the add-map. - -commit 302a3576d96fdbd31c1e72e6b2f57a43b30ff30c -Author: Seth Greylyn -Date: Fri Jun 16 13:51:30 2017 -0700 - - Commentary for wellsMap. - -commit 748f12cc4b0708b076bff4aacace2b6e308cea78 -Merge: 7e456c874 bb54faaeb -Author: Seth Greylyn -Date: Fri Jun 16 13:47:04 2017 -0700 - - Merge remote-tracking branch 'origin/leaflet-infrastructure' into leaflet-infrastructure - -commit 7e456c874f0403b0d370a14b28ea9453913d8d1e -Author: Seth Greylyn -Date: Fri Jun 16 13:00:51 2017 -0700 - - Refactoring map initialisation, default marker behaviour. - -commit 2c0ed5b0299553ac24173a4d662aa35a29380fa3 -Author: Seth Greylyn -Date: Fri Jun 16 11:31:07 2017 -0700 - - Refinement of marker placement and removal. - -commit 8fbb2dd84483dc6b0d69c6e7dc4d17381ad103f8 -Author: Seth Greylyn -Date: Thu Jun 15 17:56:45 2017 -0700 - - Button now clears stale markers. - -commit 2bf612b5902f8d94ab0d85a398092a63284e731f -Author: Seth Greylyn -Date: Thu Jun 15 17:34:38 2017 -0700 - - Test page has one-way marker placement - - Still needs cleanup on repeat click and backward information (i.e., moving the marker updates the lat and long nodes). - -commit 74d973bd0a72285aa4ea122c9641b6c7fdcb1ee0 -Author: Seth Greylyn -Date: Thu Jun 15 16:00:55 2017 -0700 - - Raw test page. - -commit 69248d8b45660be1a2cc8c7b02bbf0c8f5965e83 -Author: Seth Greylyn -Date: Thu Jun 15 15:24:37 2017 -0700 - - Interstitial commit; will stand up static HTML page within the app. - -commit 0026f680f10dbae6a445aa4cc0b85f748bfa8cc2 -Author: Seth Greylyn -Date: Thu Jun 15 14:18:39 2017 -0700 - - More thorough WMS options - -commit 9bfe7761c302bd7bb881f5472487e7cd0bf5b2c5 -Author: Seth Greylyn -Date: Thu Jun 15 14:00:07 2017 -0700 - - Basic patterns established for creating a wellsMap with ESRI base layers and WMS data layers. - -commit 0562e979f87bcebca361805e2fdcdabf422deedd -Author: Seth Greylyn -Date: Thu Jun 15 10:49:11 2017 -0700 - - Replacing base map URL - -commit f41789ef9808631b8a4523280481a7420fde695f -Author: Seth Greylyn -Date: Thu Jun 15 10:20:09 2017 -0700 - - Basic ESRI Leaflet integration. - -commit 9fbf7b042922986975d881d9ece4b42cb9037e84 -Author: Seth Greylyn -Date: Wed Jun 14 18:09:27 2017 -0700 - - Module refinement - -commit 288d41b95692f5b1fa5b5dd8ebf0212f9a28b723 -Author: Seth Greylyn -Date: Wed Jun 14 17:59:00 2017 -0700 - - wellsMap module - -commit 5a041088005d20415a551f759067c684e347f460 -Author: Seth Greylyn -Date: Wed Jun 14 17:30:30 2017 -0700 - - OSM centred on Victoria - -commit 8bd5808cc30b01b02e26e9225ce9e0603b5dcc52 -Author: Seth Greylyn -Date: Thu Jun 15 10:49:11 2017 -0700 - - Replacing base map URL - -commit e33bf438e4ce967f2c8a58a15c5af8028fd01409 -Author: Seth Greylyn -Date: Thu Jun 15 10:20:09 2017 -0700 - - Basic ESRI Leaflet integration. - -commit 5e9abc6308af1810830d5ecc4960ee26d8f76ca7 -Author: Seth Greylyn -Date: Wed Jun 14 18:09:27 2017 -0700 - - Module refinement - -commit 6c0ef1f844c04c899e604d6f29e77577109619ac -Author: Seth Greylyn -Date: Wed Jun 14 17:59:00 2017 -0700 - - wellsMap module - -commit b2905d10c6fb1614edc4a1dc7eb8d46b46ba4c15 -Author: Seth Greylyn -Date: Wed Jun 14 17:30:30 2017 -0700 - - OSM centred on Victoria - -commit 4080c9fa2b73e4bf5c927feb982b39ea433960ad -Author: Seth Greylyn -Date: Wed Jun 14 16:57:25 2017 -0700 - - Initial Leaflet experimentation - -commit bb54faaeb8135259291457144dfc0ccc31393c70 -Author: Seth Greylyn -Date: Fri Jun 16 13:00:51 2017 -0700 - - Refactoring map initialisation, default marker behaviour. - -commit a1936614b87d9ef7c2d27b371187f6d4f463c367 -Author: Seth Greylyn -Date: Fri Jun 16 11:31:07 2017 -0700 - - Refinement of marker placement and removal. - -commit 852f43fbd5c0da7743dadaef17016c141a6063a6 -Author: Seth Greylyn -Date: Thu Jun 15 17:56:45 2017 -0700 - - Button now clears stale markers. - -commit b96719ee02fddf8a6456d73d6be7123d63ac7bfa -Author: Seth Greylyn -Date: Thu Jun 15 17:34:38 2017 -0700 - - Test page has one-way marker placement - - Still needs cleanup on repeat click and backward information (i.e., moving the marker updates the lat and long nodes). - -commit 36a919d28092d837fdf8c839578c8ecfe7fdd25f -Author: Louie -Date: Thu Jun 15 16:30:45 2017 -0700 - - Added validation for location. Added layout for GPS. - -commit 6be345b1925cbe78c887955db50ed2ae8dfc9fe3 -Author: Seth Greylyn -Date: Thu Jun 15 16:00:55 2017 -0700 - - Raw test page. - -commit 0e25d516eeb3015918764076745e132883c5f282 -Author: Seth Greylyn -Date: Thu Jun 15 15:24:37 2017 -0700 - - Interstitial commit; will stand up static HTML page within the app. - -commit d490e4b6a5436a64399a4c42ad1329e528d66688 -Author: Seth Greylyn -Date: Thu Jun 15 14:18:39 2017 -0700 - - More thorough WMS options - -commit 2e0644677b8a3a5decde959b72c07df02ab5a1f6 -Author: Seth Greylyn -Date: Thu Jun 15 14:00:07 2017 -0700 - - Basic patterns established for creating a wellsMap with ESRI base layers and WMS data layers. - -commit d2aa76400c0562b9a21616fb2281a5d3fb402c66 -Merge: bacb5d468 581289d15 -Author: Seth Greylyn -Date: Thu Jun 15 10:54:40 2017 -0700 - - Merge remote-tracking branch 'origin/leaflet-infrastructure' into leaflet-infrastructure - -commit bacb5d468c68c71f750426ea496156767b07c8a9 -Author: Seth Greylyn -Date: Thu Jun 15 10:49:11 2017 -0700 - - Replacing base map URL - -commit 943a22ab373cdd98c45ee41aef05f0fe61990cfd -Author: Seth Greylyn -Date: Thu Jun 15 10:20:09 2017 -0700 - - Basic ESRI Leaflet integration. - -commit 57450caad5496768b83b4af309ba5439222cf971 -Author: Seth Greylyn -Date: Wed Jun 14 18:09:27 2017 -0700 - - Module refinement - -commit 7f7a98424d3bf1f136b5046d9e91ef955c6c5c58 -Author: Seth Greylyn -Date: Wed Jun 14 17:59:00 2017 -0700 - - wellsMap module - -commit 5fa359f9d1a0e68b4d1f56ed75d322f02cc4c069 -Author: Seth Greylyn -Date: Wed Jun 14 17:30:30 2017 -0700 - - OSM centred on Victoria - -commit bdd74bd390b4b1a930e18236a1d78c09d1697df1 -Author: Seth Greylyn -Date: Wed Jun 14 16:57:25 2017 -0700 - - Initial Leaflet experimentation - -commit 581289d150c35bdd57bc346878ac698d497275b8 -Author: Seth Greylyn -Date: Thu Jun 15 10:49:11 2017 -0700 - - Replacing base map URL - -commit caab23437028ad826f3c617750c83a844bdd5a94 -Author: Seth Greylyn -Date: Thu Jun 15 10:20:09 2017 -0700 - - Basic ESRI Leaflet integration. - -commit b3998bbbe08bbfac89e74e4833cde44c72f30d93 -Author: Louie -Date: Thu Jun 15 10:11:59 2017 -0700 - - Upgraded psycopg2 with new version than does not depend on external C libraries. - -commit 02328791cca46643f92bb18970a7d938113218a0 -Author: Seth Greylyn -Date: Wed Jun 14 18:09:27 2017 -0700 - - Module refinement - -commit 3f82fb56ea747adfa5797e1dccaf7c51ac203a6f -Author: Seth Greylyn -Date: Wed Jun 14 17:59:00 2017 -0700 - - wellsMap module - -commit 3b97eb07345427b67fe3a8f73c75d90a2024fcc0 -Author: Seth Greylyn -Date: Wed Jun 14 17:30:30 2017 -0700 - - OSM centred on Victoria - -commit 58a309dbf770878baf5c6697eb163edac26684c9 -Author: Louie -Date: Wed Jun 14 17:11:57 2017 -0700 - - Start of GPS step in activity submission. - -commit 467d71b2b1bf8ab585e80acbd0531c623eddc93e -Author: Seth Greylyn -Date: Wed Jun 14 16:57:25 2017 -0700 - - Initial Leaflet experimentation - -commit 279b2c9b5a73485ba32e8b755ce8a98cbccdbde3 -Author: Seth Greylyn -Date: Wed Jun 14 15:24:52 2017 -0700 - - Changing psycop version for seamless Windows setup - -commit 73c326e171f424188907410a220356d9ba06ca0f -Merge: 3c7761dcd 792bae969 -Author: Louie -Date: Wed Jun 14 13:22:30 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 3c7761dcd7b4b02bdd0c4a06b76352d7d67bc4ab -Author: Louie -Date: Wed Jun 14 13:22:05 2017 -0700 - - Moved each form step to use the same template. - -commit 792bae969e48408188069afba16a3b7d9c5a01dd -Author: Gary Wong (BC Gov) -Date: Tue Jun 13 15:14:31 2017 -0700 - - Adding lat/long - -commit d4ca8f7a626c8365b1c8376de38be69f0b5e7bcd -Merge: d1d64dae1 920d5cf6e -Author: Gary Wong (BC Gov) -Date: Tue Jun 13 15:14:05 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 920d5cf6eca22d0d766f17fefad2541bf02e298f -Author: Louie -Date: Tue Jun 13 10:22:59 2017 -0700 - - Changed reference to well detail page. - -commit b1d2496e0ecc5b250a65d188955aff81f617dce9 -Author: Louie -Date: Tue Jun 13 10:12:59 2017 -0700 - - Changed code lookup for water supply well. - -commit 092dbe2e852f562226c17ca05cbfbb6969207b0b -Author: Louie -Date: Tue Jun 13 09:50:01 2017 -0700 - - Template changes to verify data load of lat/long. - -commit 6ae656d91c4b8b5fcc911747f78d3a511b860512 -Author: Louie -Date: Mon Jun 12 11:58:42 2017 -0700 - - Added lat/long fields. Temporarily hid subclass d/d from the ui. - -commit 9b8dde90a0074f38471589e1263922481bdfc5c5 -Author: Louie -Date: Mon Jun 12 11:42:06 2017 -0700 - - Updated date validation. Mockup of landing page. - -commit d1d64dae15a706a49a295624b1092264ec2a3d1c -Author: Gary Wong (BC Gov) -Date: Fri Jun 9 12:00:57 2017 -0700 - - With correct DRILLING_METHOD_CODE - -commit e1c8122045150207fc5b9e90d30be05a50bd6445 -Author: garywong-bc -Date: Thu Jun 8 14:31:33 2017 -0700 - - With Class, SubClass - - Two different columns... - -commit d9b74beb36a2dc8c451a6b1b50497eaaa1228df8 -Author: Louie -Date: Wed Jun 7 13:12:07 2017 -0700 - - Start of date validation. - -commit 20df2e122e2bb01ee511bee1e080dc1d4567ed8e -Author: Louie -Date: Tue Jun 6 16:29:35 2017 -0700 - - Show/hide subclass or intended water use based on class. - -commit 82f862a1b5b407b20387db4994dd116cd36c977a -Author: Gary Wong (BC Gov) -Date: Tue Jun 6 15:42:01 2017 -0700 - - with PERMIT_NUMBER for driller registration - -commit ffb1a0c8accc2afa26e7c9f4d44b8ce94f096110 -Author: Louie -Date: Tue Jun 6 13:53:42 2017 -0700 - - Layout updates and helper check boxes added. - -commit 37b7b760f0db11c32289443b095bc658fc1b05b6 -Merge: 12c4f0bd1 8bb3c2767 -Author: Gary Wong (BC Gov) -Date: Mon Jun 5 23:46:29 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 12c4f0bd1d3b0aca809349c5c703ea5ec11caf61 -Author: Gary Wong (BC Gov) -Date: Mon Jun 5 23:46:24 2017 -0700 - - Still need some data conversion to account for null values in legacy, where GWELLS has non-nullable - -commit 8bb3c276767cbac2a180f15ee7fb511fd2b7a10b -Author: Louie -Date: Mon Jun 5 17:12:11 2017 -0700 - - Progress on forms layout. - -commit cd3a518010538d9c4e0cada6aa0beec09f8f8db3 -Author: Louie -Date: Mon Jun 5 14:34:28 2017 -0700 - - Form steps with separate templates saving to the DB. - -commit 2a6e3204034d3b1f67c3f1d88e9e8f4f82a2ea3d -Author: Gary Wong (BC Gov) -Date: Sun Jun 4 23:58:56 2017 -0700 - - fixes to syntax errors and column orders - -commit 7cf45f2252d97b9fa63e15334fc1c783699005ca -Author: Gary Wong (BC Gov) -Date: Fri Jun 2 22:34:40 2017 -0700 - - Including interim 'xform_' tables to hold termporary data to join - -commit 380a1c4791c8837f5abd62a3a7943653c24bc518 -Author: Gary Wong (BC Gov) -Date: Fri Jun 2 19:30:26 2017 -0700 - - Fixed Code tables, as the GUID column has now moved to the start of the columns - -commit 4bd6ad74e24135f92d03e0bcdf58ff9ab7606092 -Author: Gary Wong (BC Gov) -Date: Fri Jun 2 17:00:42 2017 -0700 - - refactoring to submission-ready version of tables and columns - -commit 7284f2a0939493803bed7a2153ecd1e7d73b7dfb -Author: Louie -Date: Fri Jun 2 16:35:37 2017 -0700 - - Partial progress on forms. - -commit 601226b148084016942e084d4729f5ab76b5b59c -Author: Louie -Date: Fri Jun 2 12:24:23 2017 -0700 - - Updated fk from activity_submission to well in models. - -commit ae66a4996229abd525713014a51452df4e6243d3 -Author: Louie -Date: Fri Jun 2 11:36:24 2017 -0700 - - Changed models. - -commit 11558f9a1d56ace82f9cf4af7f7c1e54e321c9dc -Author: Gary Wong (BC Gov) -Date: Thu Jun 1 16:24:58 2017 -0700 - - Added SCREEN_SLOT_SIZE analysis - -commit 0f8c611e40523246296d16dcb34c9369625023e9 -Author: Louie -Date: Thu Jun 1 15:53:14 2017 -0700 - - Added form wizard for updated models. - -commit 4fb724ec58115053e673957211a7bfead703cc4a -Author: Gary Wong (BC Gov) -Date: Wed May 31 16:31:33 2017 -0700 - - SQL Dev User Report for Lindsay - -commit 5668f9a63f8b37e5a915863538649303ec353fa9 -Author: Louie -Date: Wed May 31 15:43:50 2017 -0700 - - Changed tests for new models. - -commit bcbf23a06425b0ae2bda42eaa03bc4dc9ca70726 -Author: Louie -Date: Wed May 31 13:40:15 2017 -0700 - - Model changes to support construction report submission. - -commit f8dae18988e798bd0d0eb152a646d0b4f6f95327 -Author: Louie -Date: Tue May 30 09:33:20 2017 -0700 - - Partial progress on well activty form. - -commit a447d55e1de973ebf18535b441768e6f01d4b59f -Author: Louie -Date: Mon May 29 16:32:28 2017 -0700 - - Partial progress on forms. - -commit e727e2a33c09a17cdaf93d03577bd8c068092022 -Author: Louie -Date: Fri May 26 10:28:43 2017 -0700 - - Partial update to search and tests due to model changes. - -commit 3488f60b83b3fb2fe5f95e05bac7ae82eb2a2051 -Author: Louie -Date: Thu May 25 16:20:17 2017 -0700 - - Model changes to support well activity over time. - -commit ba2e0e86a83c957723a8c44795f12cb07ba076ee -Author: Louie -Date: Thu May 4 10:28:11 2017 -0700 - - Added missing migration file. - -commit 81cb82be032f78813eb9a61a220a955f08f997c6 -Author: Louie -Date: Thu May 4 10:17:11 2017 -0700 - - Renamed well_drilled_depth to total_depth_drilled in models to match business language. Removed _id from fk model field names as a Django best practice. - -commit dd72bc0d49fe84da4d4b91b05c619b0569cfa73e -Author: Louie -Date: Wed May 3 16:18:27 2017 -0700 - - Changes from round 2 of user feedback. - -commit 10ea7e00d0593207fcf51243ea5992f782aebd70 -Author: garywong-bc -Date: Tue May 2 10:21:43 2017 -0700 - - Update README.md - -commit f60f84a0fb95d5c1c93c1140db2b9c7dd6159a7e -Author: Louie -Date: Mon May 1 09:39:40 2017 -0700 - - Added link to FrontCounterBC after a search is performed. - -commit d870d1eb0b98a5d2f6deb4f27a1773d2350b4fb0 -Author: Louie -Date: Fri Apr 28 16:32:14 2017 -0700 - - Added additional information page. - -commit d09cfe1f48f26095f82cd51de22f250ce1226d93 -Author: Gary Wong (BC Gov) -Date: Fri Apr 28 12:43:41 2017 -0700 - - Simplified load into PostGRES, by moving transformation logic into the export-from-Oracle step - -commit b415e7beba24aa3aa6bdd1839bc052a46a2de849 -Author: Gary Wong (BC Gov) -Date: Thu Apr 27 16:44:02 2017 -0700 - - SQL trailing line - -commit 20bd945a2478333461347d9238e71fd3d9689c82 -Author: Gary Wong (BC Gov) -Date: Thu Apr 27 10:54:17 2017 -0700 - - Correct SQL Syntax errors. - -commit 4d34c53531db5753390e00934ec627f90c75244f -Author: Gary Wong (BC Gov) -Date: Thu Apr 27 10:10:43 2017 -0700 - - Corrected relatives paths in documentation - -commit 64c1e7a66d339a01b09aaf3c78c7c27dba7b8c84 -Author: Gary Wong (BC Gov) -Date: Thu Apr 27 09:57:23 2017 -0700 - - Updated documentation - -commit 5a27774302920509bbea0983a2fd0218382fca6f -Merge: b7309bb47 05ec03242 -Author: Gary Wong (BC Gov) -Date: Wed Apr 26 16:20:13 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit b7309bb47d649f6fada17c612a4ae59546b952ff -Author: Gary Wong (BC Gov) -Date: Wed Apr 26 16:19:35 2017 -0700 - - Run transformation script directly from GitHub - -commit 05ec032424e0c750d68a53fd1e53bea2e1dfc9cb -Author: Louie -Date: Wed Apr 26 15:42:15 2017 -0700 - - Changed instructions text to be in bullet form, updated popover help text. - -commit dc5be34fb05c28c84e9421b93edf9715c3ea258a -Merge: 0a1441665 2509447dc -Author: Gary Wong (BC Gov) -Date: Tue Apr 25 16:33:02 2017 -0700 - - corrected merge error. - -commit 0a1441665ade144439123c8a28235ab3911557ab -Author: Gary Wong (BC Gov) -Date: Tue Apr 25 16:31:30 2017 -0700 - - Updated README errors. - -commit c361f77d637af28d668cda86dd4bf5f3a23815fb -Author: Gary Wong (BC Gov) -Date: Tue Apr 25 16:21:58 2017 -0700 - - update doc - -commit 2509447dc53d3a9a10ab09b9d7d5d9ded6ca4dfc -Author: Gary Wong (BC Gov) -Date: Tue Apr 25 16:21:58 2017 -0700 - - update doc - -commit d469d15b72398af4ff64dc6a8f81b294aadfc40f -Author: Gary Wong (BC Gov) -Date: Tue Apr 25 16:15:52 2017 -0700 - - Updated xform export from Oracle - -commit 405c185ff7cb3a1cc684aaf82932b3aa977651e1 -Author: Gary Wong (BC Gov) -Date: Mon Apr 24 19:30:57 2017 -0700 - - Added WELLS to the legacy transform script - -commit bc9b0544cd6d1021a962bcc5505bd85254b72735 -Merge: 0868f2c54 a49e2fe6b -Author: Gary Wong (BC Gov) -Date: Mon Apr 24 15:55:38 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit a49e2fe6bb643ef6e5eb403a7bd51687f0023e07 -Author: Louie -Date: Mon Apr 24 10:06:19 2017 -0700 - - Added seqreset.sql script to allow loading of legacy data primary keys. - -commit 9f9914c76952e895adaa1608afa3af765dc7ec32 -Author: Louie -Date: Mon Apr 24 09:56:24 2017 -0700 - - Updated search disclaimer text. - -commit 0868f2c547048af6ca22b1c65f674a7af71081a0 -Author: Gary Wong (BC Gov) -Date: Fri Apr 21 22:46:42 2017 -0700 - - SQL Developer script to export search-ready formatted CSV - -commit 22c63d1af79723804dd15e831368f6038076662a -Author: Louie -Date: Fri Apr 21 14:07:47 2017 -0700 - - Put back help icons with hover help text. - -commit 742092d57f129a6184628165d412ee9e65c15e22 -Author: Gary Wong (BC Gov) -Date: Thu Apr 20 19:03:43 2017 -0700 - - Corrected spelling errors. - -commit 9f91ab29e1705dd15d499b3de85d4b5afdf82085 -Author: Gary Wong (BC Gov) -Date: Thu Apr 20 19:01:21 2017 -0700 - - Added clear-all-data script - -commit dda84045b3b1ff23bb53e6a45a04f6a30a51dec8 -Author: Gary Wong (BC Gov) -Date: Thu Apr 20 17:44:44 2017 -0700 - - Simplified loading of legacy data into GWELLS data structures, ready for Search form MVP - -commit 8b0370f8bc7b221113c6a84c5ff7ff8224fb1882 -Author: Louie -Date: Thu Apr 20 16:14:42 2017 -0700 - - Added pagination template for bootstrap style. - -commit e296078af7469551ef91c66e7fd807dcea160a43 -Author: Louie -Date: Thu Apr 20 16:13:22 2017 -0700 - - Added webstack-django-sorting and replaced core pagination with dj-pagination for search results. - -commit f95caeccf20ffffeeca4b089475cff32ee709fb0 -Author: Louie -Date: Tue Apr 18 16:28:37 2017 -0700 - - UI changes in response to user feedback. Fixed display of Land District. Display PID with 9 digits and leading zeros. Search criteria can contain leading zeros and are stripped off when comparing to PID. - -commit f1711606871d30e6fdec1e810f3bd117882e94d0 -Author: Louie -Date: Thu Apr 13 14:36:55 2017 -0700 - - Adding more search criteria will restrict the results further. Specifying address and lot will show results with that partial address and lot. - -commit 921bcf83a701dc2db826f4c7c23ecc1b7fe7cc91 -Author: Louie -Date: Mon Apr 10 13:46:48 2017 -0700 - - Added more tests. - -commit 0e8b40b4c1f92c7d361ed18c6de6af1299167490 -Author: Louie -Date: Fri Apr 7 16:19:19 2017 -0700 - - Fixed missing owner names. - -commit efa98721d76adf1d6153bc204cf152fdc90b2202 -Author: Louie -Date: Fri Apr 7 14:44:01 2017 -0700 - - Removed unused images. - -commit d62bc748e6b4d602e53506d83a886bccbf8d7aac -Author: Louie -Date: Fri Apr 7 12:20:13 2017 -0700 - - Added schema spy. - -commit 87caa1b95ad02b3602d8cdb1d09b95550067a241 -Author: Louie -Date: Thu Apr 6 16:05:50 2017 -0700 - - Added pagination to search results. - -commit 824dd142062d4041701904b3b58e080b2780e640 -Author: Louie -Date: Thu Apr 6 11:26:25 2017 -0700 - - Added link to well details from search results. - -commit bcf801876f46bad953618bd26bcd132cb06e3eca -Author: Louie -Date: Wed Apr 5 14:27:55 2017 -0700 - - Added css class. - -commit 7d5d69759ddeead2296ab79906c6fbff5af027c9 -Author: Louie -Date: Wed Apr 5 13:17:20 2017 -0700 - - Added search tests and implementation. - -commit b78005c15350480e38a4f93910a72a98df386c4f -Author: Louie -Date: Tue Apr 4 16:16:39 2017 -0700 - - Added database migration. - -commit ee841f946da2f24e4b139ba178955a4e7cd39427 -Author: Louie -Date: Tue Apr 4 16:02:42 2017 -0700 - - Relaxed restrictions on models to reflect current system and data load. - -commit aa167eb49a0370ac2f077049dfa3d0bad04308b3 -Merge: 4bd8f3fbc f8f4f3eeb -Author: Louie -Date: Tue Apr 4 09:46:58 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 4bd8f3fbc310bee99f652c673b1d02ef89843972 -Author: Louie -Date: Tue Apr 4 09:46:50 2017 -0700 - - Fixed str definitions. - -commit f8f4f3eeb1a7abd0e42ceb8c9927b9422e87090e -Author: garywong-bc -Date: Tue Apr 4 09:25:20 2017 -0700 - - Update README.md - - Documented resource requirements of postgres pod. - -commit 4707f4607058b1bd4deefc8788f794ae8ce3b91c -Merge: 2484e7b02 90f423521 -Author: Louie -Date: Tue Apr 4 09:16:21 2017 -0700 - - Merge branch 'master' of https://github.com/bcgov/gwells - -commit 2484e7b02f96b46c2d315aa29e38d7050e0bb70f -Author: Louie -Date: Tue Apr 4 09:15:19 2017 -0700 - - Added fake search results for prototype. - -commit 90f423521e37f4685e4ff8231985edfc959dedbb -Merge: 25d03ed0c 3f6d09844 -Author: Gary Wong (BC Gov) -Date: Fri Mar 31 15:11:44 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 25d03ed0c45cb78df0e65cf3b54d6937d3a74174 -Author: Gary Wong (BC Gov) -Date: Fri Mar 31 15:11:34 2017 -0700 - - Re-ordered constraint creations, and removed redundant Unique Key constraints - -commit 3f6d0984489e2132d9ebd9d2b778108dfbc921bb -Author: Louie -Date: Fri Mar 31 11:33:47 2017 -0700 - - Updated search result fields for prototype. - -commit 15be7947deeec07f103d692c548f439f10d1b02e -Author: garywong-bc -Date: Fri Mar 31 10:11:35 2017 -0700 - - Update README.md - -commit a2b9b542fa440fc1781b8fea2f46b8fac34ca540 -Author: garywong-bc -Date: Fri Mar 31 10:10:42 2017 -0700 - - Update README.md - -commit 4cd1a2b561840bc1cd13c91a54a87390cbeb1355 -Author: garywong-bc -Date: Fri Mar 31 10:09:53 2017 -0700 - - Update README.md - -commit 218100ba7dd76083893ec558fa088d50643b330c -Merge: 11776ea5d c16f3b121 -Author: Gary Wong (BC Gov) -Date: Fri Mar 31 10:07:41 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 11776ea5d640a646d965ab3f6c134ee693c7ca12 -Author: Gary Wong (BC Gov) -Date: Fri Mar 31 10:06:09 2017 -0700 - - Corrected Markdown syntax errors. - -commit c16f3b121f21e0cf278ebcc8625070cd2dc21667 -Author: Gary Wong (BC Gov) -Date: Fri Mar 31 10:06:09 2017 -0700 - - Correcte Markdown syntax errors. - -commit e01d3527bb28e1f26964b48de7529a5f5b10c83b -Merge: 82bc70774 e31c09bb9 -Author: Gary Wong (BC Gov) -Date: Fri Mar 31 10:01:47 2017 -0700 - - Merge branch 'master' of github.com:bcgov/gwells - -commit 82bc70774202492ce9ee3fa5e5ca44f40ff4ab46 -Author: Gary Wong (BC Gov) -Date: Fri Mar 31 10:01:30 2017 -0700 - - Documented 'database' folder - -commit e31c09bb9c4a15cc478cf33a61d4e33e0a2fce2f -Author: garywong-bc -Date: Fri Mar 31 09:49:03 2017 -0700 - - Update README.md - - Included PostgreSQL related high-level documentation - -commit 0682f543eac0b9c7063d479a0d6f23049005b161 -Author: Gary Wong (BC Gov) -Date: Fri Mar 31 09:40:42 2017 -0700 - - Added PostgreSQL scripts (but data is stored outside the repo) - -commit 0623aa64e7aaa54532e26c9aa5dce63205fe77ab -Author: Louie -Date: Thu Mar 30 16:30:43 2017 -0700 - - Added prototype for simple search using crispy forms. - -commit aaddd70cccc907c3d3f28e9cfb4c46383df34b41 -Author: calouie -Date: Mon Mar 27 11:31:09 2017 -0700 - - Update README.md - -commit 78b90c68fc6d22569dcec66163be7112c7d74367 -Author: calouie -Date: Mon Mar 27 11:30:00 2017 -0700 - - Update README.md - -commit edf9b301f7bab07b2cc0917aa854201c997a0b7c -Author: Louie -Date: Mon Mar 27 11:26:04 2017 -0700 - - Fixed readme formatting. - -commit deaf39c5131d5e86b84ae492ce9200da726eeda3 -Author: Louie -Date: Mon Mar 27 11:23:42 2017 -0700 - - Updated with environment variables settings for local postgres. - -commit 16b7beb4e3553f4850d203942a625ac6dfa8a701 -Author: Louie -Date: Fri Mar 24 16:33:27 2017 -0700 - - Set allowed hosts back to all. - -commit 83d325fa9f3b21d9274d8361fbe174593d4a2a63 -Author: Louie -Date: Fri Mar 24 16:21:57 2017 -0700 - - Fixed malformed stylesheet references causing whitenoise to not find the file and generate a 500 error when debug = False. - -commit 88aea569ed62b871d45f6b063cee2c9760b2b6d1 -Author: Louie -Date: Fri Mar 24 10:52:18 2017 -0700 - - Changed models in preparation for search results. - -commit 9d735731e3af012d4411c7c83ea8f4ee1ff9b296 -Author: Louie -Date: Tue Mar 21 14:09:31 2017 -0700 - - Updated readme. - -commit a014ce7a7139cce4cf5f2a567e51ac833fbe3f3f -Author: Louie -Date: Tue Mar 21 10:05:31 2017 -0700 - - Model changes to specify field names. - -commit d8c2112eaaefc69ebc4fd9c755e11884c815ef4e -Author: Louie -Date: Tue Mar 21 10:00:01 2017 -0700 - - Added Django environment variables. - -commit 01ae0eaad3dc660098f5ec3d72bcaae7536f70da -Author: Louie -Date: Mon Mar 20 14:15:03 2017 -0700 - - Display yield units from db on hello world page - -commit 35c9b3c60de21cfd6857e8a5102a62cb28f4f789 -Author: Louie -Date: Mon Mar 20 13:20:29 2017 -0700 - - Upgraded whitenoise middleware in attempt to run Django 1.10 - -commit 8f0d192e6f68656cc56ae6364cda934dc72fbe68 -Author: Louie -Date: Mon Mar 20 12:03:20 2017 -0700 - - Reverted back to Django 1.8 - -commit 39b9908b6fd58736b83787c112b333c29cf070d8 -Author: Louie -Date: Mon Mar 20 11:31:06 2017 -0700 - - Removed debug toolbar for now - -commit fd85b65c30d12798bbedaace8077f4c8c14a8470 -Author: Louie -Date: Mon Mar 20 09:20:01 2017 -0700 - - Upgraded version of gunicorn to 19.7.0 - -commit efc7b58247feb447c2f53342258439e66fc5b052 -Author: Louie -Date: Mon Mar 20 08:55:44 2017 -0700 - - Pointed wsgi settings to the gwells app. - -commit 31377a6be6594f5328eef34748c0827360ff70a3 -Author: Louie -Date: Fri Mar 17 16:28:45 2017 -0700 - - Removed image references to missing mini-menu images. - -commit 16f4626b42ed40a3e9a721ae02ab2c73b80056c8 -Author: Louie -Date: Fri Mar 17 16:26:16 2017 -0700 - - Removed image references to missing mini-menu images. - -commit 724b08f93c3477bd22341376add335c09315769d -Author: Louie -Date: Fri Mar 17 09:09:09 2017 -0700 - - Removed missing images. - -commit 1dc11bc18f24901e5e230306ea9586c441f2dafc -Author: Louie -Date: Fri Mar 17 09:04:15 2017 -0700 - - Removed css containing missing image. - -commit e82dd8e5617e93148ad18d3fc6be9ebabc383567 -Author: Louie -Date: Fri Mar 17 08:53:36 2017 -0700 - - Added missing search icon. - -commit dbf368ed4ec47735d91180dac76d0f47ea25ee7f -Author: Louie -Date: Fri Mar 17 08:42:17 2017 -0700 - - Deleted commented out styles that caused whitenoise compression to fail. - -commit 3b72a1d6b356821285b0ae65a14b079ed6bac17f -Author: Louie -Date: Thu Mar 16 16:22:18 2017 -0700 - - Initial commit of gwells. - -commit e0dd01578e8f12fe881b5f67f53b450a62c1bf99 -Merge: 21de0af9f e04eca6f4 -Author: calouie -Date: Fri Mar 10 10:48:29 2017 -0800 - - Merge pull request #3 from AntonCoetzer/patch-5 - - Update CONTRIBUTING.md - -commit e04eca6f4c892476265cb5b9760c4f5c55dcbf89 -Author: Anton -Date: Fri Mar 10 10:47:50 2017 -0800 - - Update CONTRIBUTING.md - - Updated CONTRIBUTING.MD to link to gwells license file. - -commit 21de0af9fbf345c84f243e5b84bf9742de829b89 -Merge: cfec7200d 6ef866d77 -Author: calouie -Date: Fri Mar 10 10:25:21 2017 -0800 - - Merge pull request #2 from AntonCoetzer/patch-4 - - Update README.md - -commit 6ef866d7788c1a2ce6b19d7677add9aa0b65d599 -Author: Anton -Date: Fri Mar 10 10:21:40 2017 -0800 - - Update README.md - - Added Introduction - -commit cfec7200d65ab86032cc9d7b5dff198aa1c4b437 -Author: calouie -Date: Fri Mar 10 10:14:51 2017 -0800 - - Added link to license. - -commit 842e46d73cea7cdc262e1f7fb0ddcb145137f158 -Merge: 2e1de0527 7cc04c561 -Author: calouie -Date: Fri Mar 10 10:09:03 2017 -0800 - - Merge pull request #1 from AntonCoetzer/patch-1 - - Create initial CONTRIBUTING.md - -commit 7cc04c5613bcd2bd809ee2a105704acfa49fee98 -Author: Anton -Date: Fri Mar 10 10:01:15 2017 -0800 - - Create initial CONTRIBUTING.md - -commit 2e1de05272e16170b2aa1607870f5e956fc9b17a -Author: Louie -Date: Tue Feb 28 15:05:54 2017 -0800 - - Added OpenShift templates and readme. - -commit 4faa6948a7fd93e08209b8f7ac88239cb4f92758 -Author: Louie -Date: Tue Feb 28 10:14:56 2017 -0800 - - Added Apache 2 license. - -commit 8c20b559cd9f15af866d4621cc941244e7929409 -Merge: 856f5572c 1a0b2abcf -Author: Ben Parees -Date: Wed Feb 15 16:27:37 2017 -0500 - - Merge pull request #80 from bparees/sc_metadata - - add service catalog metadata to templates - -commit 1a0b2abcf86b1c9645203a63ca8329ccf8f91a28 -Author: Ben Parees -Date: Tue Feb 14 14:41:32 2017 -0500 - - add service catalog metadata to templates - -commit 856f5572cf4739abf2b35774b3972c265f0278aa -Merge: 31f1455e3 870c64db0 -Author: Ben Parees -Date: Thu Feb 2 11:41:37 2017 -0500 - - Merge pull request #78 from ghyde/fix-service-names - - Allow database service names to contain dashes. - -commit 870c64db0b8db2a660d89e06b417a90e382d3e71 -Author: Garrett Hyde -Date: Thu Feb 2 01:10:49 2017 -0800 - - Allow database service names to contain dashes. - - Fixes #77 - -commit 31f1455e3bf51ac0a9bcf51c2b69b0f13a2b585b -Merge: 5f5f5135e 5620f6c47 -Author: Ben Parees -Date: Wed Jan 18 14:07:37 2017 -0500 - - Merge pull request #76 from coreydaley/update_templates_to_use_secrets_2 - - updating db dc - -commit 5620f6c47dd5d385352af05e5d4d4c0addb2c1e1 -Author: Corey Daley -Date: Wed Jan 18 13:47:08 2017 -0500 - - updating db dc - -commit 5f5f5135e5bd851a1e7322b67398b65bd6dc7b0b -Merge: 6ddac81c6 02b0ec042 -Author: Ben Parees -Date: Wed Jan 18 12:40:16 2017 -0500 - - Merge pull request #75 from coreydaley/update_templates_to_use_secrets - - updating to use secrets - -commit 02b0ec0429ec7492abead500aeabbb20bad18e0d -Author: Corey Daley -Date: Wed Jan 18 12:13:16 2017 -0500 - - updating to use secrets - -commit 6ddac81c67c38ef816ebddbd19735816f024eb56 -Merge: 175b94b4d 2b44398b0 -Author: Ben Parees -Date: Tue Jan 17 14:06:18 2017 -0500 - - Merge pull request #74 from bparees/template - - fix invalid key names - -commit 2b44398b0ba5c48b3d88eeb20cbcbe781ed7e7a7 -Author: Ben Parees -Date: Tue Jan 17 14:03:48 2017 -0500 - - fix invalid key names - -commit 175b94b4dac426e58a1059270c4027b021ea8594 -Merge: 9f04dc0f0 6c4846b11 -Author: Ben Parees -Date: Tue Jan 3 12:42:12 2017 -0500 - - Merge pull request #73 from bparees/wsgi - - switch wsgi_application value to wsgi.application - -commit 6c4846b113f24d012afc2b28f157865b5fdf376a -Author: Ben Parees -Date: Tue Jan 3 12:10:10 2017 -0500 - - switch wsgi_application value to wsgi.application - -commit 9f04dc0f07c3d20529124dec2a7617cb7f5e3383 -Merge: b7ce64258 86f28a62a -Author: Ben Parees -Date: Sun Dec 11 23:05:22 2016 -0500 - - Merge pull request #69 from guangxuli/fix_branch - - fix some incorrect description - -commit 86f28a62ae793240c12c59cf1d0fc498022502c4 -Author: guangxuli -Date: Mon Dec 12 10:00:14 2016 +0800 - - fix some incorrect description - -commit b7ce64258655354e2e26caa7ebc28eb58b02a27d -Merge: 253aa3570 43bd6dcc5 -Author: Ben Parees -Date: Fri Dec 2 11:04:17 2016 -0500 - - Merge pull request #68 from coreydaley/github_12043_origin_image_test_failure - - moving wsgi file and updating settings.py to work with updates to s2i-python-container changes - -commit 43bd6dcc57c22bd2d92e73adde7692dccbbea92f -Author: Corey Daley -Date: Fri Dec 2 10:28:48 2016 -0500 - - moving wsgi file and updating settings.py to work with updates to s2i-python-container changes - -commit 253aa3570ff2fa8fe536abf76e25e57c81d1d44c -Merge: c4727a081 2269d0553 -Author: Ben Parees -Date: Tue Nov 29 14:26:21 2016 -0500 - - Merge pull request #67 from jupierce/migrate-passwords-to-secrets - - Moving credentials into secrets - -commit 2269d0553653ecbf39e9bb2ffc7b91664db6b62c -Author: jupierce -Date: Tue Nov 29 11:18:03 2016 -0500 - - Moving credentials into secrets - -commit c4727a081b79d4d9dd5af5e3a14e2c22beed5399 -Merge: 28ce74503 4170089b8 -Author: Ben Parees -Date: Wed Nov 2 15:35:32 2016 -0400 - - Merge pull request #66 from bparees/allowed_hosts - - move allowed hosts to settings.py - -commit 4170089b8e50a83cde05e714494ae7448415cde4 -Author: Ben Parees -Date: Wed Nov 2 15:27:35 2016 -0400 - - move allowed hosts to settings.py - -commit 28ce74503e7d9c551ea9e08b7bcb25a70d011252 -Merge: c28ec1e65 080ea9203 -Author: Ben Parees -Date: Wed Nov 2 14:18:52 2016 -0400 - - Merge pull request #65 from bparees/allowed_hosts - - add allowed_hosts env var for django - -commit 080ea9203d6a8fb00e8c28fc63970af696364c69 -Author: Ben Parees -Date: Wed Nov 2 14:11:10 2016 -0400 - - add allowed_hosts env var for django - -commit c28ec1e65e181107f62f3fc540b25e7378d9d0d7 -Merge: 380f34793 6b3770e70 -Author: Ben Parees -Date: Mon Oct 24 16:51:38 2016 -0400 - - Merge pull request #64 from luciddreamz/master - - Updates template display name, tags, description, message, and grouping - -commit 6b3770e705e0b5c2ab5ea14feec8555e143a269a -Author: luciddreamz -Date: Mon Oct 24 16:33:48 2016 -0400 - - Updates template display name, tags, description, message, and service grouping - -commit 380f34793e11ad7efc9374cc86809d37a18b6f93 -Merge: 9f38043a5 d0e5792db -Author: Ben Parees -Date: Wed Oct 19 13:53:28 2016 -0400 - - Merge pull request #63 from sallyom/group-services - - group services in quickstarts - -commit d0e5792db227edfd18fcb005437087ea529654b9 -Author: Sally O'Malley -Date: Wed Oct 19 13:30:27 2016 -0400 - - group services in quickstarts - -commit 9f38043a5ef683404aae82bfd86f4f7c15f618ea -Merge: b0d550d17 734d72755 -Author: Ben Parees -Date: Sun Oct 2 06:00:08 2016 -0800 - - Merge pull request #61 from stedotmartin/master - - Updated django-debug-toolbar to 1.5 to fix - -commit 734d72755fcf034bd27d113f1f792b9fdeb0ef69 -Author: Stephen Martin -Date: Sun Oct 2 10:00:29 2016 +0100 - - Updated django-debug-toolbar to 1.5 to fix - - TypeError at / - process() missing 1 required positional argument: 'stream' - - Related to https://github.com/jazzband/django-debug-toolbar/issues/856 - -commit b0d550d17373b3926ed50323349dac520501fd7e -Merge: fa3c4f339 de05f6267 -Author: Ben Parees -Date: Tue Sep 20 09:12:19 2016 -0400 - - Merge pull request #59 from luciddreamz/master - - Adds Django/PostgreSQL template with persistent storage. - -commit de05f626768993b536182c29d894614fd367e61e -Author: luciddreamz -Date: Tue Sep 13 09:44:51 2016 -0400 - - Adds Django/PostgreSQL template with persistent storage. - -commit fa3c4f339935d404b38a26083df17331213f3aa8 -Merge: 8a0c7d6a9 bb07bf1b4 -Author: Ben Parees -Date: Wed Jul 13 13:38:56 2016 -0400 - - Merge pull request #55 from bparees/bump_version - - bump to latest imagestream versions - -commit bb07bf1b492424f1918fa4fcdb3d84b7be805df9 -Author: Ben Parees -Date: Wed Jul 13 13:26:20 2016 -0400 - - bump to latest imagestream versions - -commit 8a0c7d6a9ba1570ea10e7e03439195bc48408ef4 -Merge: 6aa44a62c 7c7c23682 -Author: Rodolfo Carvalho -Date: Fri Jul 8 17:43:50 2016 +0200 - - Merge pull request #53 from jfmatth/whitenoise-compression - - enable whitenoise compression #3 - -commit 7c7c2368244ca9c76a1e26c40ca5bf2aad6c1c14 -Author: John Matthew -Date: Fri Jul 8 08:00:57 2016 -0700 - - enable compression - -commit 6aa44a62c5aab1a0a66cf1b294bbaaaece8d1ed5 -Merge: 6e6a53ec0 47671cfcf -Author: Rodolfo Carvalho -Date: Fri Jul 8 08:26:54 2016 +0200 - - Merge pull request #50 from jfmatth/add-whitenoise - - Put Whitenoise back in settings.py - -commit 47671cfcf7900d66fc320c24772f73888b777a95 -Author: John Matthew -Date: Thu Jul 7 21:47:39 2016 -0700 - - update to remove old whitenoise setup - -commit 22b1bdf6565d20f2a7f1ca3a5f44ba3fa1b7d075 -Author: John Matthew -Date: Thu Jul 7 07:04:00 2016 -0700 - - remove extra line - -commit 6e6a53ec04a5e8c900eefbb10ce958f29c535f06 -Merge: 70d28615a 472ea2f68 -Author: Ben Parees -Date: Wed Jul 6 12:13:49 2016 -0400 - - Merge pull request #51 from dinhxuanvu/template-fix - - Add PIP_INDEX_URL option and fix required parameter issue - -commit 472ea2f68fa3a8466faefc46fba1735482a2af9d -Author: Vu Dinh -Date: Wed Jul 6 11:51:46 2016 -0400 - - Add PIP_INDEX_URL option and fix required parameter issue - - The new PIP_INDEX_URL parameter is added to allow custom PyPi mirror - URL to be used during the build process. - - There are several paramaters that are required but didn't listed as - requested (*). Now, they are marked as required to be explicit. - - Signed-off-by: Vu Dinh - -commit a33bd309a67f25cc48f84aeee3eef5f60f762fd6 -Author: John Matthew -Date: Tue Jul 5 07:34:04 2016 -0700 - - Put Whitenoise back in settings.py - -commit 70d28615a80fc920ed920d6a96747a3bdb2f38ee -Merge: c57ca429b dc5fa090d -Author: Ben Parees -Date: Mon Jun 27 10:34:32 2016 -0400 - - Merge pull request #47 from dinhxuanvu/django-version - - Fix Django version incompatible for Python 3.3 - -commit c57ca429becdd54b9ddf15c226fcb048ffe8cfbd -Merge: be20c410d 3cf1378da -Author: Ben Parees -Date: Wed Jun 22 05:51:16 2016 -0700 - - Merge pull request #46 from bkmagnetron/master - - docs: update python 33 to python 35 - -commit 3cf1378da5decd7eb31e0f36b462b50209f648ef -Author: Balakrishnan -Date: Fri May 27 04:27:24 2016 -0400 - - Fix ImportError: cannot import name find_spec - - find_spec isn't available in Python 3.3; it was added in Python 3.4. - -commit dc5fa090dfa541839f58959cb8890c3bd20f0258 -Author: Vu Dinh -Date: Tue May 31 12:29:28 2016 -0400 - - Fix Django version incompatable for Python 3.3 - - The current required Django version is 1.9.5 which doesn't support - Python 3.3 which causes the Python 3.3 deployment to fail while - using django-ex git repo. - - The Django version is modified to use 1.8.x only to include Python - 3.3 support. - - Signed-off-by: Vu Dinh - -commit be20c410d97e3e5a7d0d90b0a589e474bfa3d470 -Author: Ben Parees -Date: Thu Jun 9 08:59:13 2016 -0400 - - fix django typo - -commit c3ebdac547d242bbe1ec7fd64ac9e9bdbfe22111 -Merge: 4e6e4bac6 e321b6dce -Author: Ben Parees -Date: Sun May 22 20:10:40 2016 -0400 - - Merge pull request #45 from gabemontero/fixWebhookInstructions - - update webhook instructions - -commit e321b6dce46e127c90eee647fa9cd167421d31d6 -Author: gabemontero -Date: Sun May 22 20:00:52 2016 -0400 - - update webhook instructions - -commit 4e6e4bac6f7954783e8b81e04cc4129cad3094bb -Merge: 77f7d4bec 067d9b0ba -Author: Ben Parees -Date: Mon May 16 12:06:37 2016 -0400 - - Merge pull request #44 from gabemontero/fixContainerImageField - - fix container image field - get as close to no value as currently pos… - -commit 067d9b0bad41616fbd0f3c445f16fe2016c2b4b7 -Author: gabemontero -Date: Fri May 13 12:02:03 2016 -0400 - - fix container image field - get as close to no value as currently possible - -commit 77f7d4bec3ecfa81b87a284ce14c185c7a46ddab -Merge: 26d90aed5 7d797d8b7 -Author: Ben Parees -Date: Thu May 12 13:19:55 2016 -0400 - - Merge pull request #43 from gabemontero/fixTemplatesVolLab - - add volume labels from origin version - -commit 7d797d8b702c2da6b8d4474c1f3101c6d05a261e -Author: gabemontero -Date: Thu May 12 12:59:41 2016 -0400 - - add volume labels from origin version - -commit 26d90aed54cae8162345fce18ecdd09e8801c3bb -Merge: f5dc6e48c 28d7d42b6 -Author: Ben Parees -Date: Thu May 12 10:28:33 2016 -0400 - - Merge pull request #42 from gabemontero/fixTemplatesAutoFalse - - change BC ICT to automatic=true (more deterministic) - -commit 28d7d42b69c554a5b1d1ba6b6edcd40a6850edbb -Author: gabemontero -Date: Thu May 12 10:27:01 2016 -0400 - - change BC ICT to automatic=true (more deterministic) - -commit f5dc6e48c6b970f80b2caaac0426c4a693665f93 -Merge: c0f9b0ade 560365b54 -Author: Ben Parees -Date: Fri Apr 29 10:44:18 2016 -0400 - - Merge pull request #40 from PI-Victor/pi-victor/upgrade_django_vers - - bump django version - -commit 560365b54e0ff76b8edf1bec13d7b38f12b7ada1 -Author: PI-Victor -Date: Thu Apr 14 13:41:13 2016 +0200 - - update project dependencies - -commit c0f9b0aded02cf5de49afe916ee9f1119093692a -Author: Ionut Palade -Date: Mon Apr 18 12:26:37 2016 +0200 - - fix typo in README.md - - s/filling/filing - -commit 7bfcaa7e1148052f68de7428431404e9b41b798f -Merge: 96e934a9f f371465cc -Author: Ben Parees -Date: Mon Mar 14 21:27:13 2016 +0000 - - Merge pull request #37 from gabemontero/3563 - - parameterize IS namespace - -commit f371465cc2b87a361d14bcae78812718957474ab -Author: gabemontero -Date: Mon Mar 14 17:23:01 2016 -0400 - - parameterize IS namespace - -commit 96e934a9fc14e483ef1f58cb32e46f612886ea9a -Merge: 3375b23fc 85e79a7a7 -Author: Ben Parees -Date: Fri Mar 11 21:32:50 2016 +0000 - - Merge pull request #36 from gabemontero/issue3571 - - parameterize name - -commit 85e79a7a71a3f4fbc311ee9f1b6831db8b9ec442 -Author: gabemontero -Date: Thu Mar 10 16:59:16 2016 -0500 - - parameterize name - -commit 3375b23fc8640e8636f02c2a8329182b8b6c771a -Merge: 3ccf971bf 0b6bfc4ea -Author: Ben Parees -Date: Mon Mar 7 21:16:11 2016 +0000 - - Merge pull request #35 from gabemontero/onlineMotivatedWordsmithing - - edits consistent with UI philosophy - -commit 0b6bfc4ea7e374eab6d85fda0971ad493822b2f9 -Author: gabemontero -Date: Mon Mar 7 11:12:12 2016 -0500 - - edits consistent with UI philosophy - -commit 3ccf971bfc41a70d447bc98f8194a758094f8cc9 -Merge: 704ab1dba 1304dedf6 -Author: Ben Parees -Date: Tue Mar 1 14:25:14 2016 -0500 - - Merge pull request #33 from gabemontero/moveTo512Mi - - bump all template mem limits to 512 Mi - -commit 1304dedf6f1e03fe492f360890c37f5f6cc2822a -Author: gabemontero -Date: Mon Feb 29 22:09:26 2016 -0500 - - bump all template mem limits to 512 Mi - -commit 704ab1dba671d7126e5308a16c861e1563a4fe8b -Merge: 36f7972ce dfc399fe9 -Author: Michal Fojtik -Date: Mon Feb 29 17:48:55 2016 +0100 - - Merge pull request #32 from mfojtik/probe - - Add liveness and readiness probe - -commit dfc399fe955e93d03cec12a8d2f4a0a98fb6279f -Author: Michal Fojtik -Date: Mon Feb 29 16:19:42 2016 +0100 - - Add liveness and readiness probe - -commit 36f7972ce954629155561de92eef4714f5548475 -Merge: ce117909c 7191b87d4 -Author: Ben Parees -Date: Wed Feb 24 18:37:17 2016 -0500 - - Merge pull request #31 from gabemontero/addMemLimit - - add mem limit for deployments - -commit 7191b87d43535b5677cd59c592173eb1155f5518 -Author: gabemontero -Date: Wed Feb 24 18:28:13 2016 -0500 - - add mem limit for deployments - -commit ce117909c48ac89222b18b1c230d16398fd8c268 -Merge: be9cbdadc ba557ab6f -Author: Ben Parees -Date: Wed Feb 24 15:44:58 2016 -0500 - - Merge pull request #30 from bparees/master - - switch tag to quickstart - -commit ba557ab6f2ee06ac5c46e5bb47fcb71abc0be1f6 -Author: Ben Parees -Date: Wed Feb 24 15:44:44 2016 -0500 - - switch tag to quickstart - -commit be9cbdadce543a8fddbbba035c4b758da5557139 -Merge: 4706c39a7 283a46001 -Author: Ben Parees -Date: Mon Feb 22 13:16:53 2016 -0500 - - Merge pull request #29 from rhcarvalho/build-hook - - Add build post commit hook to run tests - -commit 283a460018cb48faf4446b618d86313c5f2ebc77 -Author: Rodolfo Carvalho -Date: Mon Feb 22 18:46:48 2016 +0100 - - Add build post commit hook to run tests - -commit 4706c39a70353211a239f8e419c15b08590d2fd2 -Merge: 6f307eba3 878b18768 -Author: Ben Parees -Date: Tue Jan 12 10:02:36 2016 -0500 - - Merge pull request #28 from PI-Victor/pi-victor/tests - - basic django example tests - -commit 878b18768bcf29a6ad3ceed065d898706d193f42 -Author: pi-victor -Date: Mon Jan 11 14:05:53 2016 +0100 - - basic django example tests - - Signed-off-by: pi-victor - -commit 6f307eba39dbca753d6aee4ce5bf387fa81f7658 -Author: Ben Parees -Date: Fri Nov 20 22:42:35 2015 -0500 - - namespace typo - -commit 42789cf5a250934e7e918467dc0c041db47ce274 -Merge: 2b30d2195 81c51848b -Author: Ben Parees -Date: Fri Nov 20 21:34:05 2015 -0500 - - Merge pull request #27 from bparees/version - - use openshift namespace - -commit 81c51848bea5be30af1ac78ebb0461c1cc2283ce -Author: Ben Parees -Date: Fri Nov 20 21:31:30 2015 -0500 - - use openshift namespace - -commit 2b30d21957d42ba422c116f560d8d0d5a4a47a89 -Merge: e0a3fa6c0 8e44d68d3 -Author: Ben Parees -Date: Fri Nov 20 19:36:02 2015 -0500 - - Merge pull request #26 from bparees/version - - update image version - -commit 8e44d68d3086fb251e4987855058e96b62280374 -Author: Ben Parees -Date: Fri Nov 20 18:26:32 2015 -0500 - - update image version - -commit e0a3fa6c0ab3412ad725e028fb87e72b7ee47912 -Merge: 2003ae657 816192d38 -Author: Michal Fojtik -Date: Thu Oct 1 16:12:19 2015 +0200 - - Merge pull request #25 from mnagy/add_reload_config - - Add configuration file for Gunicorn automatic reloading - -commit 816192d38868e4eb709f09c8c69220b25e84c9bc -Author: Martin Nagy -Date: Thu Oct 1 15:51:36 2015 +0200 - - Add configuration file for Gunicorn automatic reloading - -commit 2003ae657a8fbf5e51f900a5ee23caf414851e4e -Merge: 2a7e09f47 71a132beb -Author: Ben Parees -Date: Thu Aug 20 09:34:03 2015 -0400 - - Merge pull request #24 from bparees/master - - remove bad default route hostname - -commit 71a132bebd830d682f28c8c784d322d3f656644c -Author: Ben Parees -Date: Tue Aug 18 13:19:30 2015 -0400 - - remove bad default route hostname - -commit 2a7e09f47e1b3d3ef8fff27a4316b3b5a212f269 -Merge: a51feaedf b5f15113d -Author: Michal Fojtik -Date: Mon Aug 3 10:37:20 2015 +0200 - - Merge pull request #23 from bparees/param - - parameterize the db image name - -commit b5f15113d7eb9657d92b50c47e0edfacfeff4812 -Author: Ben Parees -Date: Fri Jul 31 14:09:50 2015 -0400 - - parameterize the db image name - -commit a51feaedf6a7342bc26c12bcfe01de36675d0ec1 -Merge: c84b9f85d d3a54ad5f -Author: Ben Parees -Date: Fri Jul 31 09:41:40 2015 -0400 - - Merge pull request #22 from bparees/length - - shorten service name to less than 24 chars - -commit d3a54ad5fd5496f9c4982bdce5c1bcf6d4ece64b -Author: Ben Parees -Date: Fri Jul 31 09:32:39 2015 -0400 - - shorten service name to less than 24 chars - -commit c84b9f85deec6220308b8c460e85edab8b7be163 (tag: v1.0.1) -Merge: d89bae695 9cf2c50ce -Author: Ben Parees -Date: Wed Jul 1 14:44:43 2015 -0400 - - Merge pull request #21 from gabemontero/issue3358 - - get names consistent; associated doc updates based on test walkthrough - -commit 9cf2c50ce8c318891e490f85b5123d3fdc3420af -Author: gabemontero -Date: Tue Jun 30 17:05:43 2015 -0400 - - get names consistent; associated doc updates based on test walkthrough; incorporate Ben's comments; more name corrections - -commit d89bae6957aed288da8dbf9fece75ff185039281 -Merge: 82a9957aa 609b1dd5c -Author: Ben Parees -Date: Mon Jun 22 23:24:19 2015 -0400 - - Merge pull request #20 from bparees/s2i - - sti to s2i - -commit 609b1dd5c000abce8facad77a762b6d5a3c5680b -Author: Ben Parees -Date: Mon Jun 22 15:40:50 2015 -0400 - - sti to s2i - -commit 82a9957aab29451f9ab56c39ab9af5d2500759c8 -Merge: 301be465e 203f24f6f -Author: Ben Parees -Date: Fri Jun 19 17:07:28 2015 -0400 - - Merge pull request #19 from bparees/master - - minor cleanup - -commit 203f24f6f32bb231eeb1089457e374e759205c70 -Author: Ben Parees -Date: Fri Jun 19 17:07:10 2015 -0400 - - minor cleanup - -commit 301be465eb9857ab2f251e88e34dc0ed1ecb4c53 -Merge: e3ea512de fe8d049e2 -Author: Michal Fojtik -Date: Thu Jun 18 13:46:23 2015 +0200 - - Merge pull request #18 from rhcarvalho/welcome-page-updates - - Change welcome page to match other example apps - -commit fe8d049e2b92d5c337acb6a240b3adddb3954205 -Author: Rodolfo Carvalho -Date: Thu Jun 18 13:41:33 2015 +0200 - - Change welcome page to match other example apps - -commit e3ea512decb515a795d8256f4bd931355ede9622 -Merge: f4f8364a4 6525c9445 -Author: Ben Parees -Date: Wed Jun 17 11:38:55 2015 -0400 - - Merge pull request #17 from rhcarvalho/update-run-in-container - - Make default pod name match the one from template - -commit 6525c94458403e4ece8d4e7c2188e5a13738b22d -Author: Rodolfo Carvalho -Date: Wed Jun 17 17:30:00 2015 +0200 - - Make default pod name match the one from template - -commit f4f8364a4ae2ce1243ad5418d636b793f66753c9 (tag: v1.0) -Merge: ad80f212e 17c53b5da -Author: Ben Parees -Date: Tue Jun 16 13:21:02 2015 -0400 - - Merge pull request #16 from ewolinetz/update_routes - - Updating front end route variables and the default front end route value - -commit 17c53b5da755b14634e3ec31e4e488d34565bfa0 -Author: ewolinetz -Date: Tue Jun 16 11:45:38 2015 -0500 - - Updating front end route variables and the default front end route value - -commit ad80f212e881343ffee1e4c81cd280be518cfb58 -Merge: a0ff4b505 9a1f379b2 -Author: Ben Parees -Date: Tue Jun 16 10:19:06 2015 -0400 - - Merge pull request #14 from rhcarvalho/output-to-ist - - Output to ImageStreamTag - -commit a0ff4b50526c7bc9503c61b1ae10f906d063bf3e -Merge: bd607127b 31d7511ad -Author: Michal Fojtik -Date: Tue Jun 16 15:12:31 2015 +0200 - - Merge pull request #15 from rhcarvalho/git-ref - - Add SOURCE_REPOSITORY_REF parameter - -commit 31d7511adfeb26b13ec115a037db1b8edbb4bcd9 -Author: Rodolfo Carvalho -Date: Tue Jun 16 12:07:49 2015 +0200 - - Add SOURCE_REPOSITORY_REF parameter - -commit 9a1f379b21dd960b602ed7521652c30e1a3e9044 -Author: Rodolfo Carvalho -Date: Tue Jun 16 11:53:41 2015 +0200 - - Set build output to latest ImageStreamTag - -commit bd607127bc4409c1800bc81050ffd4dcf1090b6c -Merge: 505ff52a0 67470cb25 -Author: Ben Parees -Date: Fri Jun 12 11:23:51 2015 -0400 - - Merge pull request #12 from rhcarvalho/std-tmpl - - Standardize templates across examples - -commit 67470cb254efea62f764fd5eed89ee5e37c977ff -Author: Rodolfo Carvalho -Date: Thu Jun 11 21:05:29 2015 +0200 - - Standardize templates across examples - -commit 505ff52a058e9e51393889639c226dbe5b3c09fc -Merge: dc87dd2f5 cfe92fa34 -Author: Ben Parees -Date: Thu Jun 11 11:35:33 2015 -0400 - - Merge pull request #11 from rhcarvalho/api-v1 - - Update templates to API v1 - -commit cfe92fa3402ae037651d1ae945a43a1de53c08b2 -Author: Rodolfo Carvalho -Date: Thu Jun 11 17:19:47 2015 +0200 - - Update templates to API v1 - -commit dc87dd2f533a050de477af0b1f43b5a91ed9a385 -Merge: dbc2e6b57 73f43e3e0 -Author: Ben Parees -Date: Thu Jun 11 10:04:12 2015 -0400 - - Merge pull request #10 from rhcarvalho/remove-custom-sti-scripts - - Remove custom sti scripts - -commit dbc2e6b57b5fe1384c571f4b54eacfcd8ac8bde7 -Merge: 6e1ecb37b e92d6e9bd -Author: Ben Parees -Date: Wed Jun 10 11:57:17 2015 -0400 - - Merge pull request #9 from rhcarvalho/simplify-run-in-container - - Simplify run-in-container script - -commit 73f43e3e01a9825ddacaaad29486e33aa7303099 -Author: Rodolfo Carvalho -Date: Wed Jun 10 17:44:24 2015 +0200 - - Remove custom sti scripts - - Not needed once Django supports lands in sti-python. - -commit e92d6e9bd095bf4d34569d777cad4a7a35cfc5d4 -Author: Rodolfo Carvalho -Date: Wed Jun 10 17:38:09 2015 +0200 - - Simplify run-in-container script - - After changes in k8s and sti-base/sti-python some hacks can be removed. - -commit 6e1ecb37b8a44a35f092b6a4a9ba246592dc31ba -Merge: 8a5a2cb4d aa79a0501 -Author: Ben Parees -Date: Mon Jun 8 17:30:56 2015 -0400 - - Merge pull request #7 from sspeiche/routes - - Added routes to templates - -commit aa79a05018c74f8ed8bad1908034b39c7b5b5e45 -Author: sspeiche -Date: Mon Jun 8 15:31:12 2015 -0400 - - Added routes to templates - -commit 8a5a2cb4d85a75310e8d1fd26ab15b6d12c681a8 -Merge: aa6c82325 a13a023c6 -Author: Ben Parees -Date: Mon Jun 8 08:22:11 2015 -0400 - - Merge pull request #6 from rhcarvalho/osc-oc - - Rename osc -> oc - -commit a13a023c637c224b85d8705e22c11e28104051b8 -Author: Rodolfo Carvalho -Date: Mon Jun 8 11:37:27 2015 +0200 - - Rename osc -> oc - -commit aa6c8232562912df12de34293974e37493ab9bf6 -Merge: 548848423 29cc141f7 -Author: Ben Parees -Date: Sat Jun 6 00:29:15 2015 -0400 - - Merge pull request #4 from rhcarvalho/std-1 - - Improvements - -commit 29cc141f7ec36d25360c4e758d36f428bf3439b8 -Author: Rodolfo Carvalho -Date: Thu Jun 4 16:47:06 2015 +0200 - - Improvements - - * Move OpenShift-specific files to openshift/ - * Add note about ephemeral database - * Document how to read logs - * Document one-off cmd execution - * Remove APP_MODULE from templates: should be auto-detected for Django projects. - * Remove gunicorn config file and document APP_CONFIG - -commit 97a7a5617560b8c1d280a610735fae5c880da4f1 -Author: Rodolfo Carvalho -Date: Fri Jun 5 23:35:22 2015 +0200 - - New assemble and run scripts with Django support - -commit 548848423847ff6125e5ce535a851906bac09de9 -Merge: 2dde1e072 3d6b60abd -Author: Ben Parees -Date: Wed Jun 3 12:13:22 2015 -0400 - - Merge pull request #3 from rhcarvalho/issue-1 - - Fix type error - -commit 3d6b60abd9088584716562b9ababc42817f77455 -Author: Rodolfo Carvalho -Date: Wed Jun 3 17:27:32 2015 +0200 - - Fix type error - - Fixes #1. - -commit 2dde1e072d4ffe60859efa7a56e95937d24ef1dd -Author: Rodolfo Carvalho -Date: Wed Jun 3 17:00:23 2015 +0200 - - Fix comment - -commit 3ed7c144cfd5ff081d36e9e8cae691e9d839699e -Author: Rodolfo Carvalho -Date: Wed Jun 3 16:34:49 2015 +0200 - - Convert templates to v1beta3 - -commit 3657c889b3ced052375b0d222eb39e6746ef312b -Author: Michal Fojtik -Date: Wed Jun 3 14:35:32 2015 +0200 - - Send access log to stdout - -commit 432bd9b34499b70507658a25fffbafb86393ac1e -Author: Rodolfo Carvalho -Date: Tue Jun 2 16:19:35 2015 +0200 - - Make service_name uppercase - - We need it uppercase to read env vars with that prefix. - -commit 3c3f724fc5bbdeb94a6086a888c6f4f26d0f9784 -Author: Rodolfo Carvalho -Date: Tue Jun 2 16:19:11 2015 +0200 - - Fix template missing DATABASE_ENGINE - -commit 63683b7469ace3768c472623272e411a2200fe35 -Author: Rodolfo Carvalho -Date: Tue Jun 2 16:17:58 2015 +0200 - - Change database service name to be more specific - -commit b98dd0b7612213e84a5a4e047bc0b126483d4630 -Author: Rodolfo Carvalho -Date: Tue Jun 2 14:10:57 2015 +0200 - - Fix templates - -commit dd6e9e1b7e445ddb914e39ad4acc3536276915e9 -Author: Rodolfo Carvalho -Date: Mon Jun 1 19:17:48 2015 +0200 - - Fix template json - -commit a1a26ac9ad6e7a24197796208691fdb9df20ab81 -Author: Rodolfo Carvalho -Date: Mon Jun 1 19:10:56 2015 +0200 - - Update README info about application templates - -commit 3ae50da49f27803eb708d16947fbbc669e198dfc -Author: Rodolfo Carvalho -Date: Mon Jun 1 18:45:29 2015 +0200 - - Fix spacing - -commit 3fefaffcf97f80bd8a9c306bb52530afd823ee2d -Author: Rodolfo Carvalho -Date: Mon Jun 1 18:43:32 2015 +0200 - - Add application template without database - -commit 2d9c89e6bf374e6afac85026eb68c48a30d31bfe -Author: Rodolfo Carvalho -Date: Mon Jun 1 18:37:01 2015 +0200 - - Update application template - -commit d9c03a7b79b3aae8136e8eb31bf4066c89ad8da0 -Author: Rodolfo Carvalho -Date: Mon Jun 1 15:06:05 2015 +0200 - - Document how to use new-app instead of templates - -commit 96070d958a2f07047af18aa71b6d2bb0b2d9bd40 -Author: Rodolfo Carvalho -Date: Mon Jun 1 14:07:14 2015 +0200 - - Update run-in-container.sh script - - Add detailed information on how to perform the task manually. - -commit c09d32e7583eb83b47e1bde39c321b53cc74c140 -Author: Rodolfo Carvalho -Date: Mon Jun 1 13:12:20 2015 +0200 - - Update README - -commit 4d4166b2a1feb4546ed6ee7c19dd6c0facc3664c -Author: Rodolfo Carvalho -Date: Mon Jun 1 12:49:37 2015 +0200 - - Fix formatting - -commit d9741ee2bcdafc90e5a0f82505b71a89d302cdb9 -Author: Rodolfo Carvalho -Date: Mon Jun 1 12:49:15 2015 +0200 - - Add license info - -commit bbe0ebfc431abf9ceca52bc6b7c601477f8488e3 -Author: Rodolfo Carvalho -Date: Mon Jun 1 12:48:58 2015 +0200 - - Add info about data persistence - -commit 027e1bd8c127b803135561faf4dfbb72d6fd0859 -Author: Rodolfo Carvalho -Date: Mon Jun 1 12:48:01 2015 +0200 - - Update deployment instructions - -commit 57468d13fee6a31e26cbd1e9da54e66ecca55d33 -Author: Rodolfo Carvalho -Date: Mon Jun 1 12:44:15 2015 +0200 - - Add info about files in this repo - -commit f473e3df9e0de33f75e511827a8e4a661dacab9c -Author: Rodolfo Carvalho -Date: Mon Jun 1 10:43:44 2015 +0200 - - Generalize div's id - -commit afa5a3f090e3b03c41878335077abd207d1f0a12 -Author: Rodolfo Carvalho -Date: Mon Jun 1 10:43:14 2015 +0200 - - Update sample app's name - -commit d9ed34f5f2c6c608f1da654e3165354e0a5c010c -Author: Rodolfo Carvalho -Date: Fri May 29 17:19:22 2015 +0200 - - Update README - -commit 3015a46f9a2593fcc624ec77d441fc6b784760eb -Author: Rodolfo Carvalho -Date: Fri May 29 17:14:34 2015 +0200 - - Improve database info - - Support for MySQL, include SQLite persistence warning. - -commit a6f9284570a6c38d1bbb1089d5659ba89ace6e6a -Author: Rodolfo Carvalho -Date: Fri May 29 15:52:28 2015 +0200 - - Automatically plug database via env vars - -commit 1064d7df1a7a8f1f3711fcb8cc0cebd20cba1636 -Author: Rodolfo Carvalho -Date: Fri May 29 13:26:15 2015 +0200 - - Rename application template JSON - -commit 932889ef2d1961a31565ff517855739aeb8946f6 -Author: Rodolfo Carvalho -Date: Fri May 29 12:23:59 2015 +0200 - - Rename app openshift -> welcome - -commit b686e608e43308a987a7cb865a13424df2967607 -Author: Rodolfo Carvalho -Date: Fri May 29 12:11:33 2015 +0200 - - Remove empty JSON object - -commit 97b5332be40fd1b1dc92a94f7a0aa1bc6614e6a3 -Author: Rodolfo Carvalho -Date: Mon May 25 22:32:27 2015 +0200 - - Include page view in the admin interface - -commit 8eccec0f1d3c0157adb9c4eecf6dde401c9448d9 -Author: Rodolfo Carvalho -Date: Mon May 25 22:31:57 2015 +0200 - - Add ConfigChange trigger - -commit 25e334bd6985d33ed6dff315ef761a6cec0d50c9 -Author: Rodolfo Carvalho -Date: Mon May 25 20:57:28 2015 +0200 - - Include database info in welcome page - -commit 00dccbbc3144974c6c5c232e6c2d3975d97d2046 -Author: Rodolfo Carvalho -Date: Mon May 25 20:54:23 2015 +0200 - - Lowercase template variable - -commit 86f8f207764f35a4a18c6e6d3ac71b49e182bcd6 -Author: Rodolfo Carvalho -Date: Mon May 25 16:12:22 2015 +0200 - - Add page view counter - - To showcase database connectivity. - -commit d398a46623b7c699a7d9f0fddecb6f486b60de98 -Author: Rodolfo Carvalho -Date: Sun May 24 21:07:24 2015 +0200 - - Fix key name - -commit 1e9b2d599cb6f20d7067910915e8f1d959d08e7e -Author: Rodolfo Carvalho -Date: Sun May 24 14:32:06 2015 +0200 - - Add script to run command in container - -commit bcefb8c4640cc7f05eb504b31e14150fceffa29b -Author: Rodolfo Carvalho -Date: Sun May 24 14:19:47 2015 +0200 - - Remove pre_deploy hook - -commit 018acd708d0e295bc2d56bcbc29a1fa75e833379 -Author: Rodolfo Carvalho -Date: Sun May 24 14:17:14 2015 +0200 - - Remove custom debug toolbar settings - -commit ed7d098cb52ddcb53d7e59a4c3429ee0c878dabc -Author: Rodolfo Carvalho -Date: Sun May 24 14:06:57 2015 +0200 - - Update README - -commit ab4b961cb51e1e2322dc59af09166d679ddd23d3 -Author: Rodolfo Carvalho -Date: Sun May 24 13:56:43 2015 +0200 - - Show server hostname - -commit 0bb02a4c0f303ea856036bc6cdf9e4d17b6525be -Author: Rodolfo Carvalho -Date: Sun May 24 13:53:57 2015 +0200 - - Reformat HTML - -commit 5bc5c9d9bc63790d8f4cd4ecba86daa850d05a75 -Author: Rodolfo Carvalho -Date: Sun May 24 13:37:30 2015 +0200 - - Show debug toolbar to all incoming requests - -commit fe41f577cdcaa09960e29dc0a2f5c02ef2c3a527 -Author: Rodolfo Carvalho -Date: Sun May 24 13:10:47 2015 +0200 - - Add demo app - -commit 0684d3f043996967ffa4828e00fc99e0d65eaf4f -Author: Rodolfo Carvalho -Date: Sun May 24 13:09:31 2015 +0200 - - Add Django Debug Toolbar - -commit bbd2bc6d091fc0edf8e5c2249179fe9fa4f9069e -Author: Rodolfo Carvalho -Date: Fri May 22 16:38:15 2015 +0200 - - Add config to send access log to file - -commit df9fdb39f78cd001b6f420d7c54c64886b378483 -Author: Rodolfo Carvalho -Date: Fri May 22 16:12:53 2015 +0200 - - Configure WhiteNoise to serve static files - -commit fcf0ccde53a7a27bffe2b678ce16e462d9f7a354 -Author: Rodolfo Carvalho -Date: Fri May 22 15:34:11 2015 +0200 - - Fix database config - -commit 83a388343b2559c50bb746f85e110d8f06e6832b -Author: Rodolfo Carvalho -Date: Fri May 22 15:33:35 2015 +0200 - - Fix template, add required metadata - -commit fada708b037b16867d835607dd9f40d4dc739187 -Author: Rodolfo Carvalho -Date: Fri May 22 15:32:24 2015 +0200 - - Fix template, name must be ImageStreamTag - - Currently, even setting "kind": "ImageStream" won't work - -commit 6103ae13630eba60acbce3e443c3df351c80625e -Author: Rodolfo Carvalho -Date: Fri May 22 15:31:55 2015 +0200 - - Fix trigger names - -commit 40f55f00d3d22a20b8f54e2f0598caccc3225450 -Author: Rodolfo Carvalho -Date: Fri May 22 15:30:02 2015 +0200 - - Fix template, kind is ImageStreamTag by default - -commit 00e160f7321f8506a9f4eb5445a025663d52179b -Author: Rodolfo Carvalho -Date: Fri May 22 14:07:04 2015 +0200 - - Fix invalid template name - -commit 8c5dfbc161fd2524ef3824cd1d774ed46c394f2f -Author: Rodolfo Carvalho -Date: Fri May 22 14:03:47 2015 +0200 - - Remove unused env vars - -commit 4308a97beb346c41de19c1f6bacf3766959fff52 -Author: Rodolfo Carvalho -Date: Fri May 22 14:00:57 2015 +0200 - - Run django migrations during deploy - -commit ae6eaa2272c43a0b793f70709c98c47c451a5133 -Author: Rodolfo Carvalho -Date: Fri May 22 13:47:35 2015 +0200 - - Add sti scripts - -commit 5548c3ad52243f9887152c117c9a72dc8c993b42 -Author: Rodolfo Carvalho -Date: Fri May 22 13:31:14 2015 +0200 - - Update template to v1 - -commit a3d47d74ccf87950fb993fbce439aa84a8427b9d -Author: Rodolfo Carvalho -Date: Tue May 19 17:37:48 2015 +0200 - - Use dedicated script to pre deploy actions - -commit 9b0e7e8a15f65717e9ce6966e8804c18fec29e14 -Author: Rodolfo Carvalho -Date: Tue May 19 12:18:31 2015 +0200 - - Update README - -commit f8143210db4dcff7036f36a010b0696a47b6abd3 -Author: Rodolfo Carvalho -Date: Wed Apr 29 17:56:59 2015 +0200 - - Add OpenShift application template - -commit e0dd41070dd908f6a036728f1171fa3b0406d78b -Author: Rodolfo Carvalho -Date: Wed Apr 29 17:56:45 2015 +0200 - - Add Django project - -commit 747910568deed5932d773ca43a570cb1c5c2727f -Author: Rodolfo Carvalho -Date: Wed Apr 29 15:30:10 2015 +0200 - - Add requirements - -commit 86dc6295ac006475a49726aa18f21bca8a3a2f3d -Author: Rodolfo Carvalho -Date: Wed Apr 29 14:40:30 2015 +0200 - - Initial commit From fa216f3fd2230084ec930ff9fdd5a5e03722ab0e Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Tue, 10 Sep 2024 11:02:30 -0700 Subject: [PATCH 2/4] Stop autogenerating db pw --- .github/workflows/.deploy.yml | 1 + database/postgresql.dc.yml | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml index f768a2fda..6f641efe5 100644 --- a/.github/workflows/.deploy.yml +++ b/.github/workflows/.deploy.yml @@ -55,3 +55,4 @@ jobs: -p REQUEST_MEMORY=512Mi -p LIMIT_CPU=500m -p LIMIT_MEMORY=1Gi + -p POSTGRESQL_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} diff --git a/database/postgresql.dc.yml b/database/postgresql.dc.yml index 3e5b7be73..f420ff7d0 100644 --- a/database/postgresql.dc.yml +++ b/database/postgresql.dc.yml @@ -29,10 +29,7 @@ parameters: generate: expression name: POSTGRESQL_USER required: true - - description: Password for the PostgreSQL connection user. - displayName: PostgreSQL Connection Password - from: "[a-zA-Z0-9]{16}" - generate: expression + - description: Password for the PostgreSQL connection user name: POSTGRESQL_PASSWORD required: true - description: Name of the PostgreSQL database accessed. From 95560606d8772214c06b6242118f62ed723aa575 Mon Sep 17 00:00:00 2001 From: "Fergus MacConnell WLRS:EX" Date: Tue, 10 Sep 2024 11:42:39 -0700 Subject: [PATCH 3/4] Comment out dump context job. Add nr- to database service. --- .github/workflows/.deploy.yml | 2 +- .github/workflows/pr-open.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml index 6f641efe5..e8702419d 100644 --- a/.github/workflows/.deploy.yml +++ b/.github/workflows/.deploy.yml @@ -44,7 +44,7 @@ jobs: file: database/postgresql.dc.yml overwrite: true parameters: - -p DATABASE_SERVICE_NAME=gwells-pg12-dev-${{ github.event.number }} + -p DATABASE_SERVICE_NAME=nr-gwells-pg12-dev-${{ github.event.number }} -p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }} -p IMAGE_STREAM_NAME=crunchy-postgres-gis -p NAME_SUFFIX=-dev-${{ github.event.number }} diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 9cc79c3c3..b295e3766 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -48,10 +48,10 @@ jobs: steps: - run: echo "Success!" - dump: - name: Dump Context - runs-on: ubuntu-22.04 - env: - CONTEXT: ${{ toJson(github) }} - steps: - - run: echo "${{ env.CONTEXT }}" + # dump: + # name: Dump Context + # runs-on: ubuntu-22.04 + # env: + # CONTEXT: ${{ toJson(github) }} + # steps: + # - run: echo "${{ env.CONTEXT }}" From 6f55aad7ae0202e0721eefe7b5bf9107517ccce4 Mon Sep 17 00:00:00 2001 From: "Fergus MacConnell WLRS:EX" Date: Tue, 10 Sep 2024 12:00:50 -0700 Subject: [PATCH 4/4] Comment out deploy-test - Helm related deploy job on merge. --- .github/workflows/merge.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index d2d605fca..f785d8475 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -34,14 +34,14 @@ jobs: uses: bcgov-nr/action-get-pr@v0.0.1 # https://github.com/bcgov/quickstart-openshift-helpers - deploy-test: - name: Deploy (test) - uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.6.1 - secrets: - oc_namespace: ${{ secrets.OC_NAMESPACE }} - oc_token: ${{ secrets.OC_TOKEN }} - with: - environment: test + # deploy-test: + # name: Deploy (test) + # uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.6.1 + # secrets: + # oc_namespace: ${{ secrets.OC_NAMESPACE }} + # oc_token: ${{ secrets.OC_TOKEN }} + # with: + # environment: test # deploy-prod: # name: Deploy (prod)