166 Commits

Author SHA1 Message Date
8c7e433358 Merge branch 'acs-backend' into acs-frontend 2021-07-30 16:15:19 -04:00
3a2220d215 Merge branch 'acs-search' into acs-backend 2021-07-30 16:08:53 -04:00
f0713c90dd Merge branch 'acs-lats' into acs-backend 2021-07-30 16:08:47 -04:00
c5171fdb51 Merge branch 'acs' into acs-mysql 2021-07-30 15:58:15 -04:00
0332838752 updated ATE AIO memory limit min 2021-07-30 15:57:23 -04:00
35e15a1735 Merge branch 'acs' into acs-lats 2021-07-30 15:56:37 -04:00
979924957c updated ASS memory limit min 2021-07-30 15:53:20 -04:00
2a4b61053d Merge branch 'acs' into acs-search 2021-07-30 15:52:35 -04:00
b8016f4ac7 updated ACS memory limits 2021-07-30 15:52:07 -04:00
b59eae3b5f Merge branch 'acs' into acs-mysql 2021-01-11 22:47:08 -05:00
79566e47de Merge branch 'acs-frontend-persist.acs-backend-persist' into acs-mysql-frontend-persist.acs-frontend-persist 2021-01-11 13:57:47 -05:00
4f3da7361a Merge branch 'acs-frontend.acs-backend' into acs-frontend-persist.acs-frontend 2021-01-06 16:39:54 -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
677a3e1dc8 Merge branch 'acs.acs-base' into acs-lats.acs 2021-01-06 16:24:01 -05:00
d70efc6943 parameterized AOS 2021-01-06 15:19:41 -05:00
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
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
395cc67cc0 Merge branch 'acs-frontend-community-persist.acs-backend-community-persist' into acs-mysql-frontend-community-persist.acs-frontend-community-persist 2020-12-26 15:17:45 -05:00
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
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
ab342d698a Merge branch 'acs-frontend-community-persist.acs-backend-community-persist' into acs-mysql-frontend-community-persist.acs-frontend-community-persist 2020-12-26 14:36:34 -05:00
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
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
48d46aa70c Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-26 14:18:13 -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
82b58f638c Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community 2020-12-26 13:58:35 -05:00
55b70f1a36 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:58:15 -05:00
5b65b4817e Merge branch 'acs-base.proxy' into acs-mysql-base.acs-base 2020-12-26 13:57:17 -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
5a929f6317 Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community 2020-12-26 13:39:03 -05:00
3ac57ce7d1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:37:05 -05:00
f66e9aa1e8 replaced postgresql with mysql 2020-12-26 11:25:37 -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
2071957b17 fixed mysql JDBC URL 2020-12-25 15:12:10 -05:00