8586 Commits

Author SHA1 Message Date
Richard Cordovano
1c6f0d8d04
Merge pull request #3512 from zhhl/2229-Part20UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 20 use getOpenCase() instead of getCurrentCase()
2018-03-09 17:44:43 -05:00
Richard Cordovano
a421ad58c6
Merge pull request #3509 from zhhl/2229-Part18UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 18 use getOpenCase() instead of getCurrentCase()
2018-03-09 17:44:14 -05:00
Richard Cordovano
8941be9038
Merge pull request #3507 from zhhl/2229-Part17UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 17 use getOpenCase() instead of getCurrentCase()
2018-03-09 17:44:04 -05:00
Richard Cordovano
93839f99fc
Merge pull request #3506 from zhhl/2229-Part16UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 16 use getOpenCase() instead of getCurrentCase()
2018-03-09 17:43:51 -05:00
Richard Cordovano
3293226271
Merge pull request #3505 from zhhl/2229-Part15UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 15 use getOpenCase() instead of getCurrentCase()
2018-03-09 17:43:30 -05:00
Richard Cordovano
59ff049ee4
Merge branch 'develop' into 3568_fileviewer_exception 2018-03-09 17:36:01 -05:00
U-BASIS\zhaohui
73c97dc2bd 2229: Part 26: Use getOpenCase() instead of getCurrentCase() in casemodule, modules, imageGallery. 2018-03-09 15:47:47 -05:00
U-BASIS\zhaohui
01a14e5328 Merge remote-tracking branch 'upstream/develop' into 2229-Part25UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-09 14:29:17 -05:00
Richard Cordovano
20a08e5e46
Merge pull request #3525 from dgrove727/3564_EncryptionDetectionSettingsPanelSize
Resized settings panel to 300x200.
2018-03-09 11:53:08 -05:00
U-BASIS\dgrove
39aa20a0bb Finished Central Repo panel; removed redundant strings. 2018-03-08 16:32:32 -05:00
rishwanth1995
00b59cb904 added regex task to the build-zip target 2018-03-08 15:49:16 -05:00
U-BASIS\dgrove
e3750917dc Merge remote-tracking branch 'upstream/develop' into 3563_ApplicationOptionsPanelScrollBars 2018-03-08 15:47:46 -05:00
rishwanth1995
8215e5f7fa added tsk_version.xml file to change sleuthkit version 2018-03-08 14:59:29 -05:00
U-BASIS\dgrove
ac87ed7e4e Merge remote-tracking branch 'upstream/develop' into 3575_PhotoRecCorruptedFilesSetting 2018-03-08 14:50:45 -05:00
U-BASIS\dgrove
71de2410ff Modified sizing and label in settings panel. 2018-03-08 14:50:05 -05:00
U-BASIS\dgrove
878f166af4 Fixed Application panel; work in progress for Central Repo. 2018-03-08 14:29:17 -05:00
rishwanth1995
c767aa975c modified preinstall.sh and added regex to change the version 2018-03-08 13:43:33 -05:00
Richard Cordovano
82b824e4ce
Merge pull request #3526 from APriestman/3579_progressBars
Dispose of progress bar dialog when complete
2018-03-08 13:06:28 -05:00
Ann Priestman
e2ee2d6ba0 Dispose of progress bar dialog when complete 2018-03-08 12:36:02 -05:00
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