 brian.long
|
dc236b7550
|
added sync/adw config after testing
|
2021-01-14 11:20:05 -05:00 |
|
|
brian.long
|
d87935cd44
|
Merge branch 'acs-aims' into acs-aims-enterprise
|
2021-01-14 11:19:10 -05:00 |
|
|
brian.long
|
0be038fe07
|
added acs platform/share AIMS config after testing
|
2021-01-14 11:19:01 -05:00 |
|
|
brian.long
|
25d0633fdb
|
Merge branch 'aims' into acs-aims
|
2021-01-14 11:17:08 -05:00 |
|
|
brian.long
|
44b6f26f4f
|
updates after some acs-enterprise testing
|
2021-01-14 11:17:01 -05:00 |
|
|
brian.long
|
a388c1d2fb
|
Merge branch 'acs-aims' into acs-aims-enterprise
|
2021-01-14 09:41:20 -05:00 |
|
|
brian.long
|
ca420b43e2
|
added aims config to platform/share
|
2021-01-14 09:40:28 -05:00 |
|
|
brian.long
|
af39f367b6
|
Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise
|
2021-01-13 20:55:01 -05:00 |
|
|
brian.long
|
6471292c34
|
added share proxy to adw
|
2021-01-13 18:19:06 -05:00 |
|
|
brian.long
|
7114bb5de1
|
Merge branch 'acs-adw-base' into acs-frontend-enterprise
|
2021-01-13 18:18:28 -05:00 |
|
|
brian.long
|
5ea48c405f
|
added host-based config
|
2021-01-13 18:14:24 -05:00 |
|
 brian
|
00335f5795
|
Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise
|
2021-01-13 17:38:59 -05:00 |
|
|
brian
|
e222fc3fba
|
Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise
|
2021-01-13 17:38:42 -05:00 |
|
|
brian.long
|
3b5fc8c096
|
fixed sync service config
|
2021-01-13 17:35:43 -05:00 |
|
|
brian.long
|
8aa7067286
|
Merge remote-tracking branch 'origin/acs-frontend-enterprise' into acs-aims-enterprise
|
2021-01-13 17:22:01 -05:00 |
|
|
brian.long
|
77f2c5e0f1
|
Merge branch 'aims' into acs-aims
|
2021-01-13 17:15:32 -05:00 |
|
|
brian.long
|
919d842d61
|
added identity service
|
2021-01-13 17:01:06 -05:00 |
|
|
brian.long
|
41858ebddb
|
added ADW version and config
|
2021-01-13 11:47:27 -05:00 |
|
|
brian.long
|
5788051f22
|
Merge remote-tracking branch 'origin/acs-adw-base' into acs-frontend-enterprise
|
2021-01-13 11:36:13 -05:00 |
|
|
brian.long
|
b534456065
|
Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise
|
2021-01-13 11:28:54 -05:00 |
|
|
brian.long
|
ac7e691100
|
Merge branch 'acs-sync-base' into acs-backend-enterprise
|
2021-01-13 11:09:18 -05:00 |
|
|
brian.long
|
15ccb5642b
|
using proxy values for sync url
|
2021-01-13 09:59:21 -05:00 |
|
|
brian.long
|
4349851dd9
|
Merge remote-tracking branch 'origin/acs-sync-base' into acs-backend-enterprise
|
2021-01-13 09:56:54 -05:00 |
|
|
brian.long
|
de8920ba0b
|
Merge remote-tracking branch 'origin/acs-frontend' into acs-frontend-enterprise
|
2021-01-13 09:50:51 -05:00 |
|
|
brian.long
|
9b3ba22ca1
|
Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search
|
2021-01-06 16:33:19 -05:00 |
|
|
brian.long
|
69531bde6d
|
Merge branch 'acs-backend.acs-lats' into acs-frontend.acs-backend
|
2021-01-06 16:29:12 -05:00 |
|
|
brian.long
|
5ff71f0e3c
|
Merge branch 'acs-search.acs' into acs-backend.acs-search
|
2021-01-06 16:27:17 -05:00 |
|
|
brian.long
|
11bb8c62ed
|
Merge branch 'acs.acs-base' into acs-search.acs
|
2021-01-06 16:24:47 -05:00 |
|
|
brian.long
|
a56556b596
|
Merge branch 'acs-base.proxy' into acs-sync-base.acs-base
|
2021-01-06 15:54:27 -05:00 |
|
|
brian.long
|
0a0cb15580
|
Merge branch 'acs-base.proxy' into acs-adw-base.acs-base
|
2021-01-06 15:54:12 -05:00 |
|
|
brian.long
|
37de03317b
|
Merge branch 'acs-enterprise.acs-community' into acs-ats-enterprise.acs-enterprise
|
2021-01-06 15:40:03 -05:00 |
|
|
brian.long
|
dc9fb0abfa
|
added license dir
|
2021-01-06 15:39:29 -05:00 |
|
|
brian.long
|
68dc071342
|
configured ACS for ATS
|
2021-01-06 15:36:32 -05:00 |
|
|
brian.long
|
78ec9c2a94
|
Merge branch 'ats-base.base' into acs-ats-enterprise.ats-base
|
2021-01-06 15:25:16 -05:00 |
|
|
brian.long
|
cafee75cdc
|
set platform to v6.2.2.3
|
2021-01-06 15:21:05 -05:00 |
|
|
brian.long
|
d70efc6943
|
parameterized AOS
|
2021-01-06 15:19:41 -05:00 |
|
|
brian.long
|
a0c6074358
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2021-01-06 10:45:33 -05:00 |
|
|
brian.long
|
4afdf95b44
|
added share context to share config
|
2021-01-06 10:45:23 -05:00 |
|
|
brian.long
|
b3001c56ff
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2020-12-26 15:10:45 -05:00 |
|
|
brian.long
|
89ffe20aee
|
added CSRF
|
2020-12-26 15:10:13 -05:00 |
|
|
brian.long
|
d4f4b6217e
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2020-12-26 14:22:18 -05:00 |
|
|
brian.long
|
86ad2bc409
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-26 14:20:12 -05:00 |
|
|
brian.long
|
efb9210c5a
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-26 14:18:31 -05:00 |
|
|
brian.long
|
fc9c26eac5
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-26 14:02:30 -05:00 |
|
|
brian.long
|
55b70f1a36
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:58:15 -05:00 |
|
|
brian.long
|
f2ac689f85
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 13:56:13 -05:00 |
|
|
brian.long
|
1d5624496d
|
renamed proxy variables to match changes to proxy branch
|
2020-12-26 13:55:19 -05:00 |
|
|
brian.long
|
2367651a7e
|
added share context removed from acs-base
|
2020-12-26 13:52:17 -05:00 |
|
|
brian.long
|
b8b267d4c5
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 13:51:34 -05:00 |
|
|
brian.long
|
c0c6dcd1ce
|
remove share context; moving to acs-share-base
|
2020-12-26 13:51:23 -05:00 |
|