Andrew Ziehl
|
c86d2618bf
|
Update to be functional with most recent common files code.
Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3870-pure-callable
# Conflicts:
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResultRootNode.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeValue.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadata.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadataBuilder.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
# Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
# Core/src/org/sleuthkit/autopsy/corecomponents/MultiLayerTableFilterNode.java
# Core/src/org/sleuthkit/autopsy/datamodel/InstanceCountNode.java
# Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
# Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
|
2018-08-06 13:47:37 -07: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
|
78f9cf5fe4
|
Merge pull request #4007 from dannysmyda/1837-escape-control-characters-fileutil
1837: Updated the regex in FileUtil.escapeFileName function to remove ascii control characters
|
2018-08-03 15:44:16 -04:00 |
|
Richard Cordovano
|
9ceacdfa05
|
Merge pull request #3984 from wschaeferB/4040-TagsWithUser
4040 Associate the user name of who created a tag with that tag
|
2018-08-03 15:43:47 -04:00 |
|
Richard Cordovano
|
d4ed8ea6c1
|
Merge pull request #4020 from briangsweeney/3788-intercase-intracase-merge
Pass in datasource map so CR results don't error out.
|
2018-08-03 15:27:18 -04:00 |
|
Richard Cordovano
|
03a0a39d52
|
Merge pull request #3988 from eugene7646/kws_adhoc_search_4043
Allow users to perform keyword searches that do not save results as artifacts (4043)
|
2018-08-03 14:26:27 -04:00 |
|
Richard Cordovano
|
7175ba9bc2
|
Merge pull request #4018 from dgrove727/4078_Prep_HtmlReportInvalidPathException
Cleanup.
|
2018-08-03 14:17:03 -04:00 |
|
Richard Cordovano
|
616bb5b4e1
|
Merge pull request #4009 from dgrove727/4033_Prep_SaveLastExportLocation
Cleanup.
|
2018-08-03 14:13:39 -04:00 |
|
Richard Cordovano
|
24e3530e78
|
Merge pull request #3999 from dgrove727/4067_PreventDuplicateKeywordHits
4067 prevent duplicate keyword hits
|
2018-08-03 14:07:37 -04:00 |
|
Richard Cordovano
|
fa05d237d8
|
Merge pull request #3987 from dgrove727/4066_PreventDuplicateHashSetHits
4066 prevent duplicate hash set hits
|
2018-08-03 14:07:10 -04:00 |
|
Richard Cordovano
|
71fcb4a342
|
Merge pull request #3980 from dgrove727/4020_AddHashesButtons
Changed form layout to conform with Add Keywords.
|
2018-08-03 14:05:19 -04: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 |
|
Andrew Ziehl
|
1db7ad6140
|
Pass in datasource map so CR results don't error out.
|
2018-08-03 10:59:29 -07:00 |
|
Richard Cordovano
|
5e9a7abfe9
|
Merge pull request #3991 from briangsweeney/3788-intercase-intracase-merge
3788 intercase intracase merge
|
2018-08-03 13:52:30 -04:00 |
|
Brian Sweeney
|
f7d01493db
|
merge conflicts
|
2018-08-03 11:42:23 -06:00 |
|
Brian Sweeney
|
882ac439c4
|
Merge branch '4071_populate_searchresults' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
# Core/src/org/sleuthkit/autopsy/commonfilesearch/AbstractCommonAttributeInstance.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseCommonAttributeSearcher.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
# Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java
|
2018-08-03 11:21:16 -06: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 |
|
Brian Sweeney
|
3bffd2017a
|
Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
# Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseCommonAttributeSearcher.java
|
2018-08-03 10:34:29 -06:00 |
|
U-BASIS\dgrove
|
fa8b42c1e7
|
Cleanup.
|
2018-08-03 11:28:18 -04:00 |
|
Richard Cordovano
|
6c5ae9a34b
|
Merge pull request #4017 from sleuthkit/revert-4016-revert-3989-4072_remove_cache
Revert "Revert "4072 remove cache""
|
2018-08-03 11:15:48 -04:00 |
|
Richard Cordovano
|
7a60aba429
|
Revert "Revert "4072 remove cache""
|
2018-08-03 11:15:28 -04:00 |
|
U-BASIS\dgrove
|
4804c2f3cd
|
Changed Japanese button label to 'OK'.
|
2018-08-03 11:09:43 -04:00 |
|
Richard Cordovano
|
e4275df6cb
|
Merge pull request #4016 from sleuthkit/revert-3989-4072_remove_cache
Revert "4072 remove cache"
|
2018-08-03 11:03:21 -04:00 |
|
Richard Cordovano
|
cde3d8dd1f
|
Revert "4072 remove cache"
|
2018-08-03 11:03:02 -04:00 |
|
Richard Cordovano
|
4ca5ffe523
|
Merge pull request #3989 from briangsweeney/4072_remove_cache
4072 remove cache
|
2018-08-03 09:39:23 -04:00 |
|
U-BASIS\dgrove
|
56a713120b
|
Cleanup.
|
2018-08-02 15:12:21 -04:00 |
|
Richard Cordovano
|
44849b30a9
|
Update TableReportGenerator.java
|
2018-08-02 14:25:04 -04:00 |
|
Richard Cordovano
|
7c179408e7
|
Merge pull request #3969 from dgrove727/4051_MinorUiUpdates_3
Added VHD to picker.
|
2018-08-01 19:20:32 -04:00 |
|
Richard Cordovano
|
de70f33736
|
Merge pull request #3979 from millmanorama/tl-listview-columns
add tooltip to timeline listview description column
|
2018-08-01 18:54:43 -04:00 |
|
Richard Cordovano
|
4a637581a0
|
Change build type back to DEVELOPMENT
|
2018-08-01 16:21:56 -04:00 |
|
Richard Cordovano
|
7650955d13
|
Merge pull request #4003 from sleuthkit/release-4.8.0
Release 4.8.0
|
2018-08-01 16:18:34 -04:00 |
|
Eugene Livis
|
fee2e81264
|
Removed empty space in UI
|
2018-08-01 10:44:41 -04:00 |
|
Eugene Livis
|
d38d9c6dff
|
Merge branch 'develop' of github.com:sleuthkit/autopsy into kws_adhoc_search_4043
|
2018-08-01 10:37:30 -04:00 |
|
Andrew Ziehl
|
9163256cd3
|
Refactoring
|
2018-07-31 15:54:33 -07:00 |
|
Andrew Ziehl
|
35d5df5ebc
|
Cleanup excess fields.
|
2018-07-31 15:32:32 -07:00 |
|
Andrew Ziehl
|
6ee9ed54bd
|
cleanup logic, functionally complete
|
2018-07-31 15:20:35 -07:00 |
|
Andrew Ziehl
|
075b76e8bf
|
logic overhaul to reduce manipulation and building of hashmaps.
|
2018-07-31 11:46:44 -07:00 |
|
Richard Cordovano
|
375927c91b
|
Merge pull request #3998 from APriestman/4087_kwReportFix
4087 Fixes for postgres report queries
|
2018-07-31 13:05:36 -04:00 |
|
Brian Sweeney
|
8d3aeff77f
|
codacy suggestions
|
2018-07-31 11:00:13 -06:00 |
|
Andrew Ziehl
|
137aae131d
|
Sqlite where cluase wasn't passed in.
|
2018-07-31 09:17:27 -07:00 |
|
Andrew Ziehl
|
f0a87e43e5
|
Add code commments for IntraCasePanel in conjuction with the previous bugfix.
|
2018-07-31 08:14:41 -07:00 |
|
U-BASIS\dgrove
|
3fadd00b45
|
Additional cleanup.
|
2018-07-31 10:56:21 -04:00 |
|
U-BASIS\dgrove
|
dd1bfc106d
|
Cleanup.
|
2018-07-31 10:38:16 -04:00 |
|
Ann Priestman
|
830f338611
|
Fixes for postgres queries
|
2018-07-31 10:23:06 -04:00 |
|
Richard Cordovano
|
8093d9610f
|
Merge pull request #3997 from sleuthkit/release-4.8.0
Merge in release 4.8.0 branch
|
2018-07-31 10:01:23 -04:00 |
|
Richard Cordovano
|
248d2fbf7c
|
Merge pull request #3996 from rcordovano/module-version-updates-4.8.0
Module version updates got release 4.8.0
|
2018-07-30 11:27:03 -04:00 |
|
Richard Cordovano
|
b205a983d3
|
Module version updates for release 4.8.0
|
2018-07-30 11:24:54 -04:00 |
|
U-BASIS\dgrove
|
490d8df3e7
|
Preventing duplicate keyword hits.
|
2018-07-30 10:52:47 -04:00 |
|
Richard Cordovano
|
42835825a9
|
AutopsyTreeChildrenFactory => final AutopsyTreeChildFactory
|
2018-07-27 18:06:12 -04:00 |
|
Brian Sweeney
|
cd502079f6
|
rename
|
2018-07-27 10:55:09 -06:00 |
|