codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-17 16:26:19 +00:00
Code Issues Releases Wiki Activity
19,713 Commits 24 Branches 52 Tags
56156cc7b9dfdcaac767256986531c3c2a5cc2ce
Commit Graph
282 Commits
Author SHA1 Message Date
Andrew Ziehl 56156cc7b9 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3870-pure-callable 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResults.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseTestUtils.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
 2018-08-29 08:56:55 -07:00
Andrew Ziehl ea29efccf3 Address PR feedback 2018-08-28 13:24:03 -07:00
Brian Sweeney 6681accdc7 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4102-filter-by-frequency 
# Conflicts:
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
 2018-08-27 13:46:02 -06:00
Brian Carrier 932832d9bb Merge pull request #4055 from briangsweeney/3863_remove_correlationattribute 
3863 remove correlationattribute
 2018-08-23 15:28:14 -04:00
Brian Sweeney e70fc3210c assertion api changed slightly 2018-08-23 10:47:12 -06:00
Andrew Ziehl e405c3ab98 Address codeacy, remove TODOs from code. 2018-08-23 09:05:10 -07:00
Brian Sweeney 5a2b9c924d Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 4102-filter-by-frequency 2018-08-23 08:06:57 -06:00
Andrew Ziehl a47979ee65 Code review cleanup, codeacy issue fixes. 2018-08-22 17:51:00 -07:00
Brian Sweeney ac31962c95 frequency search tests 2018-08-22 17:20:34 -06:00
Brian Sweeney 4a68eb7e57 updated comments with info pertinent to frequency search tests 2018-08-22 17:19:42 -06:00
Brian Sweeney 92605055b5 typo in tests 2018-08-22 08:34:15 -06:00
Brian Sweeney 2c32fe42e8 fixed all the tests 2018-08-21 17:03:33 -06:00
Andrew Ziehl ff64c74c5e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3863_remove_correlationattribute 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.form
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeData.java
 2018-08-17 10:38:40 -07:00
Andrew Ziehl 38a3b1604e test fix 2018-08-17 10:07:03 -07:00
Andrew Ziehl 6d5c5662da fix normalization discrepancies causing tests to fail. may conflict with. 3868 2018-08-16 14:51:33 -07:00
rishwanth1995 1aea3198cf replaced python asserts with junut asserts 2018-08-16 16:47:44 -04:00
Andrew Ziehl 2b4059a613 Add fields to DB returns to properly create CorrelationAttributeInstances 2018-08-15 16:54:26 -07:00
Andrew Ziehl a3eb28f1dc update tests for instance refactor. 2018-08-15 16:38:18 -07:00
Andrew Ziehl bf28dbb83d first pass, almost done to no build errors. 2018-08-10 14:45:09 -07:00
Brian Sweeney ba55eecccc more codacy things 2018-08-10 08:42:44 -06:00
Brian Sweeney ac096fac57 codacy stuff 2018-08-09 17:41:10 -06:00
Brian Sweeney bf2d2be90d Merge branch 'develop' of https://github.com/briangsweeney/autopsy into commonfiles 2018-08-07 12:33:56 -06:00
Brian Sweeney 02c340fae9 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into commonfiles 2018-08-05 21:22:56 -06:00
Richard Cordovano 53990be2e4 Merge pull request #3931 from zhhl/3964-testZipBomb 
3964: Functional test that tests flag for zip bomb
 2018-08-03 14:00:31 -04:00
Brian Sweeney 547c981445 Merge branch '4070_remove_db_methods' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
 2018-08-03 10:58:15 -06:00
Richard Cordovano 7a60aba429 Revert "Revert "4072 remove cache"" 2018-08-03 11:15:28 -04:00
Richard Cordovano cde3d8dd1f Revert "4072 remove cache" 2018-08-03 11:03:02 -04:00
William Schaefer 21fc9a67a9 3964 adjust failure messages for zip bomb test to give more context 2018-08-02 16:08:21 -04:00
William Schaefer aec96c0ea3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3964-testZipBomb-Rev2 2018-08-02 14:39:42 -04:00
William Schaefer 74bf4bd272 3964 - change name of new image to reflect naming schema in 3771 2018-08-02 14:14:24 -04: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