76 Commits

Author SHA1 Message Date
Aaron Louie
1e826bbd21 Merge branch 'dev' into rrt/dev 2020-05-23 15:12:49 -04:00
Aaron Louie
4a03fb1ede Sets base href from environment variable 2020-05-23 12:29:32 -04:00
Aaron Louie
0fa80ea5fb Runs database upgrade/downgrade/reset based on environment variables 2020-05-22 14:56:46 -04:00
Aaron Louie
6a370deff8 Merge branch 'rrt/dev' into dev 2020-05-18 22:00:03 -04:00
Aaron Louie
afac5dc9e3 Merge branch 'master' into rrt/dev 2020-05-18 21:59:27 -04:00
Aaron Louie
228469e622
Merge pull request #3 from sartography/feature/not_sure
Fixing a bug that prevented editing existing studies.
2020-05-18 21:58:12 -04:00
Aaron Louie
5ef1ce4147 Merge remote-tracking branch 'origin/testing' into feature/not_sure 2020-05-16 13:49:01 -04:00
Aaron Louie
f967b67f8e
Merge branch 'master' into feature/not_sure 2020-05-16 13:46:15 -04:00
Aaron Louie
3019b1199b
Merge pull request #11 from sartography/dev
Dev
2020-05-16 13:45:33 -04:00
Aaron Louie
46eb99085f
Merge branch 'testing' into dev 2020-05-16 13:16:05 -04:00
Aaron Louie
8d805e3757 Merge branch 'rrt/dev' into dev 2020-05-16 13:14:26 -04:00
Aaron Louie
279a664069 Corrects typo 2020-05-16 13:14:10 -04:00
Aaron Louie
c2f121d0c7
Merge pull request #10 from sartography/dev
Dev
2020-05-16 12:50:49 -04:00
Aaron Louie
c8424acba7
Merge branch 'testing' into dev 2020-05-16 11:44:03 -04:00
Aaron Louie
6e4fb0e4c5 Merge branch 'dev' into rrt/dev 2020-05-16 11:42:14 -04:00
Aaron Louie
ffb8927661 Run flask on PORT_0 environment variable, if defined. 2020-05-16 11:42:03 -04:00
Aaron Louie
1d47c76ce3 Merge branch 'dev' into rrt/dev 2020-05-15 21:48:01 -04:00
Aaron Louie
f527a1a016 Sets default port to 5001 2020-05-15 21:33:48 -04:00
Aaron Louie
0661567c03 Allows port to be set via environment variable 2020-05-15 21:32:17 -04:00
Aaron Louie
04b3639585
Merge pull request #9 from sartography/dev
Dev
2020-05-14 15:44:50 -04:00
Aaron Louie
577646f809
Merge pull request #8 from sartography/rrt/dev
Rrt/dev
2020-05-14 13:17:32 -04:00
Aaron Louie
9b43f5987a Only creates Docker tag for branch 2020-05-14 08:51:49 -04:00
Aaron Louie
c05893130e Builds RRT Docker image. Deploys to RRT instance. 2020-05-13 21:18:10 -04:00
Aaron Louie
3cdb39aecc Adds dev, demo, and training branches 2020-05-11 12:05:05 -04:00
Aaron Louie
aa9c306cab
Merge pull request #7 from sartography/staging
Staging
2020-05-08 17:37:24 -04:00
Aaron Louie
ccc8613069
Merge pull request #6 from sartography/testing
Testing
2020-05-08 15:49:24 -04:00
Aaron Louie
c5c3403086
Merge pull request #5 from sartography/chore/github_branches_to_docker_tags
Tags Docker image with branch, commit, and Travis build number. Deplo…
2020-05-07 17:18:41 -04:00
Aaron Louie
aca5cd1621 Tags Docker image with branch, commit, and Travis build number. Deploys to appropriate DC/OS stage after successful Docker push. 2020-05-07 17:03:57 -04:00
Aaron Louie
8dda7fd9f4 Adds DSP 2020-05-06 10:38:02 -04:00
Dan Funk
771a90ace7 Merge branch 'master' of github.com:sartography/protocol-builder-mock 2020-04-21 13:35:37 -04:00
Aaron Louie
a5a4733058 Prevents duplicate studies and requirements from being created on study update 2020-04-17 11:27:12 -04:00
Aaron Louie
c5861166d9 Sets dev and testing environment variables 2020-04-15 16:49:14 -04:00
Aaron Louie
d68079b247 Prints some config settings for debugging 2020-04-15 14:02:52 -04:00
Aaron Louie
6a506af7ed Exposes correct port. Prints some config settings for debugging. 2020-04-15 13:49:57 -04:00
Aaron Louie
b91e6ea923 Removes eval. Just casting string to bool works. 2020-04-15 13:36:26 -04:00
Aaron Louie
b3ef4eac87 Enables config items to be set via environment variables 2020-04-15 13:26:40 -04:00
Aaron Louie
e5d02e4015 Adds favicon to silence 404 error 2020-04-03 18:14:51 -04:00
Aaron Louie
10f70e1d5f Moves awscli install to install step 2020-04-03 16:41:28 -04:00
Aaron Louie
7ce4e008bc Moves AWS CLI install step into deploy script 2020-04-03 15:53:58 -04:00
Aaron Louie
968b6bba0b Skips cleanup in deploy step 2020-04-03 15:38:01 -04:00
Aaron Louie
b74e5798d2 Sends message to DCOS when Docker Hub image is updated 2020-04-03 11:32:50 -04:00
Aaron Louie
124f358984 Fixes path 2020-04-02 08:59:23 -04:00
Aaron Louie
b111fb7554 Fixes paths 2020-04-02 08:58:29 -04:00
Aaron Louie
6f4f8df6a9 Runs flask db upgrade on startup 2020-04-01 18:26:07 -04:00
Dan Funk
d5b2decd89 Fixing a bug that prevented editing existing studies. 2020-03-30 09:34:42 -04:00
Aaron Louie
a54ddec58b Uses sqlite for local testing. 2020-03-25 10:21:01 -04:00
Aaron Louie
6f0facdb69 Installs pyscss build dependency 2020-03-25 10:00:07 -04:00
Dan Funk
4ea5340248 Just auto-increment study ids, don't require them. Creates a big mess. 2020-03-24 16:52:13 -04:00
Dan Funk
8955a2d00c Switching to postgres means we need to be more complete in our deletes. 2020-03-24 14:32:59 -04:00
Dan Funk
57f66063df Still trying to get this to move all the way through the build process. Sheesh, how many different ways can I mess this up?!? 2020-03-23 17:05:34 -04:00