1
0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Commit Graph

16921 Commits

Author SHA1 Message Date
Raman
dc0bf5e285 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2018-03-02 11:53:52 -05:00
Richard Cordovano
9b5e083cab Merge remote-tracking branch 'upstream/custom-release-2.11.1' into develop 2018-03-01 09:36:54 -05:00
Richard Cordovano
9be542dbde Merge pull request #3460 from dgrove727/3545_LocalDiskImageBlockSize
3545 local disk image block size
2018-03-01 09:05:28 -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
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
Richard Cordovano
2aea610495 Merge pull request #3461 from APriestman/3550_newSolrCloud
Implement DIY solr cloud
2018-02-28 13:07:58 -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
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
Raman
2895060b3b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3544_mediacontentviewer 2018-02-28 10:10:29 -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
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
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\zhaohui
e1251d7975 Delete Autopsy Core Unit test: IngestFileFiltersTest.java 2018-02-27 12:48:58 -05:00
Richard Cordovano
f5d00c420b Merge pull request #3445 from zhhl/3532-makeNightlyFailureEasierToDebug
3532: Add a html file to include the links to case output directory.
2018-02-27 12:00:43 -05:00
U-BASIS\dgrove
ff6feace52 Disable deprioritize buttons when not prioritized. 2018-02-26 17:29:58 -05:00
U-BASIS\dgrove
e46a201405 Removed deprioritization event in favor of existing. 2018-02-26 15:11:19 -05:00
Richard Cordovano
cbcdfeda55 Merge pull request #3465 from esaunders/develop
Updated regression test script to handle indexed reports.
2018-02-26 14:58:25 -05:00
U-BASIS\dgrove
05a1f5b28b Merge remote-tracking branch 'upstream/custom-release-2.11.1' into 3454_AutoIngestDeprioritizeJobs 2018-02-26 13:15:37 -05:00
esaunders
fa51c573c1 Updated regression test script to handle indexed reports. 2018-02-26 12:22:38 -05:00
U-BASIS\dgrove
e7379f859f Cleanup. 2018-02-26 12:05:18 -05:00
U-BASIS\dgrove
03943ac78a Minor cleanup. 2018-02-26 11:59:27 -05:00
Raman
5c3b4b362c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2018-02-26 09:00:58 -05:00
Ann Priestman
112b57776d Implement DIY solr cloud 2018-02-23 16:37:34 -05:00
U-BASIS\dgrove
c1ac9cf29f Merge remote-tracking branch 'upstream/develop' into 3545_LocalDiskImageBlockSize 2018-02-23 16:30:45 -05:00
Richard Cordovano
29c5ed1f0f Merge pull request #3433 from dgrove727/3353_CenterChildWindows
3353 center child windows
2018-02-23 15:09:36 -05:00
U-BASIS\dgrove
e2abab1cda Merge remote-tracking branch 'upstream/develop' into 3545_LocalDiskImageBlockSize 2018-02-23 15:00:28 -05:00
U-BASIS\dgrove
521d15ca63 Merge remote-tracking branch 'upstream/develop' into 3353_CenterChildWindows 2018-02-23 14:56:18 -05:00
Richard Cordovano
b6b4f09909 Merge pull request #3455 from wschaeferB/3565-AddMD5ColumnToInterestingItems
3565 add MD5 Hash column to File Tags and Interesting Files
2018-02-23 14:56:07 -05:00
U-BASIS\dgrove
8952c5686c Merge. 2018-02-23 14:55:31 -05:00
Richard Cordovano
7e493c7888 Merge pull request #3441 from dgrove727/3385_ContentViewerReset
3385 content viewer reset
2018-02-23 14:38:37 -05:00
Richard Cordovano
038542151b Merge pull request #3454 from esaunders/report_index_and_search
Merged develop into report indexing work and fixed issue with Content not in lookup
2018-02-23 14:32:23 -05:00
Richard Cordovano
69c2dcb40d Merge pull request #3409 from dgrove727/3284_DiskImageBlockSize
3284 disk image block size
2018-02-23 14:25:24 -05:00
Raman
9949b77dd1 Fixes an NPE in the previous commit. 2018-02-23 14:20:34 -05:00
U-BASIS\dgrove
89bf08c1d1 Cleanup. 2018-02-23 13:31:20 -05:00
U-BASIS\dgrove
2012bfb773 Merge branch '3284_DiskImageBlockSize' into 3545_LocalDiskImageBlockSize 2018-02-23 13:03:49 -05:00
U-BASIS\dgrove
d0e127d8c0 Compile issue resolved. 2018-02-23 12:59:26 -05:00
Raman
2c9b6fe6a4 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3544_mediacontentviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java
#	Core/src/org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java
2018-02-23 12:35:14 -05:00
U-BASIS\dgrove
f180ff75b1 Merge. 2018-02-23 12:20:57 -05:00
U-BASIS\dgrove
c02263a7f9 Merge. 2018-02-23 12:15:21 -05:00
U-BASIS\dgrove
739d7cbb57 Minor tweaks. 2018-02-23 12:06:07 -05:00
Raman
c1fd998807 3544: Integrate Media content viewer into Application content viewer
Modified DataContentViewerMedia to implement the FileTypeViewer interface, and renamed it to MediaFileViewer
2018-02-23 11:38:44 -05:00
Richard Cordovano
817d8e5945 Merge pull request #3440 from wschaeferB/1916-L01Processor
1916 l01 processor
2018-02-23 10:57:09 -05:00