10010 Commits

Author SHA1 Message Date
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
bbd7154153 Merge branch 'commonfiles' of https://github.com/sleuthkit/autopsy into commonfiles 2018-07-23 15:16:52 -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
086e57551b notes 2018-07-23 09:39:52 -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
941ae94b15 greater access to tests can see these members 2018-07-21 10:16:19 -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
ba24556ac0 cleanup 2018-07-21 09:22:26 -06:00
Brian Sweeney
26987a4c5d polish 2018-07-21 08:53:42 -06:00
Brian Sweeney
cc0639d1d6 cleanup 2018-07-21 08:10:24 -06:00
Brian Sweeney
0396a52b52 comments 2018-07-20 14:49:49 -06:00
Brian Sweeney
f03c675cf2 notes 2018-07-20 14:07:07 -06:00
Brian Sweeney
dd0b41e62d cleanup 2018-07-20 14:06:39 -06:00
Brian Sweeney
2e40856eab fixes a bug where no leaves files were added to the tree because the map was not populated 2018-07-20 08:50:37 -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
61064e4d7f Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge 2018-07-19 11:06:28 -06:00
Brian Sweeney
7df457b5e3 polish 2018-07-19 11:02:33 -06:00
Brian Sweeney
f87e8de830 cleanup, comments, access modifiers 2018-07-18 20:26:53 -06:00
Brian Sweeney
0210e71a76 comments renames cleanup 2018-07-18 19:15:06 -06:00
Brian Sweeney
ce385483ce typo (bad merge) in logger instantiation 2018-07-18 11:05:10 -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
Brian Sweeney
adae694065 cleanup / defensive coding 2018-07-18 10:46:04 -06:00
Brian Sweeney
83f88a40b3 fixes for issues where not all md5 nodes would have the correct number of children 2018-07-18 10:26:06 -06:00
U-BASIS\dgrove
fbc91771d2 Set checkbox by default. 2018-07-18 12:14:57 -04:00
Brian Sweeney
d4abf71f26 fixes for identifying abstract files that we have access to even tho we (mostly) only query the eamdb for this one 2018-07-18 09:15:26 -06:00
Brian Sweeney
57ab0fbd89 disable double click on leaf nodes 2018-07-17 17:54:27 -06:00
Andrew Ziehl
8f59f705be restore logic to return intracase node if match is in the current case. 2018-07-17 14:51:31 -07:00
Brian Sweeney
601a8bb212 omg 2018-07-17 15:05:26 -06:00
Brian Sweeney
a6c4e93543 cleanup comments 2018-07-17 14:17:10 -06:00
Brian Sweeney
55950b01c3 Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
2018-07-17 13:24:11 -06:00
Brian Sweeney
4450b1619b cleanup 2018-07-17 13:22:14 -06:00
Andrew Ziehl
8233f41fd6 renames and comments for CR results processing. 2018-07-17 11:58:15 -07:00
Brian Sweeney
487222dcbc renames, accessibility stuff 2018-07-17 11:47:59 -06:00
Richard Cordovano
7019eece50
Merge pull request #3926 from briangsweeney/3985-intra-case-test-update
3985 intra case test update
2018-07-17 13:25:39 -04:00
Andrew Ziehl
78d47955f4 Renames. 2018-07-16 16:58:27 -07:00
Andrew Ziehl
6ecf913293 3904, remove CommonFilesDialog 2018-07-16 15:50:01 -07:00
Andrew Ziehl
5c93eca945 Fix intracase cache being null. 2018-07-16 14:29:57 -07:00
Andrew Ziehl
071f783bb4 Fix bundle strings, cleanup. 2018-07-16 14:17:38 -07:00
Brian Sweeney
2b33110dcb cleaned up 2018-07-16 14:10:38 -06:00
Richard Cordovano
44ef634551
Merge pull request #3961 from APriestman/4006_adHocKWinReport
4006 Show ad hoc keyword hits in report.
2018-07-13 18:18:40 -04:00
Richard Cordovano
9d61987743
Merge pull request #3949 from APriestman/3923_setNodesToNull
Set UI selections to null before closing top components.
2018-07-13 17:21:46 -04:00
Richard Cordovano
290ef3aeb2
Merge pull request #3960 from dgrove727/4048_OpenCoreWindowsMultipleDataSources
Fixed core window opening condition.
2018-07-13 17:02:07 -04:00
Richard Cordovano
710f129d00
Update DirectoryTreeTopComponent.java 2018-07-13 17:00:41 -04:00
Richard Cordovano
5c7de4e552
Merge pull request #3952 from APriestman/4017_longDomains
4017 Fix domain parsing and increase max artifact value length
2018-07-13 16:57:35 -04:00