 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
|
24ea707337
|
Merge branch 'ags.acs' into ags-backend.ags
|
2021-01-06 16:29:50 -05:00 |
|
|
brian.long
|
da0046118b
|
Merge branch 'acs-backend.acs-lats' into ags-backend.acs-backend
|
2021-01-06 16:29:33 -05:00 |
|
|
brian.long
|
0999563353
|
Merge branch 'acs.acs-base' into ags.acs
|
2021-01-06 16:27:44 -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
|
962817ba63
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2021-01-06 15:56:25 -05:00 |
|
|
brian.long
|
d70efc6943
|
parameterized AOS
|
2021-01-06 15:19:41 -05:00 |
|
|
brian.long
|
4863e29854
|
Merge branch 'ags-community.acs-community' into ags-backend-community.ags-community
|
2021-01-06 12:24:27 -05:00 |
|
|
brian.long
|
d96822cedd
|
Merge branch 'acs-backend-community.acs-lats-community' into ags-backend-community.acs-backend-community
|
2021-01-06 12:24:18 -05:00 |
|
|
brian.long
|
295b0711b0
|
Merge branch 'acs-community.acs-base' into ags-community.acs-community
|
2021-01-06 12:24:10 -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
|
59d082734f
|
Merge branch 'acs-backend-community.acs-lats-community' into ags-backend-community.ags-community
|
2021-01-06 10:26:33 -05:00 |
|
|
brian.long
|
bc6a8539f3
|
switched platform to AGS (not AMP module distributed anymore)
|
2021-01-06 10:24:47 -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
|
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
|
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
|
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
|
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
|
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
|
32ad6d8195
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-25 23:32:25 -05:00 |
|
|
brian.long
|
0ed77985f0
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-25 23:32:10 -05:00 |
|