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
|
ba6a0f70ad
|
Merge branch 'aps-base' into aps-persist-base
|
2021-04-02 09:13:20 -04:00 |
|
brian
|
ec00d1a445
|
Merge branch 'acs-base' into acs-adw-base
|
2021-04-02 09:13:18 -04:00 |
|
brian
|
8b7ec4654e
|
Merge branch 'aps-base' into aps
|
2021-04-02 09:13:16 -04:00 |
|
brian
|
bf09b85448
|
Merge branch 'acs-base' into acs-share-base
|
2021-04-02 09:13:10 -04:00 |
|
brian
|
f23cda3fd1
|
Merge branch 'proxy' into aims
|
2021-04-02 09:12:59 -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 |
|
|
|
6e0c055222
|
Merge branch 'proxy' into aps-base
|
2021-04-02 09:06:48 -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 |
|
brian
|
0469d435a4
|
Merge branch 'aims' into aims-persist
|
2021-01-14 11:41:00 -05:00 |
|
|
|
b4be2e251c
|
changed admin username ot alfresco defaults
|
2021-01-14 11:40:42 -05:00 |
|
brian
|
a933edb6bd
|
Merge branch 'aims' into aims-persist
|
2021-01-14 11:21:18 -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
|
d3c1579905
|
Merge branch 'ags-frontend-enterprise' into ags-frontend-enterprise-persist
|
2021-01-13 20:52:46 -05:00 |
|
brian
|
3b83b005c5
|
Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist
|
2021-01-13 20:52:45 -05:00 |
|
brian
|
df5d011a3a
|
Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
|
2021-01-13 20:52:42 -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
|
b757323701
|
Merge branch 'ags-frontend-enterprise' into ags-frontend-enterprise-persist
|
2021-01-13 17:38:57 -05:00 |
|
brian
|
812dead437
|
Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist
|
2021-01-13 17:38:57 -05:00 |
|
brian
|
e0df60bc8b
|
Merge branch 'acs-backend-enterprise-persist' into acs-frontend-enterprise-persist
|
2021-01-13 17:38:55 -05:00 |
|
brian
|
8b21dcd843
|
Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
|
2021-01-13 17:38:53 -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
|
a140d6806f
|
Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist
|
2021-01-13 17:38:40 -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 |
|
