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
9cac208546
upgrade to Angular 12
2021-09-24 21:52:14 +03:00
Diamantis Tziotzios
f5d266554b
Merge commit 'ca91c14114b8994d41fdf2b97fc6d1a4d82ffa4e'
2021-05-19 14:22:47 +03:00
apapachristou
2c5feb5fa9
Restyles profile page
2020-10-23 10:49:09 +03:00
Diamantis Tziotzios
7cf64c18f2
Merge branch 'Development'
2019-09-17 11:31:58 +03:00
apapachristou
ffebb8f365
Adds dynamic page titles
2019-09-16 18:46:19 +03:00
apapachristou
8a9e0c2d1f
dashboard redesign
2019-04-24 12:26:53 +03:00
Diamantis Tziotzios
92d9c2cf03
rxjs refactor
2018-11-27 19:33:17 +02:00
Ioannis Kalyvas
b0ccac191f
no message
2018-03-06 17:33:55 +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
Ioannis Kalyvas
4948737142
no message
2018-02-23 12:36:51 +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
annabakouli
60b12fe501
no message
2018-01-10 18:05:23 +02:00
annabakouli
4eff328ebb
no message
2018-01-09 13:31:01 +02:00
Diamantis Tziotzios
ad4af5aa1f
cleanup
2017-12-19 19:34:00 +02:00
Diamantis Tziotzios
74f11f0f1b
no message
2017-12-19 17:59:34 +02:00
Diamantis Tziotzios
24b2dfabdc
no message
2017-12-19 13:45:56 +02:00
annabakouli
c1f2c615af
no message
2017-12-18 18:25:08 +02:00
annampak
878db46b0e
dashboard
2017-12-14 18:43:57 +02:00
Diamantis Tziotzios
fbc76556f7
material addition
2017-12-14 12:41:26 +02:00
Diamantis Tziotzios
cde1596c35
no message
2017-12-11 15:47:52 +02:00
Diamantis Tziotzios
ccbd1644b4
no message
2017-12-11 10:10:54 +02:00
annabakouli
86c988c840
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
...
# Conflicts:
# dmp-frontend/src/app/app.module.ts
# dmp-frontend/src/index.html
2017-11-27 15:45:04 +02:00
annabakouli
95b937cfcc
no message
2017-11-27 15:40:16 +02:00
Nikolaos Laskaris
123660f250
cherry pick from master
2017-11-23 15:04:53 +02:00
annabakouli
2c47630087
fixed missing files error
2017-11-23 13:26:22 +02:00
Nikolaos Laskaris
a00eec68d8
fixed glitches of google-sign-in component
2017-11-23 13:13:20 +02:00
annabakouli
a90c4d7561
refactoring implementation to support composite fields
2017-11-23 12:40:02 +02:00
Nikolaos Laskaris
57159bf523
fixed scrollers on form container
2017-11-10 15:57:08 +02:00
Nikolaos Laskaris
0d8c0514a6
Added a customizable scrollbar
2017-11-10 13:38:18 +02:00
Nikolaos Laskaris
95bace54c8
--
2017-11-09 16:18:02 +02:00
Nikolaos Laskaris
f1dbe240a4
changes on projects
2017-11-06 18:25:23 +02:00
Nikolaos Laskaris
6f4adf5ab3
caption changes
2017-11-02 10:38:56 +02:00
Nikolaos Laskaris
c20d2fa87a
MAJOR changes to login
2017-11-01 19:18:27 +02:00
annampak
265cc65999
create project modal window with form
2017-10-24 12:49:02 +03:00
annampak
d342ebb247
login - create new project
2017-10-19 17:33:12 +03:00
annampak
f8ea069ac4
fonts awesome for data table & dataset fix
2017-10-18 21:58:58 +03:00
annampak
ab5d169e77
dataset page , getDataset rest-base urls
2017-10-18 21:30:55 +03:00
annampak
7a11d3bb58
general improvements & fixes
2017-10-17 10:38:04 +03:00
annampak
c4eb413e24
Routing Projects, Table of Contents version 1, Sections in HTML
2017-09-28 18:05:46 +03:00
annampak
1abb322f59
sign in gmail and routing
2017-09-26 18:16:04 +03:00
Nikolaos Laskaris
9f8b4a3cce
Initial import of DMP project modules.
...
1) dmp-backend : spring-hibernate webservice which allows dmp data
storing and fetching from a relational database.
2) dmp-javascript-engine: a simple wrapper for java's nashorn javascript
engine.
3) dmp-frontend: an angular based frontend app to serve dynamic
questionnaires to aid the formation of Digital Management Plans
2017-09-14 13:43:44 +03:00