120 Commits

Author SHA1 Message Date
3957262e74 Merge branch 'ext-jsconsole' into acs-jsconsole 2021-07-30 16:40:51 -04:00
cbbf9c8c9a Merge branch 'acs-ext-share' into ext-jsconsole 2021-07-30 16:40:01 -04:00
fa1c51c08c Merge branch 'acs-ext-platform' into ext-jsconsole 2021-07-30 16:39:58 -04:00
1050ccbf5c Merge branch 'acs-frontend' into acs-jsconsole 2021-07-30 16:15:49 -04:00
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
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
aeb3fe5b62 splitting share/platform module dirs 2021-04-23 08:37:03 -04:00
4ff7371d19 separating share/platform module directories 2021-04-23 08:35:21 -04:00
83c580d470 Merge branch 'acs-frontend.acs-backend' into acs-jsconsole.acs-frontend 2021-01-06 16:39:02 -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
9d415076a7 Merge branch 'ext-jsconsole.acs-ext-platform' into acs-jsconsole-community.ext-jsconsole 2021-01-06 10:46:15 -05:00
512c51e5ac Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share 2021-01-06 10:45:53 -05:00
e582744e6c Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2021-01-06 10:45:43 -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
8ab92e681e Merge branch 'ext-jsconsole.acs-ext-platform' into acs-jsconsole-community.ext-jsconsole 2020-12-26 15:12:04 -05:00
2e3990c8ff Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share 2020-12-26 15:11:35 -05:00
31eaf8c7c2 Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2020-12-26 15:11:03 -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
55500840e1 Merge branch 'acs-frontend-community.acs-backend-community' into acs-jsconsole-community.acs-frontend-community 2020-12-26 14:29:12 -05:00
58e4543d0f Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share 2020-12-26 14:27:23 -05:00
14a4c09f4d Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2020-12-26 14:27:06 -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
5a12f3a6e0 Merge branch 'acs-base.proxy' into acs-ext-platform.acs-base 2020-12-26 14:06:49 -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