 brian
|
926494b3ee
|
Merge branch 'ags' into ags-backend
|
2021-04-02 09:14:34 -04:00 |
|
|
brian
|
9e49b1d3c1
|
Merge branch 'acs-backend' into ags-backend
|
2021-04-02 09:14:33 -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
|
6e09a9c0c9
|
Merge branch 'acs' into ags
|
2021-04-02 09:13:52 -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.long
|
6bce626075
|
Merge branch 'proxy' into acs-base
acs-base-v6
|
2021-04-02 08:42:43 -04:00 |
|
|
brian.long
|
3d6aa1d4bc
|
Merge branch 'base' into proxy
|
2021-04-02 08:41:45 -04:00 |
|
|
brian.long
|
91ad3afc0a
|
removed external dir
|
2021-04-02 08:40:18 -04:00 |
|
|
brian.long
|
24ea707337
|
Merge branch 'ags.acs' into ags-backend.ags
|
2021-01-06 16:29:50 -05:00 |
|
|
brian.long
|
da0046118b
|
Merge branch 'acs-backend.acs-lats' into ags-backend.acs-backend
|
2021-01-06 16:29:33 -05:00 |
|
|
brian.long
|
0999563353
|
Merge branch 'acs.acs-base' into ags.acs
|
2021-01-06 16:27:44 -05:00 |
|
|
brian.long
|
078b2ae35c
|
Merge branch 'acs-lats.acs' into acs-backend.acs-lats
|
2021-01-06 16:27:31 -05:00 |
|
|
brian.long
|
5ff71f0e3c
|
Merge branch 'acs-search.acs' into acs-backend.acs-search
|
2021-01-06 16:27:17 -05:00 |
|
|
brian.long
|
2878298644
|
Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base
|
2021-01-06 16:26:04 -05:00 |
|
|
brian.long
|
11bb8c62ed
|
Merge branch 'acs.acs-base' into acs-search.acs
|
2021-01-06 16:24:47 -05:00 |
|
|
brian.long
|
30f3420ee5
|
Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base
|
2021-01-06 16:24:29 -05:00 |
|
|
brian.long
|
677a3e1dc8
|
Merge branch 'acs.acs-base' into acs-lats.acs
|
2021-01-06 16:24:01 -05:00 |
|
|
brian.long
|
2ec11a1135
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2021-01-06 16:12:46 -05:00 |
|
|
brian.long
|
962817ba63
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2021-01-06 15:56:25 -05:00 |
|
|
brian.long
|
d70efc6943
|
parameterized AOS
|
2021-01-06 15:19:41 -05:00 |
|
|
brian.long
|
4863e29854
|
Merge branch 'ags-community.acs-community' into ags-backend-community.ags-community
|
2021-01-06 12:24:27 -05:00 |
|
|
brian.long
|
d96822cedd
|
Merge branch 'acs-backend-community.acs-lats-community' into ags-backend-community.acs-backend-community
|
2021-01-06 12:24:18 -05:00 |
|
|
brian.long
|
295b0711b0
|
Merge branch 'acs-community.acs-base' into ags-community.acs-community
|
2021-01-06 12:24:10 -05:00 |
|
|
brian.long
|
e660d79ef1
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2021-01-06 12:23:49 -05:00 |
|
|
brian.long
|
f036e13180
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2021-01-06 12:23:35 -05:00 |
|
|
brian.long
|
83db2b08dc
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2021-01-06 12:23:18 -05:00 |
|
|
brian.long
|
40207d43ff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2021-01-06 12:22:58 -05:00 |
|
|
brian.long
|
a3cb815dd1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2021-01-06 12:22:27 -05:00 |
|
|
brian.long
|
ebd6c503bd
|
Merge branch 'proxy.base' into acs-base.proxy
|
2021-01-06 12:21:58 -05:00 |
|
|
brian.long
|
ac18d6d637
|
fixed host/protocol URL rewrites
|
2021-01-06 12:21:21 -05:00 |
|
|
brian.long
|
59d082734f
|
Merge branch 'acs-backend-community.acs-lats-community' into ags-backend-community.ags-community
|
2021-01-06 10:26:33 -05:00 |
|
|
brian.long
|
bc6a8539f3
|
switched platform to AGS (not AMP module distributed anymore)
|
2021-01-06 10:24:47 -05:00 |
|
|
brian.long
|
41b87a9e5e
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2020-12-26 14:20:33 -05:00 |
|
|
brian.long
|
86ad2bc409
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-26 14:20:12 -05:00 |
|
|
brian.long
|
2a56247aa1
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-26 14:18:48 -05:00 |
|
|
brian.long
|
efb9210c5a
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-26 14:18:31 -05:00 |
|
|
brian.long
|
48d46aa70c
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-26 14:18:13 -05:00 |
|
|
brian.long
|
fc9c26eac5
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-26 14:02:30 -05:00 |
|
|
brian.long
|
2715b3afea
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 14:00:14 -05:00 |
|
|
brian.long
|
55b70f1a36
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:58:15 -05:00 |
|
|
brian.long
|
1d5624496d
|
renamed proxy variables to match changes to proxy branch
|
2020-12-26 13:55:19 -05:00 |
|
|
brian.long
|
3a6b5c4850
|
Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy
|
2020-12-26 13:54:44 -05:00 |
|
|
brian.long
|
817b062dfd
|
merged platform/share into single proxy
|
2020-12-26 13:54:31 -05:00 |
|