 brian.long
|
c9d1646933
|
Merge remote-tracking branch 'origin/acs-backend-enterprise' into acs-frontend-enterprise
|
2021-04-02 09:20:11 -04:00 |
|
|
brian.long
|
39928d09fc
|
Merge branch 'ats-base' into acs-ats-base
|
2021-04-02 09:11:32 -04:00 |
|
|
brian.long
|
9859e68fe8
|
Merge branch 'acs-base' into acs-ats-base
|
2021-04-02 09:11:22 -04:00 |
|
|
brian.long
|
4dccd7892f
|
Merge branch 'base' into ats-base
|
2021-04-02 09:09:13 -04:00 |
|
|
brian.long
|
6bce626075
|
Merge branch 'proxy' into acs-base
|
2021-04-02 08:42:43 -04:00 |
|
|
brian.long
|
3d6aa1d4bc
|
Merge branch 'base' into proxy
|
2021-04-02 08:41:45 -04:00 |
|
|
brian.long
|
91ad3afc0a
|
removed external dir
|
2021-04-02 08:40:18 -04: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.long
|
3b5fc8c096
|
fixed sync service config
|
2021-01-13 17:35:43 -05:00 |
|
|
brian.long
|
41858ebddb
|
added ADW version and config
|
2021-01-13 11:47:27 -05:00 |
|
|
brian.long
|
fd30fd4555
|
Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
|
2021-01-13 11:37:23 -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
|
d4616bfdb2
|
Merge branch 'acs-backend-enterprise-persist' into acs-frontend-enterprise-persist
|
2021-01-13 11:30:37 -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
|
28e32e34a2
|
Merge branch 'acs-frontend-persist.acs-backend-persist' into acs-frontend-enterprise-persist.acs-frontend-persist
|
2021-01-06 16:44:22 -05:00 |
|
|
brian.long
|
c7378dd9c2
|
Merge branch 'acs-backend-persist.acs-backend' into acs-backend-enterprise-persist.acs-backend-persist
|
2021-01-06 16:43:39 -05:00 |
|
|
brian.long
|
6c5f4493dc
|
Merge branch 'acs-backend-persist.acs-backend' into acs-frontend-persist.acs-backend-persist
|
2021-01-06 16:40:42 -05:00 |
|
|
brian.long
|
4f3da7361a
|
Merge branch 'acs-frontend.acs-backend' into acs-frontend-persist.acs-frontend
|
2021-01-06 16:39:54 -05:00 |
|
|
brian.long
|
53404852e1
|
Merge branch 'acs-backend.acs-lats' into acs-backend-persist.acs-backend
|
2021-01-06 16:37:17 -05:00 |
|
|
brian.long
|
75743d2391
|
Merge branch 'acs-search-persist.acs-persist' into acs-backend-persist.acs-search-persist
|
2021-01-06 16:36:22 -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
|
766b2ebfd0
|
Merge branch 'acs-share-base.acs-base' into acs-frontend.acs-share-base
|
2021-01-06 16:28:51 -05:00 |
|
|
brian.long
|
078b2ae35c
|
Merge branch 'acs-lats.acs' into acs-backend.acs-lats
|
2021-01-06 16:27:31 -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
|
2878298644
|
Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base
|
2021-01-06 16:26:04 -05:00 |
|
|
brian.long
|
11bb8c62ed
|
Merge branch 'acs.acs-base' into acs-search.acs
|
2021-01-06 16:24:47 -05:00 |
|
|
brian.long
|
30f3420ee5
|
Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base
|
2021-01-06 16:24:29 -05:00 |
|
|
brian.long
|
677a3e1dc8
|
Merge branch 'acs.acs-base' into acs-lats.acs
|
2021-01-06 16:24:01 -05:00 |
|
|
brian.long
|
76dc8c7ad9
|
Merge branch 'acs-ats-base.acs-base' into acs-ats-enterprise.acs-ats-base
|
2021-01-06 16:22:31 -05:00 |
|
|
brian.long
|
b024fd8d7e
|
Merge branch 'ats-base.base' into acs-ats-base.ats-base
|
2021-01-06 16:21:36 -05:00 |
|
|
brian.long
|
8a36f91d06
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2021-01-06 16:15:41 -05:00 |
|
|
brian.long
|
2ec11a1135
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2021-01-06 16:12:46 -05:00 |
|
|
brian.long
|
6a8b1e2628
|
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
|
2021-01-06 16:11:47 -05:00 |
|
|
brian.long
|
932159b238
|
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
|
2021-01-06 16:11:28 -05:00 |
|
|
brian.long
|
962817ba63
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2021-01-06 15:56:25 -05:00 |
|
|
brian.long
|
135739da10
|
Merge branch 'acs-base.proxy' into acs-persist.acs-base
|
2021-01-06 15:56:03 -05:00 |
|
|
brian.long
|
3ef69c527b
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2021-01-06 15:54:53 -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
|
d3b41dcc46
|
Merge branch 'base' into ats-base.base
|
2021-01-06 15:53:29 -05:00 |
|
|
brian.long
|
f1a47aa620
|
Merge branch 'acs-frontend.acs-backend' into acs-frontend-community-persist.acs-frontend-community
|
2021-01-06 15:49:06 -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
|
9e2ce6b967
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
|
2021-01-06 12:29:24 -05:00 |
|
|
brian.long
|
e660d79ef1
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2021-01-06 12:23:49 -05:00 |
|
|
brian.long
|
f036e13180
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2021-01-06 12:23:35 -05:00 |
|
|
brian.long
|
83db2b08dc
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2021-01-06 12:23:18 -05:00 |
|
|
brian.long
|
40207d43ff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2021-01-06 12:22:58 -05:00 |
|
|
brian.long
|
a3cb815dd1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2021-01-06 12:22:27 -05:00 |
|
|
brian.long
|
ebd6c503bd
|
Merge branch 'proxy.base' into acs-base.proxy
|
2021-01-06 12:21:58 -05:00 |
|
|
brian.long
|
ac18d6d637
|
fixed host/protocol URL rewrites
|
2021-01-06 12:21:21 -05:00 |
|
|
brian.long
|
3d06a59303
|
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
|
2021-01-06 10:46:46 -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
|
ccbe4de116
|
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
|
2020-12-26 15:12:49 -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
|
5c25ab9d3d
|
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
|
2020-12-26 14:25:48 -05:00 |
|
|
brian.long
|
02a2ec72c0
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community
|
2020-12-26 14:23:53 -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
|
41b87a9e5e
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2020-12-26 14:20:33 -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
|
2a56247aa1
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-26 14:18:48 -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
|
48d46aa70c
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-26 14:18:13 -05:00 |
|
|
brian.long
|
b47583a716
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-26 14:15:39 -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
|
720346e9d7
|
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
|
2020-12-26 14:01:13 -05:00 |
|
|
brian.long
|
68e0652872
|
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
|
2020-12-26 14:00:56 -05:00 |
|
|
brian.long
|
2715b3afea
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 14:00:14 -05:00 |
|
|
brian.long
|
b81db4fc0f
|
Merge branch 'acs-base.proxy' into acs-persist.acs-base
|
2020-12-26 13:59:41 -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
|
3a6b5c4850
|
Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy
|
2020-12-26 13:54:44 -05:00 |
|
|
brian.long
|
817b062dfd
|
merged platform/share into single proxy
|
2020-12-26 13:54:31 -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 |
|
|
brian.long
|
253b7fd3f2
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-26 13:50:37 -05:00 |
|
|
brian.long
|
c377995a1d
|
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
|
2020-12-26 13:48:22 -05:00 |
|
|
brian.long
|
e223fd99a3
|
Merge commit '9f75b4439d19154e3aaa48e19d05451530333613' into acs-search-persist.acs-search-base
|
2020-12-26 13:47:30 -05:00 |
|
|
brian.long
|
9f75b4439d
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 13:46:21 -05:00 |
|
|
brian.long
|
5beadf9f35
|
Merge branch 'acs-base.proxy' into acs-persist.acs-base
|
2020-12-26 13:45:22 -05:00 |
|
|
brian.long
|
3ac57ce7d1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:37:05 -05:00 |
|
|
brian.long
|
68fcb3cbef
|
added proxy config to share
|
2020-12-26 11:20:42 -05:00 |
|
|
brian.long
|
4381a2d350
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 11:19:21 -05:00 |
|
|
brian.long
|
3cb24f7587
|
added proxy config to platform
|
2020-12-26 11:18:58 -05:00 |
|
|
brian.long
|
6579a5a0c9
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:16:07 -05:00 |
|