|
|
f90a541ec2
|
fixed dup service
|
2021-04-02 10:31:35 -04:00 |
|
brian
|
f52aee275e
|
Merge branch 'acs-frontend' into acs-frontend-enterprise
|
2021-04-02 09:20:56 -04:00 |
|
brian
|
c2c340f61e
|
Merge branch 'acs-adw-base' into acs-frontend-enterprise
|
2021-04-02 09:20:55 -04:00 |
|
|
|
c9d1646933
|
Merge remote-tracking branch 'origin/acs-backend-enterprise' into acs-frontend-enterprise
|
2021-04-02 09:20:11 -04:00 |
|
brian
|
26adfeee1c
|
Merge branch 'acs-backend' into acs-frontend
|
2021-04-02 09:14:46 -04:00 |
|
brian
|
68d0eeab49
|
Merge branch 'acs-share-base' into acs-frontend
|
2021-04-02 09:14:46 -04:00 |
|
brian
|
456950f31d
|
Merge branch 'acs-lats' into acs-backend
|
2021-04-02 09:14:29 -04:00 |
|
brian
|
6740f23779
|
Merge branch 'acs-search' into acs-backend
|
2021-04-02 09:14:28 -04:00 |
|
brian
|
880221a953
|
Merge branch 'acs-lats-base' into acs-lats
|
2021-04-02 09:14:00 -04:00 |
|
brian
|
398d6692f8
|
Merge branch 'acs' into acs-lats
|
2021-04-02 09:13:59 -04:00 |
|
brian
|
b6f2befafb
|
Merge branch 'acs-ats-enterprise' into acs-backend-enterprise
|
2021-04-02 09:13:57 -04:00 |
|
brian
|
c11990900c
|
Merge branch 'acs-sync-base' into acs-backend-enterprise
|
2021-04-02 09:13:56 -04:00 |
|
brian
|
e07cea5ffa
|
Merge branch 'acs-search' into acs-backend-enterprise
|
2021-04-02 09:13:54 -04:00 |
|
brian
|
29f4ca7c54
|
Merge branch 'acs-ats-base' into acs-ats-enterprise
|
2021-04-02 09:13:50 -04:00 |
|
brian
|
73fea3d13d
|
Merge branch 'acs-enterprise' into acs-ats-enterprise
|
2021-04-02 09:13:49 -04:00 |
|
brian
|
910cc2e2cb
|
Merge branch 'acs' into acs-enterprise
|
2021-04-02 09:13:44 -04:00 |
|
brian
|
99d39fa7f7
|
Merge branch 'acs-search-base' into acs-search
|
2021-04-02 09:13:42 -04:00 |
|
brian
|
1778fd04a4
|
Merge branch 'acs' into acs-search
|
2021-04-02 09:13:41 -04:00 |
|
brian
|
d616b9ef3a
|
Merge branch 'acs-base' into acs
|
2021-04-02 09:13:32 -04:00 |
|
brian
|
a72d43a6af
|
Merge branch 'acs-base' into acs-search-base
|
2021-04-02 09:13:30 -04:00 |
|
brian
|
5a16e389c4
|
Merge branch 'acs-base' into acs-lats-base
|
2021-04-02 09:13:25 -04:00 |
|
brian
|
f10722dec9
|
Merge branch 'acs-base' into acs-sync-base
|
2021-04-02 09:13:22 -04:00 |
|
brian
|
ec00d1a445
|
Merge branch 'acs-base' into acs-adw-base
|
2021-04-02 09:13:18 -04:00 |
|
brian
|
bf09b85448
|
Merge branch 'acs-base' into acs-share-base
|
2021-04-02 09:13:10 -04:00 |
|
|
|
39928d09fc
|
Merge branch 'ats-base' into acs-ats-base
|
2021-04-02 09:11:32 -04:00 |
|
|
|
9859e68fe8
|
Merge branch 'acs-base' into acs-ats-base
|
2021-04-02 09:11:22 -04:00 |
|
|
|
4dccd7892f
|
Merge branch 'base' into ats-base
|
2021-04-02 09:09:13 -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 |
|
|
|
6471292c34
|
added share proxy to adw
|
2021-01-13 18:19:06 -05:00 |
|
|
|
7114bb5de1
|
Merge branch 'acs-adw-base' into acs-frontend-enterprise
|
2021-01-13 18:18:28 -05:00 |
|
|
|
5ea48c405f
|
added host-based config
|
2021-01-13 18:14:24 -05:00 |
|
brian
|
e222fc3fba
|
Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise
|
2021-01-13 17:38:42 -05:00 |
|
|
|
3b5fc8c096
|
fixed sync service config
|
2021-01-13 17:35:43 -05:00 |
|
|
|
41858ebddb
|
added ADW version and config
|
2021-01-13 11:47:27 -05:00 |
|
|
|
5788051f22
|
Merge remote-tracking branch 'origin/acs-adw-base' into acs-frontend-enterprise
|
2021-01-13 11:36:13 -05:00 |
|
|
|
b534456065
|
Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise
|
2021-01-13 11:28:54 -05:00 |
|
|
|
ac7e691100
|
Merge branch 'acs-sync-base' into acs-backend-enterprise
|
2021-01-13 11:09:18 -05:00 |
|
|
|
15ccb5642b
|
using proxy values for sync url
|
2021-01-13 09:59:21 -05:00 |
|
|
|
4349851dd9
|
Merge remote-tracking branch 'origin/acs-sync-base' into acs-backend-enterprise
|
2021-01-13 09:56:54 -05:00 |
|
|
|
de8920ba0b
|
Merge remote-tracking branch 'origin/acs-frontend' into acs-frontend-enterprise
|
2021-01-13 09:50:51 -05:00 |
|
|
|
9b3ba22ca1
|
Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search
|
2021-01-06 16:33:19 -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 |
|
