9067 Commits

Author SHA1 Message Date
U-BASIS\dgrove
6ef85988cf Resized settings panel to 300x200. 2018-03-08 12:08:44 -05:00
U-BASIS\dgrove
5ae1b59928 Merge remote-tracking branch 'upstream/develop' into 3537_CorrelationEngineSettingsPanel 2018-03-08 11:32:02 -05:00
U-BASIS\dgrove
2000a48a1b Module version changed to match application version. 2018-03-08 11:31:36 -05:00
U-BASIS\dgrove
eba55e86f9 Added comment about module version number. 2018-03-08 11:28:11 -05:00
millmanorama
aa462abff3 Merge remote-tracking branch 'upstream/cvt-graph-view' into 957-api
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/communications/CommunicationsGraph.java
2018-03-08 16:09:33 +01:00
millmanorama
618dc6fa8a Merge remote-tracking branch 'upstream/cvt-graph-view' into 872-account-type-icons
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/communications/CommunicationsGraph.java
2018-03-08 16:06:31 +01:00
U-BASIS\dgrove
e4dadfc56a Another IDE hint addressed. 2018-03-07 17:51:21 -05:00
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
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
c2721e24bc
Merge branch 'develop' into 2229-Part11UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-07 17:02:24 -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
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
William Schaefer
674e95c227 3562 merge conflict resolution from cherry-picking 2018-03-07 14:54:48 -05:00
William Schaefer
e57b089c6c 3562 merge resolution, and use of correct runIngestModulesAction 2018-03-07 14:52:37 -05:00
Brian Carrier
aa51786ce6 changed some offsets, more sanity checking 2018-03-07 00:37:09 -05:00
U-BASIS\dgrove
8522b322a4 Removed unnecessary initializations. 2018-03-06 22:43:55 -05:00
U-BASIS\dgrove
10ad0a004d Fixed typo. 2018-03-06 22:28:11 -05:00
U-BASIS\dgrove
43fcae798d Simplified 'process()' logic. 2018-03-06 22:25:29 -05:00
U-BASIS\dgrove
eacd201dcd Fixed typo. 2018-03-06 18:00:10 -05:00
U-BASIS\dgrove
7a065600f9 Fixed a few typos. 2018-03-06 17:58:42 -05:00
U-BASIS\dgrove
010ebfc476 Merge remote-tracking branch 'upstream/develop' into 3537_CorrelationEngineSettingsPanel 2018-03-06 17:34:02 -05:00
U-BASIS\dgrove
3d5ac05422 Corrected logic to match story criteria. 2018-03-06 17:33:14 -05:00
U-BASIS\zhaohui
cd6b24075d 2229: Part 25: Use getOpenCase() instead of getCurrentCase() in ingest, modules, recentactivity... 2018-03-06 16:36:25 -05:00
rishwanth1995
eff300e558 Merge branch 'gui_changes' into developorig7 2018-03-06 15:30:59 -05:00
rishwanth1995
2260dcdc3f modified swing components in InjestProfileSelectionPanel.java 2018-03-06 15:28:13 -05:00
Mark McKinnon
a60742df33 Normalize Path for plugin data
Added normalize path to fileSet and moved check code from plugin to normalize path.  Added check if file length is 0 to skip checking for file, bad data causes this.
2018-03-06 11:41:46 -08: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
b53d993e33 Remove redundant NbBundle in Case class 2018-03-06 11:47:35 -05:00
Mark McKinnon
20aeaef2ee Fix for psxview plugin
fixed the psxview plugin returning many false positives
2018-03-06 08:42:15 -08: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
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
U-BASIS\dgrove
1c615172b5 Merge remote-tracking branch 'upstream/develop' into 3537_CorrelationEngineSettingsPanel 2018-03-06 11:07:37 -05:00
U-BASIS\dgrove
b9255ff9c6 Added logic for comparing previous instances. 2018-03-06 11:06:02 -05:00
U-BASIS\zhaohui
3542fab909 2229: Part 24: Use getOpenCase() instead of getCurrentCase() in contentviewers, modules, casemodule... 2018-03-06 10:24:48 -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
Raman
5917545641 3594: Move Application viewer tab to left
Swapped positions for Message veiwer and Indexed text viewer
2018-03-06 09:33:08 -05:00
Mark McKinnon
1a92b342ea Fix plugin ps*
Fix System file in ps* plugin output
2018-03-06 06:19:00 -08:00
Mark McKinnon
3812b10e79 Revert "Revert "Revised plugin parsing""
This reverts commit ed9027c65eb78b773db003ccbd460cac4522c5b9.
2018-03-06 05:18:14 -08:00
Mark McKinnon
ed9027c65e Revert "Revised plugin parsing"
This reverts commit 8869e18d781eeaac5a1d000d1a9e9de9a424a2ad.
2018-03-06 05:17:33 -08:00