|
|
b0fc0970aa
|
Merge branch 'acs-mysql-community.acs-community' into acs-mysql-frontend-community-persist.acs-mysql-community
|
2020-12-26 14:38:27 -05:00 |
|
|
|
ab342d698a
|
Merge branch 'acs-frontend-community-persist.acs-backend-community-persist' into acs-mysql-frontend-community-persist.acs-frontend-community-persist
|
2020-12-26 14:36:34 -05:00 |
|
|
|
5c25ab9d3d
|
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
|
2020-12-26 14:25:48 -05:00 |
|
|
|
02a2ec72c0
|
Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community
|
2020-12-26 14:23:53 -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 |
|
|
|
41b87a9e5e
|
Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community
|
2020-12-26 14:20:33 -05:00 |
|
|
|
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 |
|
|
|
82b58f638c
|
Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community
|
2020-12-26 13:58:35 -05:00 |
|
|
|
55b70f1a36
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:58:15 -05:00 |
|
|
|
5b65b4817e
|
Merge branch 'acs-base.proxy' into acs-mysql-base.acs-base
|
2020-12-26 13:57:17 -05:00 |
|
|
|
f2ac689f85
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-26 13:56:13 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
5a929f6317
|
Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community
|
2020-12-26 13:39:03 -05:00 |
|
|
|
3ac57ce7d1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:37:05 -05:00 |
|
|
|
f66e9aa1e8
|
replaced postgresql with mysql
|
2020-12-26 11:25:37 -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 |
|
|
|
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 |
|
|
|
cf7e16fdcc
|
Merge branch 'acs-frontend-community-persist.acs-backend-community-persist' into mysql.acs-frontend-community-persist
|
2020-12-26 00:07:39 -05:00 |
|
|
|
89eec1edec
|
Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community
|
2020-12-25 23:55:56 -05:00 |
|
|
|
3db235a532
|
Merge branch 'acs-backend-community-persist.acs-backend-community' into acs-frontend-community-persist.acs-backend-community-persist
|
2020-12-25 23:55:38 -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 |
|
