gpapavgeri
|
a4b61c2172
|
dmp&dataset overview_remove user & invite user update
|
2020-07-09 10:17:49 +03:00 |
apapachristou
|
f451314473
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-08 18:28:47 +03:00 |
|
apapachristou
|
ff532c56fb
|
Fixes bug on public dmp / datasets listing
|
2020-07-08 18:28:34 +03:00 |
 George Kalampokis
|
7a09d85353
|
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
|
2020-07-08 18:26:25 +03:00 |
|
George Kalampokis
|
e428e8a5df
|
When creating new DMPs pre-set the visibility (restricted) and the contact (creator). They can be changed later in the draft phase.
|
2020-07-08 18:26:07 +03:00 |
|
George Kalampokis
|
3ba34e1e69
|
Fixed issue when viewing the public DMPs
|
2020-07-08 18:23:06 +03:00 |
|
apapachristou
|
5aa231e2bf
|
Adds complete dataset listing redesign
|
2020-07-08 17:54:41 +03:00 |
|
gpapavgeri
|
097c862ab6
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-07 18:30:35 +03:00 |
|
gpapavgeri
|
bb0c5a0391
|
Invite authors-pop up_v1
|
2020-07-07 18:30:25 +03:00 |
|
apapachristou
|
5c8c156220
|
Fixes on filters of dmp listing
|
2020-07-07 18:29:15 +03:00 |
|
apapachristou
|
d3e7f57cbd
|
Adds search on dmp listing, fixes bug on load more
|
2020-07-07 15:54:12 +03:00 |
|
apapachristou
|
b94363ba5b
|
Adds links to datasets on listings
|
2020-07-07 13:33:04 +03:00 |
|
apapachristou
|
6fa7b4a350
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
# Conflicts:
# dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
|
2020-07-07 13:19:38 +03:00 |
|
apapachristou
|
2ab58f2926
|
Add filters on the side on dmp listing
|
2020-07-07 13:12:57 +03:00 |
|
George Kalampokis
|
1423f5175d
|
Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
|
2020-07-07 12:23:43 +03:00 |
|
George Kalampokis
|
ace12c3140
|
Add updateusers end point for DMP
|
2020-07-07 12:22:45 +03:00 |
 Diamantis Tziotzios
|
c61f7417f5
|
splash changes
|
2020-07-06 18:53:56 +03:00 |
|
gpapavgeri
|
6a10c26c67
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-06 18:43:06 +03:00 |
|
gpapavgeri
|
7c3f06d9f4
|
dataset-overview_update v4
|
2020-07-06 18:42:54 +03:00 |
|
George Kalampokis
|
029c246a4b
|
Fixed minor issue
|
2020-07-06 18:23:37 +03:00 |
|
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 |
|
gpapavgeri
|
75be44ee60
|
dataset-overview_update v3
|
2020-07-06 13:21:11 +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
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
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 |
|
George Kalampokis
|
bfb9eaf87c
|
Add costs listing (wip)
|
2020-07-01 18:33:16 +03:00 |
|
gpapavgeri
|
f5c70fdd60
|
Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
|
2020-07-01 18:32:51 +03:00 |
|
gpapavgeri
|
134313eb3e
|
dmp-overview_update
|
2020-07-01 18:32:22 +03:00 |
|
apapachristou
|
95c9e4eb4e
|
Adds drafts tab data
|
2020-07-01 18:25:16 +03:00 |
|
George Kalampokis
|
a7a8e3db35
|
Add contact field and "add cost" dialog
|
2020-07-01 14:26:58 +03:00 |
|
apapachristou
|
5db3485079
|
Adds drafts listing on dashboard
|
2020-07-01 10:56:59 +03:00 |
|
apapachristou
|
1230bd2417
|
Adds dashboard data on tabs
|
2020-06-30 19:40:01 +03:00 |
|
gpapavgeri
|
ee61bf4ffb
|
dmp overview_re-design_update
|
2020-06-30 18:33:01 +03:00 |
|
George Kalampokis
|
f821938542
|
Created a new Recent Activity model and backend end-point that contains more details about it's objects
|
2020-06-30 16:59:06 +03:00 |
|
gpapavgeri
|
235096a982
|
redesign_update
|
2020-06-29 18:30:36 +03:00 |
|
George Kalampokis
|
08f7d4aca4
|
Fixed issue with DMP filter on public datasets
|
2020-06-29 17:18:56 +03:00 |
|
George Kalampokis
|
7de37fa453
|
Fixed issue when using the copy dataset dialog
|
2020-06-29 16:48:15 +03:00 |
|
George Kalampokis
|
b4576f2b08
|
Minor styling improvement over DMP Overview
|
2020-06-29 13:03:20 +03:00 |
|
George Kalampokis
|
ecd7898237
|
Code clean up
|
2020-06-29 13:00:34 +03:00 |
|
George Kalampokis
|
6e4e23e00d
|
Add Zenodo file visibility field for DMP (ref #274)
|
2020-06-29 12:23:53 +03:00 |
|
gpapavgeri
|
3bf6c2d927
|
dmp-overview_re-design_initial commit
|
2020-06-29 10:53:56 +03:00 |
|
George Kalampokis
|
346c731aae
|
Fixed issue not passing DMP Extra Properties on clones and new Versions
|
2020-06-26 18:57:04 +03:00 |
|
apapachristou
|
05ea4fffd5
|
Adds language
|
2020-06-26 18:27:01 +03:00 |
|
apapachristou
|
1bae868e5a
|
Fixes progress bar, add some dynamic data on recent edited activities
|
2020-06-26 15:59:02 +03:00 |
|
apapachristou
|
7cf5ddfebe
|
Redesign of landing page, sign in interface, sidebar, navbar, dashboard (still in progress)
|
2020-06-26 12:08:51 +03:00 |
|
George Kalampokis
|
2ca9eede14
|
Merge remote-tracking branch 'origin/Development' into Development
|
2020-06-26 11:50:16 +03:00 |
|
George Kalampokis
|
b0dddeeb51
|
Add DMP Zenodo license field (ref #274)
|
2020-06-26 11:46:18 +03:00 |
|
Diamantis Tziotzios
|
e01d51d41e
|
more splash screen changes
|
2020-06-25 20:40:41 +03:00 |
|
George Kalampokis
|
d81d6e8568
|
Allow splash to send contact emails
|
2020-06-25 19:39:10 +03:00 |
dtziotzios
|
6d27abaca8
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2020-06-25 17:52:09 +03:00 |
|
dtziotzios
|
423271713f
|
splash screen changes
|
2020-06-25 17:52:00 +03:00 |
|
George Kalampokis
|
2e5faf5c05
|
Hide Uri field on Dataset Editor (ref #275)
|
2020-06-25 14:05:19 +03:00 |
|
George Kalampokis
|
92fe11b18b
|
When logging in remove the cookie consent popup
|
2020-06-25 13:35:17 +03:00 |
|
George Kalampokis
|
791f2fee61
|
Add currency field type for dataset templates
|
2020-06-25 13:00:29 +03:00 |
|
George Kalampokis
|
1771ffa426
|
Add DMP language a placeholder on UI
|
2020-06-18 16:04:08 +03:00 |
|
George Kalampokis
|
a4e21003c8
|
Add language column on the DMP quick wizard Editor (ref #273)
|
2020-06-18 15:55:15 +03:00 |
|
George Kalampokis
|
8d9913c229
|
If data repositories have no source then use it's tag
|
2020-06-16 18:46:38 +03:00 |
|
George Kalampokis
|
121cb1429e
|
When creating a template and setting a field as tag, researcher, dataset identifier then it will automatically setup the RDA standard (can be changed)
|
2020-06-11 14:12:48 +03:00 |
|
George Kalampokis
|
56da83d1e8
|
Further improvement of the import popup style
|
2020-06-10 12:45:10 +03:00 |
|
George Kalampokis
|
95e748a285
|
Improve import popup style and fixed the error message showing while importing
|
2020-06-10 12:22:20 +03:00 |
|
George Kalampokis
|
89fb26a693
|
Finished the implementation of the dataset Identifier field and added mapping support for the RDA (alongside the tags field)
|
2020-06-08 18:31:34 +03:00 |
|
George Kalampokis
|
64ff9d749c
|
Add Implementation for all the new fields (except dataset Identifier)
|
2020-06-05 18:30:48 +03:00 |
|
George Kalampokis
|
8ee2018617
|
Fixed issue when creating new DMPs
|
2020-06-04 18:38:36 +03:00 |
|
George Kalampokis
|
46cfc3dae6
|
Add new fields for the Dataset Template (incomplete but functional)
|
2020-06-04 18:37:30 +03:00 |
|
George Kalampokis
|
30542b4156
|
Merge remote-tracking branch 'origin/Development' into Development
|
2020-06-03 12:16:21 +03:00 |
|
George Kalampokis
|
78ee4673ee
|
Add ExtraProperties for DMP and language for Dataset Template
|
2020-06-03 12:13:31 +03:00 |
|
apapachristou
|
a74321b3b4
|
Changes menu popups to open on hover
|
2020-06-02 12:55:31 +03:00 |
|
apapachristou
|
4377008830
|
Adds button "sent" on contact
|
2020-05-29 17:08:46 +03:00 |
|
George Kalampokis
|
644976be29
|
Fix frontend issue
|
2020-05-29 14:01:28 +03:00 |
|
George Kalampokis
|
7c327949dd
|
Allow to set default dataset template when importing RDA json files
|
2020-05-29 13:39:18 +03:00 |
|
apapachristou
|
19c61ce868
|
Adds all pages on resources
|
2020-05-28 19:51:25 +03:00 |
|
apapachristou
|
ea8b42968a
|
Adds pages: /about/how-it-works.html and /about/faqs.html
|
2020-05-28 19:50:16 +03:00 |
|
apapachristou
|
0d34656fe0
|
Changes on Contact page
|
2020-05-28 19:47:25 +03:00 |
|
apapachristou
|
6a5eeec076
|
Adds menu popups
|
2020-05-27 19:20:36 +03:00 |
|
apapachristou
|
53bbb67e94
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2020-05-27 19:14:03 +03:00 |
|
George Kalampokis
|
20d0d8b648
|
Fix critical issue with root path
|
2020-05-27 19:08:02 +03:00 |
|
apapachristou
|
91e88329be
|
Adds contact page
|
2020-05-27 18:40:13 +03:00 |
|
George Kalampokis
|
6cc77468c5
|
Add landing page (/splash)
|
2020-05-27 17:19:38 +03:00 |
|
George Kalampokis
|
62c61a8119
|
Allow Dmps to un-finalize if they are not published or not having a DOI (ref #272)
|
2020-05-26 14:31:47 +03:00 |
|
George Kalampokis
|
2b9c2ee1e7
|
Add support for multiple sources on dataset autocomplete templates
|
2020-05-25 17:14:42 +03:00 |
|
George Kalampokis
|
f5773589ff
|
When selecting profiles from DMP editor or DMP wizard. All templates will be sorted alphabetically (ref #268)
|
2020-05-19 18:35:50 +03:00 |
|
George Kalampokis
|
da7f90eb18
|
When creating Zenodo DOI publish the DMP but keep the files under restricted access and don't give identifier back until it go public. Also add zenodo proxy for the identifier (ref #257)
|
2020-05-15 16:19:35 +03:00 |
|
George Kalampokis
|
cebf3935f3
|
Bug fix
|
2020-05-13 16:32:01 +03:00 |
|
Diamantis Tziotzios
|
ee5f74f25f
|
gr lang update
|
2020-05-12 17:41:44 +03:00 |
|
George Kalampokis
|
f51973cfc0
|
Update dataset profile criteria
|
2020-05-11 14:01:40 +03:00 |
|
George Kalampokis
|
50c45b7271
|
Show status on dataset profile listing and filter them based on status (ref #265)
|
2020-05-08 18:27:16 +03:00 |
|
George Kalampokis
|
b539544075
|
Add link to relevant zenodo entity on DOI overview with root link configurable (ref #264)
|
2020-05-07 10:57:20 +03:00 |
|
George Kalampokis
|
d67e68d0d9
|
Improve self deployment
|
2020-04-27 16:21:03 +03:00 |
|
George Kalampokis
|
8ae58c9ef3
|
Allow Organization Creator to be visible by configuration (ref #255)
|
2020-04-23 10:48:14 +03:00 |
|
George Kalampokis
|
0c443dfeba
|
Renamed JSON Export to RDA JSON
|
2020-04-22 18:41:54 +03:00 |
|
George Kalampokis
|
4e68666089
|
Re organize DMP controller and manager functions and added the ability to add custom organization (not configurable yet) (ref #255)
|
2020-04-22 18:40:43 +03:00 |
|
George Kalampokis
|
96576b16a8
|
Merge Dataset Index to the Dmp Index (ref #252)
|
2020-04-17 13:01:26 +03:00 |
|
George Kalampokis
|
e0211a019c
|
Fixed issues with public dashboard
|
2020-04-16 18:36:17 +03:00 |
|
George Kalampokis
|
2ba3f11687
|
Add additional editors for the remaining external references
|
2020-04-14 16:43:09 +03:00 |
|
George Kalampokis
|
20466bf693
|
Improve and fixed zenodo account association
|
2020-04-13 16:33:45 +03:00 |
|
George Kalampokis
|
d2192f2be0
|
Improve external's dataset styling
|
2020-04-13 16:31:09 +03:00 |
|
George Kalampokis
|
3ce7fe7595
|
Allow to edit user created Data Repositories
|
2020-04-10 18:52:14 +03:00 |
|
George Kalampokis
|
982aea0cbf
|
Improved Zenodo Account Integration
|
2020-04-10 17:16:37 +03:00 |
|
George Kalampokis
|
417ee02087
|
Fixed minor issue
|
2020-04-09 16:53:26 +03:00 |
|
George Kalampokis
|
a63ae3045e
|
When selecting "login with zenodo" it will prompt and login with zenodo, and the access token will be registered to the current user instead of re-login you in with the zenodo account.
Also disable Zenodo user login
|
2020-04-08 16:36:06 +03:00 |
|
George Kalampokis
|
b97f08d0f4
|
Add zenodo DOI access token expiration check up and show proper pop up when the user has either no or expired token
|
2020-04-07 18:42:32 +03:00 |
|
George Kalampokis
|
f39c113b7b
|
Add Zenodo Login and the ability to use it's access token for DOI creation
|
2020-04-07 18:42:31 +03:00 |
|
George Kalampokis
|
4d59821b6c
|
Allow twitter oauth to login without email (ask when logging in)
|
2020-04-03 17:04:53 +03:00 |
|
George Kalampokis
|
194ae2ccf0
|
Fixed minor issues with dmp index and dmp compact listing
|
2020-04-03 13:37:16 +03:00 |
|
Diamantis Tziotzios
|
7104c81228
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2020-04-02 13:32:33 +03:00 |
|
Diamantis Tziotzios
|
1c4b0ba87a
|
fb login provider fix
|
2020-04-02 13:32:14 +03:00 |
|
George Kalampokis
|
dcede0b1eb
|
Add Dmp Index (ref #252), compacted Dmp Listing so now both the user and the public listing will use one component (ref #253) and refactor operation context
|
2020-04-01 18:16:06 +03:00 |
|
George Kalampokis
|
8ca2b912d4
|
Immproved Ui styling
|
2020-03-31 11:50:25 +03:00 |
|
George Kalampokis
|
b03d45661e
|
Add RDA Import
|
2020-03-27 15:42:45 +02:00 |
|
George Kalampokis
|
a6bd1f71ca
|
Improved object coupling for various objects on the dataset form
|
2020-03-27 15:42:42 +02:00 |
|
George Kalampokis
|
4a4dd03b87
|
Small fix for config.json
|
2020-03-27 10:51:49 +02:00 |
|
George Kalampokis
|
21fe5bb621
|
Replace the usage of environment.ts with config.json (not too stable) (ref #251)
|
2020-03-26 18:44:12 +02:00 |
|
George Kalampokis
|
672055f9ca
|
Fix issue when inserting dataset status on dataset listing
|
2020-03-18 11:19:53 +02:00 |
|
George Kalampokis
|
1d05c73745
|
Even more bugfixes
|
2020-03-17 17:10:14 +02:00 |
|
George Kalampokis
|
2c765dbc52
|
Fixed issue when canceling dataset edit after at least one change
|
2020-03-17 15:57:28 +02:00 |
|
George Kalampokis
|
4822274a98
|
Fixed public dataset DMP Link
|
2020-03-17 12:44:37 +02:00 |
|
George Kalampokis
|
5336ac935f
|
Improve language Editor Styling
|
2020-03-17 12:43:57 +02:00 |
|
George Kalampokis
|
a21afab48a
|
Add Last Public Version on Dataset Index
|
2020-03-17 12:43:20 +02:00 |