Go to file
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
ELK.Docker Minor cleanup to logstash 2020-04-16 18:34:32 +03:00
dmp-backend Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf' 2021-12-09 12:18:39 +02:00
dmp-dataset-templates Add new source for data repositories and updated H2020 template 2020-05-29 17:13:02 +03:00
dmp-db-scema Fix db creation scripts for linux 2021-10-01 12:37:20 +03:00
dmp-frontend Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf' 2021-12-09 12:18:39 +02:00
docsbox-master no message 2018-07-11 16:47:36 +03:00
elastic-config no message 2018-09-18 15:41:24 +03:00
openDMP Improve self deployment 2020-04-27 16:21:03 +03:00
prometheus/config Add prometheus integration (ref #294) 2021-04-09 19:05:04 +03:00
static no message 2018-10-02 17:33:58 +03:00
user-guide pt user guide update 2021-08-16 18:36:10 +03:00
.env no message 2018-07-11 16:47:36 +03:00
.gitignore Fix critical issue with public dataset query 2021-08-23 11:48:29 +03:00
Jenkinsfile CI update 2020-09-24 17:37:32 +03:00
LICENSE Update LICENSE 2020-05-11 13:49:36 +03:00
docker-compose.dev.yml conf refactor 2018-11-27 16:13:56 +02:00
docker-compose.yml Improve self deployment 2020-05-04 17:15:52 +03:00
opensource-licences_urls.txt Add opensource-licences 2020-07-17 17:46:10 +03:00
welcome.docx no message 2018-03-05 18:18:45 +02:00