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 |
|
Carlos Lopez
|
59d66be10f
|
Handling empty task state
|
2020-06-16 13:13:30 -06: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 |
Dan Funk
|
1b9166dcb7
|
Cleaning up the merge, which resulted in some lost code.
|
2020-06-16 13:34:21 -04:00 |
Aaron Louie
|
3f3be6bda0
|
Merge pull request #119 from sartography/staging
Staging --> Master
|
2020-06-16 13:26:19 -04:00 |
|
Aaron Louie
|
b1d6403f84
|
Merge branch 'rrt/staging' into rrt/production
|
2020-06-16 13:25:44 -04:00 |
|
Aaron Louie
|
2ec68cd62b
|
Merge branch 'rrt/testing' into rrt/staging
|
2020-06-16 13:25:34 -04:00 |
|
Aaron Louie
|
958474fb19
|
Merge branch 'rrt/dev' into rrt/testing
|
2020-06-16 13:25:24 -04:00 |
|
Dan Funk
|
c7d8eaff30
|
Merge branch 'dev' into feature/refactor_data_loading
|
2020-06-16 13:15:43 -04:00 |
|
Aaron Louie
|
bbc4406696
|
Merge pull request #118 from sartography/testing
Testing --> Staging
|
2020-06-16 13:10:37 -04:00 |
|
Aaron Louie
|
ee669d30d2
|
Merge pull request #120 from sartography/dev
Disables AWS SQS message to refresh DCOS
|
2020-06-16 12:57:39 -04:00 |
|
Dan Funk
|
bd1321baf0
|
Merge branch 'dev' into feature/admin
|
2020-06-16 12:29:43 -04:00 |
|
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 |
|
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 |
|
Aaron Louie
|
bd79ced0d1
|
Merge pull request #117 from sartography/dev
Dev --> Testing
|
2020-06-16 08:59:58 -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 |
|
Dan Funk
|
672ed367e0
|
Merge branch 'rrt/dev' into feature/admin
|
2020-06-15 16:13:57 -04:00 |
|
Aaron Louie
|
43e73c9b08
|
Merge branch 'testing' into dev
|
2020-06-15 13:59:17 -04:00 |
|
Aaron Louie
|
8f14661822
|
Merge branch 'rrt/staging' into rrt/production
|
2020-06-15 13:31:09 -04:00 |
|
Aaron Louie
|
6e5c778ab8
|
Merge branch 'rrt/testing' into rrt/staging
|
2020-06-15 13:31:01 -04:00 |
|
Aaron Louie
|
5a312a2b2f
|
Merge branch 'rrt/dev' into rrt/testing
|
2020-06-15 13:30:49 -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
|
92a665aaf8
|
Merge pull request #87 from sartography/dev
Dev --> Master
|
2020-06-12 17:07:30 -04:00 |
|
Aaron Louie
|
2c0cda1792
|
Merge pull request #86 from sartography/dev
Dev --> Staging
|
2020-06-12 17:07:18 -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 |