 George Kalampokis
|
47d8c65814
|
Merge branch 'advanced_rda' into ui-redesign
# Conflicts:
# dmp-frontend/src/app/ui/dmp/dmp.module.ts
|
2020-07-06 18:20:37 +03:00 |
|
George Kalampokis
|
f432caa584
|
When getting user statistics on the dashboard make sure the DMP count to be distinct
|
2020-07-06 14:18:42 +03:00 |
|
George Kalampokis
|
84bb291cd6
|
Make DMP total count to use distinct in order to avoid counting duplicate entries
|
2020-07-06 14:11:14 +03:00 |
|
George Kalampokis
|
d10615d13a
|
Replace dmp and grant form String to DataManagementOverviewMaodel and GrantOverviewModel on DatasetOverviewModel
|
2020-07-06 11:58:59 +03:00 |
apapachristou
|
a8528ee5b1
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-03 18:51:57 +03:00 |
|
apapachristou
|
132f5675d3
|
Adds Filters Dialog on Dmp Listing ( 2nd Commit )
|
2020-07-03 18:51:27 +03:00 |
gpapavgeri
|
58df04516c
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-03 18:31:46 +03:00 |
|
gpapavgeri
|
21d19dbf58
|
dataset-overview_update v2
|
2020-07-03 18:31:35 +03:00 |
|
apapachristou
|
f8ab6a8024
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-03 17:17:29 +03:00 |
|
apapachristou
|
6d9dcc4ec9
|
Dmp Listing (1st Commit)
|
2020-07-03 17:17:23 +03:00 |
|
gpapavgeri
|
aec542a067
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-03 17:02:57 +03:00 |
|
gpapavgeri
|
344e49afc4
|
dataset-overview_update v1
|
2020-07-03 16:58:13 +03:00 |
|
George Kalampokis
|
fa15ae8774
|
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
|
2020-07-03 16:12:41 +03:00 |
|
George Kalampokis
|
372c9bb074
|
Add support for Dataset Overview
|
2020-07-03 16:11:54 +03:00 |
|
apapachristou
|
e315bee7f7
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-03 14:00:30 +03:00 |
|
apapachristou
|
16af9e8f3e
|
Fixes bug on loadMore and fixes spelling on recent activities
|
2020-07-03 14:00:23 +03:00 |
|
George Kalampokis
|
f2fb409900
|
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
|
2020-07-03 13:55:43 +03:00 |
|
George Kalampokis
|
d51099cedc
|
Further fixes and improvements over recent activity
|
2020-07-03 13:55:25 +03:00 |
|
apapachristou
|
2cb6583bf4
|
Removes guest component
|
2020-07-03 12:45:52 +03:00 |
|
George Kalampokis
|
0b452d2520
|
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
|
2020-07-03 12:19:21 +03:00 |
|
George Kalampokis
|
acf8b58728
|
Fixed and improved the recent activity manager
|
2020-07-03 12:18:53 +03:00 |
|
apapachristou
|
2cd03e30f8
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-03 12:01:41 +03:00 |
|
apapachristou
|
f1dc5f5f5f
|
Adds language
|
2020-07-03 12:01:34 +03:00 |
|
George Kalampokis
|
7197892352
|
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
|
2020-07-03 11:37:40 +03:00 |
|
apapachristou
|
8d569d38b3
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-03 11:24:05 +03:00 |
|
apapachristou
|
fbb2dc214a
|
Adda language
|
2020-07-03 11:23:18 +03:00 |
|
George Kalampokis
|
150667350c
|
Further Fixes over Recent Activity model
|
2020-07-03 11:23:13 +03:00 |
 Diamantis Tziotzios
|
1615707418
|
Merge branch 'Development' into ui-redesign
# Conflicts:
# dmp-frontend/src/app/app-routing.module.ts
# dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
# dmp-frontend/src/app/ui/navbar/navbar.component.html
# dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html
# dmp-frontend/src/assets/i18n/en.json
# dmp-frontend/src/assets/i18n/es.json
# dmp-frontend/src/assets/i18n/gr.json
|
2020-07-03 11:21:46 +03:00 |
|
George Kalampokis
|
2fb270d66c
|
Fix minor issues with the new merge
|
2020-07-03 10:47:04 +03:00 |
|
George Kalampokis
|
4531a5d61e
|
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
# Conflicts:
# dmp-frontend/src/app/core/services/dashboard/dashboard.service.ts
|
2020-07-03 10:45:29 +03:00 |
|
George Kalampokis
|
71279a716e
|
Minor changes to Recent Activity Model
|
2020-07-03 10:43:54 +03:00 |
|
George Kalampokis
|
b57f6fb73c
|
Recent Activity controller will require a custom DataTable Request
|
2020-07-03 10:43:19 +03:00 |
|
apapachristou
|
ce24afd16f
|
Adds text and button to add dataset on empty tab list on dashboard
|
2020-07-03 10:40:22 +03:00 |
|
apapachristou
|
8551e9140c
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-02 19:35:26 +03:00 |
|
apapachristou
|
52662f33f4
|
Adds all recent activity
|
2020-07-02 19:34:27 +03:00 |
|
George Kalampokis
|
6d491b5930
|
Rda mapper will now be able to use the new DMP fields
|
2020-07-02 18:36:18 +03:00 |
|
George Kalampokis
|
7127f6dbd6
|
Minor fix over cost listing
|
2020-07-02 18:35:16 +03:00 |
|
gpapavgeri
|
faaa57e2be
|
dmp overview re-design -- not completed: lock, remove, versions
|
2020-07-02 18:29:33 +03:00 |
|
Diamantis Tziotzios
|
0fefc762a6
|
splash screen fixes
|
2020-07-02 18:08:05 +03:00 |
|
Diamantis Tziotzios
|
e2c5fd5c57
|
splash spell error fix
|
2020-07-02 18:02:27 +03:00 |
|
George Kalampokis
|
094cff06b1
|
Properly remove associate Collaborators from a DMP
|
2020-07-02 17:24:50 +03:00 |
|
George Kalampokis
|
1ec90d7b52
|
Properly remove associate Collaborators from a DMP
|
2020-07-02 17:09:54 +03:00 |
|
George Kalampokis
|
64624ca6f1
|
Properly remove associate Collaborators from a DMP
|
2020-07-02 17:08:38 +03:00 |
|
George Kalampokis
|
62118179ff
|
Update the cost listing (near finalization) and fix some issues while loading costs from the backend
|
2020-07-02 17:06:47 +03:00 |
|
George Kalampokis
|
626b499ecc
|
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
# Conflicts:
# dmp-frontend/src/app/core/services/dashboard/dashboard.service.ts
|
2020-07-02 12:02:47 +03:00 |
|
George Kalampokis
|
f5093a6995
|
Add type to the recent activity model
|
2020-07-02 11:59:58 +03:00 |
|
George Kalampokis
|
325979a896
|
Add criteria for the recent activity model
|
2020-07-02 11:57:59 +03:00 |
|
apapachristou
|
44d9cf537a
|
Adds invite shortcut on DMPs and fixes change language bug on ui
|
2020-07-02 11:25:06 +03:00 |
|
George Kalampokis
|
747ad60fb1
|
Update cost listing
|
2020-07-02 10:16:11 +03:00 |
|
Diamantis Tziotzios
|
710b49fc83
|
splash changes
|
2020-07-01 20:30:10 +03:00 |