Commit Graph
20607 Commits
Author SHA1 Message Date
U-BASIS\dgrove 2a121d27c1 Merge remote-tracking branch 'upstream/develop' into 3437_ReadContentInputStreamError_3 2018-02-28 16:03:27 -05:00
U-BASIS\dgrove 5557c5b5b8 Added handling for ReadContentInputStreamException. 2018-02-28 16:02:48 -05:00
Brian Carrier 91f7bf5702 Merge branch 'markmckinnon-develop' into volatility_module 2018-02-28 15:58:46 -05:00
Brian Carrier 24ff8c7d00 resolved merge conflicts 2018-02-28 15:58:27 -05:00
Raman bdb3a39e93 Deleted the JPEGViewerDummy, no longer needed. 2018-02-28 15:57:46 -05:00
Raman c21ba4e662 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2018-02-28 15:55:15 -05:00
Raman 564d47d84d Address Codacy review comments. 2018-02-28 15:47:04 -05:00
rishwanth1995 7f8f2f356d merged release-linux to develop 2018-02-28 15:43:22 -05:00
Raman 2ffe8b7f0c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3568_fileviewer_exception 2018-02-28 15:11:35 -05:00
Raman 43a92df4cf 3568: improve error handling in FileTypeViewers 2018-02-28 15:11:10 -05:00
U-BASIS\zhaohui 58a04287e3 2229: Part 5: Use getOpenCase() instead of getCurrentCase() in casemodule. 2018-02-28 13:51:41 -05:00
rishwanth1995 a84984c562 Merge branch 'release-4.6.0-linux-beta-1' of https://github.com/sleuthkit/autopsy into gui_changes 2018-02-28 13:30:09 -05:00
U-BASIS\zhaohui 5e2ed95615 2229: Part 4: Use getOpenCase() instead of getCurrentCase() in casemodule. 2018-02-28 13:28:56 -05:00
U-BASIS\dgrove 3f8de1135b Cleanup. 2018-02-28 13:18:20 -05:00
esaunders 34f300ae4b Fix problem with Reports path. 2018-02-28 13:12:48 -05:00
Richard Cordovano 0705374e8e Merge pull request #3457 from raman-bt/3544_mediacontentviewer
3544: Integrate Media content viewer into Application content viewer
2018-02-28 13:12:41 -05:00
rishwanth1995 fe31caf3d9 modified gui in datasource,diagnostics,directorytree 2018-02-28 13:10:29 -05:00
Richard Cordovano 2aea610495 Merge pull request #3461 from APriestman/3550_newSolrCloud
Implement DIY solr cloud
2018-02-28 13:07:58 -05:00
U-BASIS\dgrove c82ec98122 Added handling for ReadContentInputStreamException. 2018-02-28 13:07:24 -05:00
U-BASIS\dgrove 5cc4826a6d Fixed typos. 2018-02-28 12:58:36 -05:00
Richard Cordovano 06fdedf82b Merge pull request #3480 from sleuthkit/fileset-public
Made method public so that modules would know what sets were configured
2018-02-28 12:52:10 -05:00
U-BASIS\dgrove 0966975ba1 Added handling for ReadContentInputStreamException. 2018-02-28 12:50:36 -05:00
U-BASIS\zhaohui 3cebe82f40 2229: Part 3: Use getOpenCase() instead of getCurrentCase() in casemodule. 2018-02-28 11:55:21 -05:00
rishwanth1995 0c35fb1c85 modified gui in corecomponents,central repository,communications 2018-02-28 11:39:08 -05:00
Brian Carrier 6a69f42b97 resolved conflict 2018-02-28 11:03:03 -05:00
Brian Carrier 80868442fd Made method public so that modules would know what sets were configured 2018-02-28 10:45:05 -05:00
Brian Carrier cb3a0c7a5d Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2018-02-28 10:41:09 -05:00
Brian Carrier eb1bb6b93c rearranged methods to group ingest filters from interesting files methods 2018-02-28 10:40:33 -05:00
U-BASIS\zhaohui 8d9cbf8320 2229: Simply follow Codacy suggestion to avoid negation within an 'if' expression. 2018-02-28 10:21:30 -05:00
Raman 2895060b3b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3544_mediacontentviewer 2018-02-28 10:10:29 -05:00
U-BASIS\zhaohui 94736502b1 2229: Simple return the value instead of storing it in a local variable. 2018-02-27 18:15:38 -05:00
U-BASIS\zhaohui 9feb88822b 2229: Part 2: Use getOpenCase() instead of getCurrentCase() in package actions 2018-02-27 18:11:07 -05:00
U-BASIS\zhaohui 928fc37ecf 2229: Use getOpenCase() instead of getCurrentCase() and throws checked excepiton: NoCurrentCaseException. 2018-02-27 17:56:00 -05:00
Richard Cordovano 4d594948e8 Tidy up IngestJobSettings 2018-02-27 17:42:17 -05:00
Richard Cordovano fc2ad1afb1 Merge pull request #3477 from esaunders/develop
Fix for host names in parent path
2018-02-27 17:37:06 -05:00
esaunders 274ed59ad7 Fixes for quotes, slashes and host names in paths. 2018-02-27 17:31:29 -05:00
rishwanth1995 6ac8f0ca30 modified gui to adjust for bigger fonts 2018-02-27 17:23:37 -05:00
Richard Cordovano bc28f09939 Merge pull request #3475 from sleuthkit/custom-release-2.11.1
Merge in custom release 2.11.1 branch
2018-02-27 17:13:16 -05:00
Richard Cordovano a6eaf7b3bd Merge pull request #3470 from rishwanth1995/font_changes1
added default fonts to the corecomponents installer
2018-02-27 17:12:25 -05:00
Richard Cordovano 3e613dd282 Merge branch 'release-4.6.0-linux-beta-1' into font_changes1 2018-02-27 17:12:15 -05:00
Richard Cordovano e85a1128db Merge pull request #3459 from rishwanth1995/removedefaultfont
added setlookandfeel method to EDT
2018-02-27 17:09:34 -05:00
Richard Cordovano 3ba9385102 Merge pull request #3462 from raman-bt/develop
Fixes an NPE in the previous commit.
2018-02-27 17:08:06 -05:00
Richard Cordovano 79a191285b Merge pull request #3471 from zhhl/DeleteAutopsyCoreUnitTest
Delete Autopsy Core Unit test: IngestFileFiltersTest.java
2018-02-27 16:56:32 -05:00
Richard Cordovano 9dc01347d2 Merge pull request #3474 from esaunders/develop
Remove date/times from report paths.
2018-02-27 16:53:59 -05:00
Richard Cordovano f25b1eb01e Merge pull request #3453 from dgrove727/3454_AutoIngestDeprioritizeJobs
3454 auto ingest deprioritize jobs
2018-02-27 16:52:56 -05:00
esaunders 2fda9c44fa Remove date/times from report paths. 2018-02-27 16:42:58 -05:00
U-BASIS\dgrove 7553c3418c Cleanup. 2018-02-27 16:16:21 -05:00
U-BASIS\dgrove 88a5a8c7f5 Merge remote-tracking branch 'upstream/develop' into 3537_CorrelationEngineSettingsPanel 2018-02-27 15:24:10 -05:00
U-BASIS\dgrove a518eb721c Cleanup. 2018-02-27 15:21:34 -05:00
U-BASIS\zhaohui e1251d7975 Delete Autopsy Core Unit test: IngestFileFiltersTest.java 2018-02-27 12:48:58 -05:00