207 Commits

Author SHA1 Message Date
3b031f173a Merge branch 'acs-aims' into adw-backend 2023-11-01 14:30:53 -04:00
48859f80ee fixed AIS URL 2023-11-01 14:28:26 -04:00
6f1acad7b6 Merge branch 'acs-frontend' into acs-aims 2023-11-01 14:28:01 -04:00
aa2aceb8ed Merge branch 'acs-backend' into acs-frontend 2023-11-01 14:25:55 -04:00
72026e2ad2 Merge branch 'acs-search' into acs-backend 2023-11-01 14:24:57 -04:00
b3c89aa9ce Merge branch 'acs' into acs-search 2023-11-01 14:23:12 -04:00
fbda2bcdde configure CORS in ACS 2023-11-01 14:21:02 -04:00
4c0a97f847 Merge branch 'aps-aims' into adw-backend 2023-11-01 10:45:32 -04:00
002ecfd466 fix identity integration 2023-11-01 10:41:33 -04:00
bec3617563 Merge branch 'aims' into aps-aims 2023-11-01 10:40:58 -04:00
a6797d5550 Merge branch 'aims' into acs-aims 2023-11-01 10:36:24 -04:00
b211d1ea8a fix well-known reporting 2023-11-01 10:35:56 -04:00
1655c7f1f4 Merge branch 'acs-aims' into adw-backend 2023-10-26 15:24:40 -04:00
cb894f5f5f Merge branch 'aps-aims' into adw-backend 2023-10-26 15:22:03 -04:00
2aa2cf6f64 Merge branch 'acs-backend' into acs-frontend 2023-10-26 14:35:58 -04:00
40dd43068d Merge branch 'acs-search' into acs-backend 2023-10-26 14:29:04 -04:00
bae1c47984 Merge branch 'acs' into acs-search 2023-10-26 14:27:39 -04:00
885e53df2a Merge branch 'acs' into acs-aims 2023-10-26 14:24:38 -04:00
d0593febf2 Merge branch 'aps' into aps-aims 2023-10-26 14:17:44 -04:00
b54b94839d Merge branch 'aps' into adw-backend 2023-10-26 14:16:50 -04:00
f456bb7ea9 removed mem_limit from proxy 2023-10-26 14:15:11 -04:00
6aa3731165 removed mem_limit from proxy 2023-10-26 14:14:26 -04:00
df452d73a0 removed mem_limit from proxy 2023-10-26 14:13:48 -04:00
fbefed1ff1 Merge branch 'aims' into adw-backend 2023-10-26 10:56:48 -04:00
7f06015d81 removed activiti-admin 2023-10-26 10:41:16 -04:00
8b9d766380 Merge branch 'aps' into adw-backend 2023-10-26 10:40:25 -04:00
350380fb3d Merge branch 'acs-frontend' into acs-aims 2023-10-25 22:29:48 -04:00
9427e0e1cb Merge branch 'aims' into acs-aims 2023-10-25 22:29:17 -04:00
df81075066 Merge branch 'acs-backend' into acs-frontend 2023-10-25 22:09:59 -04:00
890f8ac11a Merge branch 'acs-share-base' into acs-frontend 2023-10-25 22:09:09 -04:00
020c4822fd Merge branch 'acs-search' into acs-backend 2023-10-25 21:45:36 -04:00
59c87eb302 added solr health check 2023-10-25 20:37:32 -04:00
8c875fe850 Merge branch 'acs-search-base' into acs-search 2023-10-25 20:30:58 -04:00
51b777c0c5 Merge branch 'acs-base' into acs-search-base 2023-10-25 20:19:55 -04:00
b009fa9219 Merge branch 'acs-base' into acs-share-base 2023-10-25 20:17:55 -04:00
ef221d9c7a Merge branch 'acs-base' into acs 2023-10-25 20:11:38 -04:00
57af0a20b1 ACS v7.4.1.1 2023-10-25 20:11:15 -04:00
76e4287aa1 Merge branch 'proxy' into acs-base 2023-10-25 20:08:28 -04:00
d4362a2bcd Merge branch 'aps' into aps-aims 2023-10-25 19:48:28 -04:00
8901d10f82 Merge branch 'aps-base' into aps 2023-10-25 18:39:33 -04:00
fc8a854920 removed elasticsearch 2023-10-25 18:32:39 -04:00
7e526e0e1e Merge branch 'proxy' into aps-base 2023-10-25 18:29:28 -04:00
416fe88c6b Merge branch 'proxy' into aims 2023-10-25 18:27:08 -04:00
241a3e47ea Merge branch 'base' into proxy 2023-10-25 18:07:00 -04:00
c2a9679ede update comment 2023-10-25 18:05:39 -04:00
6126155ca0 Merge branch 'aims' into aps-aims 2022-11-01 17:49:21 -04:00
b115f86a6d Merge branch 'aps' into aps-aims 2022-11-01 17:48:56 -04:00
9114da403b Merge branch 'aims' into acs-aims 2022-11-01 17:47:43 -04:00
8e6eb7ae72 Merge branch 'acs-frontend' into acs-aims 2022-11-01 17:47:14 -04:00
ff3554c0ce parameterized AIS version 2022-11-01 17:45:46 -04:00