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

64 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominique Eifländer
2e1dfebb2e RED-1061: Upgraded to newest spring boot/cloud RED-1061_2 2021-03-15 15:00:22 +01:00
Dominique Eiflaender
3386a93169 Pull request #19: Avoid Object-prefix is already an object exception when storing report tmp files 
Merge in RED/redaction-report-service from FixObjectPrefixProblem to master

* commit '0744974c92512a8aa26ac60579e0c78496037cc9':
  Avoid Object-prefix is already an object exception when storing report tmp files
2.1.3 		2021-02-24 10:58:43 +01:00
Dominique Eifländer
0744974c92 Avoid Object-prefix is already an object exception when storing report tmp files FixObjectPrefixProblem_2 2021-02-24 10:56:35 +01:00
Dominique Eiflaender
cd0c7d298a Pull request #18: Added missing rabbitmq and minio properties to application.yml 
Merge in RED/redaction-report-service from MissingProps to master

* commit 'd15ea6efe59d4e0ea517075639ee8c47cce7d55c':
  Added missing rabbitmq and minio properties to application.yml
2.1.2 		2021-02-23 14:05:53 +01:00
Dominique Eifländer
d15ea6efe5 Added missing rabbitmq and minio properties to application.yml MissingProps_2 2021-02-23 14:01:57 +01:00
Dominique Eiflaender
81b74be436 Pull request #17: Removed ruleSetId from ReportRequestMessage as it is in redactionlog 
Merge in RED/redaction-report-service from RemRuleSetId to master

* commit 'b735760ebaa026a7dc5dad26a9d807971ae7ac47':
  Removed ruleSetId from ReportRequestMessage as it is in redactionlog
2.1.1 		2021-02-22 13:09:46 +01:00
Dominique Eifländer
b735760eba Removed ruleSetId from ReportRequestMessage as it is in redactionlog RemRuleSetId_2 2021-02-22 13:08:05 +01:00
Dominique Eiflaender
24195c74cc Pull request #16: RED-1058: Added generation of excel report, communitate via queue, load redaction log files direct from storage, sort report entries the same way as the ui does 
Merge in RED/redaction-report-service from RED-1058 to master

* commit 'e29a5b91f5a3c24bd0b6b0e4198fe4403d9cea7e':
  RED-1058: Added generation of excel report, communitate via queue, load redaction log files direct from storage, sort report entries the same way as the ui does
2.1.0 		2021-02-22 12:42:15 +01:00
Dominique Eifländer
e29a5b91f5 RED-1058: Added generation of excel report, communitate via queue, load redaction log files direct from storage, sort report entries the same way as the ui does RED-1058_2 2021-02-22 12:39:29 +01:00
Dominique Eiflaender
bbe9fb0a59 Pull request #15: Disable metrics as it leads to nullpointer in actuator on long requests 
Merge in RED/redaction-report-service from disableMetrics to master

* commit '29d64e9cb2bd11f6833787a6c4d3fe24e0f741fa':
  Disable metrics as it leads to nullpointer in actuator on long requests
2.0.2 		2021-02-10 13:25:11 +01:00
Dominique Eifländer
29d64e9cb2 Disable metrics as it leads to nullpointer in actuator on long requests disableMetrics_2 2021-02-10 13:22:19 +01:00
Dominique Eiflaender
183532fd07 Pull request #14: removed legal basis non-sense at it is not reliable 
Merge in RED/redaction-report-service from legal-basis-update to master

* commit '56ad432feaf758da5e24359dd84d1fa1aa808559':
  Reverted to reading legal basis, optimistically
  fixed tests regarding legal basis
  removed legal basis non-sense at it is not reliable
2.0.1 master_32 		2021-01-19 17:05:05 +01:00
Timo
56ad432fea Reverted to reading legal basis, optimistically legal-basis-update_4 2021-01-19 17:51:18 +02:00
Timo
3480ce3851 fixed tests regarding legal basis legal-basis-update_3 2021-01-19 17:31:18 +02:00
Timo
07e4306496 removed legal basis non-sense at it is not reliable 2021-01-19 17:29:06 +02:00
Timo Bejan
e36b92add8 Pull request #13: RuleSet Integration and dev features 
Merge in RED/redaction-report-service from feature/ruleset-integration to master

* commit 'b5190ebb7ca41a21182bb6ed4efb9af92cb7b60e':
  RuleSet Integration and dev features
2.0.0 master_30 		2021-01-06 16:31:51 +01:00
Timo
b5190ebb7c RuleSet Integration and dev features feature/ruleset-integration_2 2021-01-06 17:29:09 +02:00
Dominique Eiflaender
ec911956a7 Pull request #12: RED-811: Sort by filename 
Merge in RED/redaction-report-service from RED-811-1 to master

* commit '968b4c37e9994821309bf36f3d213b0dc4a63a66':
  RED-811: Sort by filename
0.2.8 		2020-12-14 15:14:38 +01:00
Dominique Eifländer
968b4c37e9 RED-811: Sort by filename RED-811-1_2 2020-12-14 15:08:54 +01:00
Dominique Eiflaender
e170e6327f Pull request #11: RED-811: Added possiblity to select template, changed current template 
Merge in RED/redaction-report-service from RED-811 to master

* commit '0b98ed81f8c6e873bc2358ca31c0a9d8b1779996':
  RED-811: Added possiblity to select template, changed current template
0.2.7 		2020-12-14 11:40:29 +01:00
Dominique Eifländer
0b98ed81f8 RED-811: Added possiblity to select template, changed current template RED-811_2 2020-12-14 11:27:17 +01:00
Dominique Eiflaender
11efe35be9 Pull request #10: RED-824: Do not add recommendations to redaction log 
Merge in RED/redaction-report-service from RED-824 to master

* commit 'd831f57f86d2f8791f095bdaf9bfd34b569c1a8b':
  RED-824: Do not add recommendations to redaction log
0.2.6 		2020-12-08 10:58:20 +01:00
deiflaender
d831f57f86 RED-824: Do not add recommendations to redaction log RED-824_2 2020-12-08 09:52:02 +01:00
Christoph  Schabert
abea391143 PlanSpec.java edited online with Bitbucket master_23 2020-11-26 13:37:14 +01:00
Dominique Eiflaender
cf679a0f44 Pull request #9: RED-456: Changed to new template 
Merge in RED/redaction-report-service from RED-456 to master

* commit '7be44a7f21ecd7e653d7ec59019f488c0a14ed2b':
  RED-456: Changed to new template
0.2.5 		2020-11-20 13:57:03 +01:00
deiflaender
7be44a7f21 RED-456: Changed to new template RED-456_3 2020-11-20 13:54:51 +01:00
Thierry Goeckel
e1a5a7a545 Pull request #8: Add legal basis to report 
Merge in RED/redaction-report-service from RED-451 to master

* commit '3a3e923c75a00277b327b4dd82487b9117d6563a':
  Add legal basis to report
0.2.4 master_18 		2020-10-27 16:54:09 +01:00
Thierry Göckel
3a3e923c75 Add legal basis to report RED-451_2 2020-10-27 15:54:49 +01:00
Kresnadi Budisantoso
e98fe6868f Pull request #7: Add missing metric dependency and streamline actuator settings 
Merge in RED/redaction-report-service from RED-403 to master

* commit '10cb5c49464ddd0c9fedb7213e8ebf9c673c34e0':
  Add missing metric dependency and streamline actuator settings
0.2.3 master_16 		2020-10-22 10:14:25 +02:00
Thierry Göckel
10cb5c4946 Add missing metric dependency and streamline actuator settings RED-403_2 2020-10-22 10:03:00 +02:00
Dominique Eiflaender
ab72de54a4 Pull request #6: Only add manual redactions, if they are approved 
Merge in RED/redaction-report-service from manual to master

* commit '78bd529bc7ccd36ccf73e35f7953862120fd0b4d':
  Only add manual redactions, if they are approved
0.2.2 master_14 		2020-10-19 13:42:16 +02:00