475 Commits

Author SHA1 Message Date
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
U-BASIS\dgrove
d93580422b Merge conflicts fixed. 2018-06-12 17:33:38 -04:00
Brian Carrier
de5e0709ea
Merge branch 'develop' into cr_cleanup1 2018-06-12 11:34:23 -04:00
rishwanth1995
5cb0521b4d refactor centralrepository test cases and callback interface 2018-06-12 11:31:06 -04:00
rishwanth1995
9f2dbcfccf modified test cases 2018-06-11 13:36:15 -04:00
rishwanth1995
7028872771 query api and tests for central repo 2018-06-11 09:40:28 -04:00
U-BASIS\dgrove
6cb2fe2e51 Merge remote-tracking branch 'upstream/develop' into 3846_AddViewCommentsCentralRepository 2018-06-08 14:43:07 -04:00
Brian Carrier
15d4185c47 fix tests, more API reduction 2018-06-07 13:45:04 -04:00
Brian Carrier
c6e3cc4c94 reduced public API, minor refactor, added some comments 2018-06-06 22:44:57 -04:00
Brian Sweeney
69b6eb14fa more progress 2018-06-06 18:12:03 -06:00
U-BASIS\dgrove
7c659e1dc5 Made use of 'assertNotNull()'. 2018-06-06 16:49:26 -04:00
U-BASIS\dgrove
1dfea88e7e Full implementation with functional test. 2018-06-06 16:39:28 -04:00
Brian Sweeney
ae9d90f913 rename 2018-06-04 19:30:44 -06:00
Brian Sweeney
583b02de40 1st pass to address bug where files not in the present case get the wrong name 2018-06-04 15:52:44 -06:00
Brian Sweeney
b91d066631 ensure that intercase search does not return matches for files which only appear in a single case (this would be an intra-case result) 2018-06-03 23:13:51 -06:00
Brian Sweeney
ea8c8a46cd stubbing out test helpers and refactoring naming for old tests 2018-06-02 20:00:04 -06:00
Brian Sweeney
7ee79bb798 api cleanup 2018-06-02 18:07:20 -06:00
Brian Sweeney
a7e69d8fb5 bug fixes for testing exceptions and notes 2018-06-01 12:28:04 -06:00
Brian Sweeney
87a38b19cb Merge branch '3870-ui-unresponsiveness' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/EamDbCommonFilesAlgorithm.java
2018-06-01 11:06:39 -06:00
Brian Sweeney
e82126e721 clearTestDir added 2018-05-31 11:38:46 -06:00
Brian Sweeney
12ca0870ca comments 2018-05-31 09:29:43 -06:00
Brian Sweeney
cf25790821 fixed a logic error in tear down 2018-05-31 09:29:27 -06:00
Brian Sweeney
3989cb44f2 test one stub 2018-05-30 15:50:47 -06:00
Brian Sweeney
78d51d001a had to initialize cr db and save settings 2018-05-30 15:50:05 -06:00
Brian Sweeney
730d3075a2 some renames and cleanups and a new test stub 2018-05-29 20:02:56 -06:00