Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity
95 Commits 31 Branches 763 Tags
Commit Graph

95 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominique Eifländer
f1487c4acd RED-1666: Fixed duplicate justifications in report RED-1666_2 2021-06-24 13:37:14 +02:00
Dominique Eiflaender
74b8c06ca9 Pull request #38: RED-1446: Enabled to change legal basis manually 
Merge in RED/redaction-report-service from RED-1446 to master

* commit '324c4264ae80756b12a1cb74cb982f0d59000f3a':
  RED-1446: Enabled to change legal basis manually
2.13.0 		2021-06-24 10:27:45 +02:00
Dominique Eifländer
324c4264ae RED-1446: Enabled to change legal basis manually RED-1446_2 2021-06-24 10:25:18 +02:00
Kresnadi Budisantoso
b74556b63c Pull request #37: RED-1326: Fixed wrong redaction-service dependency that leads to JSON parse error 
Merge in RED/redaction-report-service from RED-1326 to master

* commit 'a3141956f9a43a680cb6369b429a14d4c6557928':
  RED-1326: Fixed wrong redaction-service dependency that leads to JSON parse error
2.12.0 master_80 		2021-06-21 17:47:57 +02:00
Dominique Eifländer
a3141956f9 RED-1326: Fixed wrong redaction-service dependency that leads to JSON parse error RED-1326_2 2021-06-21 15:55:42 +02:00
Dominique Eiflaender
63c62aba51 Pull request #36: RED-1212: Ignore excluded redactionlog entries 
Merge in RED/redaction-report-service from RED-1212 to master

* commit '7d33b0d97e5e1da90b7e3de316ca3f7f1020f559':
  RED-1212: Ignore excluded redactionlog entries
2.11.0 		2021-06-17 13:05:11 +02:00
Dominique Eifländer
7d33b0d97e RED-1212: Ignore excluded redactionlog entries RED-1212_2 2021-06-17 12:59:48 +02:00
Dominique Eiflaender
aac01c6866 Pull request #35: RED-455: added dossier attribute for signature/image 
Merge in RED/redaction-report-service from RED-455-21a to master

* commit '7664b95d19a1e08ab29910c0a0af92bb8e312618':
  RED-455: added dossier attribute for signature/image
2.10.0 		2021-06-09 12:53:51 +02:00
aoezyetimoglu
7664b95d19 RED-455: added dossier attribute for signature/image RED-455-21a_2 2021-06-09 12:49:13 +02:00
Dominique Eiflaender
a958ac175a Pull request #34: RED-455: replace dossier attributes in report 
Merge in RED/redaction-report-service from RED-455-16a to master

* commit '5be0827d3ab38f5e0465524da5a9d2f5a9e626f1':
  RED-455: replace dossier attributes in report
2.9.0 master_74 		2021-06-09 10:08:23 +02:00
aoezyetimoglu
5be0827d3a RED-455: replace dossier attributes in report RED-455-16a_2 2021-06-09 10:06:12 +02:00
Ali Oezyetimoglu
350ad39b34 Pull request #33: RED-455: updated versions in pom 
Merge in RED/redaction-report-service from RED-455-12 to master

* commit '8580f7403709d054875f412384be4e9671be8abb':
  RED-455: updated versions in pom
2.8.0 		2021-06-01 13:56:41 +02:00
aoezyetimoglu
8580f74037 RED-455: updated versions in pom RED-455-12_2 2021-06-01 13:54:43 +02:00
Timo Bejan
17527f3680 Pull request #32: Updated versions 
Merge in RED/redaction-report-service from RED-1329 to master

* commit '5eec1f8907620a4a687a3b081bc4fde9bff6f510':
  Updated versions
2.7.0 master_70 		2021-05-31 15:30:38 +02:00
Timo
5eec1f8907 Updated versions RED-1329_4 2021-05-31 16:28:54 +03:00
Timo Bejan
0f236f4104 Pull request #31: rename project and ruleSet 
Merge in RED/redaction-report-service from RED-1329 to master

* commit 'b275e30062865af796b9685b946dc4ae9a2e82d9':
  rename project and ruleSet
2.6.0 master_68 		2021-05-31 14:00:23 +02:00
Timo
b275e30062 rename project and ruleSet RED-1329_2 2021-05-31 14:58:56 +03:00
Christoph  Schabert
fbd0293c01 Pull request #30: Switch to build script for maven 
Merge in RED/redaction-report-service from RED-1533 to master

* commit 'aafebc1354b4ceeac44587166a437d52f3e177c2':
  Switch to build script for maven
master_67 		2021-05-25 08:59:41 +02:00
cschabert
aafebc1354 Switch to build script for maven RED-1533_5 2021-05-25 08:54:50 +02:00
Ali Oezyetimoglu
209b7c00db Pull request #29: RED-1428: fixed nullpointer if file does not contain file attribute 
Merge in RED/redaction-report-service from RED-1428-5 to master

* commit '02ccdcd867ecbac56747f60fc0a9ea0e264e3fa4':
  RED-1428: fixed nullpointer if file does not contain file attribute
2.5.0 		2021-05-20 11:51:38 +02:00
aoezyetimoglu
02ccdcd867 RED-1428: fixed nullpointer if file does not contain file attribute RED-1428-5_2 2021-05-20 11:49:10 +02:00
Dominique Eiflaender
9da075cf43 Pull request #28: RED-1428 3 
Merge in RED/redaction-report-service from RED-1428-3 to master

* commit '96d86b06030fa9deead5b15e28de74eeac5cdbfe':
  RED-1428: use file attributes placeholder from configuration-service
  RED-1422: enable to use custom report templates
2.4.0 master_61 		2021-05-19 16:26:57 +02:00
aoezyetimoglu
96d86b0603 RED-1428: use file attributes placeholder from configuration-service RED-1428-3_2 2021-05-19 16:18:15 +02:00
aoezyetimoglu
f664b8faa2 Merge branch 'master' of ssh://git.iqser.com:2222/red/redaction-report-service 2021-05-17 15:17:09 +02:00
aoezyetimoglu
5e29ad7bb5 RED-1422: enable to use custom report templates dumpAli_2 2021-05-17 15:16:49 +02:00
Timo Bejan
767c49ab91 Pull request #27: removed dependency from legal basis 
Merge in RED/redaction-report-service from RED-785 to master

* commit '83b009d1a676643d6effdcd944d12fd1ba1a2a8b':
  removed dependency from legal basis
2.3.0 master_59 		2021-05-14 15:36:30 +02:00
Timo
83b009d1a6 removed dependency from legal basis RED-785_2 2021-05-14 16:34:47 +03:00
Dominique Eiflaender
211952c3ab Pull request #26: RED-1422 7 
Merge in RED/redaction-report-service from RED-1422-7 to master

* commit '92ffa9bb74751c192c441234a18044745f9779e7':
  RED-1422:updated version of configuration-service
  RED-1422:updated version of configuration-service
  RED-1422: added new report type and integrated it to other files
  RED-1422: fixed minor problems
  RED-1186: updates
  RED-1186: replacing placeholders for texts, images, date and time
  RED-1186: replacing placeholders for texts, images, date and time
  RED-1186: replacing placeholders in documents; TODO: adding entries to tables
  RED-1186: replacing placeholders in documents; TODO: adding entries to tables
  RED-1186: Return mocked placeholders in unittest
2.2.0 		2021-05-12 10:49:10 +02:00
aoezyetimoglu
92ffa9bb74 RED-1422:updated version of configuration-service RED-1422-7_4 2021-05-12 10:33:03 +02:00
aoezyetimoglu
46d2bce323 RED-1422:updated version of configuration-service 2021-05-12 10:31:36 +02:00
aoezyetimoglu
36613c137c RED-1422: added new report type and integrated it to other files 2021-05-12 10:25:50 +02:00
aoezyetimoglu
fa9a5590d2 RED-1422: fixed minor problems 2021-05-11 11:38:29 +02:00
aoezyetimoglu
5c3f69e005 RED-1186: updates 2021-05-04 11:53:13 +02:00
aoezyetimoglu
d0484e1097 Merge branch 'master' of ssh://git.iqser.com:2222/red/redaction-report-service 
 Conflicts:
	redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
	redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
 2021-05-04 10:17:06 +02:00
aoezyetimoglu
0ff4970da2 RED-1186: replacing placeholders for texts, images, date and time 2021-05-04 10:13:46 +02:00
aoezyetimoglu
51804a376a RED-1186: replacing placeholders for texts, images, date and time 2021-05-03 13:27:24 +02:00
Dominique Eiflaender
5cadeedee4 Pull request #25: Fixed missing filename in reports 
Merge in RED/redaction-report-service from MissingFilenameFix to master

* commit '05bce43c5d2d101970c7169875cfe2d6338785bd':
  Fixed missing filename in reports
2.1.9 		2021-04-30 11:54:09 +02:00
Dominique Eifländer
05bce43c5d Fixed missing filename in reports MissingFilenameFix_2 2021-04-30 11:49:01 +02:00
aoezyetimoglu
4c2d77736d RED-1186: replacing placeholders in documents; TODO: adding entries to tables 2021-04-28 22:25:36 +02:00
aoezyetimoglu
0579710cd2 RED-1186: replacing placeholders in documents; TODO: adding entries to tables 2021-04-28 13:34:40 +02:00
Timo Bejan
f492fb6e47 Pull request #24: filename is no longer stored in redactionlog 
Merge in RED/redaction-report-service from api-updates to master

* commit '920277c20ba536ba45b8a442e1cf2d438dd499c5':
  filename is no longer stored in redactionlog
2.1.8 		2021-04-26 15:58:31 +02:00
Timo
920277c20b filename is no longer stored in redactionlog api-updates_4 2021-04-26 15:44:05 +03:00
Timo Bejan
190ca24dbb Pull request #23: updated dependencies to latest version 
Merge in RED/redaction-report-service from api-updates to master

* commit 'ae9b7e42fbbf0858ae1a2f7cd3e0c96c3058fa75':
  updated dependencies to latest version
2.1.7 master_50 		2021-04-26 14:21:24 +02:00
Timo
ae9b7e42fb updated dependencies to latest version api-updates_2 2021-04-26 15:14:07 +03:00
Dominique Eifländer
951a901702 RED-1186: Return mocked placeholders in unittest 2021-04-26 09:41:57 +02:00
Dominique Eiflaender
2d5b3fe4fa Pull request #22: RED-1260: RedactionLog has now flag isImage 
Merge in RED/redaction-report-service from RED-1260 to master

* commit '1b2f651795d28cbecaea7d264dfab03bd46a70c0':
  RED-1260: RedactionLog has now flag isImage
2.1.6 		2021-04-12 09:32:26 +02:00
Dominique Eifländer
1b2f651795 RED-1260: RedactionLog has now flag isImage RED-1260_2 2021-04-12 09:28:41 +02:00
Dominique Eiflaender
027dd559c0 Pull request #21: Added new Templates 
Merge in RED/redaction-report-service from newTemplates to master

* commit '5708a2b9cdbc5eb0bb6af19412aa70471facb3fd':
  Added new Templates
2.1.5 		2021-03-22 12:38:13 +01:00
Dominique Eifländer
5708a2b9cd Added new Templates newTemplates_2 2021-03-22 12:33:51 +01:00
Dominique Eiflaender
522bd6c106 Pull request #20: RED-1061: Upgraded to newest spring boot/cloud 
Merge in RED/redaction-report-service from RED-1061 to master

* commit '2e1dfebb2eac12070a1711152d65f951b0a4a09f':
  RED-1061: Upgraded to newest spring boot/cloud
2.1.4 		2021-03-15 15:05:56 +01:00