 Diamantis Tziotzios
|
7a8375b988
|
Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf'
# Conflicts:
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
# dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
# dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java
# dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
# dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java
|
2021-12-09 12:18:39 +02:00 |
 George Kalampokis
|
6f92409f1e
|
Update Spring boot framework to version 2.5.2
|
2021-09-07 09:42:31 +03:00 |
|
George Kalampokis
|
b5fcc5971e
|
Fix various library issues with postgres and elastic
(cherry picked from commit 4a4042d621)
|
2021-06-25 12:46:09 +03:00 |
|
George Kalampokis
|
4a4042d621
|
Fix various library issues with postgres and elastic
|
2021-06-25 12:32:58 +03:00 |
|
George Kalampokis
|
4a9c589636
|
Fixed maven depedency issues
|
2020-06-16 11:07:18 +03:00 |
Ioannis Kalyvas
|
78b91ee3e0
|
no message
|
2018-07-11 16:47:36 +03:00 |
|
Ioannis Kalyvas
|
5de4c1ada0
|
no message
|
2018-06-05 11:18:01 +03:00 |
|
Ioannis Kalyvas
|
cc5e080219
|
no message
|
2018-05-14 09:44:35 +03:00 |
|
Ioannis Kalyvas
|
063eca915d
|
no message
|
2018-03-21 12:57:56 +02:00 |
|
Ioannis Kalyvas
|
12df9e9345
|
no message
|
2018-03-21 12:16:32 +02:00 |