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 |
|
|
|
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 |
|
|
|
5a12f3a6e0
|
Merge branch 'acs-base.proxy' into acs-ext-platform.acs-base
|
2020-12-26 14:06:49 -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 |
|
|
|
8e697651c8
|
Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.acs-ext-share
|
2020-12-26 00:01:50 -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 |
|
|
|
f2f0eecccc
|
Merge branch 'acs-ext-platform.acs-base' into ext-jsconsole.acs-ext-platform
|
2020-12-26 00:00:58 -05:00 |
|
|
|
b6ff1bb4d2
|
Merge remote-tracking branch 'home/acs-ext-platform.acs-base' into acs-ext-platform.acs-base
|
2020-12-26 00:00:32 -05:00 |
|
