Commit Graph
10154 Commits
Author SHA1 Message Date
Brian Sweeney d4ab36eaf4 this was missing metadata 2018-08-08 18:56:53 -06:00
Brian Sweeney 93bf1b2e9c fixed bug where toggling between any data source and single data source on intra case search would not always run the correct algorithm 2018-08-08 18:41:51 -06:00
Brian Sweeney 0673c49c12 case was missing from casedbattributeinstancenodes 2018-08-08 12:05:45 -06:00
Brian Sweeney 0e58f6ea05 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into commonfiles 2018-08-07 16:54:46 -06:00
Brian Sweeney 1a08c871c7 fixed a bug where single intercase search would stay selected after it was selected once and then changed back to any intercase 2018-08-07 16:10:41 -06:00
Richard Cordovano b3e82c7e5f Merge pull request #4021 from dgrove727/4078_HtmlReportInvalidPathException_1a
Normalize path.
2018-08-07 15:35:49 -04:00
Richard Cordovano 090612d6a9 Merge pull request #4023 from wschaeferB/4103-AddIconsBackToAid2.0
4103 added icons back to AID 2.0 as part of figuring out how to do 4095
2018-08-07 15:26:33 -04:00
Richard Cordovano 1d300fb07f Merge pull request #4013 from dgrove727/4089_CentralRepositoryCommentDialogWidth
Fixed dialog size.
2018-08-07 15:25:21 -04:00
Richard Cordovano 15ec0ca5f2 Merge pull request #4022 from dgrove727/4033_SaveLastExportLocation_1
4033 save last export location 1
2018-08-07 14:42:13 -04:00
Richard Cordovano 5a524f3ec0 Merge pull request #4014 from wschaeferB/4065-FilterTagsForUser-Rev2
4065 filter tags for user rev2
2018-08-07 14:35:53 -04:00
Richard Cordovano 25b232c5c8 Merge pull request #3951 from dgrove727/3995_OtherOccurrencesNoResultsFound
3995 other occurrences no results found
2018-08-07 14:34:30 -04: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
William Schaefer 833da05484 3964 update url for new version of Emedded test file 2018-08-03 17:27:46 -04:00
William Schaefer 79d4b507a6 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3964-testZipBomb-Rev2 2018-08-03 17:12:14 -04:00
William Schaefer 19b7ba19c0 4103 added icons back to AID 2.0 as part of figuring out how to do 4095 2018-08-03 16:15:27 -04: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
U-BASIS\dgrove 9fe9afc0d7 Resolved merge conflicts. 2018-08-03 14:43:05 -04:00
U-BASIS\dgrove 9c4f2b2438 Normalize path. 2018-08-03 14:23:11 -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 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
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 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 cde3d8dd1f Revert "4072 remove cache" 2018-08-03 11:03:02 -04:00
William Schaefer 2367bd5766 4065 fix codacy issue and formating issue found in review 2018-08-02 18:01:16 -04:00
William Schaefer 215f76ad99 4065 move use of userName filter setting to Tags tree out of Tags Manager 2018-08-02 17:59:45 -04:00
William Schaefer 6baf076f98 4065 clean up and comments for hiding tags other than the current users 2018-08-02 17:59:30 -04:00
William Schaefer efbd58fd34 4065 replace static text with text from bundle message 2018-08-02 17:59:11 -04:00
William Schaefer f772010fc2 4065 fix non event refresh for group by data source 2018-08-02 17:58:57 -04:00
William Schaefer 764c3e4a06 4065 finish removal of tag refresh event 2018-08-02 17:58:37 -04:00
William Schaefer 5a50721b33 4065 continued conflict resolution while cherry-picking 2018-08-02 17:58:02 -04:00
William Schaefer b86307de60 4065 continued conflict resolution while cherry-picking 2018-08-02 17:56:36 -04:00
William Schaefer 75fed47b97 4065 resolve conflict in DirectorTreeTopComponent with develop 2018-08-02 17:54:57 -04:00
William Schaefer 372ca76864 4065 initial implementation without refresh - minimal public api changes 2018-08-02 17:52:42 -04:00
U-BASIS\dgrove 5238b6b5dd Fixed dialog size. 2018-08-02 17:50:26 -04:00
William Schaefer ab5280682c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4040-TagsWithUser 2018-08-02 17:12:41 -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
U-BASIS\dgrove 0c571ab20e Added user-defined path for extraction. 2018-08-02 15:27:27 -04:00
U-BASIS\dgrove 56a713120b Cleanup. 2018-08-02 15:12: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