|
|
ce372ad731
|
Merge branch 'acs-aims' into acs-aims-enterprise
|
2021-04-02 09:31:27 -04:00 |
|
|
|
75476c4d4e
|
Merge remote-tracking branch 'origin/acs-frontend-enterprise' into acs-aims-enterprise
|
2021-04-02 09:31:11 -04:00 |
|
brian
|
d15d9d291c
|
Merge branch 'aims' into acs-aims
|
2021-04-02 09:21:23 -04:00 |
|
brian
|
ec79404d1c
|
Merge branch 'acs-frontend' into acs-aims
|
2021-04-02 09:21:23 -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 |
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
