 brian.long
|
48d46aa70c
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-26 14:18:13 -05:00 |
|
|
brian.long
|
b47583a716
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-26 14:15:39 -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
|
f2ac689f85
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 13:56:13 -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 |
|
|
brian.long
|
2367651a7e
|
added share context removed from acs-base
|
2020-12-26 13:52:17 -05:00 |
|
|
brian.long
|
b8b267d4c5
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 13:51:34 -05:00 |
|
|
brian.long
|
c0c6dcd1ce
|
remove share context; moving to acs-share-base
|
2020-12-26 13:51:23 -05:00 |
|
|
brian.long
|
253b7fd3f2
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-26 13:50:37 -05:00 |
|
|
brian.long
|
9f75b4439d
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 13:46:21 -05:00 |
|
|
brian.long
|
3ac57ce7d1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:37:05 -05:00 |
|
|
brian.long
|
68fcb3cbef
|
added proxy config to share
|
2020-12-26 11:20:42 -05:00 |
|
|
brian.long
|
4381a2d350
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 11:19:21 -05:00 |
|
|
brian.long
|
3cb24f7587
|
added proxy config to platform
|
2020-12-26 11:18:58 -05:00 |
|
|
brian.long
|
6579a5a0c9
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:16:07 -05:00 |
|
|
brian.long
|
d6b7a879b1
|
added .env configurable platform/share context
|
2020-12-26 11:15:44 -05:00 |
|
|
brian.long
|
1ead7a8d16
|
added alf-specific variables back to docker-compose env in the right branch
|
2020-12-26 11:13:00 -05:00 |
|
|
brian.long
|
63aa212ccb
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:11:48 -05:00 |
|
|
brian.long
|
5e618569bc
|
Merge branch 'base' into proxy.base
|
2020-12-26 11:11:16 -05:00 |
|
|
brian.long
|
b02204d996
|
remove alf-specific variables; renamed existing
|
2020-12-26 11:10:46 -05:00 |
|
|
brian.long
|
6d396a640f
|
added JDBC driver to base config
|
2020-12-26 11:06:07 -05:00 |
|
|
brian.long
|
573ab3d2cb
|
Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base
|
2020-12-25 23:41:27 -05:00 |
|
|
brian.long
|
c2795cd76c
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
|
2020-12-25 23:40:53 -05:00 |
|
|
brian.long
|
17f70ea253
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2020-12-25 23:40:25 -05:00 |
|
|
brian.long
|
2173a9eb5b
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-25 23:40:01 -05:00 |
|
|
brian.long
|
8e1a7f11ca
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-25 23:39:36 -05:00 |
|
|
brian.long
|
ca1eaa8bff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-25 23:39:19 -05:00 |
|
|
brian.long
|
520e211c11
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-25 23:38:58 -05:00 |
|
|
brian.long
|
1635445cba
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-25 23:38:36 -05:00 |
|
|
brian.long
|
6ec4a797ca
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-25 23:38:22 -05:00 |
|
|
brian.long
|
b1f3b14846
|
Merge branch 'acs-base.proxy' into acs-sync-base.acs-base
|
2020-12-25 23:37:08 -05:00 |
|
|
brian.long
|
04f44ef280
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-25 23:32:53 -05:00 |
|
|
brian.long
|
32ad6d8195
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-25 23:32:25 -05:00 |
|
|
brian.long
|
0ed77985f0
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-25 23:32:10 -05:00 |
|
|
brian.long
|
4b9900a7fd
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-25 23:30:52 -05:00 |
|
|
brian.long
|
56492a45c8
|
Merge branch 'acs-base.proxy' into acs-adw-base.acs-base
|
2020-12-25 23:30:25 -05:00 |
|
|
brian.long
|
9720bd7fa6
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-25 23:08:53 -05:00 |
|
|
brian.long
|
4e8453becd
|
removed port from reverse proxy; allows it to work when port changes
|
2020-12-25 23:08:07 -05:00 |
|
|
brian.long
|
ce9b143fb5
|
added ATS-only base config
|
2020-12-21 11:50:38 -05:00 |
|
|
brian.long
|
ce899a9480
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
|
2020-12-17 21:03:22 -05:00 |
|
|
brian.long
|
701489665a
|
Merge branch 'acs-lats-community.acs-lats-base' into acs-backend-community.acs-lats-community
|
2020-12-17 21:03:07 -05:00 |
|
|
brian.long
|
0976a3975f
|
Merge branch 'acs-min-community.acs-base' into acs-lats-community.acs-min-community
|
2020-12-17 21:02:41 -05:00 |
|
|
brian.long
|
22d1220a14
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community
|
2020-12-17 21:02:00 -05:00 |
|
|
brian.long
|
0ad2cdf9ad
|
Merge branch 'acs-search-community.acs-min-community' into acs-backend-community.acs-search-community
|
2020-12-17 21:01:06 -05:00 |
|
|
brian.long
|
1d0aa0c91e
|
fixed solr configuration on platform
|
2020-12-17 21:00:27 -05:00 |
|
|
brian.long
|
7a005d16d7
|
Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community
|
2020-12-17 20:50:09 -05:00 |
|