112 Commits

Author SHA1 Message Date
f90a541ec2 fixed dup service 2021-04-02 10:31:35 -04:00
6471292c34 added share proxy to adw 2021-01-13 18:19:06 -05:00
7114bb5de1 Merge branch 'acs-adw-base' into acs-frontend-enterprise 2021-01-13 18:18:28 -05:00
5ea48c405f added host-based config 2021-01-13 18:14:24 -05:00
brian
e222fc3fba Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2021-01-13 17:38:42 -05:00
3b5fc8c096 fixed sync service config 2021-01-13 17:35:43 -05:00
41858ebddb added ADW version and config 2021-01-13 11:47:27 -05:00
5788051f22 Merge remote-tracking branch 'origin/acs-adw-base' into acs-frontend-enterprise 2021-01-13 11:36:13 -05:00
b534456065 Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2021-01-13 11:28:54 -05:00
ac7e691100 Merge branch 'acs-sync-base' into acs-backend-enterprise 2021-01-13 11:09:18 -05:00
15ccb5642b using proxy values for sync url 2021-01-13 09:59:21 -05:00
4349851dd9 Merge remote-tracking branch 'origin/acs-sync-base' into acs-backend-enterprise 2021-01-13 09:56:54 -05:00
de8920ba0b Merge remote-tracking branch 'origin/acs-frontend' into acs-frontend-enterprise 2021-01-13 09:50:51 -05:00
9b3ba22ca1 Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search 2021-01-06 16:33:19 -05:00
69531bde6d Merge branch 'acs-backend.acs-lats' into acs-frontend.acs-backend 2021-01-06 16:29:12 -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
a56556b596 Merge branch 'acs-base.proxy' into acs-sync-base.acs-base 2021-01-06 15:54:27 -05:00
0a0cb15580 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2021-01-06 15:54:12 -05:00
37de03317b Merge branch 'acs-enterprise.acs-community' into acs-ats-enterprise.acs-enterprise 2021-01-06 15:40:03 -05:00
dc9fb0abfa added license dir 2021-01-06 15:39:29 -05:00
68dc071342 configured ACS for ATS 2021-01-06 15:36:32 -05:00
78ec9c2a94 Merge branch 'ats-base.base' into acs-ats-enterprise.ats-base 2021-01-06 15:25:16 -05:00
cafee75cdc set platform to v6.2.2.3 2021-01-06 15:21:05 -05:00
d70efc6943 parameterized AOS 2021-01-06 15:19:41 -05:00
a0c6074358 Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base 2021-01-06 10:45:33 -05:00
4afdf95b44 added share context to share config 2021-01-06 10:45:23 -05:00
b3001c56ff Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base 2020-12-26 15:10:45 -05:00
89ffe20aee added CSRF 2020-12-26 15:10:13 -05:00
d4f4b6217e Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base 2020-12-26 14:22:18 -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
f2ac689f85 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 13:56:13 -05:00
1d5624496d renamed proxy variables to match changes to proxy branch 2020-12-26 13:55:19 -05:00
2367651a7e added share context removed from acs-base 2020-12-26 13:52:17 -05:00
b8b267d4c5 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 13:51:34 -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
68fcb3cbef added proxy config to share 2020-12-26 11:20:42 -05:00
4381a2d350 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 11:19:21 -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
ce9b143fb5 added ATS-only base config 2020-12-21 11:50:38 -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
22d1220a14 Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community 2020-12-17 21:02:00 -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