10157 Commits

Author SHA1 Message Date
rishwanth1995
05af81c463 Merge branch 'gui_changes' into preinstall_script 2018-03-13 11:27:33 -04:00
U-BASIS\dgrove
caf3d6ce0a Merge remote-tracking branch 'upstream/develop' into 3537_CorrelationEngineSettingsPanel 2018-03-13 10:33:15 -04:00
U-BASIS\dgrove
6397c0e936 Fixed merge issue regarding LOGGER variable. 2018-03-13 10:31:17 -04:00
rishwanth1995
739edc437e Merge branch 'gui_changes' into developorig7 2018-03-13 10:31:07 -04:00
rishwanth1995
b812a7981c central repository config dialog buttons does not disappear anymore 2018-03-13 10:28:55 -04:00
U-BASIS\zhaohui
4cec521f8b 2229: Part 27: Add comments. 2018-03-12 16:13:17 -04:00
Richard Cordovano
fafc9131d8
Merge pull request #3534 from millmanorama/942-tagged-status
942 tagged status
2018-03-12 16:13:09 -04:00
Richard Cordovano
7ae70957be
Merge pull request #3528 from dgrove727/3563_ApplicationOptionsPanelScrollBars
3563 application options panel scroll bars
2018-03-12 16:12:27 -04:00
Richard Cordovano
e93c5310ce
Merge pull request #3523 from dgrove727/3575_PhotoRecCorruptedFilesSetting
3575 photo rec corrupted files setting
2018-03-12 16:11:53 -04:00
Richard Cordovano
8ffc128607 Fix compile error, improve error handling in SQLiteViewer.java 2018-03-12 14:13:57 -04:00
Richard Cordovano
b0d35cf313 Fix compile error, improve error handling in SQLiteViewer.java 2018-03-12 14:10:01 -04:00
U-BASIS\dgrove
06e461890a Improved bundle message references. 2018-03-12 13:41:58 -04:00
millmanorama
53c3718e03 add Tags property to RelationshipNodes and AttachementNodes, enabling highlighting. 2018-03-12 13:08:50 +01:00
millmanorama
d57985ac8c enable "View File in Directory" action for attachments 2018-03-12 13:05:58 +01:00
U-BASIS\zhaohui
a3e1d37fff Merge remote-tracking branch 'upstream/develop' into 2229-Part26UsegetOpenCaseInsteadOfg4etCurrentCase 2018-03-09 18:40:25 -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
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
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
Brian Sweeney
d7c610d96a private member made final 2018-03-09 10:49:04 -07:00
Brian Sweeney
babdf9d346 stubbing out new feature 2018-03-09 10:42:34 -07: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