Diamantis Tziotzios
e8aef281d4
Merge branch 'Development'
2024-02-22 11:09:31 +02:00
Georgios Kakaletris
9c37e5a073
Update 'README.md'
2023-10-18 12:31:03 +02:00
Georgios Kakaletris
444c1aacb1
Update 'README.md'
2023-10-18 12:27:40 +02:00
Diamantis Tziotzios
50c96ef821
Merge branch 'Development'
2023-06-20 09:39:15 +03:00
Konstantina Galouni
0adc7044ab
h2020.docx: [Bug fix] Updated image of Argos in h2020.docx DMP template | DataManagementPlanManager.java & DatasetManager.java: Added parameter "isDataset" in fillFirstPage() | WordBuilder.java: [Bug fix] Added parameter isDataset in fillFirstPage() and added some checks in description.
...
(cherry picked from commit c9b4b35e39
)
2023-05-09 10:33:44 +03:00
Konstantina Galouni
13e62fd409
h2020.docx & WordBuilder.java: Updated h2020.docx DMP template and added export of DMP description.
...
(cherry picked from commit 28c1c9b71d
)
2023-03-14 10:23:35 +02:00
Diamantis Tziotzios
7185b5d117
Merge commit '180e02c829a8fb35056124d5afdbec3835a94b62'
2023-02-28 16:08:32 +02:00
George Kalampokis
5f131b9823
Remove thread sleeps when trying to load config files and removed principal from Exception Handling Controller
2022-12-06 14:34:11 +02:00
Diamantis Tziotzios
93320f7c94
Merge branch 'Development'
2022-11-22 15:03:08 +02:00
Diamantis Tziotzios
876d99ce38
Merge commit '18dcabbac2599d35246f91204efbb25238106565'
2022-11-03 14:20:16 +02:00
George Kalampokis
7a71110033
Fix critical issue with open file handle leak on user guide folder
...
(cherry picked from commit fa723c07ae
)
2022-07-28 17:14:13 +03:00
Diamantis Tziotzios
14c267c97e
Merge branch 'Development'
...
# Conflicts:
# dmp-backend/web/src/main/resources/config/application-production.properties
2022-05-13 11:58:34 +03:00
Diamantis Tziotzios
b04b35d62b
Merge branch 'Development'
...
# Conflicts:
# dmp-backend/web/src/main/resources/RDACommonStandards.txt
2022-02-25 12:19:29 +02:00
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
Diamantis Tziotzios
895dbcf098
Revert "user guide path fix"
...
This reverts commit bd15b1e2c7
.
2021-07-07 20:39:41 +03:00
Diamantis Tziotzios
bd15b1e2c7
user guide path fix
2021-07-07 20:39:22 +03:00
George Kalampokis
faabd343a9
Improve error handling
...
(cherry picked from commit d5cd90814a
)
2021-07-06 13:41:09 +03:00
George Kalampokis
e5a929f259
Fix issues with xml import and issues with zenodo deposit
...
(cherry picked from commit efe177f0b1
)
2021-07-06 13:40:15 +03:00
George Kalampokis
d1fc10854c
Fix issue with zenodo depositions
...
(cherry picked from commit c57e10a033
)
2021-07-06 12:15:49 +03:00
George Kalampokis
2537923dc0
Fix various critical issues
...
(cherry picked from commit 244bfa5c54
)
2021-07-05 11:10:11 +03:00
George Kalampokis
c1adbe283a
Improvements over MS Word Document export
...
(cherry picked from commit 4e3b98f1ff
)
2021-06-30 18:48:20 +03:00
George Kalampokis
1c365a191e
Minor Update
...
(cherry picked from commit 295750684f
)
2021-06-30 18:48:13 +03:00
Kristian Ntavidi
82c5586067
Dataset and dmp overview fix.
...
* Fix edit issue when multiple users have ownership of the same dmp/dataset.
(cherry picked from commit fd9d35aad3
)
2021-06-30 13:38:53 +03:00
George Kalampokis
04f230dff1
Fix critical issue with dataset's copy dropdown
...
(cherry picked from commit d1e3aae36d
)
2021-06-30 12:52:32 +03:00
George Kalampokis
72d88d9db4
Fix listing issues and improve elastic query
...
(cherry picked from commit dcd7f24cac
)
2021-06-29 14:25:38 +03:00
George Kalampokis
143a4c0214
Reduce severity
...
(cherry picked from commit 03b7699973
)
2021-06-25 19:31:45 +03:00
George Kalampokis
e7e5ed02b3
Add query db fallback for DMPs
...
(cherry picked from commit d1df83f689
)
2021-06-25 19:28:29 +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
Diamantis Tziotzios
c16c35225f
Merge branch 'Development'
2021-06-25 08:50:27 +03:00
Diamantis Tziotzios
f5d266554b
Merge commit 'ca91c14114b8994d41fdf2b97fc6d1a4d82ffa4e'
2021-05-19 14:22:47 +03:00
Diamantis Tziotzios
db31597fc0
Merge branch 'Development'
2020-10-07 10:58:45 +03:00
Diamantis Tziotzios
9f5054668e
Merge branch 'Development'
...
* Development: (72 commits)
splash screen fixes
splash spell error fix
Properly remove associate Collaborators from a DMP
splash changes
Fixed issue with DMP filter on public datasets
Fixed issue when using the copy dataset dialog
Minor styling improvement over DMP Overview
Code clean up
Add support for newer versions of java (11) (expirimental)
Add Zenodo file visibility field for DMP (ref #274 )
Fixed issue not passing DMP Extra Properties on clones and new Versions
Add DMP Zenodo license field (ref #274 )
more splash screen changes
Allow splash to send contact emails
splash screen changes
Hide Uri field on Dataset Editor (ref #275 )
When logging in remove the cookie consent popup
Fixed minor issues with RDA Mapping
Add currency field type for dataset templates
Add DMP language a placeholder on UI
...
# Conflicts:
# dmp-backend/web/src/main/resources/RDACommonStandards.txt
# dmp-backend/web/src/main/resources/config/application-production.properties
2020-07-03 11:00:07 +03:00
George Kalampokis
38986ef67b
no message
2020-06-16 17:58:31 +03:00
Diamantis Tziotzios
bff260b85b
config file changes
2020-06-16 17:54:50 +03:00
George Kalampokis
9519300dc4
Removed deprecated configurations and added additional RDA Common Standards for dataset Templates
...
(cherry picked from commit 5b0a66ce06
)
2020-05-29 12:07:59 +03:00
George Kalampokis
9373d3e038
Fixed logback paths
...
(cherry picked from commit 33ec8b81c0
)
2020-05-20 15:39:27 +03:00
dtziotzios
d971f02a94
Merge branch 'Development'
...
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
2020-05-13 17:29:52 +03:00
Georgios Kakaletris
d3915e26e7
Update LICENSE
2020-05-09 00:03:50 +02:00
George Kalampokis
c028aad615
Fixed and improved file export system
...
(cherry picked from commit 71ccd76896
)
2020-04-02 18:44:40 +03:00
Diamantis Tziotzios
4ee39074a3
Merge commit '8ca2b912d40ece8bf0fbcda5c49f1ef7f5f6fdfd'
2020-04-02 13:33:08 +03:00
Diamantis Tziotzios
1b4952a909
Merge branch 'Development'
2020-01-31 18:26:27 +02:00
Diamantis Tziotzios
3ada5a0d3d
Merge branch 'Development'
2019-11-26 11:41:02 +02:00
Diamantis Tziotzios
63ee865dd9
Merge commit 'c8358f22dd5d108b7f270f97724d6bab1582c2c5'
2019-11-22 18:08:55 +02:00
Diamantis Tziotzios
2a52138124
Merge branch 'Development'
2019-09-17 18:47:39 +03:00
Diamantis Tziotzios
7cf64c18f2
Merge branch 'Development'
2019-09-17 11:31:58 +03:00
Diamantis Tziotzios
71d317bab7
license file
2019-06-19 08:59:52 +02:00
Ioannis Kalyvas
cd8b3448f5
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot
2018-06-28 12:39:39 +03:00
Ioannis Kalyvas
c3d4cb6fdd
no message
2018-06-28 12:33:43 +03:00
Ioannis Kalyvas
b0ccac191f
no message
2018-03-06 17:33:55 +02:00
Ioannis Kalyvas
3b1f37ef22
no message
2018-03-06 17:27:24 +02:00
Ioannis Kalyvas
b8e040ee94
Merge branch 'master' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot
...
# Conflicts:
# dmp-backend/src/main/java/eu/eudat/helpers/Transformers.java
2018-03-06 17:21:46 +02:00
Ioannis Kalyvas
50444a0b73
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot
...
# Conflicts:
# dmp-backend/src/main/java/eu/eudat/helpers/Transformers.java
# dmp-frontend/src/index.html
2018-03-06 17:02:13 +02:00
Diamantis Tziotzios
85bdb7fad1
Merge branch 'Development'
...
# Conflicts:
# dmp-backend/src/main/java/eu/eudat/helpers/Transformers.java
2018-02-12 10:23:41 +02:00
annabakouli
b2e49fbb8a
no message
2018-01-18 12:55:35 +02:00
Diamantis Tziotzios
bfc6b63067
Merge branch 'Development'
...
# Conflicts:
# dmp-backend/src/main/java/rest/entities/DMPs.java
# dmp-backend/src/main/java/rest/entities/DataRepositories.java
# dmp-backend/src/main/java/rest/entities/DatasetProfiles.java
# dmp-backend/src/main/java/rest/entities/Datasets.java
# dmp-backend/src/main/java/rest/entities/DmpProfiles.java
# dmp-backend/src/main/java/rest/entities/Organisations.java
# dmp-backend/src/main/java/rest/entities/Projects.java
# dmp-backend/src/main/java/rest/entities/Registries.java
# dmp-backend/src/main/java/rest/entities/Researchers.java
# dmp-backend/src/main/java/rest/entities/Services.java
# dmp-backend/src/main/java/rest/entities/Users.java
# dmp-frontend/src/app/app.component.ts
# dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
# dmp-frontend/src/assets/custom.js
# dmp-frontend/src/index.html
2018-01-18 12:45:51 +02:00
Nikolaos Laskaris
9941c96dc2
Minor edits
2017-11-27 16:08:13 +02:00
Nikolaos Laskaris
06272c79da
--
2017-11-23 17:34:35 +02:00
Nikolaos Laskaris
a00eec68d8
fixed glitches of google-sign-in component
2017-11-23 13:13:20 +02:00