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

82 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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