Bernaldo Mihasi
39d709f41d
no message
2022-12-13 09:46:00 +02:00
Bernaldo Mihasi
c6d37806c8
drop column doi from dmp and refactor code(replace single doi with list of dois)
2022-12-08 13:12:54 +02:00
Bernaldo Mihasi
8c95b16164
add temp storage in zenodo repository
2022-12-08 13:06:52 +02:00
Bernaldo Mihasi
ad00695d4e
fix bug allowing invalid characters in pdf name
2022-12-08 13:04:55 +02:00
Bernaldo Mihasi
572be373e5
don't deposit empty supportingFiles.zip when no files are uploaded in datasets
2022-12-08 13:02:08 +02:00
Diamantis Tziotzios
e1a3e9b7bc
Dockerfile update
2022-12-06 11:55:06 +02:00
Bernaldo Mihasi
b7e69d5fdf
repo config using enviroment variables instead of static strings
2022-12-06 11:50:54 +02:00
George Kalampokis
6caef3e890
Remove thread sleeps when trying to load config files and removed principal from Exception Handling Controller
2022-11-30 18:19:40 +02:00
Bernaldo Mihasi
679354f699
deposit datasets' attached files in zip format
2022-11-30 09:43:03 +02:00
Konstantinos Triantafyllou
c9c99be603
Merge branch 'table-field' into Development
2022-11-29 10:19:15 +02:00
Diamantis Tziotzios
75007286fc
elasticsearch cert change
2022-11-25 17:03:25 +02:00
Diamantis Tziotzios
ccc102a52d
add more elastic logs
2022-11-25 16:03:59 +02:00
Bernaldo Mihasi
ed79d27cdc
when making a new version in dataverse delete previous files
2022-11-25 11:20:45 +02:00
Bernaldo Mihasi
da211ca756
update dockerfile to include directory with repository jars
2022-11-24 17:31:16 +02:00
Bernaldo Mihasi
7a0e1c89f2
when finalizing a dmp and its access rights are open, make it publicly available in Argos
2022-11-24 16:29:11 +02:00
Bernaldo Mihasi
573aab059b
remove redundant parameter in deposit interface
2022-11-22 09:58:47 +02:00
Bernaldo Mihasi
5e2639848b
dmps are deposited in dataverse as datasets under a parent predefined dataverse collenction
...
when a new dmp version is created and deposited, the corresponding dataset in dataverse/collection in zenodo create a new version too
deposit dmps as published not drafts
2022-11-22 09:40:05 +02:00
George Kalampokis
0888b7cd74
Enable health and metrics built-in endpoints
2022-11-21 14:06:59 +02:00
Bernaldo Mihasi
6c13d3b68f
when new version is deposited, create dataset in existing dataverse
2022-11-14 09:34:49 +02:00
Konstantinos Triantafyllou
925fc3ce4a
Merge branch 'Development' into table-field
2022-11-10 17:54:28 +02:00
Bernaldo Mihasi
b4490cb0f3
[WIP] implement dataverse repository deposit
2022-11-10 10:12:11 +02:00
Konstantina Galouni
2bbf89e779
HtmlToWorldBuilder.java & WordBuilder.java: Added methods for exporting inputs of a question as table.
2022-11-08 14:39:23 +02:00
Diamantis Tziotzios
0cd20605f0
user guide image update
2022-11-02 15:39:42 +02:00
Bernaldo Mihasi
6b2bc3c1e0
cleanup code, add authorizationUrl and recordUrl in repositories config
2022-11-02 13:31:42 +02:00
Bernaldo Mihasi
59e26dbb8d
[WIP] EntityDoi table
2022-11-02 09:41:40 +02:00
Konstantina Galouni
37724380e9
#7276 - Added tableView true/false option in multiplicity
2022-11-01 16:24:28 +02:00
Bernaldo Mihasi
7d624a2daa
[WIP] system deposit authentication, using default repo token
2022-10-27 09:32:26 +03:00
Bernaldo Mihasi
ab66a5f1da
[WIP] implement zenodo repository deposit, add authentication for depositions
2022-10-26 13:50:01 +03:00
Bernaldo Mihasi
7dd2030eb3
[WIP] create deposit interface and implement multiple deposit repositories
2022-10-24 09:35:49 +03:00
Bernaldo Mihasi
20f618a5d7
fix request body examples in publicapi
2022-10-18 09:39:46 +03:00
Bernaldo Mihasi
2b692fa579
fix public api paths
2022-10-10 11:56:48 +03:00
Bernaldo Mihasi
ef327a0a57
expose public api
2022-10-04 13:06:49 +03:00
Bernaldo Mihasi
5087a37e15
dockerization
2022-09-13 10:35:56 +03:00
Konstantina Galouni
49e42e9cba
h2020_dataset.docx & WordBuilder.java & DataManagementPlanManager.java & DatasetManager.java: Updated footer of Dataset template to set title of DMP and Dataset.
2022-07-28 17:30:44 +03:00
George Kalampokis
fa723c07ae
Fix critical issue with open file handle leak on user guide folder
2022-07-28 11:23:39 +03:00
Konstantina Galouni
a2228a5fb6
#7597 , #7893 , #7895 , #7898 : Updated DMP template file (h2020.docx) for export | Added Dataset template file (h2020_dataset.docx) for export | Updated indentation on exported docs.
...
1. h2020.docx, h2020_dataset.docx: Updated DMP template & Added Dataset template.
2. application.properties, application-devel.properties, application-production.properties, application-staging.properties: Added property for dataset template file path configuration.h2020datasettemplate=documents/h2020_dataset.docx
3. ConfigLoader.java: Added method XWPFDocument getDatasetDocument();
4. DefaultConfigLoader.java: Added fiedls and methods for loading Dataset template (h2020_dataset.docx).
5. DataManagementPlanManager.java, DatasetManager.java, , HtmlToWorldBuilder.java, WordBuilder.java: Updated header/footer/first page in exports for DMPs and Datasets | Updated indentation in exports.
2022-07-26 17:00:54 +03:00
Konstantina Galouni
9b4c7aeb6f
DataManagementPlanManager.java: #7893 - Added description of Datasets on DMP exported word file.
2022-07-12 12:52:04 +03:00
Konstantinos Triantafyllou
304a6cfdb3
Backend: Fix a bug with compareTo of a field throwing an error because ordinal is not exists. FrontEnd: Initialize visibility rules for multiple fields coming from service according to their parents.
2022-06-23 15:38:48 +03:00
Konstantina Galouni
18e98938d5
WordBuilder.java: #7869 - In exported file fix hidden question title and a. /b. /c for empty answers.
...
a. fix hidden question title when more than 1 multiplicity answers,
b. fix hidden question title when no value in the last multiplicity answer,
c. Do not show a. / b. / c.... for empty multiplicity answers,
d. Do not show a. / b. / c.... when more than 1 multiplicity answers, but only one with value.
2022-06-23 15:32:05 +03:00
Diamantis Tziotzios
2ecce0acb0
elastic conf changes
2022-06-14 14:22:59 +03:00
Bernaldo Mihasi
8b26ff19b6
Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development
2022-06-14 10:25:53 +03:00
Bernaldo Mihasi
9c4d246ef5
heading changes on export template
2022-06-14 10:24:35 +03:00
Konstantina Galouni
772a041851
WordBuilder.java: #7837 - In exported file add comment filed as ParagraphStyle.HTML instead of ParagraphStyle.COMMENT.
2022-06-14 10:14:48 +03:00
Bernaldo Mihasi
0ac5902bfd
1. export redesign based on new word template
...
2. orcid researchers in export are clickable
2022-06-13 15:16:48 +03:00
Bernaldo Mihasi
73be5d9a98
1. export redesign: multiplicity #ref 7834, multiple select #ref 7836
...
2. fix bug in license api export
2022-06-08 16:27:47 +03:00
Bernaldo Mihasi
3433f58506
Add ssl support for elasticsearch
2022-06-08 16:23:49 +03:00
George Kalampokis
0235406246
Improve image caption styling
2022-06-07 14:52:48 +03:00
George Kalampokis
7985b13cca
Add image caption on Word/Pdf export
2022-06-07 13:10:06 +03:00
George Kalampokis
54c5017609
Add Export attribute on Dataset Profile's Field. By Default is set to true. The attribute determines if the field value will be included in the word/pdf export
2022-06-07 11:00:13 +03:00
George Kalampokis
5cd79a6368
When Exporting DMP to word/pdf sort it's Datasets based on creation date
2022-06-07 10:56:44 +03:00
George Kalampokis
ea8407eece
Fix critical issue when uploading Dataset Template
2022-06-07 10:33:37 +03:00
Diamantis Tziotzios
91566c9710
Merge branch 'saml2' into Development
2022-06-01 10:45:19 +03:00
Konstantina Galouni
79bc95b099
[Bug fix] DatasetProfileManager.java: In method "createNewVersionDatasetProfile()", do not set label and language from oldDatasetProfile.
2022-05-31 16:51:59 +03:00
George Kalampokis
e8a87765ee
Fix authorization issue with Dataset Templates not showing to their original creators (that are not Admins)
2022-05-31 16:14:25 +03:00
argirok
03f7afede8
update openaire publication API to accept DOI query
2022-05-30 16:15:16 +03:00
George Kalampokis
11b0db21ac
Reconfigure Zenodo prefilling query in order to query doi and conceptdoi alongside the title (ref #7802 )
2022-05-30 11:59:49 +03:00
George Kalampokis
757b1f70e8
Change default filterType to remote (ref #7799 & #7800 )
2022-05-26 15:03:45 +03:00
George Kalampokis
66511d2ed6
Further stability improvement over external urls query
2022-05-25 18:06:54 +03:00
George Kalampokis
0f4b209427
Add {query} field for external urls with configurable queries and make ORCID query more strict (similar to orcid's website) (ref #7798 )
2022-05-25 17:37:20 +03:00
George Kalampokis
3aff6ac90e
Allow to update Dataset Templates by uploading dataset Template .xml files (ref #7793 )
2022-05-25 14:50:00 +03:00
Bernaldo Mihasi
ff6d068ddd
sign artifact resolve-code + post binding
2022-05-25 10:30:59 +03:00
George Kalampokis
912a3cc095
Order datasets on DMP listing (ref #7746 )
2022-05-11 18:13:35 +03:00
Bernaldo Mihasi
6c36253f09
artifact binding + decryption of assertion
2022-05-11 10:38:10 +03:00
Bernaldo Mihasi
cfd0707f2a
bug fix: license api-fields didnt get prefilled
2022-05-04 11:11:25 +03:00
Bernaldo Mihasi
8ac8f9588c
#7680 : Support SAML Authentication
2022-04-28 12:03:01 +03:00
George Kalampokis
7c933d9f32
Refactor Zenodo deposit creation. Add model for mapping instead of relying on stringBuilder
2022-04-07 17:31:45 +03:00
George Kalampokis
e373baee7e
Fix critical issue when importing from xml with researchers
2022-04-07 17:31:44 +03:00
George Kalampokis
2a12f1b5be
Change Dataset sorting on DMP overview and editor from last modified to last created
2022-04-05 15:29:36 +03:00
George Kalampokis
ef6e3b8d7c
Sort Datasets by Modified date on DMP Overview and DMP Editor
2022-04-01 13:54:13 +03:00
Bernaldo Mihasi
7cfedf24a2
add missing enums to render styles
2022-03-31 17:49:33 +03:00
Bernaldo Mihasi
db8f10ac1e
fix issue with upload field in xml export
2022-03-31 17:02:27 +03:00
George Kalampokis
afb0be5b18
Make DMP export to be more consistent with the DMP shown on the front end UI
2022-03-29 15:13:58 +03:00
George Kalampokis
c41c89774b
Make Dataset Validation checker to no longer be exception depedant
2022-03-29 15:13:58 +03:00
George Kalampokis
3eb27c04f6
Fix critical issue with xml import
2022-03-29 11:32:52 +03:00
George Kalampokis
72507dd1b8
Fix issue with DMP json export if it have been imported from json
2022-03-29 10:57:06 +03:00
argirok
35ea0b5d6c
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
2022-03-29 10:32:39 +03:00
Konstantina Galouni
650e0ceb06
#7636 : [Bug fix] Copy dataset from latest activity or dataset listing: Reverting some changes from commit:b6c28be3b3
...
1. DatasetListingModel.java: Added field DatasetProfileOverviewModel profile, getter/setter and set profile in methods "fromDataModel()" and "toDataModel()".
2. RecentActivityModel.java: Added field DatasetProfileOverviewModel profile and getter/setter.
3. RecentDatasetModel.java: Set profile in methods "fromEntity()" and "fromDmpEntity()".
2022-03-28 17:02:57 +03:00
Bernaldo Mihasi
78895a1df1
no message
2022-03-24 09:43:13 +02:00
argirok
62b60b93a8
URLConfiguration add FilterType. When filterType is "local" the filtering is applied in argos backend - not throught the API
2022-03-23 16:03:42 +02:00
George Kalampokis
864b4bfec8
Make rda mapping more lax
2022-03-22 16:40:51 +02:00
Bernaldo Mihasi
116f9b99ea
fix tags - distribution_format word export
2022-03-22 14:03:22 +02:00
Konstantina Galouni
8734d7c1ba
#7528 : Fixes in exporting images to document.
...
WordBuilder.java: Use media types instead of file extension for IMAGE_TYPE_MAP | Calculate image dimensions inside document according to its initial ratio and remove from page size the top, bottom, left, right margins.
2022-03-21 18:19:51 +02:00
Bernaldo Mihasi
ba55881830
image export: pixels to points
2022-03-18 16:55:41 +02:00
George Kalampokis
3101cf0e42
Optimize image export
2022-03-17 17:08:45 +02:00
Bernaldo Mihasi
65b4e58aad
attach images in word export
2022-03-17 10:47:50 +02:00
Konstantina Galouni
2a9d8b8296
#7528 : [NEW] Upload files field type.
...
1. Datasets.java: In "delete()" method, call also fileManager.markAllFilesOfEntityIdAsDeleted.
2. DatasetManager.java: Added method "deleteOldFilesAndAddNew()" which is called by "createOrUpdate()", to mark as deleted files that are not used any more and save the new ones.
3. DatabaseRepository.java & DatabaseRepositoryImpl.java: Include in DAOs FileUploadDAO.
4. ModelBuilder.java & ViewStyle.java: Incluse "upload" field type.
5. field-data.ts:
a. In "getOrdinal()" method return Integer instead of int.
b. In "getValidations()" method added null check.
c. In methods "fromJsonObject()" and "toMap()" added special if clauses for "upload" field type.
6. application.properties:
a. Added property "file.storage", to set the folder where the files will be permanently saved.
b. Changed default spring.servlet.multipart.max-file-size and pring.servlet.multipart.max-request-size to 10 MB.
7. UserInvitationController.java: Deleted a print in System.out.
8. New files for upload field type: FileUploadDao.java, FileUploadDaoImpl.java, FileUpload.java, PostgreSQLEnumType.java (necessary for the enum EntityType), FileController.java, FileManager.java, UploadData.java.
2022-03-16 12:14:08 +02:00
George Kalampokis
dc06ba9201
Allow to return DMP with no Datasets for the Dataset Editor
2022-03-15 17:58:01 +02:00
George Kalampokis
4e0402df95
Fix issue with prefilling Mapper and empty array values
2022-03-15 17:55:40 +02:00
George Kalampokis
563711eae4
Fix issue saving tags from template when the field is a textField
2022-03-15 17:52:58 +02:00
George Kalampokis
d3a1e85ba9
Fix issue with keeping non Admin users on Dataset Templates
2022-03-08 13:37:26 +02:00
George Kalampokis
56499223cf
Fix issue with Grant authentication
2022-03-02 17:51:41 +02:00
George Kalampokis
75fc8a1d13
Update some entities based on the Db configuration
2022-03-02 17:51:17 +02:00
George Kalampokis
608c4f3fc0
Add get Parent values on json Searcher
2022-03-02 10:56:28 +02:00
George Kalampokis
5ea8b9b964
Minor fix for visibility Rules Service
2022-03-01 17:14:02 +02:00
George Kalampokis
1e572b3214
Fix issue with prefilling mapping
2022-03-01 17:11:14 +02:00
George Kalampokis
ea72f64ed4
Replace DB DOIFunder with a json config file
2022-03-01 14:37:49 +02:00
George Kalampokis
c3aff92cd4
Don't include Funder if it's not in the Doi Funder Table
2022-02-28 16:28:31 +02:00
George Kalampokis
5a3f871c58
Remove various unnecessary info messages
2022-02-28 15:24:10 +02:00
George Kalampokis
93aa2d36e5
Fix another issue with login
2022-02-24 10:47:12 +02:00
George Kalampokis
69a94fa236
Make email nullable field
2022-02-23 12:02:03 +02:00
George Kalampokis
94a225cf9f
Add Description on Dataset Export
2022-02-22 16:39:35 +02:00
Bernaldo Mihasi
494ee47620
zenodo prefilling customizations
2022-02-22 15:53:25 +02:00
George Kalampokis
3c42ee3531
Improve tags pre-filling mapping
2022-02-22 14:15:51 +02:00
Bernaldo Mihasi
0bd08c2fac
fixed tag prefilling
2022-02-22 14:00:22 +02:00
George Kalampokis
817ee9b44d
Fixed ParsedTags
2022-02-22 13:39:52 +02:00
George Kalampokis
f6cb4a40d2
Generalized (again) dataset prefilling
2022-02-22 11:58:39 +02:00
George Kalampokis
d1eab0d019
Fix issue with not showing datasets on all version listing
2022-02-22 11:30:22 +02:00
George Kalampokis
4bdb27fcef
Merge remote-tracking branch 'origin/Development' into Development
2022-02-21 17:48:52 +02:00
George Kalampokis
ad8239ca5e
Improve if statement on Prefilling Mapping
2022-02-21 17:48:40 +02:00
Bernaldo Mihasi
1a43c28496
add more prefilled fields
2022-02-21 17:38:16 +02:00
George Kalampokis
b6c28be3b3
Optimize Dashboard's recent activity logic, removed various unused fields from Listing Models and implement toDataModel conversion logic in some models
2022-02-21 17:16:32 +02:00
George Kalampokis
71b1010ea1
Merge remote-tracking branch 'origin/Development' into Development
2022-02-18 17:52:04 +02:00
George Kalampokis
d16e130dc6
Optimize general metric counter
2022-02-18 17:51:57 +02:00
George Kalampokis
11ff99fd77
Improve and generalize prefilling logic
2022-02-18 17:51:32 +02:00
argirok
3aa1c1ae59
fix issue with pub api #7326#note-5 the value was a number instaed of search
2022-02-18 17:41:33 +02:00
argirok
cc926970ca
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
...
Conflicts:
dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts
2022-02-18 17:09:34 +02:00
Bernaldo Mihasi
da5ba952e1
rda export import tag bug, format preffiling fixed
2022-02-17 10:11:34 +02:00
Bernaldo Mihasi
bf77a85acb
Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development
2022-02-11 13:11:40 +02:00
Bernaldo Mihasi
eedcf0dfb0
fix freetext-format bug in prefilling temporarily
2022-02-11 13:09:29 +02:00
George Kalampokis
fac6a93c0a
Fix minor worldBuilder issue and a minor refactor
2022-02-10 13:21:21 +02:00
George Kalampokis
4740fbe8e0
Refactor visibilityRuleService
2022-02-09 15:23:16 +02:00
Konstantinos Triantafyllou
26e10b1299
Add URL Validator type in validators. Free Text can have URL validator.
2022-02-08 14:31:36 +02:00
Bernaldo Mihasi
80e5e12f29
fix export-import dataset missing rda mappings
2022-02-08 14:04:26 +02:00
Bernaldo Mihasi
815fc05af6
fix missing section titles from word export
2022-02-08 09:44:55 +02:00
Diamantis Tziotzios
14550e0536
visibility rule fix on word builder
2022-02-04 18:17:51 +02:00
Diamantis Tziotzios
2b71cddc39
Fix for word generator not merging multiple visibility rule results
2022-02-04 16:38:05 +02:00
argirok
938f98100f
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
2022-02-04 10:05:32 +02:00
Bernaldo Mihasi
048189952c
format prefilling fixes
2022-02-02 14:15:33 +02:00
George Kalampokis
eaa0c67177
Add multiplicity field on Sections
2022-01-31 11:15:23 +02:00
Diamantis Tziotzios
1c318ddff5
dataset templates metric renamed
2022-01-28 16:02:07 +02:00
Bernaldo Mihasi
125a97baed
keyword-tags exported-imported fixes, prefilling more mapping
2022-01-28 14:55:52 +02:00
George Kalampokis
70d37cead1
Fix wrong metrics count for Dataset Template
2022-01-27 11:05:40 +02:00
argirok
90b49194ac
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
2022-01-24 12:11:39 +02:00
George Kalampokis
01d32427c3
Add additional checks when generating world documents
2022-01-24 11:30:03 +02:00
George Kalampokis
f95a704787
Make remote fetcher's value normalization more type safe
2022-01-24 11:29:06 +02:00
argirok
a3c4b3c143
Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
...
Conflicts:
dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcherUtils.java
2022-01-24 11:12:56 +02:00
argirok
858fa3ee71
#7326 - static APIs
...
1. Rename of "Registries" to "Metadata"
2. add apis for taxonomy, licenses, publications
3. change data repositories: from querying all registered to all of type data repository
4. add separate APIs for journals and pub repositories
2022-01-21 15:44:51 +02:00
George Kalampokis
8f56b1874b
Add extra prefilling mapping fields and add better support for prefilling tags
2022-01-19 17:51:30 +02:00
George Kalampokis
ce386ac047
Refactor Remote Fetcher's json parser
2022-01-19 12:12:20 +02:00
Bernaldo Mihasi
61de8c4df0
dmp import fixes
2022-01-18 11:38:24 +02:00
George Kalampokis
64ec74363b
Merge remote-tracking branch 'origin/Development' into Development
2022-01-13 13:33:13 +02:00
George Kalampokis
5a70ce7602
Fix issue of not keeping dataset template users after version update
2022-01-13 13:26:30 +02:00
Bernaldo Mihasi
641088e289
Remove local configs, commited by mistake
2022-01-12 16:31:07 +02:00
DESKTOP-4ES9U2E\aldom
dc1f59d8b5
Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development
2022-01-12 14:11:18 +02:00
DESKTOP-4ES9U2E\aldom
9d5d685ad6
ethical_issues added to DatasetRDAMapper, minor fixes to dmp docx export
2022-01-12 14:10:00 +02:00
George Kalampokis
91f98a8759
Rename sample tag
2022-01-12 11:45:57 +02:00
George Kalampokis
db01f2d119
Add fixedMappings for prefilling
2022-01-12 11:43:32 +02:00
George Kalampokis
1d68b2a379
Minor improvement for dataset prefilling
2022-01-07 18:06:19 +02:00
DESKTOP-4ES9U2E\aldom
16c124cc3d
Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development
...
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetIdRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DistributionRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/KeywordRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/LicenseRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/SecurityAndPrivacyRDAMapper.java
# dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/TechnicalResourceRDAMapper.java
2021-12-30 11:28:15 +02:00
DESKTOP-4ES9U2E\aldom
e675ad7c9d
madmp changes
2021-12-29 15:24:46 +02:00