Commit Graph

871 Commits

Author SHA1 Message Date
Dan Funk 0608ffa08a Restricting the admin endpoints to be admin only, and adding a bit of configuration. 2020-06-16 12:26:25 -04:00
Dan Funk 672ed367e0 Merge branch 'rrt/dev' into feature/admin 2020-06-15 16:13:57 -04:00
Aaron Louie 610a317af2 Merge branch 'dev' into rrt/dev 2020-06-15 13:30:21 -04:00
Aaron Louie cda024409b Merge branch 'rrt/production' into dev 2020-06-15 13:29:17 -04:00
Aaron Louie ffadc8e1b7 Merge branch 'rrt/staging' into rrt/production 2020-06-15 13:28:55 -04:00
Aaron Louie 6e6d34425e Merge branch 'rrt/testing' into rrt/staging 2020-06-15 13:27:19 -04:00
Aaron Louie f3999ab362 Merge branch 'rrt/dev' into rrt/testing 2020-06-15 13:26:59 -04:00
Aaron Louie 8ce8f05321 Merge branch 'dev' into rrt/dev 2020-06-15 12:54:52 -04:00
Dan Funk 92580ee867 adding an additional error check for invalid json returned from the Protocol builder. 2020-06-15 12:26:53 -04:00
Aaron Louie fae80cd3d0 Merge branch 'dev' into rrt/dev 2020-06-15 11:52:43 -04:00
Dan Funk eec4b579a7 Don't error out if we don't have a valid study id when doing validation. 2020-06-15 11:27:28 -04:00
Aaron Louie a78b23f108 Merge branch 'rrt/dev' into dev 2020-06-13 23:46:10 -04:00
Aaron Louie 3a1b36d564 Adds database URI 2020-06-13 23:46:00 -04:00
Aaron Louie f171d88bf4 Merge branch 'dev' into rrt/dev 2020-06-13 23:34:23 -04:00
Aaron Louie 81b6fc1490 Removes unnecessary extra config file 2020-06-13 23:34:12 -04:00
Aaron Louie bca58ed578 Merge branch 'rrt/dev' into dev 2020-06-13 11:56:12 -04:00
Aaron Louie c664a77beb Updates default Protocol Builder base URL 2020-06-13 11:56:00 -04:00
Aaron Louie 6ba5b8f272
Merge branch 'master' into dev 2020-06-12 16:56:53 -04:00
Aaron Louie bee7165ff1 Trying to speed up Docker builds 2020-06-12 16:53:35 -04:00
Aaron Louie d6e7f4939b
Merge branch 'staging' into dev 2020-06-12 16:51:08 -04:00
Aaron Louie 2a54a5cc05
Merge branch 'testing' into dev 2020-06-12 15:56:30 -04:00
Aaron Louie 7e3378b4a6 Merge branch 'rrt/dev' into dev 2020-06-12 14:35:34 -04:00
Aaron Louie a4a367cb22
Merge pull request #116 from sartography/chore/test_coverage
Chore/test coverage
2020-06-12 14:34:47 -04:00
Aaron Louie 8d84775896 Merge branch 'rrt/dev' into dev 2020-06-12 14:31:58 -04:00
Aaron Louie 2a84d5196a filter, not filter_by 2020-06-12 14:13:27 -04:00
Aaron Louie e3126620b3 Eschews obfuscation 2020-06-12 14:09:08 -04:00
Aaron Louie 561e254315 Prevents non-admin users from editing each others' tasks. Fixes bug where test user uid was not being set from token. Moves complete form and get workflow API test utility methods into BaseTest. 2020-06-12 13:46:10 -04:00
Aaron Louie d7e8f22c5b
Merge pull request #115 from sartography/feature/swagger_admin_authentication
Feature/swagger admin authentication
2020-06-11 19:20:04 -04:00
Aaron Louie 691258a4fb Fixes bug where approvals counts were off by 1. Tests CSV export and all approvals endpoints with lots of records. 2020-06-11 17:15:44 -04:00
Aaron Louie f51e5e4e6b Adds tests for approval counts and all approvals endpoints 2020-06-11 16:39:00 -04:00
Aaron Louie 768f14b3ac Cleans up console logging 2020-06-11 13:42:44 -04:00
Aaron Louie 0cbbe756a3 Tests for token expiration ApiError 2020-06-11 13:42:32 -04:00
Aaron Louie 312eef4d40 Raises 403 error if no user found 2020-06-11 13:07:27 -04:00
Dan Funk 4e006e2653 Clear out the g.user between tests. 2020-06-11 11:49:07 -04:00
Aaron Louie cccff9b856 Fixes broken unit tests. But still broken. 2020-06-11 11:29:58 -04:00
Aaron Louie 1f5554d0d8 Merge branch 'rrt/dev' into feature/swagger_admin_authentication 2020-06-11 08:55:29 -04:00
Dan Funk 9281c962a6 Default to no ssl or tls 2020-06-08 14:46:36 -04:00
Dan Funk 777e429382 Merging production back into dev, because we got out of whack somehow. 2020-06-08 14:19:30 -04:00
Dan Funk 8cf420b781 Default mail user name and password to blank. 2020-06-08 14:15:56 -04:00
Carlos Lopez ed10cc1fa8 Enabling mail debugging 2020-06-08 11:59:09 -06:00
Carlos López 29dc3ecfe5
Merge pull request #113 from sartography/fix/error-collection-on-mails
Adding bcc to all emails sent
2020-06-08 11:31:13 -06:00
Dan Funk e370148380
Merge pull request #112 from sartography/rrt/dev
Rrt/dev
2020-06-08 13:18:41 -04:00
Carlos Lopez 0351b3548a Adding bcc to all emails sent 2020-06-08 11:17:17 -06:00
Dan Funk 943169e7e2
Merge pull request #111 from sartography/fix/error-collection-on-mails
Capturing explicit errors from mails
2020-06-08 12:51:11 -04:00
Carlos Lopez f91fbf76b9 Capturing explicit errors from mails 2020-06-08 09:16:26 -06:00
Aaron Louie 87e2379871 Merge branch 'rrt/dev' into feature/swagger_admin_authentication 2020-06-08 10:30:16 -04:00
Carlos Lopez 4cf52b527c Adding admin dashboard 2020-06-08 07:14:31 -06:00
Aaron Louie 2ffdd70f06 Merge branch 'rrt/staging' into rrt/production 2020-06-07 22:39:51 -04:00
Aaron Louie 1744f07148 Merge branch 'rrt/testing' into rrt/staging 2020-06-07 22:39:42 -04:00
Aaron Louie 1c8c085afe Merge branch 'rrt/dev' into rrt/testing 2020-06-07 22:39:34 -04:00