argos/dmp-frontend/src
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
..
app #7225: In dataset template, rename "users" to "editors" and add hint | #7226: In dataset templates, default descending sorting by "created". 2021-11-30 12:21:03 +02:00
assets Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf' 2021-12-09 12:18:39 +02:00
common Fixed #7182: Required field names appearing in the warning modal. 2021-11-16 11:47:24 +02:00
environments Add User Guide Editor (ref #239) 2020-02-13 18:15:34 +02:00
favicon.ico Changes favicon 2020-10-16 10:22:37 +03:00
favicon_v1.ico Adds new logo icon - ARGOS 2019-09-17 13:55:18 +03:00
favicon_v2.ico Changes favicon 2020-10-16 10:22:37 +03:00
index.html Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf' 2021-12-09 12:18:39 +02:00
main.ts Initial import of DMP project modules. 2017-09-14 13:43:44 +03:00
polyfills.ts upgrade to Angular 12 2021-09-24 21:52:14 +03:00
styles.scss Use <rich-text-editor-component> when html editor is needed - replace in dataset template descriprion, section & question descriptions. 2021-11-01 15:10:00 +02:00
tsconfig.app.json upgrade to Angular 12 2021-09-24 21:52:14 +03:00
tsconfig.spec.json angular update to version 8 2019-09-23 11:17:03 +03:00