 Richard Cordovano
|
2afc59ee39
|
Revert "merge develop into Timeline event mgr"
|
2019-04-19 13:16:26 -04:00 |
|
|
millmanorama
|
01966ad498
|
Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
# Core/build.xml
# Core/src/org/sleuthkit/autopsy/casemodule/Case.java
# Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
# Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionDataSourceIngestModule.java
# Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
# Core/src/org/sleuthkit/autopsy/timeline/db/EventsRepository.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties-MERGED
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchErrorDialog.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchOpenAction.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchPanel.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseSearcher.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SearchQuery.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SelectMultiUserCasesDialog.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SelectMultiUserCasesPanel.java
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
|
2019-04-16 18:40:34 +02:00 |
|
|
esaunders
|
46f0c0ae39
|
Use property instead of variable in build script.
|
2019-04-02 16:01:39 -04:00 |
|
|
esaunders
|
3c1789463c
|
Added GStreamer paths to PATH environment variable on Windows so that we can find the correct version even if there is more than one version of Autopsy installed.
|
2019-04-01 13:55:12 -04:00 |
|
|
millmanorama
|
0e0d41185a
|
Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
# Core/src/org/sleuthkit/autopsy/casemodule/Case.java
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
# branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
# branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
# thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
|
2019-03-01 12:20:18 +01:00 |
|
|
Richard Cordovano
|
84b2660ffc
|
Revert "Revert "Copy merged bundles into src folder so that they can be checked in.""
|
2019-02-23 14:24:44 -05:00 |
|
|
Richard Cordovano
|
bd2866819f
|
Revert "Copy merged bundles into src folder so that they can be checked in."
|
2019-02-15 13:33:42 -05:00 |
|
|
Brian Carrier
|
c4548389ca
|
Copy merged buncles into src folder so that they can be checked in
|
2019-02-12 15:39:53 -05:00 |
|
|
millmanorama
|
03c88d9739
|
Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
# Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
|
2019-01-15 12:14:41 +01:00 |
|
|
U-BASIS\dsmyda
|
9f97452c2c
|
Upgraded jar reference in ImageGallery, Core, and Keyword Search
|
2019-01-07 10:18:11 -05:00 |
|
|
millmanorama
|
f5cf885463
|
Merge branch 'threading-review-bug-fixes' into timeline-event-mgr
# Conflicts:
# Core/src/org/sleuthkit/autopsy/casemodule/Case.java
# Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
# Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
|
2018-09-15 14:14:48 +02:00 |
|
|
William Schaefer
|
e05c697473
|
4121 add common file attrs test image links to google drive
|
2018-09-13 14:15:26 -04:00 |
|
|
Brian Sweeney
|
c8b72724c6
|
more test code
|
2018-09-05 18:17:16 -06:00 |
|
|
millmanorama
|
1aec7c0ae8
|
Merge remote-tracking branch 'upstream/develop' into move_ui_code_out_of_tsk
# Conflicts:
# Core/src/org/sleuthkit/autopsy/casemodule/services/Blackboard.java
# Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
# Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java
|
2018-08-09 17:10:42 +02:00 |
|
|
Brian Sweeney
|
bf2d2be90d
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into commonfiles
|
2018-08-07 12:33:56 -06:00 |
|
|
Brian Sweeney
|
02c340fae9
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into commonfiles
|
2018-08-05 21:22:56 -06:00 |
|
|
William Schaefer
|
833da05484
|
3964 update url for new version of Emedded test file
|
2018-08-03 17:27:46 -04:00 |
|
|
William Schaefer
|
74bf4bd272
|
3964 - change name of new image to reflect naming schema in 3771
|
2018-08-02 14:14:24 -04:00 |
|
|
Brian Sweeney
|
c30ed1f251
|
build script modified to include intercase correleation test data
|
2018-07-26 08:56:46 -06:00 |
|
|
millmanorama
|
6cb9ac803b
|
Merge remote-tracking branch 'upstream/develop' into move_ui_code_out_of_tsk
# Conflicts:
# Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
# Core/src/org/sleuthkit/autopsy/modules/iOS/ContactAnalyzer.java
# Core/src/org/sleuthkit/autopsy/timeline/PerCaseTimelineProperties.java
# Core/src/org/sleuthkit/autopsy/timeline/filters/TagNameFilter.java
|
2018-07-13 13:23:53 +02:00 |
|
|
millmanorama
|
6dfda639ca
|
Merge remote-tracking branch 'upstream/develop' into move_ui_code_out_of_tsk
|
2018-07-03 13:55:03 +02:00 |
|
|
U-BASIS\zhaohui
|
91cbc58774
|
3964: The new vhd file includes the 2 zip bomb test files
|
2018-06-29 15:08:14 -04:00 |
|
|
Brian Sweeney
|
998234ea4b
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation
# Conflicts:
# Core/build.xml
# Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
# Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
# Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDb.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
# Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java
# Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
# Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java
# Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseUtils.java
|
2018-06-21 15:09:13 -06:00 |
|
|
Richard Cordovano
|
f23e845fd4
|
Merge pull request #3837 from APriestman/2823_tskLayerTest
2823 check that a content object has children before doing the visible children query
|
2018-06-20 12:06:23 -04:00 |
|
|
Richard Cordovano
|
9ae5a8996e
|
Merge pull request #3859 from dgrove727/3771_FunctionalTestDataSourceNames
Data sources renamed.
|
2018-06-18 14:47:16 -04:00 |
|
|
U-BASIS\dgrove
|
fb20a28bc4
|
Changed IDs for the four CommonFiles VHD images.
|
2018-06-15 11:57:06 -04:00 |
|
|
U-BASIS\dgrove
|
dbfabd55e1
|
Data sources renamed.
|
2018-06-14 16:12:17 -04:00 |
|
|
Ann Priestman
|
661efce4c7
|
Adding SparseBitSet jar
|
2018-06-11 10:21:24 -04:00 |
|
|
William Schaefer
|
9d2639a177
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3845-ObjectDetectionModule
|
2018-06-08 10:49:10 -04:00 |
|
|
Brian Sweeney
|
06c3577068
|
stubbed in test data file downloads
|
2018-05-28 18:35:54 -06:00 |
|
|
Mark McKinnon
|
fbe8322be4
|
Merge remote-tracking branch 'upstream/timeline-event-mgr' into timeline-event-mgr
to get the branch up to date
|
2018-05-27 18:05:30 -07:00 |
|
|
William Schaefer
|
8ecc169d00
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3845-ObjectDetectionModule
|
2018-05-24 13:39:44 -04:00 |
|
|
Brian Sweeney
|
b7d1c6678b
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation
|
2018-05-24 09:28:16 -06:00 |
|
|
William Schaefer
|
0fca4ebe4f
|
3845 move OpenCv library to corelibs
|
2018-05-24 11:00:54 -04:00 |
|
|
Brian Sweeney
|
cc2f4aeeac
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests
|
2018-05-24 08:44:36 -06:00 |
|
|
William Schaefer
|
c072fe57ae
|
Add sqlcipher test image download back to build.xml
|
2018-05-22 15:24:06 -04:00 |
|
|
Richard Cordovano
|
f9a93e0360
|
Merge custom-release-may-2018 into develop
|
2018-05-21 18:42:23 -04:00 |
|
|
Richard Cordovano
|
a36e56469d
|
Merge branch 'custom-release-may-2018' into 3751_SqlCipherDetection
|
2018-05-16 11:52:56 -04:00 |
|
|
Richard Cordovano
|
ec2aed9db6
|
Merge branch 'custom-release-may-2018' into 3751_SqlCipherDetection
|
2018-05-16 10:23:54 -04:00 |
|
|
Mark McKinnon
|
1652b3aac2
|
Initial creation of plaso module
Initial creation of plaso module that will run plaso against an image.
|
2018-05-16 06:55:32 -07:00 |
|
|
U-BASIS\dgrove
|
c2b6b5854b
|
Bitlocker detection implemented.
|
2018-05-15 11:17:03 -04:00 |
|
|
Brian Sweeney
|
d5d9216d6c
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests
|
2018-05-14 14:15:27 -06:00 |
|
|
Richard Cordovano
|
929a58fcc3
|
Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop
|
2018-05-14 12:47:49 -04:00 |
|
|
Richard Cordovano
|
72fd1eb015
|
Repair Core/build.xml
|
2018-05-14 12:38:32 -04:00 |
|
|
Richard Cordovano
|
6fc9f4ed96
|
Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop
|
2018-05-14 12:14:39 -04:00 |
|
|
Richard Cordovano
|
162bd4de8b
|
Merge branch 'develop' into custom-release-may-2018
|
2018-05-14 12:10:25 -04:00 |
|
|
Richard Cordovano
|
248e724161
|
Merge pull request #3760 from eugene7646/ocr_via_tika_3760
OCR via tika (3760)
|
2018-05-14 11:38:16 -04:00 |
|
|
Brian Sweeney
|
1fe13d2463
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests
|
2018-05-14 08:57:19 -06:00 |
|
|
Brian Sweeney
|
763eb661db
|
tests added, data download issue dealt with, case closed NPE dealt with tentatively
|
2018-05-10 15:51:03 -06:00 |
|
|
U-BASIS\dgrove
|
e639d02fd6
|
Fixed merge conflicts.
|
2018-05-10 11:41:57 -04:00 |
|