147 Commits

Author SHA1 Message Date
Richard Cordovano
e14d49aba6 Integrate and update data src deletion 2019-11-12 17:30:39 -05:00
Richard Cordovano
360c0a293d Integrate and update data src deletion 2019-11-12 17:12:39 -05:00
Richard Cordovano
b0138680d0 Data source deletion support changes 2019-11-08 16:43:15 -05:00
Richard Cordovano
d07f80fd00 Merge in new data source deletion code from McKinnon 2019-10-28 16:31:24 -04:00
Richard Cordovano
dfdba9c4d3 Fix Codacy issues in fix for backwards incompatibility in reports 2019-10-04 14:30:40 -04:00
Richard Cordovano
260fc190df Update version number to 4.13.0 in branding 2019-10-02 12:36:45 -04:00
Richard Cordovano
ed137d494d Update version number to 4.13.0 in branding 2019-10-02 12:35:20 -04:00
Kelly Kelly
30d5b61f9c Further refinement of the layouts of the cvt 2019-06-07 16:12:51 -04:00
Kelly Kelly
1f8a71d933 fixed merge conflicts 2019-05-08 21:44:52 -04:00
Kelly Kelly
e54f0aed9e Merged in develop 2019-05-01 15:00:24 -04:00
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
millmanorama
886356dcd5 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AbstractCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/timeline/snapshot/SnapShotReportWriter.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java
2019-03-22 09:11:46 +01:00
millmanorama
ce6807b96e Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
2019-03-06 16:32:42 +01:00
millmanorama
1975c0e369 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 2019-03-04 10:08:20 +01:00
Richard Cordovano
e1a11fde04 Update branding Bundle.properties files with current version numbers 2019-02-26 14:51:57 -05:00
Richard Cordovano
0f016128a0 Fixes for CR db_info table 2018-12-11 14:44:37 -05:00
Richard Cordovano
e7721e8bdb Fixes for CR db_info table 2018-12-11 14:20:04 -05:00
Richard Cordovano
5189640a56 Fixes for CR db_info table 2018-12-11 14:11:58 -05:00
Richard Cordovano
612b7f135b Remove eager init of executor in IG controller shutDown 2018-11-29 12:30:29 -05:00
Raman
d5bd765c9b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1110-no-prepop-2
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
2018-11-13 18:00:46 -05:00
Richard Cordovano
9230451cb7 Remove SQLiteUtil from public API for future work 2018-10-13 21:08:04 -04:00
Raman
9f8e1d8d95 Revert "1060: ingest stuck when adding another data source during ingest"
This reverts commit bfd8ed8325df1a8da85ccd4e91c18d0c759cb18d.
2018-10-05 10:27:22 -04:00
millmanorama
f8cdcc7f4d cleanup 2018-09-03 17:32:39 +02:00
Richard Cordovano
9e7a273931 Add dummy GSTVideoPanel class for VT backwards compatibility 2018-06-25 17:19:39 -04:00
Brian Sweeney
416d4d3242 tablefilternode pulled into an interface 2018-06-16 17:15:13 -06:00
Andrew Ziehl
a3038ac395 Merge branch '3700-3730-3731-3732-3639-roundup' of https://github.com/briangsweeney/autopsy into common-files-type-filter
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSources.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleDataSource.java

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSources.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleDataSource.java
2018-04-19 12:12:13 -06:00
Brian Sweeney
538bd3c2af comments and access modifiers
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSources.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleDataSource.java
2018-04-19 11:51:17 -06:00
Andrew Ziehl
ec560e4785 hook up panel UI elements.
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
2018-04-19 11:32:19 -06:00
Brian Sweeney
461d3491a1 Merge branch '3602-common-case-files_r2' of https://github.com/briangsweeney/autopsy into 3602-common-case-files_r2
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
2018-04-19 11:32:11 -06:00
Andrew Ziehl
132f8a938f wip ChildFactor refactor
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
2018-04-19 11:32:09 -06:00
Brian Sweeney
ec8bbb9d2b stubbed out lots of ui components for common files search 2018-04-19 11:31:56 -06: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
447c4d430d Merger in release-4.6.0 branch 2018-01-23 11:34:53 -05:00
Richard Cordovano
73241a637b Add side effect to FileTypeDetector.getMIMEType 2018-01-23 11:14:12 -05:00
Raman
dd10b4778c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3414_appcontentviewer 2018-01-09 09:42:34 -05:00
Richard Cordovano
3759cb94be
Merge pull request #3348 from zhhl/3386-changeFilePermission
3386: Update the files permission from 755 to 644
2018-01-08 12:49:06 -05:00
Raman
22a04601c3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3414_appcontentviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetector.java
2018-01-05 13:35:16 -05:00
Richard Cordovano
e13d82ee16 Update FileTupeDetector API 2018-01-05 10:44:47 -05:00
Richard Cordovano
5d06db99b7 Update FileTupeDetector API 2018-01-05 10:04:28 -05:00
U-BASIS\zhaohui
7c9a7026c5 3386: Update the files permission from 755 to 644 2018-01-03 14:43:27 -05:00
Richard Cordovano
bc14f13aa6 Update documentation of ThreadUtils 2017-12-18 14:43:24 -05:00
Raman
1464d73ea4 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into accounts_relationships
# Conflicts:
#	Core/nbproject/project.properties
#	Core/nbproject/project.xml
#	InternalPythonModules/android/calllog.py
#	InternalPythonModules/android/contact.py
#	InternalPythonModules/android/textmessage.py
#	InternalPythonModules/android/wwfmessage.py
2017-12-06 10:18:51 -05:00
Richard Cordovano
b4d2cbd447 Update comment in some JPanel subclasses 2017-11-08 17:45:39 -05:00
Richard Cordovano
44c8dfe47a Additional updates to AID 2.0 2017-09-07 14:28:32 -04:00
Richard Cordovano
8e4d7e2c4f Merge in develop branch 2017-09-07 11:17:51 -04:00
U-BASIS\dgrove
d11c827e7b New AID implemented. 2017-08-22 15:05:15 -04:00
U-BASIS\dgrove
22dc9dc76c AID separation with fixes. 2017-08-16 13:25:36 -04:00
U-BASIS\dgrove
70339153e1 Sync 2017-08-16 11:44:14 -04:00
Maxwell Koo
8fa6839d5f Convert sql statements referring to device name to use device id 2017-06-22 09:28:18 -04:00