|
|
b86dd34b55
|
Merge branch 'acs-share-base' into acs-ext-share
|
2023-10-25 22:16:36 -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 |
|
|
|
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 |
|
|
|
4ff7371d19
|
separating share/platform module directories
|
2021-04-23 08:35:21 -04:00 |
|
brian
|
a41c084c9f
|
Merge branch 'acs-share-base' into acs-ext-share
|
2021-04-02 09:14:21 -04:00 |
|
brian
|
bf09b85448
|
Merge branch 'acs-base' into acs-share-base
|
2021-04-02 09:13:10 -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 |
|
|
|
f49ea55a48
|
Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base
|
2021-01-06 16:09:26 -05:00 |
|
|
|
3ef69c527b
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2021-01-06 15:54:53 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
14a4c09f4d
|
Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base
|
2020-12-26 14:27:06 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
486ff23ce4
|
Merge remote-tracking branch 'home/acs-ext-share.acs-share-base' into acs-ext-share.acs-share-base
|
2020-12-26 00:01:32 -05:00 |
|
|
|
bdef8c6b7f
|
Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base
|
2020-12-25 23:38:02 -05:00 |
|
|
|
4b9900a7fd
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-25 23:30:52 -05:00 |
|
