|
|
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 |
|
|
|
192bd41c1a
|
Merge remote-tracking branch 'origin/ags-frontend-enterprise' into ags-aims-enterprise
|
2021-01-14 14:26:04 -05:00 |
|
brian
|
c76e745e2d
|
Merge branch 'acs-aims' into acs-aims-enterprise
|
2021-01-14 11:41:14 -05:00 |
|
brian
|
fd79be4aed
|
Merge branch 'aims' into acs-aims
|
2021-01-14 11:41:09 -05:00 |
|
|
|
b4be2e251c
|
changed admin username ot alfresco defaults
|
2021-01-14 11:40:42 -05:00 |
|
|
|
dc236b7550
|
added sync/adw config after testing
|
2021-01-14 11:20:05 -05:00 |
|
|
|
d87935cd44
|
Merge branch 'acs-aims' into acs-aims-enterprise
|
2021-01-14 11:19:10 -05:00 |
|
|
|
0be038fe07
|
added acs platform/share AIMS config after testing
|
2021-01-14 11:19:01 -05:00 |
|
|
|
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 |
|
|
|
a388c1d2fb
|
Merge branch 'acs-aims' into acs-aims-enterprise
|
2021-01-14 09:41:20 -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 |
|
|
|
af39f367b6
|
Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise
|
2021-01-13 20:55:01 -05:00 |
|
brian
|
c5f2448cf9
|
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
|
2021-01-13 20:52:40 -05: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
|
00335f5795
|
Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise
|
2021-01-13 17:38:59 -05:00 |
|
brian
|
806601c800
|
Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise
|
2021-01-13 17:38:46 -05:00 |
|
brian
|
e9542dbc96
|
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
|
2021-01-13 17:38:45 -05:00 |
|
brian
|
e222fc3fba
|
Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise
|
2021-01-13 17:38:42 -05:00 |
|
brian
|
eaa6f1025d
|
Merge branch 'acs-backend-enterprise' into ags-backend-enterprise
|
2021-01-13 17:38:37 -05:00 |
|
|
|
3b5fc8c096
|
fixed sync service config
|
2021-01-13 17:35:43 -05:00 |
|
|
|
8aa7067286
|
Merge remote-tracking branch 'origin/acs-frontend-enterprise' into acs-aims-enterprise
|
2021-01-13 17:22:01 -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
|
75afb1580b
|
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
|
2021-01-13 11:55:43 -05:00 |
|
|
|
41858ebddb
|
added ADW version and config
|
2021-01-13 11:47:27 -05:00 |
|
|
|
6aa7c2229d
|
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
|
2021-01-13 11:38:30 -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 |
|
|
|
f977291894
|
using AGS share-enterprise container
|
2021-01-13 11:22:01 -05:00 |
|
|
|
cc4ed62159
|
Merge remote-tracking branch 'origin/acs-adw-base' into ags-frontend-enterprise
|
2021-01-13 11:21:00 -05:00 |
|
|
|
e8a8d088f4
|
Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise
|
2021-01-13 11:19:08 -05:00 |
|
|
|
c9075398cd
|
Merge branch 'acs-backend-enterprise' into ags-backend-enterprise
|
2021-01-13 11:17:17 -05:00 |
|
|
|
128a289ac3
|
Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise
|
2021-01-13 11:12:52 -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 |
|
|
|
4f5a939b71
|
Merge remote-tracking branch 'origin/acs-backend-enterprise' into ags-backend-enterprise
|
2021-01-13 09:47:53 -05:00 |
|
|
|
22b2583505
|
Merge branch 'acs-enterprise' into ags-enterprise
|
2021-01-13 09:45:50 -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 |
|
