406 Commits

Author SHA1 Message Date
Brian Sweeney
1e379b0882 test code added, stub code 2018-07-30 11:00:32 -06:00
Brian Sweeney
b570830d1b need to check for existance of eamdb before trying getinstance 2018-07-26 17:32:54 -06:00
Brian Sweeney
441230d3e9 and the tests are fixed 2018-07-26 17:19:23 -06:00
Andrew Ziehl
5bad6cff78 Cleanup and add tests, add null check. 2018-07-26 12:57:24 -07: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
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
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
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
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
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
1e84766419 these were deleted and i think it was a mistake 2018-07-19 11:52:40 -06:00
Brian Sweeney
7df457b5e3 polish 2018-07-19 11:02:33 -06:00
millmanorama
d0e71951cf Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# 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-19 12:44:32 +02:00
Brian Sweeney
f87e8de830 cleanup, comments, access modifiers 2018-07-18 20:26:53 -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
Andrew Ziehl
78d47955f4 Renames. 2018-07-16 16:58:27 -07:00
Brian Sweeney
2b33110dcb cleaned up 2018-07-16 14:10:38 -06:00
Andrew Ziehl
9e8f613d08 Cleanup CommonFilesPanel 2018-07-02 08:16:57 -07:00
U-BASIS\zhaohui
7e37d4cdd2 3964: rename image name 2018-06-29 14:41:34 -04:00
U-BASIS\zhaohui
3eaf840a5f 3964: correct the image name 2018-06-29 14:36:44 -04:00
U-BASIS\zhaohui
911c787003 3964: Functional test include testing flag for zip bomb 2018-06-29 14:32:22 -04:00
Brian Sweeney
a36c4a61e3 trying to quiet codacy 2018-06-28 19:27:52 -06:00
Brian Sweeney
7168cfe187 comments 2018-06-28 19:08:26 -06:00
Brian Sweeney
e40eb48182 added tests for revised intra case correlation algorithm 2018-06-28 19:06:14 -06: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
Brian Sweeney
859300bcaa minor refit to reflect new data structure 2018-06-20 12:08:38 -06: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
dbfabd55e1 Data sources renamed. 2018-06-14 16:12:17 -04:00
Richard Cordovano
6dd79da09f
Merge pull request #3826 from dgrove727/3846_AddViewCommentsCentralRepository
3846 add view comments central repository
2018-06-14 12:17:51 -04:00
Richard Cordovano
dad29fd447
Merge pull request #3847 from rishwanth1995/queryApi_CR
query api to process each instances in the instances table.
2018-06-14 11:46:44 -04:00