|
|
25d0633fdb
|
Merge branch 'aims' into acs-aims
|
2021-01-14 11:17:08 -05:00 |
|
|
|
44b6f26f4f
|
updates after some acs-enterprise testing
|
2021-01-14 11:17:01 -05:00 |
|
|
|
ca420b43e2
|
added aims config to platform/share
|
2021-01-14 09:40:28 -05:00 |
|
|
|
8be7673ad3
|
Merge branch 'aims' into acs-aims
|
2021-01-14 09:39:54 -05:00 |
|
|
|
b124cd027c
|
added default admin.1 user
|
2021-01-14 09:39:34 -05:00 |
|
|
|
77f2c5e0f1
|
Merge branch 'aims' into acs-aims
|
2021-01-13 17:15:32 -05:00 |
|
|
|
919d842d61
|
added identity service
|
2021-01-13 17:01:06 -05:00 |
|
brian
|
9dd046ad51
|
Merge branch 'aps-base' into aps
|
2021-01-13 16:16:27 -05:00 |
|
|
|
20b41bbcb1
|
corrected misspelling
|
2021-01-13 15:39:02 -05:00 |
|
|
|
89348916a5
|
Merge branch 'aps-base' into aps
|
2021-01-13 15:37:13 -05:00 |
|
|
|
a2619fac7b
|
fixed license directory var
|
2021-01-13 15:37:06 -05:00 |
|
|
|
3a47c43a88
|
Merge branch 'aps-base' into aps
|
2021-01-13 15:32:16 -05:00 |
|
|
|
16aa444b19
|
removed excess file mapping
|
2021-01-13 15:32:03 -05:00 |
|
|
|
deb6bf058c
|
Merge branch 'aps-base' into aps
|
2021-01-13 15:23:44 -05:00 |
|
|
|
8a0ccc61a5
|
backported some stuff from aps to aps-base
|
2021-01-13 15:22:30 -05:00 |
|
|
|
695e3b3dc0
|
fixed after testing
|
2021-01-13 15:20:03 -05:00 |
|
|
|
2b7755222b
|
added versions and config to APS
|
2021-01-13 14:42:41 -05:00 |
|
|
|
237a8abd62
|
fixed proxy depends_on
|
2021-01-13 14:33:11 -05:00 |
|
|
|
f28c16c4fe
|
initial aps base
|
2021-01-13 14:32:12 -05:00 |
|
|
|
69531bde6d
|
Merge branch 'acs-backend.acs-lats' into acs-frontend.acs-backend
|
2021-01-06 16:29:12 -05:00 |
|
|
|
766b2ebfd0
|
Merge branch 'acs-share-base.acs-base' into acs-frontend.acs-share-base
|
2021-01-06 16:28:51 -05:00 |
|
|
|
078b2ae35c
|
Merge branch 'acs-lats.acs' into acs-backend.acs-lats
|
2021-01-06 16:27:31 -05:00 |
|
|
|
5ff71f0e3c
|
Merge branch 'acs-search.acs' into acs-backend.acs-search
|
2021-01-06 16:27:17 -05:00 |
|
|
|
2878298644
|
Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base
|
2021-01-06 16:26:04 -05:00 |
|
|
|
11bb8c62ed
|
Merge branch 'acs.acs-base' into acs-search.acs
|
2021-01-06 16:24:47 -05:00 |
|
|
|
30f3420ee5
|
Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base
|
2021-01-06 16:24:29 -05:00 |
|
|
|
677a3e1dc8
|
Merge branch 'acs.acs-base' into acs-lats.acs
|
2021-01-06 16:24:01 -05:00 |
|
|
|
2ec11a1135
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2021-01-06 16:12:46 -05:00 |
|
|
|
962817ba63
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2021-01-06 15:56:25 -05:00 |
|
|
|
3ef69c527b
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2021-01-06 15:54:53 -05:00 |
|
|
|
d70efc6943
|
parameterized AOS
|
2021-01-06 15:19:41 -05:00 |
|
|
|
9e2ce6b967
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
|
2021-01-06 12:29:24 -05:00 |
|
|
|
e660d79ef1
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2021-01-06 12:23:49 -05:00 |
|
|
|
f036e13180
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2021-01-06 12:23:35 -05:00 |
|
|
|
83db2b08dc
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2021-01-06 12:23:18 -05:00 |
|
|
|
40207d43ff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2021-01-06 12:22:58 -05:00 |
|
|
|
a3cb815dd1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2021-01-06 12:22:27 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
d4f4b6217e
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2020-12-26 14:22:18 -05:00 |
|
|
|
41b87a9e5e
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2020-12-26 14:20:33 -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 |
|
|
|
2a56247aa1
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-26 14:18:48 -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 |
|
