brian.long
68f4c70fa3
Merge remote-tracking branch 'origin/ags-frontend-enterprise' into ags-frontend-enterprise-persist
2021-04-02 09:29:57 -04:00
brian.long
3d7c7d3880
Merge remote-tracking branch 'origin/acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist
2021-04-02 09:28:49 -04:00
brian
947a48dc90
Merge branch 'acs-backend-enterprise-persist' into acs-frontend-enterprise-persist
2021-04-02 09:21:35 -04:00
brian
c2e962a2be
Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
2021-04-02 09:21:34 -04:00
brian
84feaff8e3
Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise
2021-04-02 09:21:13 -04:00
brian
3b7770e16d
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
2021-04-02 09:21:12 -04:00
brian
f52aee275e
Merge branch 'acs-frontend' into acs-frontend-enterprise
2021-04-02 09:20:56 -04:00
brian
c2c340f61e
Merge branch 'acs-adw-base' into acs-frontend-enterprise
2021-04-02 09:20:55 -04:00
brian.long
c9d1646933
Merge remote-tracking branch 'origin/acs-backend-enterprise' into acs-frontend-enterprise
2021-04-02 09:20:11 -04:00
brian
26adfeee1c
Merge branch 'acs-backend' into acs-frontend
2021-04-02 09:14:46 -04:00
brian
68d0eeab49
Merge branch 'acs-share-base' into acs-frontend
2021-04-02 09:14:46 -04:00
brian
230e7fcf5e
Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist
2021-04-02 09:14:44 -04:00
brian
180e642ce3
Merge branch 'acs-backend-persist' into acs-backend-enterprise-persist
2021-04-02 09:14:43 -04:00
brian
a50c3da468
Merge branch 'acs-backend-enterprise' into ags-backend-enterprise
2021-04-02 09:14:39 -04:00
brian
f8638e7a26
Merge branch 'ags-enterprise' into ags-backend-enterprise
2021-04-02 09:14:38 -04:00
brian
38def362f6
Merge branch 'acs-search-persist' into acs-backend-persist
2021-04-02 09:14:37 -04:00
brian
f3d3293e9e
Merge branch 'acs-backend' into acs-backend-persist
2021-04-02 09:14:36 -04:00
brian
4d584785ff
Merge branch 'ags' into ags-enterprise
2021-04-02 09:14:31 -04:00
brian
96987b7ff1
Merge branch 'acs-enterprise' into ags-enterprise
2021-04-02 09:14:31 -04:00
brian
456950f31d
Merge branch 'acs-lats' into acs-backend
2021-04-02 09:14:29 -04:00
brian
6740f23779
Merge branch 'acs-search' into acs-backend
2021-04-02 09:14:28 -04:00
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
b6f2befafb
Merge branch 'acs-ats-enterprise' into acs-backend-enterprise
2021-04-02 09:13:57 -04:00
brian
c11990900c
Merge branch 'acs-sync-base' into acs-backend-enterprise
2021-04-02 09:13:56 -04:00
brian
e07cea5ffa
Merge branch 'acs-search' into acs-backend-enterprise
2021-04-02 09:13:54 -04:00
brian
6e09a9c0c9
Merge branch 'acs' into ags
2021-04-02 09:13:52 -04:00
brian
29f4ca7c54
Merge branch 'acs-ats-base' into acs-ats-enterprise
2021-04-02 09:13:50 -04:00
brian
73fea3d13d
Merge branch 'acs-enterprise' into acs-ats-enterprise
2021-04-02 09:13:49 -04:00
brian
2c82f844b1
Merge branch 'acs-search-base' into acs-search-persist
2021-04-02 09:13:47 -04:00
brian
b805fbbd1a
Merge branch 'acs-persist' into acs-search-persist
2021-04-02 09:13:46 -04:00
brian
910cc2e2cb
Merge branch 'acs' into acs-enterprise
2021-04-02 09:13:44 -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
brian
b7c883068a
Merge branch 'acs-base' into acs-persist
2021-04-02 09:13:27 -04:00
brian
5a16e389c4
Merge branch 'acs-base' into acs-lats-base
2021-04-02 09:13:25 -04:00
brian
f10722dec9
Merge branch 'acs-base' into acs-sync-base
2021-04-02 09:13:22 -04:00
brian
ec00d1a445
Merge branch 'acs-base' into acs-adw-base
2021-04-02 09:13:18 -04:00
brian
bf09b85448
Merge branch 'acs-base' into acs-share-base
2021-04-02 09:13:10 -04:00
brian.long
39928d09fc
Merge branch 'ats-base' into acs-ats-base
2021-04-02 09:11:32 -04:00
brian.long
9859e68fe8
Merge branch 'acs-base' into acs-ats-base
2021-04-02 09:11:22 -04:00
brian.long
4dccd7892f
Merge branch 'base' into ats-base
2021-04-02 09:09:13 -04:00
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
d3c1579905
Merge branch 'ags-frontend-enterprise' into ags-frontend-enterprise-persist
2021-01-13 20:52:46 -05:00
brian
3b83b005c5
Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist
2021-01-13 20:52:45 -05:00
brian
df5d011a3a
Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
2021-01-13 20:52:42 -05:00
brian
c5f2448cf9
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
2021-01-13 20:52:40 -05:00
brian.long
6471292c34
added share proxy to adw
2021-01-13 18:19:06 -05:00
brian.long
7114bb5de1
Merge branch 'acs-adw-base' into acs-frontend-enterprise
2021-01-13 18:18:28 -05:00
brian.long
5ea48c405f
added host-based config
2021-01-13 18:14:24 -05:00
brian
b757323701
Merge branch 'ags-frontend-enterprise' into ags-frontend-enterprise-persist
2021-01-13 17:38:57 -05:00
brian
812dead437
Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist
2021-01-13 17:38:57 -05:00
brian
e0df60bc8b
Merge branch 'acs-backend-enterprise-persist' into acs-frontend-enterprise-persist
2021-01-13 17:38:55 -05:00
brian
8b21dcd843
Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
2021-01-13 17:38:53 -05:00
brian
806601c800
Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise
2021-01-13 17:38:46 -05:00
brian
e9542dbc96
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
2021-01-13 17:38:45 -05:00
brian
e222fc3fba
Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise
2021-01-13 17:38:42 -05:00
brian
a140d6806f
Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist
2021-01-13 17:38:40 -05:00
brian
eaa6f1025d
Merge branch 'acs-backend-enterprise' into ags-backend-enterprise
2021-01-13 17:38:37 -05:00
brian.long
3b5fc8c096
fixed sync service config
2021-01-13 17:35:43 -05:00
brian
cf22527520
Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist
2021-01-13 12:03:27 -05:00
brian
6eeef4cfbe
Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
2021-01-13 12:03:25 -05:00
brian
58a9db5244
Merge branch 'ags-frontend-enterprise' into ags-frontend-enterprise-persist
2021-01-13 11:55:45 -05:00
brian
75afb1580b
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
2021-01-13 11:55:43 -05:00
brian.long
41858ebddb
added ADW version and config
2021-01-13 11:47:27 -05:00
brian.long
69481655e8
Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist
2021-01-13 11:43:15 -05:00
brian.long
6aa7c2229d
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
2021-01-13 11:38:30 -05:00
brian.long
fd30fd4555
Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
2021-01-13 11:37:23 -05:00
brian.long
5788051f22
Merge remote-tracking branch 'origin/acs-adw-base' into acs-frontend-enterprise
2021-01-13 11:36:13 -05:00
brian.long
d4616bfdb2
Merge branch 'acs-backend-enterprise-persist' into acs-frontend-enterprise-persist
2021-01-13 11:30:37 -05:00
brian.long
b534456065
Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise
2021-01-13 11:28:54 -05:00
brian
3409eb4eec
Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist
2021-01-13 11:26:27 -05:00
brian.long
f977291894
using AGS share-enterprise container
2021-01-13 11:22:01 -05:00
brian.long
cc4ed62159
Merge remote-tracking branch 'origin/acs-adw-base' into ags-frontend-enterprise
2021-01-13 11:21:00 -05:00
brian.long
e8a8d088f4
Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise
2021-01-13 11:19:08 -05:00
brian.long
c9075398cd
Merge branch 'acs-backend-enterprise' into ags-backend-enterprise
2021-01-13 11:17:17 -05:00
brian.long
128a289ac3
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
2021-01-13 11:12:52 -05:00
brian.long
ac7e691100
Merge branch 'acs-sync-base' into acs-backend-enterprise
2021-01-13 11:09:18 -05:00
brian.long
15ccb5642b
using proxy values for sync url
2021-01-13 09:59:21 -05:00
brian.long
4349851dd9
Merge remote-tracking branch 'origin/acs-sync-base' into acs-backend-enterprise
2021-01-13 09:56:54 -05:00
brian.long
de8920ba0b
Merge remote-tracking branch 'origin/acs-frontend' into acs-frontend-enterprise
2021-01-13 09:50:51 -05:00
brian.long
4f5a939b71
Merge remote-tracking branch 'origin/acs-backend-enterprise' into ags-backend-enterprise
2021-01-13 09:47:53 -05:00
brian.long
22b2583505
Merge branch 'acs-enterprise' into ags-enterprise
2021-01-13 09:45:50 -05:00
brian.long
28e32e34a2
Merge branch 'acs-frontend-persist.acs-backend-persist' into acs-frontend-enterprise-persist.acs-frontend-persist
2021-01-06 16:44:22 -05:00
brian.long
c7378dd9c2
Merge branch 'acs-backend-persist.acs-backend' into acs-backend-enterprise-persist.acs-backend-persist
2021-01-06 16:43:39 -05:00
brian.long
6c5f4493dc
Merge branch 'acs-backend-persist.acs-backend' into acs-frontend-persist.acs-backend-persist
2021-01-06 16:40:42 -05:00
brian.long
4f3da7361a
Merge branch 'acs-frontend.acs-backend' into acs-frontend-persist.acs-frontend
2021-01-06 16:39:54 -05:00
brian.long
53404852e1
Merge branch 'acs-backend.acs-lats' into acs-backend-persist.acs-backend
2021-01-06 16:37:17 -05:00
brian.long
75743d2391
Merge branch 'acs-search-persist.acs-persist' into acs-backend-persist.acs-search-persist
2021-01-06 16:36:22 -05:00
brian.long
9b3ba22ca1
Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search
2021-01-06 16:33:19 -05:00
brian.long
69531bde6d
Merge branch 'acs-backend.acs-lats' into acs-frontend.acs-backend
2021-01-06 16:29:12 -05:00
brian.long
766b2ebfd0
Merge branch 'acs-share-base.acs-base' into acs-frontend.acs-share-base
2021-01-06 16:28:51 -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
76dc8c7ad9
Merge branch 'acs-ats-base.acs-base' into acs-ats-enterprise.acs-ats-base
2021-01-06 16:22:31 -05:00
brian.long
b024fd8d7e
Merge branch 'ats-base.base' into acs-ats-base.ats-base
2021-01-06 16:21:36 -05:00
brian.long
8a36f91d06
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
2021-01-06 16:15:41 -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
6a8b1e2628
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
2021-01-06 16:11:47 -05:00
brian.long
932159b238
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
2021-01-06 16:11:28 -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
135739da10
Merge branch 'acs-base.proxy' into acs-persist.acs-base
2021-01-06 15:56:03 -05:00
brian.long
3ef69c527b
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2021-01-06 15:54:53 -05:00
brian.long
a56556b596
Merge branch 'acs-base.proxy' into acs-sync-base.acs-base
2021-01-06 15:54:27 -05:00
brian.long
0a0cb15580
Merge branch 'acs-base.proxy' into acs-adw-base.acs-base
2021-01-06 15:54:12 -05:00
brian.long
d3b41dcc46
Merge branch 'base' into ats-base.base
2021-01-06 15:53:29 -05:00
brian.long
f1a47aa620
Merge branch 'acs-frontend.acs-backend' into acs-frontend-community-persist.acs-frontend-community
2021-01-06 15:49:06 -05:00
brian.long
37de03317b
Merge branch 'acs-enterprise.acs-community' into acs-ats-enterprise.acs-enterprise
2021-01-06 15:40:03 -05:00
brian.long
dc9fb0abfa
added license dir
2021-01-06 15:39:29 -05:00
brian.long
68dc071342
configured ACS for ATS
2021-01-06 15:36:32 -05:00
brian.long
78ec9c2a94
Merge branch 'ats-base.base' into acs-ats-enterprise.ats-base
2021-01-06 15:25:16 -05:00
brian.long
cafee75cdc
set platform to v6.2.2.3
2021-01-06 15:21:05 -05:00
brian.long
d70efc6943
parameterized AOS
2021-01-06 15:19:41 -05:00
brian.long
9e2ce6b967
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2021-01-06 12:29:24 -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
3d06a59303
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
2021-01-06 10:46:46 -05:00
brian.long
a0c6074358
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
2021-01-06 10:45:33 -05:00
brian.long
4afdf95b44
added share context to share config
2021-01-06 10:45:23 -05:00
brian.long
bc6a8539f3
switched platform to AGS (not AMP module distributed anymore)
2021-01-06 10:24:47 -05:00
brian.long
ccbe4de116
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
2020-12-26 15:12:49 -05:00
brian.long
b3001c56ff
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
2020-12-26 15:10:45 -05:00
brian.long
89ffe20aee
added CSRF
2020-12-26 15:10:13 -05:00
brian.long
5c25ab9d3d
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
2020-12-26 14:25:48 -05:00
brian.long
02a2ec72c0
Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community
2020-12-26 14:23:53 -05:00
brian.long
d4f4b6217e
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
2020-12-26 14:22:18 -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
b47583a716
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
2020-12-26 14:15:39 -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
720346e9d7
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
2020-12-26 14:01:13 -05:00
brian.long
68e0652872
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
2020-12-26 14:00:56 -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
b81db4fc0f
Merge branch 'acs-base.proxy' into acs-persist.acs-base
2020-12-26 13:59:41 -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
f2ac689f85
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-26 13:56:13 -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
2367651a7e
added share context removed from acs-base
2020-12-26 13:52:17 -05:00
brian.long
b8b267d4c5
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-26 13:51:34 -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
c377995a1d
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
2020-12-26 13:48:22 -05:00
brian.long
e223fd99a3
Merge commit '9f75b4439d19154e3aaa48e19d05451530333613' into acs-search-persist.acs-search-base
2020-12-26 13:47:30 -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
5beadf9f35
Merge branch 'acs-base.proxy' into acs-persist.acs-base
2020-12-26 13:45:22 -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
68fcb3cbef
added proxy config to share
2020-12-26 11:20:42 -05:00
brian.long
4381a2d350
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-26 11:19:21 -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
6d396a640f
added JDBC driver to base config
2020-12-26 11:06:07 -05:00
brian.long
89eec1edec
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
2020-12-25 23:55:56 -05:00
brian.long
3db235a532
Merge branch 'acs-backend-community-persist.acs-backend-community' into acs-frontend-community-persist.acs-backend-community-persist
2020-12-25 23:55:38 -05:00
brian.long
24337f3a13
Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community
2020-12-25 23:55:11 -05:00
brian.long
04988e43dd
Merge branch 'acs-search-persist.acs-persist' into acs-backend-community-persist.acs-search-persist
2020-12-25 23:54:43 -05:00
brian.long
f94f3e82e8
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
2020-12-25 23:52:04 -05:00
brian.long
cb5d306478
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
2020-12-25 23:51:38 -05:00
brian.long
abaa41345a
Merge branch 'acs-base.proxy' into acs-persist.acs-base
2020-12-25 23:51:17 -05:00
brian.long
573ab3d2cb
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
2020-12-25 23:41:27 -05:00
brian.long
c2795cd76c
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2020-12-25 23:40:53 -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
b1f3b14846
Merge branch 'acs-base.proxy' into acs-sync-base.acs-base
2020-12-25 23:37:08 -05:00
brian.long
04f44ef280
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
2020-12-25 23:32:53 -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
brian.long
4b9900a7fd
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-25 23:30:52 -05:00
brian.long
56492a45c8
Merge branch 'acs-base.proxy' into acs-adw-base.acs-base
2020-12-25 23:30:25 -05:00
brian.long
9720bd7fa6
Merge branch 'proxy.base' into acs-base.proxy
2020-12-25 23:08:53 -05:00
brian.long
4e8453becd
removed port from reverse proxy; allows it to work when port changes
2020-12-25 23:08:07 -05:00
brian.long
f46dacad9d
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
2020-12-21 11:58:53 -05:00
brian.long
0488b3402d
Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community
2020-12-21 11:56:57 -05:00
brian.long
ce9b143fb5
added ATS-only base config
2020-12-21 11:50:38 -05:00
brian.long
fad6fe1c2a
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
2020-12-17 21:33:18 -05:00
brian.long
2789af0bd7
added persistence to activemq
2020-12-17 21:31:57 -05:00
brian.long
91da0dedb6
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
2020-12-17 21:30:09 -05:00
brian.long
8d3c4987f0
added persistence to platform/db
2020-12-17 21:26:03 -05:00
brian.long
ce899a9480
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2020-12-17 21:03:22 -05:00
brian.long
701489665a
Merge branch 'acs-lats-community.acs-lats-base' into acs-backend-community.acs-lats-community
2020-12-17 21:03:07 -05:00
brian.long
0976a3975f
Merge branch 'acs-min-community.acs-base' into acs-lats-community.acs-min-community
2020-12-17 21:02:41 -05:00
brian.long
22d1220a14
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2020-12-17 21:02:00 -05:00
brian.long
0ad2cdf9ad
Merge branch 'acs-search-community.acs-min-community' into acs-backend-community.acs-search-community
2020-12-17 21:01:06 -05:00
brian.long
1d0aa0c91e
fixed solr configuration on platform
2020-12-17 21:00:27 -05:00
brian.long
7a005d16d7
Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community
2020-12-17 20:50:09 -05:00
brian.long
60b5a8989b
changed from v6.2.2-RC1 to v6.2.0-ga
2020-12-17 20:42:54 -05:00
brian.long
eb11f51348
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2020-12-17 18:57:36 -05:00
brian.long
7bb62f421e
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
2020-12-17 18:55:51 -05:00
brian.long
f02d4ff427
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
2020-12-17 18:55:28 -05:00
brian.long
1e09466e78
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
2020-12-17 18:54:28 -05:00
brian.long
b762ba0ce1
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
2020-12-17 18:53:59 -05:00
brian.long
c22af67a06
disabled jodconverter in platform
2020-12-17 18:53:34 -05:00
brian.long
0b507962fa
added sync service config
2020-12-17 17:41:47 -05:00
brian.long
f73fdbb5ea
added volume to base shared file store config
2020-12-17 17:16:01 -05:00
brian.long
1216469feb
Merge branch 'acs-lats-community.acs-community' into acs-search-lats-community.acs-lats-community
2020-12-17 16:48:32 -05:00
brian.long
6a6dbdc798
set core-aio version
2020-12-17 16:48:13 -05:00
brian.long
2ac3d013c9
Merge branch 'acs-search-community.acs-community' into acs-search-lats-community.acs-search-community
2020-12-17 16:43:44 -05:00
brian.long
80a938d674
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
2020-12-17 16:42:16 -05:00
brian.long
ddb535ab14
added legacy transform URLs
2020-12-17 16:40:02 -05:00
brian.long
8be9a0749a
Merge branch 'acs-share-base.acs-base' into acs-share-community.acs-share-base
2020-12-17 16:37:05 -05:00
brian.long
0bd09b8cbd
Merge branch 'acs-search-community.acs-community' into acs-share-community.acs-search-community
2020-12-17 16:36:31 -05:00
brian.long
a7cacf8edc
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
2020-12-17 16:35:44 -05:00
brian.long
43d5686407
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
2020-12-17 16:35:11 -05:00
brian.long
e29e80b650
Merge branch 'acs-base.proxy' into acs-community.acs-base
2020-12-17 16:34:26 -05:00
brian.long
331eda62fc
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
2020-12-17 16:33:23 -05:00
brian.long
fbf7ca3678
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
2020-12-17 16:32:50 -05:00
brian.long
ff5442c869
added share to nginx
2020-12-17 16:32:32 -05:00
brian.long
4cb5100065
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-17 16:31:16 -05:00
brian.long
f239550be7
Merge branch 'acs-base.proxy' into acs-adw-base.acs-base
2020-12-17 16:29:54 -05:00
brian.long
3b631bcd87
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
2020-12-17 16:29:45 -05:00
brian.long
46bbeeef30
fixed missed envvar
2020-12-17 16:29:36 -05:00
brian.long
e5824d17e1
added adw to nginx
2020-12-17 16:28:54 -05:00
brian.long
5cd3530ef0
Merge branch 'acs-base.proxy' into acs-adw-base.acs-base
2020-12-17 16:26:50 -05:00
brian.long
d6f1c99c79
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
2020-12-17 16:25:37 -05:00
brian.long
6b0c103d75
added depends_on for proxy
2020-12-17 16:24:34 -05:00
brian.long
6d35ffa551
Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base
2020-12-17 16:21:14 -05:00
brian.long
faee3aaa48
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
2020-12-17 16:20:23 -05:00
brian.long
beb87dd97a
Merge branch 'proxy.base' into acs-proxy.proxy
2020-12-17 16:20:12 -05:00
brian.long
a42af25649
added port for localhost
2020-12-17 16:19:34 -05:00
brian.long
6c739c5795
Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base
2020-12-17 16:18:18 -05:00
brian.long
db6a1e148c
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
2020-12-17 16:16:57 -05:00
brian.long
ab396f7656
changed version to 'acs'
2020-12-17 16:16:44 -05:00
brian.long
b65d3d301f
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
2020-12-17 16:16:07 -05:00
brian.long
6332985ebd
removed proxy
2020-12-17 16:09:48 -05:00
brian.long
010149e6b6
added platform config
2020-12-17 16:07:17 -05:00
brian.long
f1df9c3217
initial nginx dynamic docker image config
2020-12-17 16:03:33 -05:00
brian.long
055119eeb5
added share config
2020-12-17 14:24:15 -05:00
brian.long
75df5099e9
Merge branch 'acs-share-base.acs-base' into acs-share-community.acs-share-base
2020-12-17 14:20:22 -05:00
brian.long
69974eaeea
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
2020-12-17 13:24:15 -05:00
brian.long
82d6fd5c8a
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
2020-12-17 13:22:28 -05:00
brian.long
90e935a49e
minor fixes
2020-12-17 13:22:05 -05:00
brian.long
6e32209824
Merge branch 'acs-base.base' into acs-community.acs-base
2020-12-17 13:20:59 -05:00
brian.long
0bb3b7bb28
added service name reference to platform
2020-12-17 13:07:55 -05:00
brian.long
f97b6b973b
Merge branch 'acs-base.base' into acs-lats-base.acs-base
2020-12-17 13:04:06 -05:00
brian.long
63d1ee7ef9
changed service from solr6 to search; added service name variables
2020-12-17 13:03:32 -05:00
brian.long
a081d5b5c8
Merge branch 'acs-base.base' into acs-search-base.acs-base
2020-12-17 12:56:03 -05:00
brian.long
c084972d39
Merge branch 'acs-base.base' into acs-share-base.acs-base
2020-12-17 12:55:48 -05:00
brian.long
b9fb8971dd
Merge branch 'acs-base.base' into acs-adw-base.acs-base
2020-12-17 12:48:57 -05:00
brian.long
487a677f6f
added service referencing variables
2020-12-17 12:48:48 -05:00
brian.long
0608045c1b
Merge branch 'acs-base.base' into acs-ats-base.acs-base
2020-12-17 12:46:35 -05:00
brian.long
79a1644530
more corrections to service names and addressing additions
2020-12-17 12:46:24 -05:00
brian.long
8296a96294
Merge branch 'acs-base.base' into acs-adw-base.acs-base
2020-12-17 12:38:18 -05:00
brian.long
79ef1f5868
added depends_on for ATS
2020-12-17 12:37:10 -05:00
brian.long
8c480402ed
Merge branch 'acs-base.base' into acs-ats-base.acs-base
2020-12-17 12:32:07 -05:00
brian.long
5cfee3d18f
updated service names
2020-12-17 12:31:55 -05:00
brian.long
8a5004ed74
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-community
2020-12-17 12:29:33 -05:00
brian.long
3fea801d26
added minimum local transform service
2020-12-17 00:01:13 -05:00
brian.long
d0a62bfd24
Merge branch 'acs-base.base' into acs-community.acs-base
2020-12-16 23:57:29 -05:00
brian.long
7cedfa4fa2
Merge branch 'acs-base.base' into acs-search-base.acs-base
2020-12-16 23:56:43 -05:00
brian.long
72f7960369
Merge branch 'acs-base.base' into acs-share-base.acs-base
2020-12-16 23:56:30 -05:00
brian.long
4f036e530b
Merge branch 'acs-base.base' into acs-adw-base.acs-base
2020-12-16 23:56:24 -05:00
brian.long
6858d201c2
Merge branch 'acs-base.base' into acs-ats-base.acs-base
2020-12-16 23:56:08 -05:00
brian.long
6c665fab04
added depends_on for the alfresco service
2020-12-16 23:55:56 -05:00
brian.long
723f3ec954
configured for ACS community v6.2.2-RC1
2020-12-16 23:55:00 -05:00
brian.long
dcb88c42ea
added minimum unconfigured search service
2020-12-16 23:44:46 -05:00
brian.long
00e0a17249
added share to proxy
2020-12-16 23:42:47 -05:00
brian.long
89626fcd1d
added minimum unconfigured ADW service
2020-12-16 23:42:22 -05:00
brian.long
bfa65c999e
added share unconfigured service
2020-12-16 23:40:20 -05:00
brian.long
c1323a8171
added ATS minimum unconfigured services
2020-12-16 23:38:34 -05:00
brian.long
0f36dd1943
added minimum unconfigured ACS services to Docker Compose
2020-12-16 23:34:34 -05:00