895 Commits

Author SHA1 Message Date
Carlos Lopez
4db815a999 Handling incoming values from processor 2020-06-17 21:11:47 -06:00
Carlos Lopez
e947f40ec7 Merge branch 'rrt/dev' into feature/emails-enhancement 2020-06-17 20:10:11 -06:00
Carlos Lopez
5ce279b663 Dropping silly pdb statement 2020-06-17 17:36:15 -06:00
Carlos Lopez
896ba6b377 Email relies now on markdown content 2020-06-17 17:00:16 -06:00
Carlos Lopez
ddf1f4640c Re-organizing tests file structure 2020-06-17 16:10:06 -06:00
Carlos Lopez
2ce2dc73b5 Rendering proper content & organizing file structure for email tests 2020-06-17 16:09:38 -06:00
Aaron Louie
769bdbeb46 Merge branch 'dev' into rrt/dev 2020-06-17 11:11:39 -04:00
Carlos Lopez
c730a7b1ec Sending subject and using default sender 2020-06-17 08:53:02 -06:00
Aaron Louie
720435113b Fixes typo in Alex's uid 2020-06-17 08:54:43 -04:00
Aaron Louie
afd86e56ee Goes back to python base 2020-06-16 22:41:02 -04:00
Aaron Louie
40ff3b5fcb Uses mock LDAP if LDAP_URL environment variable is 'mock' 2020-06-16 21:43:20 -04:00
Carlos Lopez
2ff836019f Sonarcloud fix 2020-06-16 18:55:18 -06:00
Carlos Lopez
d4a285883f Email script 2020-06-16 18:42:36 -06:00
Aaron Louie
1b124a7503 Merge branch 'dev' into rrt/dev 2020-06-16 16:38:13 -04:00
Aaron Louie
64cecfba07 Installs pytest and coverage as dev dependencies 2020-06-16 15:56:09 -04:00
Aaron Louie
388f667cde Updates package hashes. 2020-06-16 14:46:38 -04:00
Aaron Louie
db42a9128d Removes dependence on cr-connect-python-base for now 2020-06-16 14:23:13 -04:00
Aaron Louie
7e1bc6062c Merge branch 'dev' into rrt/dev 2020-06-16 11:44:57 -04:00
Aaron Louie
14d68f40df Disables AWS SQS message to refresh DCOS 2020-06-16 11:09:48 -04:00
Kelly McDonald
7723862530 Merge branch 'dev' of https://github.com/sartography/cr-connect-workflow into dev 2020-06-15 16:30:17 -04:00
Aaron Louie
43e73c9b08
Merge branch 'testing' into dev 2020-06-15 13:59:17 -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
Kelly McDonald
706c4afda5 Create a parameter 'lane' since we are using the output from the nav-list as the input to the NavigationItem initializer.
NB - this doesn't do anything with the lane designation, it just keeps it from blowing up.
2020-06-15 12:33:51 -04:00
Kelly McDonald
0d3105fe7e Make changes to the workflow names so that they are placed in the correct order - I made workflows go in order of the name rather than in the order they appear in the XML to allow more control over the way the nav list is displayed. 2020-06-15 12:32:19 -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
17b36a81f2
Merge pull request #85 from sartography/dev
Dev --> Testing
2020-06-12 16:05:31 -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
Carlos Lopez
5f13b96079 More enhancements 2020-06-12 12:17:08 -06: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