186 Commits

Author SHA1 Message Date
Dominique Eiflaender
de66d2fda8 Pull request #60: RED-510: Do not add annotations for manual redactions that are approved and should be already in a dictionary
Merge in RED/redaction-service from RED-510 to master

* commit '1b2bd7fa209cba7e635bbaad7962396d931576ff':
  RED-510: Do not add annotations for manual redactions that are approved and should be already in a dictionary
1.3.5 master_118
2020-10-29 15:37:37 +01:00
deiflaender
1b2bd7fa20 RED-510: Do not add annotations for manual redactions that are approved and should be already in a dictionary RED-510_2 2020-10-29 15:16:30 +01:00
Dominique Eiflaender
013353d6ef Pull request #59: RED-499: Changed prefix for redactions, fixed legalbasis problem
Merge in RED/redaction-service from RED-499 to master

* commit '0015304eea9564d76765fcb1a76d2b6a293c1ebc':
  RED-499: Changed prefix for redactions, fixed legalbasis problem
1.3.4 master_116
2020-10-28 13:55:41 +01:00
deiflaender
0015304eea RED-499: Changed prefix for redactions, fixed legalbasis problem RED-499_2 2020-10-28 13:02:46 +01:00
Dominique Eiflaender
97257a9c08 Pull request #58: RED-427: Added possibility to add comments to all annotation
Merge in RED/redaction-service from RED-427 to master

* commit '612d67301bbf186f5144c0243f9a37fe21d3646c':
  RED-427: Added possibility to add comments to all annotation
1.3.3 master_114
2020-10-27 13:02:50 +01:00
deiflaender
612d67301b RED-427: Added possibility to add comments to all annotation RED-427_4 2020-10-27 12:32:11 +01:00
Thierry Goeckel
6986b14713 Pull request #57: RED-451 Legal Basis
Merge in RED/redaction-service from RED-451 to master

* commit '8be59e4ddf2432f47a57d50e2743886c56af3652':
  Add legal basis to redaction log entry
  Integrate legal basis to rules, redaction annotation and tests
1.3.2 master_112
2020-10-27 12:00:59 +01:00
Thierry Göckel
8be59e4ddf Add legal basis to redaction log entry RED-451_4 legal_basis2 2020-10-26 15:03:21 +01:00
Thierry Göckel
f0f748db1b Integrate legal basis to rules, redaction annotation and tests RED-451_2 legal_basis 2020-10-26 10:07:41 +01:00
Thierry Goeckel
04f0c29a49 Pull request #56: Streamline actuator settings
Merge in RED/redaction-service from actuator-settings to master

* commit 'b5192b7424745360dc2206b45ec7f7667b867e27':
  Streamline actuator settings
1.3.1 master_110
2020-10-22 09:43:11 +02:00
Thierry Göckel
b5192b7424 Streamline actuator settings actuator-settings_2 2020-10-21 17:50:33 +02:00
Dominique Eiflaender
268dd0200e Pull request #55: RED-413: Added user to manual redactions, approved flag to Status.APPROVED
Merge in RED/redaction-service from RED-413 to master

* commit '638c4f9c65d35406bba1fd33e20c3bae8a6e6a13':
  RED-413: Added user to manual redactions, approved flag to Status.APPROVED
1.3.0 master_108
2020-10-12 12:32:30 +02:00
deiflaender
638c4f9c65 RED-413: Added user to manual redactions, approved flag to Status.APPROVED RED-413_2 2020-10-12 12:21:18 +02:00
Dominique Eiflaender
8f12695f16 Pull request #54: RED-414: Ids for manual redactions and comments must be created in file-management-service
Merge in RED/redaction-service from RED-414 to master

* commit '79db6e4bf9d821fe4716a6da31d3f6d6fcaff05b':
  RED-414: Ids for manual redactions and comments must be created in file-management-service
1.2.9 master_106
2020-10-09 12:17:38 +02:00
deiflaender
79db6e4bf9 RED-414: Ids for manual redactions and comments must be created in file-management-service RED-414_2 2020-10-09 12:06:19 +02:00
Dominique Eiflaender
c8eac2ca3d Pull request #53: RED-240: Use HexColors instead of float[], RED-380: Load all system colors from dictionary-service
Merge in RED/redaction-service from RED-240 to master

* commit 'a01651b8278ed09f9409d6ec2e1615680bc846cb':
  RED-240: Use HexColors instead of float[], RED-380: Load all system colors from dictionary-service
1.2.8 master_104
2020-10-08 12:05:42 +02:00
deiflaender
a01651b827 RED-240: Use HexColors instead of float[], RED-380: Load all system colors from dictionary-service RED-240_2 2020-10-08 11:51:35 +02:00
Dominique Eiflaender
943d40366e Pull request #52: RED-391: Support comments and approval of manual redactions, RED-385: Improve annotation IDs in PDFs
Merge in RED/redaction-service from RED-391 to master

* commit '365158a0084b2034aca91e6f77eb9df42bbcb246':
  RED-391: Support comments and approval of manual redactions, RED-385: Improve annotation IDs in PDFs
1.2.7 master_102
2020-10-05 15:36:06 +02:00
deiflaender
365158a008 RED-391: Support comments and approval of manual redactions, RED-385: Improve annotation IDs in PDFs RED-391_3 2020-10-05 15:14:23 +02:00
Thierry Goeckel
e76b893c8d Pull request #51: RED-104
Merge in RED/redaction-service from RED-104 to master

* commit 'fa29f56d98d05fd348dd27e3bbb1098851c238bd':
  Test line break fix
1.2.6 master_100
2020-10-05 11:02:56 +02:00
Thierry Goeckel
d91612a69a Pull request #50: Make sure section and table char indices match
Merge in RED/redaction-service from RED-381 to master

* commit '9a965dd68a72285af6bf6a28ec6aa67358c35dba':
  Make sure section and table char indices match
2020-10-05 11:02:44 +02:00
Thierry Göckel
fa29f56d98 Test line break fix RED-104_2 2020-10-02 18:11:58 +02:00
Thierry Göckel
9a965dd68a Make sure section and table char indices match RED-381_2 2020-10-02 17:54:31 +02:00
Dominique Eiflaender
0f4838e60d Pull request #49: RED-373: Fixed multiline annotations view in pdftron
Merge in RED/redaction-service from RED-373-2 to master

* commit 'a4e012762e1adda234decc1137f221cfd70498d3':
  RED-373: Fixed multiline annotations view in pdftron
1.2.5 master_97
2020-10-01 15:31:25 +02:00
deiflaender
a4e012762e RED-373: Fixed multiline annotations view in pdftron RED-373-2_2 2020-10-01 15:19:57 +02:00
Dominique Eiflaender
0c1d8ba33d Pull request #48: RED-372: Suffix cross page annotations with -1, -2, etc., to avoid duplicate annotation ids
Merge in RED/redaction-service from RED-372 to master

* commit 'ecdfd29803e09ac57cc74b19408db54d9a8247a7':
  RED-372: Suffix cross page annotations with -1, -2, etc., to avoid duplicate annotation ids
1.2.4 master_95
2020-10-01 13:01:24 +02:00
deiflaender
ecdfd29803 RED-372: Suffix cross page annotations with -1, -2, etc., to avoid duplicate annotation ids RED-372_4 2020-10-01 12:48:44 +02:00
Dominique Eiflaender
107dbe1910 Pull request #47: RED-373: Use a single multiline annotation instead of seperate annotations per line for one Entity
Merge in RED/redaction-service from RED-373 to master

* commit 'dd02296face3c32bf7675301cf9969103e65f52f':
  Changed formating
  RED-373: Use a single multiline annotation instead of seperate annotations per line for one Entity
master_94
2020-10-01 12:47:58 +02:00
deiflaender
dd02296fac Changed formating RED-373_3 2020-10-01 11:55:38 +02:00
Thierry Goeckel
589458a112 Pull request #46: Add rule redacting sponsor companies if preceded by prefix
Merge in RED/redaction-service from RED-301 to master

* commit '6a8f3665198ec2d7452ed0dac43b9a7d220c8bc5':
  Remove entries from must_redact dict, add test and refactor rules
  Add rule redacting sponsor companies if preceded by prefix
master_93
2020-10-01 11:44:41 +02:00
deiflaender
ce22121802 RED-373: Use a single multiline annotation instead of seperate annotations per line for one Entity RED-373_2 2020-10-01 11:15:28 +02:00
Thierry Göckel
6a8f366519 Remove entries from must_redact dict, add test and refactor rules RED-301_3 2020-09-30 16:08:56 +02:00
Thierry Göckel
cec5fd3d5e Add rule redacting sponsor companies if preceded by prefix 2020-09-30 14:13:17 +02:00
Dominique Eiflaender
99bde2956f Pull request #45: RED-277: Upgraded to pdfbox 2.0.21
Merge in RED/redaction-service from RED-277 to master

* commit 'ecc303e79e82ed698f1c8bdd37dbd521335428bc':
  RED-277: Upgraded to pdfbox 2.0.21
master_92
2020-09-29 16:17:32 +02:00
deiflaender
ecc303e79e RED-277: Upgraded to pdfbox 2.0.21 RED-277_2 2020-09-29 15:18:58 +02:00
Dominique Eiflaender
384cd1d0dc Pull request #44: Fix annotating single letter entities
Merge in RED/redaction-service from bugfix/single-letter-annotations to master

* commit '8e5ff318106e700e28abd14a0eb1337d3a44c109':
  Fix annotating single letter entities
1.2.3 master_90
2020-09-29 15:17:51 +02:00
Thierry Göckel
8e5ff31810 Fix annotating single letter entities bugfix/single-letter-annotations_2 2020-09-29 15:10:52 +02:00
Dominique Eiflaender
8b1574845c Pull request #43: RED-264: Avoid phantom cells, by merging line till rounded value of biggest char height/width
Merge in RED/redaction-service from RED-264 to master

* commit 'e1adcfb02c4c7d46140884b3d38f8daf1e1aae92':
  Added missing unittest
  RED-264: Avoid phantom cells, by merging line till rounded value of biggest char height/width
master_89
2020-09-29 15:04:20 +02:00
deiflaender
e1adcfb02c Added missing unittest RED-264_3 2020-09-29 14:54:35 +02:00
deiflaender
11164219c5 RED-264: Avoid phantom cells, by merging line till rounded value of biggest char height/width RED-264_2 2020-09-29 14:21:42 +02:00
Thierry Goeckel
c9516205fe Pull request #42: RED-318
Merge in RED/redaction-service from RED-318 to master

* commit 'f5790bccab3fb8dce66aeb9fbe501655ae6b86c3':
  Log entries and manual redaction require one position per line
  Annotate line by line
  Refactor multiple positions to one
  Merge rectangles for single annotation/redaction log entry
master_88
2020-09-29 14:15:21 +02:00
Thierry Göckel
f5790bccab Log entries and manual redaction require one position per line RED-318_3 2020-09-29 13:54:32 +02:00
Thierry Göckel
74e63ca292 Annotate line by line RED-318_2 2020-09-29 13:43:16 +02:00
Thierry Göckel
6638f0cf9e Refactor multiple positions to one 2020-09-28 17:47:55 +02:00
Thierry Göckel
5448153096 Merge rectangles for single annotation/redaction log entry 2020-09-28 17:31:40 +02:00
Dominique Eiflaender
03274ba1ab Pull request #41: RED-299: Redact complete Author(s) Field in Vertebrate study tables
Merge in RED/redaction-service from RED-299 to master

* commit '664b9b420605cb1adf1113b34c52a45e8024dbbc':
  RED-299: Redact complete Author(s) Field in Vertebrate study tables
1.2.2 master_86
2020-09-23 15:34:46 +02:00
deiflaender
664b9b4206 RED-299: Redact complete Author(s) Field in Vertebrate study tables RED-299_2 2020-09-23 15:20:52 +02:00
Thierry Goeckel
564d74e39d Pull request #40: Test modified rules 8 and 10
Merge in RED/redaction-service from RED-288 to master

* commit 'cfb7554c618b9482f529b8183bc0f1f95df7d00f':
  Test modified rules 8 and 9
1.2.1 master_84
2020-09-23 11:44:35 +02:00
Thierry Göckel
cfb7554c61 Test modified rules 8 and 9 RED-288_2 2020-09-22 21:36:05 +02:00
Christoph  Schabert
ee40064b32 Pull request #39: RED-316: Switch to new red base image
Merge in RED/redaction-service from RED-316 to master

* commit 'f2fafc3db2ab8825eb4a2136e8eab28a12dbc2e6':
  Switch to rootless base-image
  Upgrade bamboo-specs to 7.1.2
1.2.0 master_82
2020-09-16 08:59:45 +02:00