|
da0046118b
|
Merge branch 'acs-backend.acs-lats' into ags-backend.acs-backend
|
2021-01-06 16:29:33 -05:00 |
|
|
5ff71f0e3c
|
Merge branch 'acs-search.acs' into acs-backend.acs-search
|
2021-01-06 16:27:17 -05:00 |
|
|
11bb8c62ed
|
Merge branch 'acs.acs-base' into acs-search.acs
|
2021-01-06 16:24:47 -05:00 |
|
|
d70efc6943
|
parameterized AOS
|
2021-01-06 15:19:41 -05:00 |
|
|
59d082734f
|
Merge branch 'acs-backend-community.acs-lats-community' into ags-backend-community.ags-community
|
2021-01-06 10:26:33 -05:00 |
|
|
bc6a8539f3
|
switched platform to AGS (not AMP module distributed anymore)
|
2021-01-06 10:24:47 -05:00 |
|
|
86ad2bc409
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-26 14:20:12 -05:00 |
|
|
efb9210c5a
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-26 14:18:31 -05:00 |
|
|
fc9c26eac5
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-26 14:02:30 -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 |
|
|
c0c6dcd1ce
|
remove share context; moving to acs-share-base
|
2020-12-26 13:51:23 -05:00 |
|
|
253b7fd3f2
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-26 13:50:37 -05:00 |
|
|
9f75b4439d
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 13:46:21 -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 |
|
|
6d396a640f
|
added JDBC driver to base config
|
2020-12-26 11:06: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 |
|
|
0ad2cdf9ad
|
Merge branch 'acs-search-community.acs-min-community' into acs-backend-community.acs-search-community
|
2020-12-17 21:01:06 -05:00 |
|
|
1d0aa0c91e
|
fixed solr configuration on platform
|
2020-12-17 21:00:27 -05:00 |
|
|
7a005d16d7
|
Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community
|
2020-12-17 20:50:09 -05:00 |
|
|
60b5a8989b
|
changed from v6.2.2-RC1 to v6.2.0-ga
|
2020-12-17 20:42:54 -05:00 |
|
|
f02d4ff427
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-17 18:55:28 -05:00 |
|
|
1e09466e78
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-17 18:54:28 -05:00 |
|
|
b762ba0ce1
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-17 18:53:59 -05:00 |
|
|
c22af67a06
|
disabled jodconverter in platform
|
2020-12-17 18:53:34 -05:00 |
|
|
1216469feb
|
Merge branch 'acs-lats-community.acs-community' into acs-search-lats-community.acs-lats-community
|
2020-12-17 16:48:32 -05:00 |
|
|
6a6dbdc798
|
set core-aio version
|
2020-12-17 16:48:13 -05:00 |
|
|
2ac3d013c9
|
Merge branch 'acs-search-community.acs-community' into acs-search-lats-community.acs-search-community
|
2020-12-17 16:43:44 -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 |
|
|
43d5686407
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-17 16:35:11 -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 |
|
|
fbf7ca3678
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-17 16:32:50 -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 |
|
|
beb87dd97a
|
Merge branch 'proxy.base' into acs-proxy.proxy
|
2020-12-17 16:20:12 -05:00 |
|
|
a42af25649
|
added port for localhost
|
2020-12-17 16:19:34 -05:00 |
|
|
db6a1e148c
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:16:57 -05:00 |
|
|
ab396f7656
|
changed version to 'acs'
|
2020-12-17 16:16:44 -05:00 |
|
|
b65d3d301f
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:16:07 -05:00 |
|
|
6332985ebd
|
removed proxy
|
2020-12-17 16:09:48 -05:00 |
|
|
f1df9c3217
|
initial nginx dynamic docker image config
|
2020-12-17 16:03:33 -05:00 |
|
|
69974eaeea
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-17 13:24:15 -05:00 |
|
|
82d6fd5c8a
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-17 13:22:28 -05:00 |
|
|
90e935a49e
|
minor fixes
|
2020-12-17 13:22:05 -05:00 |
|
|
6e32209824
|
Merge branch 'acs-base.base' into acs-community.acs-base
|
2020-12-17 13:20:59 -05:00 |
|
|
0bb3b7bb28
|
added service name reference to platform
|
2020-12-17 13:07:55 -05:00 |
|
|
f97b6b973b
|
Merge branch 'acs-base.base' into acs-lats-base.acs-base
|
2020-12-17 13:04:06 -05:00 |
|