|
|
86ad2bc409
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-26 14:20:12 -05:00 |
|
|
|
2a56247aa1
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-26 14:18:48 -05:00 |
|
|
|
efb9210c5a
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-26 14:18:31 -05:00 |
|
|
|
48d46aa70c
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-26 14:18:13 -05:00 |
|
|
|
fc9c26eac5
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-26 14:02:30 -05:00 |
|
|
|
720346e9d7
|
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
|
2020-12-26 14:01:13 -05:00 |
|
|
|
68e0652872
|
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
|
2020-12-26 14:00:56 -05:00 |
|
|
|
2715b3afea
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 14:00:14 -05:00 |
|
|
|
b81db4fc0f
|
Merge branch 'acs-base.proxy' into acs-persist.acs-base
|
2020-12-26 13:59:41 -05:00 |
|
|
|
55b70f1a36
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:58:15 -05:00 |
|
|
|
1d5624496d
|
renamed proxy variables to match changes to proxy branch
|
2020-12-26 13:55:19 -05:00 |
|
|
|
3a6b5c4850
|
Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy
|
2020-12-26 13:54:44 -05:00 |
|
|
|
817b062dfd
|
merged platform/share into single proxy
|
2020-12-26 13:54:31 -05:00 |
|
|
|
c0c6dcd1ce
|
remove share context; moving to acs-share-base
|
2020-12-26 13:51:23 -05:00 |
|
|
|
253b7fd3f2
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-26 13:50:37 -05:00 |
|
|
|
c377995a1d
|
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
|
2020-12-26 13:48:22 -05:00 |
|
|
|
e223fd99a3
|
Merge commit '9f75b4439d19154e3aaa48e19d05451530333613' into acs-search-persist.acs-search-base
|
2020-12-26 13:47:30 -05:00 |
|
|
|
9f75b4439d
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-26 13:46:21 -05:00 |
|
|
|
5beadf9f35
|
Merge branch 'acs-base.proxy' into acs-persist.acs-base
|
2020-12-26 13:45:22 -05:00 |
|
|
|
3ac57ce7d1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:37:05 -05:00 |
|
|
|
3cb24f7587
|
added proxy config to platform
|
2020-12-26 11:18:58 -05:00 |
|
|
|
6579a5a0c9
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:16:07 -05:00 |
|
|
|
d6b7a879b1
|
added .env configurable platform/share context
|
2020-12-26 11:15:44 -05:00 |
|
|
|
1ead7a8d16
|
added alf-specific variables back to docker-compose env in the right branch
|
2020-12-26 11:13:00 -05:00 |
|
|
|
63aa212ccb
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:11:48 -05:00 |
|
|
|
5e618569bc
|
Merge branch 'base' into proxy.base
|
2020-12-26 11:11:16 -05:00 |
|
|
|
b02204d996
|
remove alf-specific variables; renamed existing
|
2020-12-26 11:10:46 -05:00 |
|
|
|
6d396a640f
|
added JDBC driver to base config
|
2020-12-26 11:06:07 -05:00 |
|
|
|
24337f3a13
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community
|
2020-12-25 23:55:11 -05:00 |
|
|
|
04988e43dd
|
Merge branch 'acs-search-persist.acs-persist' into acs-backend-community-persist.acs-search-persist
|
2020-12-25 23:54:43 -05:00 |
|
|
|
f94f3e82e8
|
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
|
2020-12-25 23:52:04 -05:00 |
|
|
|
cb5d306478
|
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
|
2020-12-25 23:51:38 -05:00 |
|
|
|
abaa41345a
|
Merge branch 'acs-base.proxy' into acs-persist.acs-base
|
2020-12-25 23:51:17 -05:00 |
|
|
|
17f70ea253
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2020-12-25 23:40:25 -05:00 |
|
|
|
2173a9eb5b
|
Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community
|
2020-12-25 23:40:01 -05:00 |
|
|
|
8e1a7f11ca
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-25 23:39:36 -05:00 |
|
|
|
ca1eaa8bff
|
Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community
|
2020-12-25 23:39:19 -05:00 |
|
|
|
520e211c11
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-25 23:38:58 -05:00 |
|
|
|
1635445cba
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-25 23:38:36 -05:00 |
|
|
|
6ec4a797ca
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-25 23:38:22 -05:00 |
|
|
|
32ad6d8195
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-25 23:32:25 -05:00 |
|
|
|
0ed77985f0
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-25 23:32:10 -05:00 |
|
|
|
9720bd7fa6
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-25 23:08:53 -05:00 |
|
|
|
4e8453becd
|
removed port from reverse proxy; allows it to work when port changes
|
2020-12-25 23:08:07 -05:00 |
|
|
|
0488b3402d
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community
|
2020-12-21 11:56:57 -05:00 |
|
|
|
fad6fe1c2a
|
Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist
|
2020-12-17 21:33:18 -05:00 |
|
|
|
2789af0bd7
|
added persistence to activemq
|
2020-12-17 21:31:57 -05:00 |
|
|
|
91da0dedb6
|
Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base
|
2020-12-17 21:30:09 -05:00 |
|
|
|
8d3c4987f0
|
added persistence to platform/db
|
2020-12-17 21:26:03 -05:00 |
|
|
|
701489665a
|
Merge branch 'acs-lats-community.acs-lats-base' into acs-backend-community.acs-lats-community
|
2020-12-17 21:03:07 -05:00 |
|
