brian
|
880221a953
|
Merge branch 'acs-lats-base' into acs-lats
|
2021-04-02 09:14:00 -04:00 |
|
brian
|
398d6692f8
|
Merge branch 'acs' into acs-lats
|
2021-04-02 09:13:59 -04:00 |
|
brian
|
d616b9ef3a
|
Merge branch 'acs-base' into acs
|
2021-04-02 09:13:32 -04:00 |
|
brian
|
5a16e389c4
|
Merge branch 'acs-base' into acs-lats-base
|
2021-04-02 09:13:25 -04:00 |
|
|
|
6bce626075
|
Merge branch 'proxy' into acs-base
acs-base-v6
|
2021-04-02 08:42:43 -04:00 |
|
|
|
3d6aa1d4bc
|
Merge branch 'base' into proxy
|
2021-04-02 08:41:45 -04:00 |
|
|
|
91ad3afc0a
|
removed external dir
|
2021-04-02 08:40:18 -04:00 |
|
|
|
30f3420ee5
|
Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base
|
2021-01-06 16:24:29 -05:00 |
|
|
|
677a3e1dc8
|
Merge branch 'acs.acs-base' into acs-lats.acs
|
2021-01-06 16:24:01 -05:00 |
|
|
|
2ec11a1135
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2021-01-06 16:12:46 -05:00 |
|
|
|
d70efc6943
|
parameterized AOS
|
2021-01-06 15:19:41 -05:00 |
|
|
|
40207d43ff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2021-01-06 12:22:58 -05:00 |
|
|
|
a3cb815dd1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2021-01-06 12:22:27 -05:00 |
|
|
|
ebd6c503bd
|
Merge branch 'proxy.base' into acs-base.proxy
|
2021-01-06 12:21:58 -05:00 |
|
|
|
ac18d6d637
|
fixed host/protocol URL rewrites
|
2021-01-06 12:21:21 -05:00 |
|
|
|
2a56247aa1
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-26 14:18:48 -05:00 |
|
|
|
efb9210c5a
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-26 14:18:31 -05:00 |
|
|
|
48d46aa70c
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-26 14:18:13 -05:00 |
|
|
|
55b70f1a36
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:58:15 -05:00 |
|
|
|
1d5624496d
|
renamed proxy variables to match changes to proxy branch
|
2020-12-26 13:55:19 -05:00 |
|
|
|
3a6b5c4850
|
Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy
|
2020-12-26 13:54:44 -05:00 |
|
|
|
817b062dfd
|
merged platform/share into single proxy
|
2020-12-26 13:54:31 -05:00 |
|
|
|
c0c6dcd1ce
|
remove share context; moving to acs-share-base
|
2020-12-26 13:51:23 -05:00 |
|
|
|
3ac57ce7d1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:37:05 -05:00 |
|
|
|
3cb24f7587
|
added proxy config to platform
|
2020-12-26 11:18:58 -05:00 |
|
|
|
6579a5a0c9
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:16:07 -05:00 |
|
|
|
d6b7a879b1
|
added .env configurable platform/share context
|
2020-12-26 11:15:44 -05:00 |
|
|
|
1ead7a8d16
|
added alf-specific variables back to docker-compose env in the right branch
|
2020-12-26 11:13:00 -05:00 |
|
|
|
63aa212ccb
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:11:48 -05:00 |
|
|
|
5e618569bc
|
Merge branch 'base' into proxy.base
|
2020-12-26 11:11:16 -05:00 |
|
|
|
b02204d996
|
remove alf-specific variables; renamed existing
|
2020-12-26 11:10:46 -05:00 |
|
|
|
6d396a640f
|
added JDBC driver to base config
|
2020-12-26 11:06:07 -05:00 |
|
|
|
8e1a7f11ca
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-25 23:39:36 -05:00 |
|
|
|
ca1eaa8bff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-25 23:39:19 -05:00 |
|
|
|
6ec4a797ca
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-25 23:38:22 -05:00 |
|
|
|
32ad6d8195
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-25 23:32:25 -05:00 |
|
|
|
9720bd7fa6
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-25 23:08:53 -05:00 |
|
|
|
4e8453becd
|
removed port from reverse proxy; allows it to work when port changes
|
2020-12-25 23:08:07 -05:00 |
|
|
|
0976a3975f
|
Merge branch 'acs-min-community.acs-base' into acs-lats-community.acs-min-community
|
2020-12-17 21:02:41 -05:00 |
|
|
|
60b5a8989b
|
changed from v6.2.2-RC1 to v6.2.0-ga
|
2020-12-17 20:42:54 -05:00 |
|
|
|
1e09466e78
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-17 18:54:28 -05:00 |
|
|
|
c22af67a06
|
disabled jodconverter in platform
|
2020-12-17 18:53:34 -05:00 |
|
|
|
6a6dbdc798
|
set core-aio version
|
2020-12-17 16:48:13 -05:00 |
|
|
|
80a938d674
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-17 16:42:16 -05:00 |
|
|
|
ddb535ab14
|
added legacy transform URLs
|
2020-12-17 16:40:02 -05:00 |
|
|
|
e29e80b650
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-17 16:34:26 -05:00 |
|
|
|
331eda62fc
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-17 16:33:23 -05:00 |
|
|
|
46bbeeef30
|
fixed missed envvar
|
2020-12-17 16:29:36 -05:00 |
|
|
|
6b0c103d75
|
added depends_on for proxy
|
2020-12-17 16:24:34 -05:00 |
|
|
|
faee3aaa48
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:20:23 -05:00 |
|
