Diamantis Tziotzios e65bce0f5a Merge branch 'ui-redesign' into Development ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java # dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java # dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml		2020-10-06 16:43:20 +03:00
ELK.Docker	Minor cleanup to logstash	2020-04-16 18:34:32 +03:00
dmp-backend	Merge branch 'ui-redesign' into Development	2020-10-06 16:43:20 +03: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	fixes	2020-10-05 12:08:57 +03:00
dmp-frontend	Adds message on submit of contact form	2020-10-06 14:26:57 +03: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
static	no message	2018-10-02 17:33:58 +03:00
user-guide	user guide update	2020-10-02 20:08:43 +03:00
.env	no message	2018-07-11 16:47:36 +03:00
.gitignore	Add dmp ids, organization, tags and last version (incomplete) to the elastic index	2020-03-11 11:04:49 +02: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