5d4cce1bf9
Merge branch 'ags-backend' into ags-frontend
2023-10-26 14:44:05 -04:00
4a9ebc7b0a
Merge branch 'acs-frontend' into ags-frontend
2023-10-26 14:44:00 -04:00
2aa2cf6f64
Merge branch 'acs-backend' into acs-frontend
2023-10-26 14:35:58 -04:00
42da1404d0
Merge branch 'acs-frontend' into ags-frontend
2023-10-25 22:33:22 -04:00
bf0fdd7f90
Merge branch 'ags-backend' into ags-frontend
2023-10-25 22:33:00 -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
23b3057329
ACS share v7.4.1.2
2023-10-25 20:19:43 -04:00
b009fa9219
Merge branch 'acs-base' into acs-share-base
2023-10-25 20:17:55 -04:00
eda5fa71e2
Merge branch 'acs-frontend' into ags-frontend
2022-11-01 17:35:52 -04:00
8fb51b3ac3
Merge branch 'ags-backend' into ags-frontend
2022-11-01 17:34:13 -04:00
7fd04f30f3
Merge branch 'acs-share-base' into acs-frontend
2022-11-01 16:23:43 -04:00
226a2d05e2
Merge branch 'acs-backend' into acs-frontend
2022-11-01 16:22:46 -04:00
fcd1262721
parameterized ACS share version
2022-11-01 15:03:04 -04:00
d7de714eeb
Merge branch 'acs-base' into acs-share-base
2022-11-01 15:01:38 -04:00
95d9a634d4
Merge branch 'acs-frontend' into ags-frontend
2021-07-30 16:16:49 -04:00
6d209e4633
Merge branch 'ags-backend' into ags-frontend
2021-07-30 16:16:37 -04:00
8c7e433358
Merge branch 'acs-backend' into acs-frontend
2021-07-30 16:15:19 -04:00
brian
baf69f0fb3
Merge branch 'acs-frontend' into ags-frontend
2021-04-02 09:21:17 -04:00
brian
2d0e25fd06
Merge branch 'ags-backend' into ags-frontend
2021-04-02 09:21:16 -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
bf09b85448
Merge branch 'acs-base' into acs-share-base
2021-04-02 09:13:10 -04:00
d753a42731
Merge branch 'acs-frontend.acs-backend' into ags-frontend.acs-frontend
2021-01-06 16:30:24 -05:00
bf6a3cb669
Merge branch 'ags-backend.acs-backend' into ags-frontend.ags-backend
2021-01-06 16:30:10 -05:00
69531bde6d
Merge branch 'acs-backend.acs-lats' into acs-frontend.acs-backend
2021-01-06 16:29:12 -05:00
766b2ebfd0
Merge branch 'acs-share-base.acs-base' into acs-frontend.acs-share-base
2021-01-06 16:28:51 -05:00
3ef69c527b
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2021-01-06 15:54:53 -05:00
2134cda63a
Merge branch 'acs-frontend-community.acs-backend-community' into ags-frontend-community.acs-frontend-community
2021-01-06 12:29:50 -05:00
9e2ce6b967
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2021-01-06 12:29:24 -05:00
eb09f26857
Merge branch 'acs-frontend-community.acs-backend-community' into ags-frontend-community.acs-frontend-community
2021-01-06 10:47:05 -05:00
a0c6074358
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
2021-01-06 10:45:33 -05:00
4afdf95b44
added share context to share config
2021-01-06 10:45:23 -05:00
9709aceaed
switched share to AGS (no AMP module distributed anymore)
2021-01-06 10:31:26 -05:00
3686a6751d
Merge branch 'acs-frontend-community.acs-share-base' into ags-frontend-community.acs-frontend-community
2021-01-06 10:28:33 -05:00
b3001c56ff
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
2020-12-26 15:10:45 -05:00
89ffe20aee
added CSRF
2020-12-26 15:10:13 -05:00
d4f4b6217e
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
2020-12-26 14:22:18 -05:00
f2ac689f85
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-26 13:56:13 -05:00
2367651a7e
added share context removed from acs-base
2020-12-26 13:52:17 -05:00
b8b267d4c5
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-26 13:51:34 -05:00
68fcb3cbef
added proxy config to share
2020-12-26 11:20:42 -05:00
4381a2d350
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-26 11:19:21 -05:00
573ab3d2cb
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
2020-12-25 23:41:27 -05:00
c2795cd76c
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2020-12-25 23:40:53 -05:00
4b9900a7fd
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-25 23:30:52 -05:00
ce899a9480
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2020-12-17 21:03:22 -05:00
22d1220a14
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2020-12-17 21:02:00 -05:00
eb11f51348
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
2020-12-17 18:57:36 -05:00
8be9a0749a
Merge branch 'acs-share-base.acs-base' into acs-share-community.acs-share-base
2020-12-17 16:37:05 -05:00
0bd09b8cbd
Merge branch 'acs-search-community.acs-community' into acs-share-community.acs-search-community
2020-12-17 16:36:31 -05:00
ff5442c869
added share to nginx
2020-12-17 16:32:32 -05:00
4cb5100065
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
2020-12-17 16:31:16 -05:00
055119eeb5
added share config
2020-12-17 14:24:15 -05:00
75df5099e9
Merge branch 'acs-share-base.acs-base' into acs-share-community.acs-share-base
2020-12-17 14:20:22 -05:00
c084972d39
Merge branch 'acs-base.base' into acs-share-base.acs-base
2020-12-17 12:55:48 -05:00
72f7960369
Merge branch 'acs-base.base' into acs-share-base.acs-base
2020-12-16 23:56:30 -05:00
00e0a17249
added share to proxy
2020-12-16 23:42:47 -05:00
bfa65c999e
added share unconfigured service
2020-12-16 23:40:20 -05:00