399 Commits

Author SHA1 Message Date
8dc083bf2b Merge branch 'dbp-aims' into dbp-persist-aims 2021-07-07 09:22:23 -04:00
a9d29aaf7b Merge branch 'aps-aims' into dbp-aims 2021-07-07 09:22:04 -04:00
97b9237171 added activiti-app redirect URI 2021-07-06 17:19:40 -04:00
925d05e41b Merge branch 'dbp-aims' into dbp-persist-aims 2021-06-22 09:31:10 -04:00
99c9621a9f Merge branch 'aps-aims' into dbp-aims 2021-06-22 09:27:59 -04:00
2ffde7c784 Merge branch 'ags-aims-enterprise' into dbp-aims 2021-06-22 09:27:54 -04:00
d7c28f9b6e changed URLs to use split envvars 2021-06-22 09:26:41 -04:00
924c687250 Merge branch 'aims' into aps-aims 2021-06-22 09:25:56 -04:00
3ca58472a3 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-06-22 09:25:11 -04:00
8894180ea1 changed URLs to use split envvars 2021-06-22 09:24:40 -04:00
7b0dd55b4e Merge branch 'acs-aims' into acs-aims-enterprise 2021-06-22 09:23:46 -04:00
dfb0f61088 changed URLs to use split envvars 2021-06-22 09:23:05 -04:00
1a0d8ba2b2 Merge branch 'aims' into acs-aims 2021-06-22 09:13:03 -04:00
a7fa111930 split AIS url into parts for reuse 2021-06-22 09:11:00 -04:00
0e64298361 Merge branch 'ags-aims-enterprise' into dbp-aims 2021-05-06 14:21:01 -04:00
5ab1283aab Merge branch 'aps-aims' into dbp-aims 2021-05-06 14:20:55 -04:00
995fbfb13f Merge branch 'aims' into aps-aims 2021-05-06 14:20:07 -04:00
65a2d15c07 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-05-06 14:19:24 -04:00
bb6c28f859 Merge branch 'acs-aims' into acs-aims-enterprise 2021-05-06 14:19:17 -04:00
171f67daf0 added identity service as dependency to platform 2021-05-06 14:18:02 -04:00
d47e68fc70 Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-05-06 14:15:54 -04:00
7fbe8b5c1f Merge branch 'acs-aims' into acs-aims-enterprise 2021-05-06 14:15:01 -04:00
db6c0f84a9 Merge branch 'aims' into acs-aims 2021-05-06 14:14:17 -04:00
b238e3c727 added identity service healthcheck 2021-05-06 14:13:12 -04:00
60572f0c9d added APS support to ADW with AIS is present 2021-05-06 10:39:17 -04:00
3d14c54688 Merge branch 'aims-persist' into dbp-persist-aims 2021-04-20 09:56:50 -04:00
cade3f1b3b Merge branch 'dbp-persist' into dbp-persist-aims 2021-04-20 09:52:32 -04:00
29a71867f2 Merge branch 'aps-aims' into dbp-aims 2021-04-19 09:02:18 -04:00
1929c94880 configured aps for aims 2021-04-19 08:51:12 -04:00
c6c8b06331 Merge branch 'dbp' into dbp-aims 2021-04-19 08:31:35 -04:00
d9237cdb78 Merge branch 'aps-persist' into dbp-persist 2021-04-19 08:30:54 -04:00
25163f428c Merge branch 'dbp' into dbp-persist 2021-04-19 08:30:45 -04:00
6e862151cc Merge branch 'aps' into dbp 2021-04-19 08:30:13 -04:00
2ed89fa708 Merge branch 'aps-persist-base' into aps-persist 2021-04-19 08:27:38 -04:00
bcdd5e0525 Merge branch 'aps-base' into aps-persist-base 2021-04-19 08:26:57 -04:00
7590f2d390 Merge branch 'aps-base' into aps 2021-04-19 08:26:27 -04:00
2d91d8bc08 renamed proxy from acs to aps 2021-04-19 08:26:13 -04:00
1bd9da2339 Merge remote-tracking branch 'origin/aims' into aps-aims 2021-04-19 08:24:15 -04:00
4afb1f3e20 Merge branch 'ags-aims-enterprise' into dbp-aims 2021-04-02 10:40:57 -04:00
f0fe828a44 Merge branch 'dbp' into dbp-aims 2021-04-02 10:40:10 -04:00
b5ffc3e6e4 Merge branch 'ags-frontend-enterprise-persist' into dbp-persist 2021-04-02 10:39:42 -04:00
f32e582608 Merge branch 'dbp' into dbp-persist 2021-04-02 10:39:21 -04:00
0a834c839f Merge remote-tracking branch 'origin/ags-frontend-enterprise' into dbp 2021-04-02 10:39:09 -04:00
0ab7ab7a49 Merge remote-tracking branch 'origin/ags-frontend-enterprise' into ags-aims-enterprise 2021-04-02 10:38:09 -04:00
575aff046e Merge branch 'acs-aims-enterprise' into ags-aims-enterprise 2021-04-02 10:38:02 -04:00
18d337ffa0 Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise 2021-04-02 10:37:36 -04:00
c2191ef143 Merge branch 'acs-frontend-enterprise-persist' into ags-frontend-enterprise-persist 2021-04-02 10:36:11 -04:00
brian
54c4f13f8a Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist 2021-04-02 10:34:47 -04:00
brian
e86f9b6237 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-04-02 10:34:43 -04:00
f90a541ec2 fixed dup service 2021-04-02 10:31:35 -04:00