Andrew Ziehl
|
cf8af26327
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4121_correlation_types
# Conflicts:
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
|
2018-08-24 12:59:08 -07:00 |
|
Brian Sweeney
|
33837e8d18
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr
# Conflicts:
# Core/nbproject/project.xml
# Core/src/org/sleuthkit/autopsy/centralrepository/AddEditCentralRepoCommentAction.java
# Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
# Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java
# Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
# Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttribute.java
# Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java
# Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamDb.java
# Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDb.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
# Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
# Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
|
2018-08-24 09:00:44 -06:00 |
|
Brian Sweeney
|
cebb79822e
|
validation modifications and test code modifications
|
2018-08-23 17:53:21 -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 |
|
Andrew Ziehl
|
20e0cf6dbd
|
Backend logic changes to incorporate multiple CR types based on yet-to-be implemented UI selection. Decided to pass type into existing classes rather than create new extension classes, for simplicity.
|
2018-08-23 12:12:24 -07: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 |
|
Brian Sweeney
|
66e97f8349
|
codacy stuff
|
2018-08-14 10:59:10 -06:00 |
|
Brian Sweeney
|
385222ef2c
|
must convert to lower since thats what the normalizer does
|
2018-08-14 09:05:23 -06:00 |
|
Brian Sweeney
|
b4bd847d5e
|
Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr
|
2018-08-13 08:45:45 -06: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
|
7559a45a7c
|
added phone normalization and renamed the whole thing
|
2018-08-09 16:48:09 -06:00 |
|
millmanorama
|
1aec7c0ae8
|
Merge remote-tracking branch 'upstream/develop' into move_ui_code_out_of_tsk
# Conflicts:
# Core/src/org/sleuthkit/autopsy/casemodule/services/Blackboard.java
# Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
# Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java
|
2018-08-09 17:10:42 +02:00 |
|
Brian Sweeney
|
49e53f4780
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3868-normalize-cr
# Conflicts:
# Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeData.java
|
2018-08-07 17:43:27 -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
|
55b171c135
|
bugs in test code
|
2018-08-07 11:59:18 -06:00 |
|
Brian Sweeney
|
9d0c90f83f
|
tests update centralrepovalidator and eamdb that throws exceptions and leaves handling to clients
|
2018-08-07 08:30:47 -06:00 |
|
Brian Sweeney
|
eb5a7f13b3
|
remove python libs
|
2018-08-06 16:41:52 -06:00 |
|
Brian Sweeney
|
2541927897
|
Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr
# Conflicts:
# Core/nbproject/project.xml
# Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
# Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java
|
2018-08-06 10:25:30 -06:00 |
|
Brian Sweeney
|
d8093fd690
|
Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr
|
2018-08-05 21:46:03 -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 |
|
Brian Sweeney
|
cb7d290265
|
comments
|
2018-08-03 08:47:06 -06:00 |
|
Brian Sweeney
|
c63c85b0db
|
cleanup
|
2018-08-02 21:29:53 -06:00 |
|
Brian Sweeney
|
6164dead35
|
client updated to account for validation failures, tests updated to account for new sorts of failures, null check added to validator
|
2018-08-02 21:24:48 -06:00 |
|
William Schaefer
|
21fc9a67a9
|
3964 adjust failure messages for zip bomb test to give more context
|
2018-08-02 16:08:21 -04:00 |
|
Brian Sweeney
|
761273608e
|
updating tests of client code
|
2018-08-02 13:58:45 -06:00 |
|
Brian Sweeney
|
11dea2acf7
|
various errors with tests
|
2018-08-02 13:54:05 -06: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
|
ca9709b781
|
tests
|
2018-08-01 16:40:07 -06:00 |
|
Brian Sweeney
|
4fe257b82d
|
public access for testable methods, bad md5 hash, wasnt actually bad, regex was made more permissive (supports mixed case)
|
2018-08-01 10:54:03 -06:00 |
|
Brian Sweeney
|
0199865b29
|
some test vars
|
2018-07-30 15:59:14 -06:00 |
|