Commit Graph
17023 Commits
Author SHA1 Message Date
U-BASIS\dgrove 33ea11b79e Merge remote-tracking branch 'upstream/develop' into 3575_PhotoRecCorruptedFilesSetting 2018-03-07 17:46:05 -05:00
U-BASIS\dgrove dadffe7df2 Minor changes to conform to coding standards. 2018-03-07 17:45:54 -05:00
U-BASIS\dgrove 3a010a9da9 Addressed IDE hints. 2018-03-07 17:27:11 -05:00
Richard Cordovano 5df04e9ff4 Merge pull request #3504 from zhhl/2229-Part14UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 14 use getOpenCase() instead of getCurrentCase()
2018-03-07 17:04:58 -05:00
Richard Cordovano 54e66e6d6b Merge branch 'develop' into 2229-Part14UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-07 17:04:49 -05:00
Richard Cordovano 3d67650c13 Merge pull request #3502 from zhhl/2229-Part13UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 13 use getOpenCase() instead of getCurrentCase()
2018-03-07 17:03:14 -05:00
Richard Cordovano b4176a9e05 Merge pull request #3501 from zhhl/2229-Part12UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 12 use getOpenCase() instead of getCurrentCase()
2018-03-07 17:03:01 -05:00
Richard Cordovano f8e1d2f222 Merge pull request #3500 from zhhl/2229-Part11UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 11 use getOpenCase() instead of getCurrentCase()
2018-03-07 17:02:31 -05:00
Richard Cordovano c2721e24bc Merge branch 'develop' into 2229-Part11UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-07 17:02:24 -05:00
Brian Carrier 9054478e6b refined codacy 2018-03-07 15:39:29 -05:00
Richard Cordovano 7c0f398ac6 Merge pull request #3499 from zhhl/2229-Part10UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 10 use getOpenCase() instead of getCurrentCase()
2018-03-07 15:25:55 -05:00
Richard Cordovano d9b8852fe7 Merge branch 'develop' into 2229-Part10UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-07 15:25:49 -05:00
Richard Cordovano 6c9a751f69 Merge pull request #3498 from zhhl/2229-Part9UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 9 use getOpencase() instead of getCurrentCase()
2018-03-07 15:24:54 -05:00
Richard Cordovano 4f12f87700 Merge pull request #3497 from zhhl/2229-Part8UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 8 use getOpenCase() instead of getCurrentCase()
2018-03-07 15:24:39 -05:00
Richard Cordovano 52d6371452 Merge pull request #3496 from zhhl/2229-Part7UsegetOpenCaseInsteadOfgetCurrentCase
2229 part 7 use getOpenCase() instead of getCurrentCase
2018-03-07 15:16:30 -05:00
Richard Cordovano a9f5b33cb2 Merge branch 'develop' into 2229-Part7UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-07 15:16:20 -05:00
Richard Cordovano d14ac572bf Merge pull request #3492 from zhhl/2229-Part6UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 6 use getOpenCase() instead of getCurrentCase()
2018-03-07 14:58:27 -05:00
Richard Cordovano bc3eef44f7 Merge pull request #3486 from zhhl/2229-Part5UsegetOpenCaseInsteadOfgetCurrentCase
2229 part 5 use getOpenCase() instead of getCurrentCase()
2018-03-07 14:58:13 -05:00
Richard Cordovano 47cad867aa Merge pull request #3484 from zhhl/2229-Part4UsegetOpenCaseInsteadOfgetCurrentCase
2229 part4 use getOpenCase() instead of getCurrentCase()
2018-03-07 14:57:26 -05:00
U-BASIS\dgrove 7eadf5c7ac Feature implemented to keep corrupted files. 2018-03-07 14:57:10 -05:00
Richard Cordovano 39c255f69b Merge pull request #3481 from zhhl/2229-Part3UsegetOpenCaseInsteadOfgetCurrentCase
2229 part 3 use getOpenCase() instead of getCurrentCase()
2018-03-06 15:34:01 -05:00
Richard Cordovano 1e3bc4e5f9 Merge branch 'develop' into 2229-Part3UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-06 12:18:13 -05:00
Richard Cordovano 1438063f54 Merge pull request #3479 from zhhl/2229-Part2UsegetOpenCaseInPackageAction
2229 part2 use getopencase in package action
2018-03-06 12:14:32 -05:00
Richard Cordovano fbf95526f2 Merge pull request #3521 from rcordovano/develop
Remove redundant NbBundle in Case class
2018-03-06 11:48:20 -05:00
Richard Cordovano b53d993e33 Remove redundant NbBundle in Case class 2018-03-06 11:47:35 -05:00
Richard Cordovano 274bef5f68 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2018-03-06 11:31:00 -05:00
Richard Cordovano bb8ce63465 Merge pull request #3478 from zhhl/2229-Part1GetOpenCaseInsteadOfgetCurrentCaseAndThrowCheckedException
2229: Part 1: Use getOpenCase() instead of getCurrentCase() and throws checke…
2018-03-06 11:30:31 -05:00
Richard Cordovano d9023751af Disable Codacy flagging use of fully qualified names 2018-03-06 11:20:57 -05:00
Richard Cordovano 62a57d7bfe Merge remote-tracking branch 'upstream/custom-release-2.11.1' into develop 2018-03-06 11:14:12 -05:00
U-BASIS\zhaohui 51f1d7044f 2229: Part 1. Fix the document comment of deprecated method and a codacy issue. 2018-03-06 11:12:55 -05:00
Richard Cordovano 4a5bb80518 Merge pull request #3490 from dgrove727/3437_ReadContentInputStreamError_3
3437 read content input stream error 3
2018-03-06 10:10:57 -05:00
Richard Cordovano f93bfe9965 Merge pull request #3482 from dgrove727/3437_ReadContentInputStreamError_1
3437 read content input stream error 1
2018-03-06 10:09:08 -05:00
U-BASIS\dgrove 516c82a1ee Merge remote-tracking branch 'upstream/develop' into 3437_ReadContentInputStreamError_3 2018-03-05 21:56:11 -05:00
U-BASIS\dgrove 59f87f77f8 Removed double-wrapped catches. 2018-03-05 21:55:55 -05:00
U-BASIS\dgrove d8a2627c99 Merge remote-tracking branch 'upstream/develop' into 3437_ReadContentInputStreamError_1 2018-03-05 21:39:36 -05:00
U-BASIS\dgrove 91d2a91cd2 Fixed logic order in 'findTexts()'. 2018-03-05 21:38:36 -05:00
Richard Cordovano b4a73dfb40 Merge pull request #3489 from esaunders/develop
Fix problem with Reports path.
2018-03-05 19:29:59 -05:00
Richard Cordovano 0e1683132a Merge pull request #3483 from dgrove727/3437_ReadContentInputStreamError_2
3437 read content input stream error 2
2018-03-05 19:21:09 -05:00
Richard Cordovano 9727108f08 Merge pull request #3494 from rishwanth1995/develop-merge
merged linux-gui changes to develop branch
2018-03-05 18:57:17 -05:00
Richard Cordovano 389711f2df Merge pull request #3468 from millmanorama/941-disable-view-in-timeline-for-attachments
941- disable ViewFileInTimelineAction if the file has no valid timestamps
2018-03-05 18:39:19 -05:00
Richard Cordovano ade9d576ad Merge pull request #3491 from wschaeferB/3565-fixBugWithNullHash
3565 Fix bug with null MD5 and Interesting file and tag nodes
2018-03-05 17:51:09 -05:00
U-BASIS\zhaohui eabe09fb12 2229: part 14 remove unused imports 2018-03-05 16:14:23 -05:00
U-BASIS\zhaohui 0f8e5f86e0 2229: part 4 remove unused imports 2018-03-05 15:56:50 -05:00
U-BASIS\zhaohui 3fa2ddea72 2229: part 2 remove unused imports 2018-03-05 15:51:16 -05:00
Richard Cordovano 4a6c94100b Merge pull request #3488 from raman-bt/develop
Remove JPEGViewerDummy test class
2018-03-05 13:23:38 -05:00
U-BASIS\zhaohui 1be23038f0 2229: Part 14: Use getOpenCase() instead of getCurrentCase() in ReportKML.java 2018-03-02 17:17:34 -05:00
U-BASIS\zhaohui 4480b37e8d 2229: Part 14: Use getOpenCase() instead of getCurrentCase() in report and stix. 2018-03-02 15:53:57 -05:00
U-BASIS\zhaohui fa648a9357 2229: Part 13: Use getOpenCase() instead of getCurrentCase() in test, timeline, report... 2018-03-02 14:26:06 -05:00
rishwanth1995 126b24ae65 Merge branch 'gui_changes' into developorig7 2018-03-02 14:00:44 -05:00
rishwanth1995 f532209721 modified spacerpanel in core.menuitem to prevent keywordsearch text cropping 2018-03-02 14:00:06 -05:00