 brian.long
|
6bce626075
|
Merge branch 'proxy' into acs-base
|
2021-04-02 08:42:43 -04:00 |
|
|
brian.long
|
3d6aa1d4bc
|
Merge branch 'base' into proxy
|
2021-04-02 08:41:45 -04:00 |
|
|
brian.long
|
91ad3afc0a
|
removed external dir
|
2021-04-02 08:40:18 -04:00 |
|
|
brian.long
|
83c580d470
|
Merge branch 'acs-frontend.acs-backend' into acs-jsconsole.acs-frontend
|
2021-01-06 16:39:02 -05:00 |
|
|
brian.long
|
b01d012d93
|
Merge branch 'ext-jsconsole.acs-ext-platform' into acs-jsconsole.ext-jsconsole
|
2021-01-06 16:38:41 -05:00 |
|
|
brian.long
|
69531bde6d
|
Merge branch 'acs-backend.acs-lats' into acs-frontend.acs-backend
|
2021-01-06 16:29:12 -05:00 |
|
|
brian.long
|
766b2ebfd0
|
Merge branch 'acs-share-base.acs-base' into acs-frontend.acs-share-base
|
2021-01-06 16:28:51 -05:00 |
|
|
brian.long
|
078b2ae35c
|
Merge branch 'acs-lats.acs' into acs-backend.acs-lats
|
2021-01-06 16:27:31 -05:00 |
|
|
brian.long
|
5ff71f0e3c
|
Merge branch 'acs-search.acs' into acs-backend.acs-search
|
2021-01-06 16:27:17 -05:00 |
|
|
brian.long
|
2878298644
|
Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base
|
2021-01-06 16:26:04 -05:00 |
|
|
brian.long
|
11bb8c62ed
|
Merge branch 'acs.acs-base' into acs-search.acs
|
2021-01-06 16:24:47 -05:00 |
|
|
brian.long
|
30f3420ee5
|
Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base
|
2021-01-06 16:24:29 -05:00 |
|
|
brian.long
|
677a3e1dc8
|
Merge branch 'acs.acs-base' into acs-lats.acs
|
2021-01-06 16:24:01 -05:00 |
|
|
brian.long
|
2ec11a1135
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2021-01-06 16:12:46 -05:00 |
|
|
brian.long
|
3dd7309a4e
|
Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share
|
2021-01-06 16:10:32 -05:00 |
|
|
brian.long
|
1829253edd
|
Merge branch 'acs-ext-platform.acs-base' into ext-jsconsole.acs-ext-platform
|
2021-01-06 16:10:21 -05:00 |
|
|
brian.long
|
85d3b45097
|
Merge branch 'download.base' into ext-jsconsole.download
|
2021-01-06 16:09:56 -05:00 |
|
|
brian.long
|
f49ea55a48
|
Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base
|
2021-01-06 16:09:26 -05:00 |
|
|
brian.long
|
fa515e4984
|
Merge branch 'acs-base.proxy' into acs-ext-platform.acs-base
|
2021-01-06 16:07:52 -05:00 |
|
|
brian.long
|
962817ba63
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2021-01-06 15:56:25 -05:00 |
|
|
brian.long
|
3ef69c527b
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2021-01-06 15:54:53 -05:00 |
|
|
brian.long
|
6261f8b7ab
|
Merge branch 'base' into download.base
|
2021-01-06 15:53:45 -05:00 |
|
|
brian.long
|
067130cb4b
|
Merge branch 'acs-frontend.acs-backend' into acs-jsconsole.acs-frontend
|
2021-01-06 15:45:54 -05:00 |
|
|
brian.long
|
d70efc6943
|
parameterized AOS
|
2021-01-06 15:19:41 -05:00 |
|
|
brian.long
|
9e2ce6b967
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
|
2021-01-06 12:29:24 -05:00 |
|
|
brian.long
|
e660d79ef1
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2021-01-06 12:23:49 -05:00 |
|
|
brian.long
|
f036e13180
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2021-01-06 12:23:35 -05:00 |
|
|
brian.long
|
83db2b08dc
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2021-01-06 12:23:18 -05:00 |
|
|
brian.long
|
40207d43ff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2021-01-06 12:22:58 -05:00 |
|
|
brian.long
|
a3cb815dd1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2021-01-06 12:22:27 -05:00 |
|
|
brian.long
|
ebd6c503bd
|
Merge branch 'proxy.base' into acs-base.proxy
|
2021-01-06 12:21:58 -05:00 |
|
|
brian.long
|
ac18d6d637
|
fixed host/protocol URL rewrites
|
2021-01-06 12:21:21 -05:00 |
|
|
brian.long
|
4c0b3fe061
|
Merge branch 'acs-frontend-community.acs-backend-community' into acs-jsconsole-community.acs-frontend-community
|
2021-01-06 10:46:28 -05:00 |
|
|
brian.long
|
9d415076a7
|
Merge branch 'ext-jsconsole.acs-ext-platform' into acs-jsconsole-community.ext-jsconsole
|
2021-01-06 10:46:15 -05:00 |
|
|
brian.long
|
512c51e5ac
|
Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share
|
2021-01-06 10:45:53 -05:00 |
|
|
brian.long
|
e582744e6c
|
Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base
|
2021-01-06 10:45:43 -05:00 |
|
|
brian.long
|
a0c6074358
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2021-01-06 10:45:33 -05:00 |
|
|
brian.long
|
4afdf95b44
|
added share context to share config
|
2021-01-06 10:45:23 -05:00 |
|
|
brian.long
|
8ab92e681e
|
Merge branch 'ext-jsconsole.acs-ext-platform' into acs-jsconsole-community.ext-jsconsole
|
2020-12-26 15:12:04 -05:00 |
|
|
brian.long
|
2e3990c8ff
|
Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share
|
2020-12-26 15:11:35 -05:00 |
|
|
brian.long
|
31eaf8c7c2
|
Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base
|
2020-12-26 15:11:03 -05:00 |
|
|
brian.long
|
b3001c56ff
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2020-12-26 15:10:45 -05:00 |
|
|
brian.long
|
89ffe20aee
|
added CSRF
|
2020-12-26 15:10:13 -05:00 |
|
|
brian.long
|
802a13ee9a
|
Merge branch 'ext-jsconsole.acs-ext-platform' into acs-jsconsole-community.ext-jsconsole
|
2020-12-26 14:29:28 -05:00 |
|
|
brian.long
|
55500840e1
|
Merge branch 'acs-frontend-community.acs-backend-community' into acs-jsconsole-community.acs-frontend-community
|
2020-12-26 14:29:12 -05:00 |
|
|
brian.long
|
4d5a486d16
|
Merge branch 'acs-ext-platform.acs-base' into ext-jsconsole.acs-ext-platform
|
2020-12-26 14:27:42 -05:00 |
|
|
brian.long
|
58e4543d0f
|
Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share
|
2020-12-26 14:27:23 -05:00 |
|
|
brian.long
|
14a4c09f4d
|
Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base
|
2020-12-26 14:27:06 -05:00 |
|
|
brian.long
|
d4f4b6217e
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2020-12-26 14:22:18 -05:00 |
|
|
brian.long
|
41b87a9e5e
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2020-12-26 14:20:33 -05:00 |
|
|
brian.long
|
86ad2bc409
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-26 14:20:12 -05:00 |
|
|
brian.long
|
2a56247aa1
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-26 14:18:48 -05:00 |
|
|
brian.long
|
efb9210c5a
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-26 14:18:31 -05:00 |
|
|
brian.long
|
48d46aa70c
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-26 14:18:13 -05:00 |
|
|
brian.long
|
5a12f3a6e0
|
Merge branch 'acs-base.proxy' into acs-ext-platform.acs-base
|
2020-12-26 14:06:49 -05:00 |
|
|
brian.long
|
fc9c26eac5
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-26 14:02:30 -05:00 |
|
|
brian.long
|
2715b3afea
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 14:00:14 -05:00 |
|
|
brian.long
|
55b70f1a36
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:58:15 -05:00 |
|
|
brian.long
|
f2ac689f85
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 13:56:13 -05:00 |
|
|
brian.long
|
1d5624496d
|
renamed proxy variables to match changes to proxy branch
|
2020-12-26 13:55:19 -05:00 |
|
|
brian.long
|
3a6b5c4850
|
Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy
|
2020-12-26 13:54:44 -05:00 |
|
|
brian.long
|
817b062dfd
|
merged platform/share into single proxy
|
2020-12-26 13:54:31 -05:00 |
|
|
brian.long
|
2367651a7e
|
added share context removed from acs-base
|
2020-12-26 13:52:17 -05:00 |
|
|
brian.long
|
b8b267d4c5
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 13:51:34 -05:00 |
|
|
brian.long
|
c0c6dcd1ce
|
remove share context; moving to acs-share-base
|
2020-12-26 13:51:23 -05:00 |
|
|
brian.long
|
253b7fd3f2
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-26 13:50:37 -05:00 |
|
|
brian.long
|
9f75b4439d
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 13:46:21 -05:00 |
|
|
brian.long
|
3ac57ce7d1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:37:05 -05:00 |
|
|
brian.long
|
68fcb3cbef
|
added proxy config to share
|
2020-12-26 11:20:42 -05:00 |
|
|
brian.long
|
4381a2d350
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 11:19:21 -05:00 |
|
|
brian.long
|
3cb24f7587
|
added proxy config to platform
|
2020-12-26 11:18:58 -05:00 |
|
|
brian.long
|
6579a5a0c9
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:16:07 -05:00 |
|
|
brian.long
|
d6b7a879b1
|
added .env configurable platform/share context
|
2020-12-26 11:15:44 -05:00 |
|
|
brian.long
|
1ead7a8d16
|
added alf-specific variables back to docker-compose env in the right branch
|
2020-12-26 11:13:00 -05:00 |
|
|
brian.long
|
63aa212ccb
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:11:48 -05:00 |
|
|
brian.long
|
5e618569bc
|
Merge branch 'base' into proxy.base
|
2020-12-26 11:11:16 -05:00 |
|
|
brian.long
|
b02204d996
|
remove alf-specific variables; renamed existing
|
2020-12-26 11:10:46 -05:00 |
|
|
brian.long
|
6d396a640f
|
added JDBC driver to base config
|
2020-12-26 11:06:07 -05:00 |
|
|
brian.long
|
09472e3fff
|
Merge branch 'ext-jsconsole.acs-ext-platform' into acs-jsconsole-community.ext-jsconsole
|
2020-12-26 00:04:00 -05:00 |
|
|
brian.long
|
8e697651c8
|
Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share
|
2020-12-26 00:01:50 -05:00 |
|
|
brian.long
|
486ff23ce4
|
Merge remote-tracking branch 'home/acs-ext-share.acs-share-base' into acs-ext-share.acs-share-base
|
2020-12-26 00:01:32 -05:00 |
|
|
brian.long
|
f2f0eecccc
|
Merge branch 'acs-ext-platform.acs-base' into ext-jsconsole.acs-ext-platform
|
2020-12-26 00:00:58 -05:00 |
|
|
brian.long
|
b6ff1bb4d2
|
Merge remote-tracking branch 'home/acs-ext-platform.acs-base' into acs-ext-platform.acs-base
|
2020-12-26 00:00:32 -05:00 |
|
|
brian.long
|
a188848ab4
|
Merge branch 'acs-frontend-community.acs-backend-community' into acs-jsconsole-community.acs-frontend-community
|
2020-12-25 23:50:54 -05:00 |
|
|
brian.long
|
69b752d971
|
Merge branch 'ext-jsconsole.acs-ext-platform' into acs-jsconsole-community.ext-jsconsole
|
2020-12-25 23:50:21 -05:00 |
|
|
brian.long
|
843f9ec293
|
Merge branch 'download.base' into ext-jsconsole.download
|
2020-12-25 23:48:30 -05:00 |
|
|
brian.long
|
ce4ce17c92
|
Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share
|
2020-12-25 23:48:03 -05:00 |
|
|
brian.long
|
5546bab430
|
Merge branch 'acs-ext-platform.acs-base' into ext-jsconsole.acs-ext-platform
|
2020-12-25 23:47:37 -05:00 |
|
|
brian.long
|
573ab3d2cb
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2020-12-25 23:41:27 -05:00 |
|
|
brian.long
|
c2795cd76c
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
|
2020-12-25 23:40:53 -05:00 |
|
|
brian.long
|
17f70ea253
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2020-12-25 23:40:25 -05:00 |
|
|
brian.long
|
2173a9eb5b
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-25 23:40:01 -05:00 |
|
|
brian.long
|
8e1a7f11ca
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-25 23:39:36 -05:00 |
|
|
brian.long
|
ca1eaa8bff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-25 23:39:19 -05:00 |
|
|
brian.long
|
520e211c11
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-25 23:38:58 -05:00 |
|
|
brian.long
|
1635445cba
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-25 23:38:36 -05:00 |
|
|
brian.long
|
6ec4a797ca
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-25 23:38:22 -05:00 |
|
|
brian.long
|
bdef8c6b7f
|
Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base
|
2020-12-25 23:38:02 -05:00 |
|
|
brian.long
|
8467968c92
|
Merge branch 'acs-base.proxy' into acs-ext-platform.acs-base
|
2020-12-25 23:37:45 -05:00 |
|
|
brian.long
|
32ad6d8195
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-25 23:32:25 -05:00 |
|