Commit Graph
13409 Commits
Author SHA1 Message Date
U-BASIS\dgrove f9b2a8601f Merge remote-tracking branch 'upstream/develop' into 3834_SevenZipExtractorTskComment 2018-05-10 15:54:09 -04:00
U-BASIS\dgrove b4a069e998 Switched TSK_NAME to TSK_COMMENT. 2018-05-10 15:53:51 -04:00
U-BASIS\zhaohui 6df34a430d 3779: Add comments for the empty method body. 2018-05-10 14:52:46 -04:00
Raman e71624e989 Cleanup after self-review. 2018-05-10 13:39:01 -04:00
U-BASIS\zhaohui 4b3ec5b51b 3779: Move the data source panel to the bottom of the file search by attributes panel. 2018-05-10 13:24:26 -04:00
U-BASIS\dgrove fdb725188c Fixed Codacy issue with appending String literals. 2018-05-10 11:43:17 -04:00
U-BASIS\dgrove e639d02fd6 Fixed merge conflicts. 2018-05-10 11:41:57 -04:00
U-BASIS\dgrove 9c4cbae4c4 Fixed Codacy issues. 2018-05-10 11:21:15 -04:00
Raman bcad232ee6 Added JIRA number for a TBD 2018-05-10 11:15:17 -04:00
Eugene Livis 50d635a42a Merge branch 'develop' of github.com:sleuthkit/autopsy into ocr_via_tika_3760 2018-05-10 11:06:01 -04:00
U-BASIS\dgrove 702f46d911 Merge remote-tracking branch 'upstream/develop' into 3784_BitlockerDetection 2018-05-10 10:49:28 -04:00
millmanorama 5e7dddc8d8 improve comment 2018-05-10 16:28:41 +02:00
millmanorama 79eefad92a change TimelineCacheException to a checked exception and add error handling for it. 2018-05-10 16:21:17 +02:00
U-BASIS\zhaohui c50ece29d7 3779: Fix typo 2018-05-10 10:05:46 -04:00
Raman 140989d9c6 Resolving conflicts after stash pop 2018-05-10 08:51:00 -04:00
Raman 8b92a52b1b 3802: Group by datasource
Build the top level tree using new RootContentChildrenFactory
2018-05-10 08:45:45 -04:00
Ann Priestman 8495e6e204 Codacy fixes 2018-05-10 08:04:53 -04:00
millmanorama b9872c8f61 introduce TimelineCacheException and throw it instead of ExecutionException 2018-05-10 13:35:53 +02:00
Raman c8bd4abf40 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3802_group_tree_by_datasource 2018-05-10 07:20:29 -04:00
Richard Cordovano 7195a146a6 Fix spelling errors in VisualizationPanel.java 2018-05-09 18:16:15 -04:00
Richard Cordovano 43a313253f Merge pull request #3743 from wschaeferB/3752-EncryptedPartitionTest
3752 encrypted partition test
2018-05-09 17:26:59 -04:00
Richard Cordovano 4eefd2deeb Merge pull request #3750 from rishwanth1995/disable_vmdkfiles_mac
Disable vmdkfiles in ImageFilePanel's filechooser mac
2018-05-09 17:13:21 -04:00
Richard Cordovano cfb84568ba Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-05-09 17:12:46 -04:00
Richard Cordovano 8f7fd27bc0 Merge pull request #3716 from rishwanth1995/release-4.7.0
added a generic settings file for python modules
2018-05-09 17:07:37 -04:00
U-BASIS\dgrove 1580a07d77 Removed SQLCipher encryption TSK_COMMENT. 2018-05-09 16:23:29 -04:00
William Schaefer 7aefbcbfe6 3752 remove local_files_test.zip 2018-05-09 16:19:19 -04:00
Richard Cordovano 6982f05cbc Merge pull request #3751 from wschaeferB/3830-FixEventBusUnregisterCalls
3830 call eventbus.unregister on object given as arg instead of 0
2018-05-09 16:18:01 -04:00
Andrew Ziehl d1fa7c0cd1 Codeacy cleanup 2018-05-09 12:46:37 -07:00
Eugene Livis 218725b9d1 Merge branch 'develop' of github.com:sleuthkit/autopsy into ocr_via_tika_3760 2018-05-09 15:42:58 -04:00
Andrew Ziehl 5bc8c4bbcf Add md5 null check, update to use of getCurrentCase() API usage 2018-05-09 12:26:38 -07:00
Andrew Ziehl f9f64407da Merge branch 'develop' into 3668-intra-case-correlation-content-viewer 2018-05-09 12:09:43 -07:00
Ann Priestman d606c99305 Change max date range to one month.
Only get entries from data base that are less than a month old.
2018-05-09 14:23:29 -04:00
U-BASIS\dgrove c393569ab2 Merge. 2018-05-09 14:02:32 -04:00
U-BASIS\dgrove ba6e2dbd0c Merge remote-tracking branch 'upstream/develop' into 3803_EncryptionSuspectedTskComment 2018-05-09 13:49:37 -04:00
Brian Sweeney 2c271dbc9c comments / stubs 2018-05-09 11:26:30 -06:00
Brian Sweeney d6143993c5 more test cases, added a method for getting unique case name 2018-05-09 11:26:30 -06:00
Brian Sweeney 4a0ae67b05 more tests 2018-05-09 11:26:30 -06:00
Brian Sweeney 25b6ac9de9 functional testing - wip 2018-05-09 11:26:29 -06:00
U-BASIS\dgrove aed9b69538 SQLCipher detection functionality and test finished. 2018-05-09 13:23:09 -04:00
Brian Sweeney 226acf8c3b testing 2018-05-09 11:21:56 -06:00
Brian Sweeney 8517a877c3 functional testing - wip 2018-05-09 11:17:16 -06:00
Brian Sweeney 0d166feaa2 testing 2018-05-09 11:16:38 -06:00
Brian Sweeney 24f515af0d test stub 2018-05-09 11:14:12 -06:00
Ann Priestman 8a40ed22f4 Merge remote-tracking branch 'origin/3613_dashboard_gridLayout' into 3613_dashboard_gridLayout 2018-05-09 12:56:07 -04:00
Ann Priestman 8a8484db68 Add option to display one day of data 2018-05-09 12:54:43 -04:00
William Schaefer b72439141c 3752 remove empty setup method for Encrypted partition test 2018-05-09 12:47:16 -04:00
millmanorama 765baf5a5a restart the timer when a notification is shown 2018-05-09 12:28:01 +02:00
millmanorama 30fbd29bcd use private verions of CheckedFunction 2018-05-09 10:44:32 +02:00
millmanorama 38b7164853 Merge remote-tracking branch 'upstream/develop' into 988-eventing 2018-05-09 10:16:38 +02:00
millmanorama f85b609f71 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 988-eventing 2018-05-09 10:16:20 +02:00