Aaron Louie
f4c6852cf9
Merge branch 'rrt/dev' into rrt/testing
2020-06-02 00:14:28 -04:00
Aaron Louie
08a87b8917
Merge branch 'feature/google-analytics' into rrt/dev
2020-06-02 00:14:02 -04:00
Aaron Louie
34ffe430a6
Wrong key
2020-06-02 00:13:12 -04:00
Aaron Louie
8097e16173
Injects GA key in Docker image build
2020-06-01 23:52:53 -04:00
Aaron Louie
cb09d4d460
Injects GA key via environment variable. Fixes GA service imports.
2020-06-01 23:49:21 -04:00
Aaron Louie
cb5b76c92f
Adds Google Analytics
2020-06-01 23:15:11 -04:00
Aaron Louie
cca7256ca5
Merge branch 'rrt/dev' into rrt/testing
2020-06-01 16:41:03 -04:00
Aaron Louie
2c0d7cdf82
Merge branch 'rrt/dev' into dev
2020-06-01 16:40:53 -04:00
Aaron Louie
930c4d219a
Updates sartography-workflow-lib
2020-06-01 16:40:44 -04:00
Aaron Louie
3b321b8b35
Merge branch 'rrt/dev' into rrt/production
2020-06-01 09:50:52 -04:00
Aaron Louie
1a5559e9a2
Merge branch 'rrt/dev' into rrt/staging
2020-06-01 09:50:41 -04:00
Aaron Louie
345cdf078d
Merge branch 'rrt/dev' into rrt/testing
2020-06-01 09:50:29 -04:00
Aaron Louie
f8ac6949e0
Merge branch 'rrt/dev' into dev
2020-06-01 09:50:16 -04:00
Aaron Louie
b236168bf7
Adds separate custom property for repeat section button label.
2020-06-01 09:50:06 -04:00
Aaron Louie
f22de9c2b3
Merge pull request #36 from sartography/rrt/staging
...
Rrt/staging
2020-06-01 01:27:39 -04:00
Aaron Louie
8ee42667ff
Merge pull request #35 from sartography/rrt/testing
...
Rrt/testing
2020-06-01 01:27:31 -04:00
Aaron Louie
d630e5b7d2
Merge pull request #34 from sartography/rrt/dev
...
Rrt/dev
2020-06-01 00:45:22 -04:00
Aaron Louie
347971d5f8
Merge branch 'rrt/dev' into dev
2020-06-01 00:44:47 -04:00
Aaron Louie
ae08ca68c9
Updates sartography-workflow-lib
2020-06-01 00:26:26 -04:00
Aaron Louie
4d9c73fa35
Updates sartography-workflow-lib: Adds title to workflow. Adds approvals to study
2020-05-31 22:56:28 -04:00
Aaron Louie
22586c2dc2
Merge pull request #33 from sartography/rrt/dev
...
Rrt/dev
2020-05-31 20:21:49 -04:00
Aaron Louie
af558bac89
Merge branch 'rrt/dev' into dev
2020-05-31 20:03:05 -04:00
Aaron Louie
517dc8d10e
Updates sartography-workflow-lib: Various Formly fixes, approval status label update.
2020-05-31 20:02:23 -04:00
Aaron Louie
21d872112f
Merge branch 'dev' into rrt/dev
2020-05-30 20:31:46 -04:00
Aaron Louie
958f73ad56
Updates sartography-workflow-lib
2020-05-30 20:31:15 -04:00
Aaron Louie
8d0ee56ba2
Merge pull request #30 from sartography/dev
...
Dev --> Testing
2020-05-29 22:30:16 -04:00
Aaron Louie
693be2e4ec
Merge branch 'rrt/dev' into rrt/testing
2020-05-29 21:50:13 -04:00
Aaron Louie
5d7664dbfc
Merge branch 'rrt/production' into rrt/dev
2020-05-29 21:49:58 -04:00
Aaron Louie
6540357d26
Merge branch 'dev' into rrt/production
2020-05-29 17:25:36 -04:00
Aaron Louie
21812867e5
Updates sartography-workflow-lib
2020-05-29 17:25:26 -04:00
Aaron Louie
a4304ab1f9
Merge branch 'dev' into rrt/production
2020-05-29 09:18:38 -04:00
Aaron Louie
a480b2d458
Removes extra slash in front of 'session' in URL.
2020-05-29 09:08:32 -04:00
Dan Funk
de5f5d1003
changing the way the token is passed.
2020-05-29 04:48:18 -04:00
Aaron Louie
a1c9b18cb1
Merge branch 'dev' into rrt/production
2020-05-27 14:55:21 -04:00
Aaron Louie
c03cbbc72e
Brings in style settings from frontend for consistency
2020-05-27 14:55:10 -04:00
Aaron Louie
ccfd229ae0
Merge branch 'rrt/production' into dev
2020-05-27 12:32:30 -04:00
Aaron Louie
9c17649371
Cleans up visual design of header and reference files screen
2020-05-27 12:32:21 -04:00
Aaron Louie
06bbc641b0
Merge branch 'dev' into rrt/production
2020-05-27 12:03:51 -04:00
Aaron Louie
f83567311e
Fixes display of autocomplete field values
2020-05-27 12:03:40 -04:00
Aaron Louie
3977532d6c
Merge branch 'dev' into rrt/production
2020-05-27 10:06:17 -04:00
Aaron Louie
bf270fb60b
Keep the port out of the URL when redirecting
2020-05-27 09:29:02 -04:00
Aaron Louie
d015679cd9
No need to add trailing slashes?
2020-05-27 08:53:30 -04:00
Aaron Louie
0d4817834e
Merge branch 'dev' into rrt/production
2020-05-26 22:05:24 -04:00
Aaron Louie
8b438a8114
Removes the extra $uri/ thing
2020-05-26 22:03:47 -04:00
Aaron Louie
c406cbcc00
Adds logo and site title. Adds file icons
2020-05-26 21:17:18 -04:00
Aaron Louie
fba504d978
Fixes failing unit tests
2020-05-26 15:38:19 -04:00
Aaron Louie
20540d4824
Updates sartography-workflow-lib
2020-05-26 15:16:00 -04:00
Aaron Louie
0592570529
Merge remote-tracking branch 'origin/dev' into dev
2020-05-26 14:48:37 -04:00
Aaron Louie
47d1c7fe88
Fixes nginx stupid. Adds back deploy url. Totally refactors docker-compose.
2020-05-26 14:48:31 -04:00
Dan Funk
3a76a077b5
Allow this app to function under /bpmn url.
...
Drop the login page all together, depend on the error interceptor to detect a logout, and redirect via shibboleth to the backend to get logged back in again.
2020-05-26 13:43:31 -04:00