brian
|
e07cea5ffa
|
Merge branch 'acs-search' into acs-backend-enterprise
|
2021-04-02 09:13:54 -04:00 |
|
brian
|
99d39fa7f7
|
Merge branch 'acs-search-base' into acs-search
|
2021-04-02 09:13:42 -04:00 |
|
brian
|
1778fd04a4
|
Merge branch 'acs' into acs-search
|
2021-04-02 09:13:41 -04:00 |
|
brian
|
d616b9ef3a
|
Merge branch 'acs-base' into acs
|
2021-04-02 09:13:32 -04:00 |
|
brian
|
a72d43a6af
|
Merge branch 'acs-base' into acs-search-base
|
2021-04-02 09:13:30 -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 |
|
|
|
3b5fc8c096
|
fixed sync service config
|
2021-01-13 17:35:43 -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 |
|
|
|
9b3ba22ca1
|
Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search
|
2021-01-06 16:33:19 -05:00 |
|
|
|
2878298644
|
Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base
|
2021-01-06 16:26:04 -05:00 |
|
|
|
11bb8c62ed
|
Merge branch 'acs.acs-base' into acs-search.acs
|
2021-01-06 16:24:47 -05:00 |
|
|
|
76dc8c7ad9
|
Merge branch 'acs-ats-base.acs-base' into acs-ats-enterprise.acs-ats-base
|
2021-01-06 16:22:31 -05:00 |
|
|
|
b024fd8d7e
|
Merge branch 'ats-base.base' into acs-ats-base.ats-base
|
2021-01-06 16:21:36 -05:00 |
|
|
|
8a36f91d06
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2021-01-06 16:15:41 -05:00 |
|
|
|
962817ba63
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2021-01-06 15:56:25 -05:00 |
|
|
|
a56556b596
|
Merge branch 'acs-base.proxy' into acs-sync-base.acs-base
|
2021-01-06 15:54:27 -05:00 |
|
|
|
d3b41dcc46
|
Merge branch 'base' into ats-base.base
|
2021-01-06 15:53:29 -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 |
|
|
|
83db2b08dc
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2021-01-06 12:23:18 -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 |
|
|
|
b47583a716
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-26 14:15:39 -05:00 |
|
|
|
fc9c26eac5
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-26 14:02:30 -05:00 |
|
|
|
2715b3afea
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 14:00:14 -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 |
|
|
|
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 |
|
|
|
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 |
|
