Andrew Ziehl
|
ce847c2c1b
|
Merge branch 'common-files-feature' of https://github.com/briangsweeney/autopsy into 3668-intra-case-correlation-content-viewer
# Conflicts:
# Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSourcesCommonFilesAlgorithm.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadata.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadataBuilder.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/FileInstanceMetadata.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/Md5Metadata.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleDataSource.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
|
2018-05-01 16:54:14 -07:00 |
|
Andrew Ziehl
|
734b4ebe6e
|
Merge branch '3700-3730-3731-3732-3639-roundup' of https://github.com/briangsweeney/autopsy into 3668-intra-case-correlation-content-viewer
# Conflicts:
# Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSources.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/FileInstanceMetaData.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/Md5MetaData.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleDataSource.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
|
2018-05-01 14:40:46 -07:00 |
|
Andrew Ziehl
|
3145e60631
|
Codeacy fixes
|
2018-05-01 14:17:14 -07:00 |
|
Ann Priestman
|
f0c017f35a
|
Added checkboxes for showing less data and hiding the trend line.
Removed code to graph the min and max values since it's unlikely to be used.
|
2018-05-01 12:24:10 -04:00 |
|
Andrew Ziehl
|
43545a0805
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3668-intra-case-correlation-content-viewer
# Conflicts:
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
|
2018-05-01 08:52:35 -07:00 |
|
Richard Cordovano
|
ebeed4893e
|
Merge in custom-release-may-2018 and resolve conflicts
|
2018-05-01 10:58:55 -04:00 |
|
Richard Cordovano
|
33dcffdd28
|
Merge in customw-release-may-2018 and resolve conflicts
|
2018-05-01 10:57:08 -04:00 |
|
William Schaefer
|
b54fb3fb27
|
3752 make failure message for vericrypt test more accurate
|
2018-05-01 10:28:50 -04:00 |
|
William Schaefer
|
fbeb1f8fcd
|
3752 update google drive vericrypt test image and check for container
|
2018-05-01 10:23:58 -04:00 |
|
Richard Cordovano
|
aad70991ea
|
Resolve conflicts for release-4.7.0 merge
|
2018-05-01 09:59:54 -04:00 |
|
William Schaefer
|
1d8882e6f9
|
3752 finish Vericrypt test and add final asserts to it
|
2018-05-01 09:51:00 -04:00 |
|
Brian Sweeney
|
2afcc99111
|
added a result set to a try-with-resources block
|
2018-05-01 07:27:50 -06:00 |
|
Ann Priestman
|
fd025de155
|
Add metrics to correlation engine
|
2018-05-01 08:22:08 -04:00 |
|
Brian Sweeney
|
9518ef3c61
|
new topcomponent factory method usage with singular viewer: dataresultviewertable
|
2018-04-30 18:42:13 -06:00 |
|
Brian Sweeney
|
c9a6915250
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into common-files-feature
# Conflicts:
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
|
2018-04-30 17:28:20 -06:00 |
|
Andrew Ziehl
|
7cb3ece7c5
|
remove testing hashcode comment
|
2018-04-30 14:58:24 -07:00 |
|
William Schaefer
|
276939278a
|
Merge branch 'custom-release-may-2018' of https://github.com/sleuthkit/autopsy into 3752-EncryptedPartionsFunctionalTest
|
2018-04-30 16:35:50 -04:00 |
|
Ann Priestman
|
2ff7ccc62b
|
Don't plot lines above the top of the graph
|
2018-04-30 15:58:38 -04:00 |
|
Andrew Ziehl
|
29b369390b
|
Refactored methods, set path to lowercase for hashcode comparisons, which fixes duplicates.
|
2018-04-30 11:55:22 -07:00 |
|
Brian Sweeney
|
ded5493226
|
fixed a bug where error state became confused on clicking the already selected box twice
|
2018-04-30 10:07:41 -06:00 |
|
Brian Sweeney
|
344bdbb304
|
first pass at ui
|
2018-04-30 08:31:36 -06:00 |
|
Andrew Ziehl
|
3c3d162159
|
Cleanup correlation case function.
|
2018-04-30 06:58:12 -07:00 |
|
millmanorama
|
f36a7b5a6e
|
fix typo in log message
|
2018-04-30 15:08:09 +02:00 |
|
millmanorama
|
b6f33bf798
|
disable PMD/codacy warning about catching NPE
|
2018-04-30 15:07:24 +02:00 |
|
millmanorama
|
e134108767
|
show warning in less intrusive JFX notifications instead of Message boxes, suppress NPEs during painting.
|
2018-04-30 14:55:36 +02:00 |
|
Brian Carrier
|
a5fe951761
|
Updated to use 4.6.1 TSK
|
2018-04-27 22:48:26 -04:00 |
|
Brian Carrier
|
3fbca05057
|
Update to use tsk 4.6.1 jar
|
2018-04-27 22:45:51 -04:00 |
|
Richard Cordovano
|
e5ede42dc1
|
Merge remote-tracking branch 'upstream/develop' into 3726-result-view-infrastructure
|
2018-04-27 20:11:49 -04:00 |
|
Richard Cordovano
|
fda8b94741
|
Complete documentation nad clean up of result view infrastructure
|
2018-04-27 20:06:04 -04:00 |
|
Andrew Ziehl
|
684e179ab3
|
Check for known status, if not known check tags and set, then add if not in CR.
|
2018-04-27 16:38:55 -07:00 |
|
Brian Sweeney
|
1d2d4dd236
|
error text is presented, search is disabled when the user has not selected any categories
|
2018-04-27 15:59:27 -06:00 |
|
Richard Cordovano
|
875a619e2d
|
Resolve merge conflict for custom-release-may-2018 branch
|
2018-04-27 17:36:33 -04:00 |
|
Richard Cordovano
|
fd4de73013
|
Merge remote-tracking branch 'upstream/release-4.7.0' into custom-release-may-2018
|
2018-04-27 17:33:19 -04:00 |
|
Richard Cordovano
|
eb01a3e899
|
Merge pull request #3719 from wschaeferB/3752-EncryptedPartitionsSupport
3752 encrypted partitions support
|
2018-04-27 16:53:24 -04:00 |
|
Richard Cordovano
|
4a2faa9983
|
Merge pull request #3712 from dgrove727/3749_FunctionalTest
3749 functional test
|
2018-04-27 16:51:18 -04:00 |
|
Richard Cordovano
|
780a2b4487
|
Merge pull request #3710 from dgrove727/3749_PasswordProtectionPdfDocuments
3749 password protection pdf documents
|
2018-04-27 16:49:44 -04:00 |
|
Brian Sweeney
|
acbd4f352b
|
potentially null value was replaced with empty string
|
2018-04-27 13:56:45 -06:00 |
|
Brian Sweeney
|
4249ea18c6
|
added resultset to try-catch-with-resourcse
|
2018-04-27 13:56:03 -06:00 |
|
Ann Priestman
|
c1ecc34773
|
Added code to check for changed multiuser settings.
|
2018-04-27 14:39:34 -04:00 |
|
William Schaefer
|
4e2056fcc8
|
3752 fix url for vericrypt vhd file
|
2018-04-27 14:21:52 -04:00 |
|
William Schaefer
|
38fbff10d1
|
3752 add vericrpyt functional test, modify existing encryption test to use Utils
|
2018-04-27 14:14:54 -04:00 |
|
Ann Priestman
|
e3dc9f2f55
|
Add message if there is no timing data.
Improve some try with resources blocks.
|
2018-04-27 14:00:50 -04:00 |
|
Raman
|
97df1d2c21
|
Addressed Codacy comments.
|
2018-04-27 13:36:48 -04:00 |
|
U-BASIS\dgrove
|
88f781d247
|
Completed functional test.
|
2018-04-27 13:30:54 -04:00 |
|
U-BASIS\dgrove
|
14806f81b4
|
Merge remote-tracking branch 'upstream/custom-release-may-2018' into 3750_PasswordProtectionAccessDatabases
|
2018-04-27 12:05:56 -04:00 |
|
William Schaefer
|
1c64c10a01
|
Merge branch 'custom-release-may-2018' of https://github.com/sleuthkit/autopsy into 3752-EncryptedPartionsFunctionalTest
|
2018-04-27 12:00:12 -04:00 |
|
Ann Priestman
|
c30120f437
|
Fixing disabled panel.
cleanup.
|
2018-04-27 11:46:47 -04:00 |
|
Raman
|
3f01e351c2
|
3757: Group views in the case tree by data source
- Removed commented code.
|
2018-04-27 11:29:13 -04:00 |
|
Raman
|
56ba0edeec
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3757_views_by_datasource
|
2018-04-27 11:09:16 -04:00 |
|
Raman
|
c05e92aec2
|
3757: Group views in the case tree by data source
|
2018-04-27 11:08:46 -04:00 |
|