Kilian Schuettler
abf29b71ba
RED-10418: improve unprocessed merge performance
2024-11-06 15:52:08 +01:00
Kilian Schüttler
2ab247b3cf
Merge branch 'RED-10264-bp' into 'release/2.589.x'
...
RED-10264: reorder migrations for backport
See merge request redactmanager/persistence-service!837
2024-11-06 10:32:10 +01:00
Kilian Schuettler
a31aa04314
RED-10264: reorder migrations for backport
2024-11-06 09:43:06 +01:00
Dominique Eifländer
be4e3c8633
Merge branch 'RED-10353-4.3' into 'release/2.589.x'
...
RED-10353: Added error code to file
See merge request redactmanager/persistence-service!830
2024-11-05 15:09:33 +01:00
Dominique Eifländer
92fc6f7f8c
RED-10353: Added error code to file
2024-11-05 14:45:43 +01:00
Maverick Studer
4eb97602cd
Merge branch 'RED-10354-bp' into 'release/2.589.x'
...
RED-10354: File viewer inconsistent after selecting "Overwrite and keep manual...
See merge request redactmanager/persistence-service!825
2024-11-05 11:27:21 +01:00
Maverick Studer
bddb43f7da
RED-10354: File viewer inconsistent after selecting "Overwrite and keep manual...
2024-11-05 11:27:20 +01:00
Corina Olariu
c0e3731844
Merge branch 'RED-10186' into 'release/2.589.x'
...
RED-10186 - Unlinked annotation with manual changes still linked and removed...
See merge request redactmanager/persistence-service!821
2024-11-04 14:10:34 +01:00
corinaolariu
546f38a615
RED-10186 - Unlinked annotation with manual changes still linked and removed in specific corner case
...
- remove commented code
2024-11-04 11:24:58 +02:00
corinaolariu
356a0e8561
RED-10186 - Unlinked annotation with manual changes still linked and removed in specific corner case
...
- update unit test
2024-11-01 15:32:16 +02:00
corinaolariu
29469008d2
RED-10186 - Unlinked annotation with manual changes still linked and removed in specific corner case
...
- update unit test
2024-11-01 15:00:35 +02:00
corinaolariu
c126be9b2d
RED-10186 - Unlinked annotation with manual changes still linked and removed in specific corner case
...
- when a local removal is done the MANUAL engine is not added anymore.
- removed basedOnDictAnnotationId from manual changes. The add which is always created at a local change with unlink with save the dictionary annotation id in the source id
- unit tests updated
2024-11-01 13:27:28 +02:00
Maverick Studer
71a10569f5
Merge branch 'RED-10335-bp1' into 'release/2.589.x'
...
RED-10335: New entity created when editing/working with annotation while auto-analysis is disabled
See merge request redactmanager/persistence-service!819
2024-10-31 16:22:26 +01:00
maverickstuder
13e5bf1c08
RED-10335: New entity created when editing/working with annotation while auto-analysis is disabled
2024-10-31 15:42:12 +01:00
Maverick Studer
7c9dc9cbd9
Merge branch 'RED-10334-bp' into 'release/2.589.x'
...
RED-10334: Wrong engine for add-to-dict dossier-level while auto-analysis is disabled
See merge request redactmanager/persistence-service!817
2024-10-31 14:40:36 +01:00
Maverick Studer
20bed836c3
RED-10334: Wrong engine for add-to-dict dossier-level while auto-analysis is disabled
2024-10-31 14:40:36 +01:00
Dominique Eifländer
3fbed91ed0
Merge branch 'RED-10353-4.3' into 'release/2.589.x'
...
RED-10353: Reset processingErrorCounter when rules are updated
See merge request redactmanager/persistence-service!815
2024-10-31 11:26:47 +01:00
Dominique Eifländer
803bc83235
RED-10353: Reset processingErrorCounter when rules are updated
2024-10-31 11:00:51 +01:00
Dominique Eifländer
8bc415b7fe
Merge branch 'RED-4732-4.3' into 'release/2.589.x'
...
RED-4732: Added missing audit logs
See merge request redactmanager/persistence-service!814
2024-10-30 13:38:39 +01:00
Dominique Eifländer
b8b8fe6e7d
RED-4732: Added missing audit logs
2024-10-30 13:01:32 +01:00
Kilian Schüttler
5d09f44654
Merge branch 'RED-10264-bp' into 'release/2.589.x'
...
RED-10264: add migration fixing missing legalbasis
See merge request redactmanager/persistence-service!811
2024-10-30 11:34:45 +01:00
Kilian Schüttler
2e584f15ba
RED-10264: add migration fixing missing legalbasis
2024-10-30 11:34:45 +01:00
maverickstuder
83a0163960
RED-10297: Provide default date format file when missing on dossier template import
2024-10-30 11:09:55 +01:00
maverickstuder
8202ff8ac6
RED-10297: Provide default date format file when missing on dossier template import
2024-10-30 11:09:55 +01:00
maverickstuder
3edb1395c0
RED-10297: Provide default date format file when missing on dossier template import
2024-10-30 11:09:55 +01:00
Corina Olariu
4087082f15
Merge branch 'RED-10071_fix_bp' into 'release/2.589.x'
...
RED-10071 - Create system-managed entities automatically - fix component definitions - bp
See merge request redactmanager/persistence-service!809
2024-10-30 09:25:23 +01:00
corinaolariu
ff6c1d1b2f
RED-10071 - Create system-managed entities automatically - fix component definitions - bp
...
- when import dossier template with update before inserting component definitions, remove the existing ones
- unit test added
2024-10-29 18:47:37 +02:00
Dominique Eifländer
5a61e4c739
Merge branch 'RED-10315-4.3' into 'release/2.589.x'
...
RED-10315: hardDeleteCleanupRetryTime in app config endpoint optional
See merge request redactmanager/persistence-service!807
2024-10-29 15:09:58 +01:00
Dominique Eifländer
45ab83732a
RED-10315: hardDeleteCleanupRetryTime in app config endpoint optional
2024-10-29 14:53:38 +01:00
Kilian Schüttler
667ea579df
Merge branch 'RED-10286-bp' into 'release/2.589.x'
...
RED-10286: treat manualchanges == null
See merge request redactmanager/persistence-service!805
2024-10-28 12:35:51 +01:00
Kilian Schüttler
ea2fa1df87
RED-10286: treat manualchanges == null
2024-10-28 12:35:51 +01:00
Kilian Schüttler
dd315a8cf9
Merge branch 'RED-10286-bp' into 'release/2.589.x'
...
RED-10286: dont load all files at once, but only the ids
See merge request redactmanager/persistence-service!803
2024-10-25 15:03:51 +02:00
Kilian Schüttler
f7b91532a0
RED-10286: dont load all files at once, but only the ids
2024-10-25 15:03:51 +02:00
Kilian Schüttler
c09c92bb31
Merge branch 'mergeErrorHotfix-bp' into 'release/2.589.x'
...
hotfix: fix merge errors
See merge request redactmanager/persistence-service!801
2024-10-25 12:44:29 +02:00
Kilian Schuettler
a65cc0f5b5
hotfix: fix merge errors
2024-10-25 12:30:23 +02:00
Kilian Schüttler
193e975290
Merge branch 'RED-10264-bp' into 'release/2.589.x'
...
RED-10264: always include unprocessed during manual change insertion to avoid...
See merge request redactmanager/persistence-service!797
2024-10-25 11:11:35 +02:00
Kilian Schüttler
949b7636ba
RED-10264: always include unprocessed during manual change insertion to avoid...
2024-10-25 11:11:35 +02:00
Maverick Studer
2f42e96b25
Merge branch 'RED-10259-bp' into 'release/2.589.x'
...
RED-10259: Failed recategorize on annotation after re-upload file without keeping changes
See merge request redactmanager/persistence-service!799
2024-10-24 14:21:09 +02:00
maverickstuder
30db55df15
RED-10259: Failed recategorize on annotation after re-upload file without keeping changes
2024-10-24 13:55:29 +02:00
Kilian Schüttler
0ae3048c70
Merge branch 'feature/RED-10260-bp' into 'release/2.589.x'
...
Resolve RED-10260 "Feature/ bp"
See merge request redactmanager/persistence-service!795
2024-10-24 11:18:36 +02:00
Kilian Schüttler
3ad0d8c9ee
Resolve RED-10260 "Feature/ bp"
2024-10-24 11:18:36 +02:00
Maverick Studer
3fb44077bd
Merge branch 'RED-10224-fp' into 'release/2.589.x'
...
RED-10224: Editing entities - Access is denied but updates value anyway
See merge request redactmanager/persistence-service!791
2024-10-23 09:45:55 +02:00
maverickstuder
112959fc47
RED-10224: Editing entities - Access is denied but updates value anyway
2024-10-23 09:26:44 +02:00
Maverick Studer
0ce2b1644c
Merge branch 'RED-10197' into 'master'
...
RED-10197: Migration preparations for RM/DM unification
Closes RED-10197
See merge request redactmanager/persistence-service!786
2024-10-17 16:32:52 +02:00
Maverick Studer
5e215c2649
RED-10197: Migration preparations for RM/DM unification
2024-10-17 16:32:52 +02:00
Corina Olariu
53bb752002
Merge branch 'feature/RED-10071' into 'master'
...
RED-10071 - Create system-managed entities automatically
Closes RED-10071
See merge request redactmanager/persistence-service!779
2024-10-15 10:48:05 +02:00
corinaolariu
ffca299cb4
RED-10071 - Create system-managed entities automatically
...
- remove commented code
2024-10-15 10:56:53 +03:00
corinaolariu
a65e9e1086
Merge branch 'master' into feature/RED-10071
...
# Conflicts:
# persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
2024-10-15 10:34:12 +03:00
Kilian Schüttler
abda71fca3
Merge branch 'RED-10127' into 'master'
...
RED-10127: Import/Export of dossiertemplate with preview files
Closes RED-10127
See merge request redactmanager/persistence-service!782
2024-10-14 15:30:18 +02:00
Kilian Schüttler
c52dfbdf5a
RED-10127: Import/Export of dossiertemplate with preview files
2024-10-14 15:30:18 +02:00
