17588 Commits

Author SHA1 Message Date
U-BASIS\zhaohui
a3e1d37fff Merge remote-tracking branch 'upstream/develop' into 2229-Part26UsegetOpenCaseInsteadOfg4etCurrentCase 2018-03-09 18:40:25 -05:00
U-BASIS\zhaohui
43d949f2b4 Merge remote-tracking branch 'upstream/develop' into 2229-Part25UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-09 18:26:10 -05:00
Richard Cordovano
c985e09dc4
Merge pull request #3520 from zhhl/2229-Part24UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 24 use getOpenCase() instead of getCurrentCase()
2018-03-09 18:23:12 -05:00
Richard Cordovano
ac08b73fc9
Merge pull request #3516 from zhhl/2229-Part23UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 23 use getOpenCase() instead of getCurrentCase()
2018-03-09 18:22:59 -05:00
Richard Cordovano
c37b5284b7
Merge pull request #3514 from zhhl/2229-Part22UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 22 use getOpenCase() instead of getCurrentCase()
2018-03-09 18:22:47 -05:00
U-BASIS\zhaohui
fe2cea93c6 Merge remote-tracking branch 'upstream/develop' into 2229-Part24UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-09 18:21:38 -05:00
U-BASIS\zhaohui
a15987a855 Merge remote-tracking branch 'upstream/develop' into 2229-Part22UsegetOpenCaseInsteadOfgetCurrentCase 2018-03-09 18:14:33 -05:00
U-BASIS\zhaohui
863e3b7a1b 2229: Use getOpenCase() instead of getCurrentCase() 2018-03-09 18:11:01 -05:00
Richard Cordovano
41d990bd15
Merge pull request #3517 from raman-bt/3594_contentviewers_reorder
3594: Move Application viewer tab to left
2018-03-09 17:48:54 -05:00
Richard Cordovano
06c2423223
Merge pull request #3508 from millmanorama/957-api
use AccountDeviceInstance API, getRelationshipCountsPairwise
2018-03-09 17:48:35 -05:00
Richard Cordovano
f090bf2a34
Merge pull request #3495 from zhhl/3532-makeNightlyFailureEasierToDebug2
3532: Move the html file to diff_output folder and update the tag con…
2018-03-09 17:48:11 -05:00
Richard Cordovano
24a9675330
Merge pull request #3513 from zhhl/2229-Part21UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 21 use getOpenCase() instead of getCurrentCase()
2018-03-09 17:44:59 -05:00
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
528689f8cf
Merge pull request #3510 from zhhl/2229-Part19UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 19 use getOpenCase() instead of getCurrentCase()
2018-03-09 17:44:26 -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
eeb0eb6c72
Merge pull request #3487 from raman-bt/3568_fileviewer_exception
3568: error handling in FileTypeViewers
2018-03-09 17:37:10 -05:00
Richard Cordovano
59ff049ee4
Merge branch 'develop' into 3568_fileviewer_exception 2018-03-09 17:36:01 -05:00
Richard Cordovano
7dead508ae
Merge pull request #3464 from millmanorama/872-account-type-icons
872-fix accout type icons in the DirectoryTree
2018-03-09 17:33:20 -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
rishwanth1995
fe2f9ca391 modified build.xml to do replace version after copying to the zip folder 2018-03-08 17:05:40 -05:00
U-BASIS\dgrove
39aa20a0bb Finished Central Repo panel; removed redundant strings. 2018-03-08 16:32:32 -05:00
rishwanth1995
70a3807d05 added condition to check JAVA_HOME 2018-03-08 16:27:48 -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
Richard Cordovano
3ca08c8c92
Merge pull request #3518 from rishwanth1995/gui_changes
Made changes to the swing components to prevent texts getting cropped in linux
2018-03-08 14:51: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
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