121 Commits

Author SHA1 Message Date
093e38af9c Merge branch 'acs-ext-share' into ext-jsconsole 2023-10-25 22:16:48 -04:00
b86dd34b55 Merge branch 'acs-share-base' into acs-ext-share 2023-10-25 22:16:36 -04:00
b4995e00d8 Merge branch 'acs-ext-platform' into ext-jsconsole 2023-10-25 20:29:25 -04:00
50ad4a380b Merge branch 'acs-base' into acs-ext-platform 2023-10-25 20:28:45 -04:00
23b3057329 ACS share v7.4.1.2 2023-10-25 20:19:43 -04:00
b009fa9219 Merge branch 'acs-base' into acs-share-base 2023-10-25 20:17:55 -04:00
57af0a20b1 ACS v7.4.1.1 2023-10-25 20:11:15 -04:00
76e4287aa1 Merge branch 'proxy' into acs-base 2023-10-25 20:08:28 -04:00
241a3e47ea Merge branch 'base' into proxy 2023-10-25 18:07:00 -04:00
c2a9679ede update comment 2023-10-25 18:05:39 -04:00
936e6ad134 Merge branch 'acs-share-base' into acs-ext-share 2022-11-01 21:28:59 -04:00
1e1667c039 parameterize ACS version in Dockerfile 2022-11-01 16:00:54 -04:00
6e6f38e9e4 Merge branch 'acs-base' into acs-ext-platform 2022-11-01 15:40:04 -04:00
fcd1262721 parameterized ACS share version 2022-11-01 15:03:04 -04:00
d7de714eeb Merge branch 'acs-base' into acs-share-base 2022-11-01 15:01:38 -04:00
8e3301877a parameterized docker image tags 2022-11-01 14:51:11 -04:00
8b4e45c2e2 Merge branch 'proxy' into acs-base 2022-11-01 14:49:06 -04:00
9e1a819e8b Merge branch 'base' into proxy 2022-11-01 14:48:11 -04:00
10e7f81163 advancing to docker v3 2022-11-01 14:46:58 -04:00
29f254a68e updated to ACS v7.3.0 2022-11-01 14:19:58 -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
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
brian
70f756f66e Merge branch 'download' into ext-jsconsole 2021-04-02 09:14:25 -04:00
brian
8b22f7cbdc Merge branch 'acs-ext-share' into ext-jsconsole 2021-04-02 09:14:23 -04:00
brian
49c3ddcdb1 Merge branch 'acs-ext-platform' into ext-jsconsole 2021-04-02 09:14:22 -04:00
brian
a41c084c9f Merge branch 'acs-share-base' into acs-ext-share 2021-04-02 09:14:21 -04:00
brian
228e930caa Merge branch 'acs-base' into acs-ext-platform 2021-04-02 09:13:13 -04:00
brian
bf09b85448 Merge branch 'acs-base' into acs-share-base 2021-04-02 09:13:10 -04:00
brian
40c3a3c019 Merge branch 'base' into download 2021-04-02 09:12:51 -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
3dd7309a4e Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share 2021-01-06 16:10:32 -05:00
1829253edd Merge branch 'acs-ext-platform.acs-base' into ext-jsconsole.acs-ext-platform 2021-01-06 16:10:21 -05:00
85d3b45097 Merge branch 'download.base' into ext-jsconsole.download 2021-01-06 16:09:56 -05:00
f49ea55a48 Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2021-01-06 16:09:26 -05:00
fa515e4984 Merge branch 'acs-base.proxy' into acs-ext-platform.acs-base 2021-01-06 16:07:52 -05:00
3ef69c527b Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2021-01-06 15:54:53 -05:00
6261f8b7ab Merge branch 'base' into download.base 2021-01-06 15:53:45 -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
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
4afdf95b44 added share context to share config 2021-01-06 10:45:23 -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
89ffe20aee added CSRF 2020-12-26 15:10:13 -05:00
4d5a486d16 Merge branch 'acs-ext-platform.acs-base' into ext-jsconsole.acs-ext-platform 2020-12-26 14:27:42 -05:00