Brian Sweeney
|
c30ed1f251
|
build script modified to include intercase correleation test data
|
2018-07-26 08:56:46 -06:00 |
|
Brian Sweeney
|
23f48b0d33
|
cleanup
|
2018-07-26 08:29:09 -06:00 |
|
Andrew Ziehl
|
c93ab554c9
|
Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
# Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
|
2018-07-25 14:25:04 -07:00 |
|
Andrew Ziehl
|
e2a5a17746
|
fix merge conflict of test removal
|
2018-07-25 14:23:53 -07:00 |
|
Brian Sweeney
|
80feccdbca
|
comments and cleanup
|
2018-07-25 14:57:40 -06:00 |
|
Brian Sweeney
|
92cf85efa3
|
this test is obsolete
|
2018-07-25 14:55:00 -06:00 |
|
Brian Sweeney
|
948bd3d2b3
|
git screwed this up
|
2018-07-25 14:54:46 -06:00 |
|
Brian Sweeney
|
cc34a759b4
|
Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
|
2018-07-25 13:34:54 -06:00 |
|
Brian Sweeney
|
188d63ea72
|
test cases for intercase correlation
|
2018-07-25 10:50:55 -06:00 |
|
Andrew Ziehl
|
1057c70cb6
|
Clean logic to return proper AbstractFile, including specific match if one exists.
|
2018-07-25 08:27:50 -07:00 |
|
Andrew Ziehl
|
672d1eea02
|
Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
# Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
|
2018-07-24 15:50:53 -07:00 |
|
Brian Sweeney
|
0468b6bd59
|
base case functioning correctly
|
2018-07-24 16:17:26 -06:00 |
|
Brian Sweeney
|
25f7cc5ef5
|
may still need this variable?
|
2018-07-24 13:58:18 -06:00 |
|
Brian Sweeney
|
8e7825de5f
|
cleanup
|
2018-07-24 13:56:45 -06:00 |
|
Brian Sweeney
|
a758fbe779
|
comment out broken stuff for the moment
|
2018-07-24 12:42:52 -06:00 |
|
Andrew Ziehl
|
944758225b
|
Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
|
2018-07-24 11:29:29 -07:00 |
|
Andrew Ziehl
|
d71bfe99fe
|
Remove for loop, add md5 qualifier to AbstractFile lookup
|
2018-07-24 11:26:38 -07:00 |
|
Brian Sweeney
|
88ab16833d
|
rename some stuff for clarity
|
2018-07-24 11:57:30 -06:00 |
|
Brian Sweeney
|
fd2d9908f5
|
renaming
|
2018-07-24 08:43:55 -06:00 |
|
Brian Sweeney
|
dd44150b99
|
removed some dead code
|
2018-07-24 08:28:57 -06:00 |
|
Brian Sweeney
|
898448abc5
|
npe in certain situations fixed
|
2018-07-24 08:27:30 -06:00 |
|
Brian Sweeney
|
a41073542c
|
vestigial param removed
|
2018-07-23 17:44:13 -06:00 |
|
Brian Sweeney
|
a65e43d112
|
more merge conflicts
|
2018-07-23 16:15:09 -06:00 |
|
Brian Sweeney
|
d8b4fc878e
|
Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResultRootNode.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResults.java
# Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java
|
2018-07-23 15:28:10 -06:00 |
|
Brian Sweeney
|
bbd7154153
|
Merge branch 'commonfiles' of https://github.com/sleuthkit/autopsy into commonfiles
|
2018-07-23 15:16:52 -06:00 |
|
Brian Sweeney
|
a3d03fa0ba
|
test utils and access modifiers required for testing
|
2018-07-23 15:10:08 -06:00 |
|
Brian Carrier
|
23a487c190
|
minor refactor
|
2018-07-23 14:06:49 -04:00 |
|
Brian Carrier
|
5fad7ae67b
|
minor refactor. No logic changes
|
2018-07-23 12:55:04 -04:00 |
|
Brian Sweeney
|
9d04ef439e
|
names/comments
|
2018-07-23 10:38:30 -06:00 |
|
Brian Sweeney
|
086e57551b
|
notes
|
2018-07-23 09:39:52 -06:00 |
|
Brian Sweeney
|
2258e368b3
|
merge/refactor de-conflicting
|
2018-07-21 18:11:32 -06:00 |
|
Brian Sweeney
|
2e0b1e0dca
|
these did not merge well
|
2018-07-21 10:16:38 -06:00 |
|
Brian Sweeney
|
941ae94b15
|
greater access to tests can see these members
|
2018-07-21 10:16:19 -06:00 |
|
Brian Sweeney
|
f2c97b8079
|
cleanup
|
2018-07-21 09:46:54 -06:00 |
|
Brian Sweeney
|
8c9d03ec60
|
work in progress
|
2018-07-21 09:41:28 -06:00 |
|
Brian Sweeney
|
ba24556ac0
|
cleanup
|
2018-07-21 09:22:26 -06:00 |
|
Brian Sweeney
|
26987a4c5d
|
polish
|
2018-07-21 08:53:42 -06:00 |
|
Brian Sweeney
|
cc0639d1d6
|
cleanup
|
2018-07-21 08:10:24 -06:00 |
|
Brian Sweeney
|
0396a52b52
|
comments
|
2018-07-20 14:49:49 -06:00 |
|
Brian Sweeney
|
f03c675cf2
|
notes
|
2018-07-20 14:07:07 -06:00 |
|
Brian Sweeney
|
dd0b41e62d
|
cleanup
|
2018-07-20 14:06:39 -06:00 |
|
Brian Sweeney
|
2e40856eab
|
fixes a bug where no leaves files were added to the tree because the map was not populated
|
2018-07-20 08:50:37 -06:00 |
|
Brian Sweeney
|
1e84766419
|
these were deleted and i think it was a mistake
|
2018-07-19 11:52:40 -06:00 |
|
Brian Sweeney
|
61064e4d7f
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
|
2018-07-19 11:06:28 -06:00 |
|
Brian Sweeney
|
7df457b5e3
|
polish
|
2018-07-19 11:02:33 -06:00 |
|
Brian Sweeney
|
f87e8de830
|
cleanup, comments, access modifiers
|
2018-07-18 20:26:53 -06:00 |
|
Brian Sweeney
|
0210e71a76
|
comments renames cleanup
|
2018-07-18 19:15:06 -06:00 |
|
Brian Sweeney
|
ce385483ce
|
typo (bad merge) in logger instantiation
|
2018-07-18 11:05:10 -06:00 |
|
Brian Sweeney
|
1f08352ae5
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributesSearchResultsViewerTable.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchAction.java
# Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java
|
2018-07-18 11:00:04 -06:00 |
|
Brian Sweeney
|
adae694065
|
cleanup / defensive coding
|
2018-07-18 10:46:04 -06:00 |
|