Commit Graph
24378 Commits
Author SHA1 Message Date
U-BASIS\dgrove fb20a28bc4 Changed IDs for the four CommonFiles VHD images. 2018-06-15 11:57:06 -04:00
rishwanth1995 3418e12ccc added try-catch for exception in jython module loader 2018-06-15 11:44:54 -04:00
U-BASIS\dgrove bc3737659f Provided missing message. 2018-06-15 11:27:56 -04:00
Ann Priestman 1cf2028d87 Save the current comment to prevent having to return null if the user cancels.
Fix a few deprecated function calls.
2018-06-15 11:25:33 -04:00
Richard Cordovano cbc31d5c90 Merge pull request #3855 from zhhl/3881-normalizeStringsBeforeSendingtoSolr
3881: Normalize the content for index and query.
2018-06-15 11:24:39 -04:00
Richard Cordovano ad69b53d7d Merge pull request #3862 from zhhl/3908-correctFileURL
3908: Use correct file url
2018-06-15 11:12:21 -04:00
Richard Cordovano f9b0d5346c Merge pull request #3858 from raman-bt/3894_take2_cleanup_tag_and_comment
3894: Clean up Tag & Comment dialog
2018-06-15 11:11:41 -04:00
Richard Cordovano 9b504e0547 Merge branch 'develop' into 3894_take2_cleanup_tag_and_comment 2018-06-15 11:11:26 -04:00
Richard Cordovano e8b64f7870 Merge pull request #3840 from raman-bt/3866_tag_context_menu_reorder
3866 User defined tags appear first in tags menu
2018-06-15 11:10:22 -04:00
Ann Priestman 0766f645a6 Codacy 2018-06-15 10:59:56 -04:00
U-BASIS\zhaohui 73a2f35fa2 3908: Use correct file url 2018-06-15 10:31:23 -04:00
Ann Priestman e9bea092c9 Merge remote-tracking branch 'upstream/develop' into 3888_refactorOtherOccurrences 2018-06-15 10:13:04 -04:00
Ann Priestman 5eccf7b4de Update the comment in the UI 2018-06-15 10:12:33 -04:00
Raman 507cfc7fc7 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3802_group_tree_by_datasource 2018-06-15 09:40:22 -04:00
Ann Priestman 2a8fa66bbf Disable the CR-based context menu items if CR is not enabled.
With CR disabled, don't enabled the other occurrences tab if the file has no MD5.
Added comments.
2018-06-15 09:21:45 -04:00
U-BASIS\dgrove a31bab151a Moved context menu creation to new provider. 2018-06-15 09:02:32 -04:00
Andrew Ziehl e3fe4b2356 Codeacy cleanup. 2018-06-14 20:56:30 -07:00
Andrew Ziehl a51a2da70a Codeacy fixes. 2018-06-14 20:49:30 -07:00
Andrew Ziehl b1e65886ef Codeacy fixes 2018-06-14 20:43:02 -07:00
Raman 43d42cf0a7 3894: Clean up Tag & Comment dialog
- Leaving the New Tag button intact this time.
2018-06-14 19:46:15 -04:00
Brian Sweeney 90bc307437 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3870-pure 2018-06-14 15:39:58 -06:00
Richard Cordovano 53c43ff71e Merge pull request #3839 from dgrove727/3655_SupressPmdErrorsInUiCode_5
Fifth batch updated for PMD error suppression and correction.
2018-06-14 16:45:55 -04:00
U-BASIS\dgrove dbfabd55e1 Data sources renamed. 2018-06-14 16:12:17 -04:00
Andrew Ziehl c1e98754dd Fix for GIT logger variable merge issue. 2018-06-14 12:46:13 -07:00
Andrew Ziehl 977c82f4e4 Change default string to 'date not available' to be clearer when CR not enabled. 2018-06-14 12:38:32 -07:00
Andrew Ziehl ff2257c6d6 Cleaned up earliest case display time. Made cases panel sortable, and scrollable. 2018-06-14 12:38:29 -07:00
Andrew Ziehl 4a6f02c63c Create and add ShowCaseDialog to Options CR panel, which displays a table of CorrelationCases. Table needs sorting. Adjust size of OtherOccurances table after adding earliest date. 2018-06-14 12:38:26 -07:00
Andrew Ziehl 0840345931 fix exception 2018-06-14 12:38:23 -07:00
Andrew Ziehl 0cd055b947 add date of earliest CR case to top of other occurances viwer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
2018-06-14 12:38:20 -07:00
Andrew Ziehl d376fbaeb0 Cleanup. 2018-06-14 12:35:01 -07:00
Andrew Ziehl b6d8bf7a1d Wrapper Child factory in callable to further delay execution. Still doesn't make Search lazy since DataResultFilterNode will gather all children and do lookups which triggers the children queries. 2018-06-14 12:31:01 -07:00
Andrew Ziehl b488dee2cd Add progress handler to search to inform user Autopsy is busy, with 3 stages.
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
2018-06-14 12:30:58 -07:00
Andrew Ziehl 35d297f9db Merge branch 'develop' of https://github.com/briangsweeney/autopsy into develop 2018-06-14 12:28:41 -07:00
Brian Sweeney 4be370ba5a trying to get extra layer of nodes working 2018-06-14 12:55:12 -06:00
Raman ebf2cb09d7 Undoing the accidental commit of branding files. 2018-06-14 14:43:09 -04:00
William Schaefer 15e27e12ce 3919 fix merge conflicts with EmbeddedFileExtractor 2018-06-14 14:27:56 -04:00
U-BASIS\zhaohui e101c84c5b 3881: Use NFKC instead of NFKD 2018-06-14 14:24:59 -04:00
Andrew Ziehl 5f6c7857bc Merge branch 'develop' of https://github.com/briangsweeney/autopsy into develop
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
2018-06-14 11:22:05 -07:00
U-BASIS\zhaohui 7dc14784df 3881: Keyword constructor internal call. 2018-06-14 14:09:25 -04:00
Richard Cordovano 9e236be973 Merge pull request #3813 from wschaeferB/3832-FixAidJobOrdering
3832 fix aid job ordering
2018-06-14 14:03:15 -04:00
U-BASIS\zhaohui b60d07e736 3881: Normalized the content for index and query. 2018-06-14 13:35:42 -04:00
Ann Priestman 589c1a5005 Merge remote-tracking branch 'upstream/develop' into 3888_refactorOtherOccurrences
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
2018-06-14 13:34:06 -04:00
Richard Cordovano 2ea77e4560 Merge pull request #3854 from APriestman/revertHealthMonitorTiming
Reset periodic health monitor writes to one hour
2018-06-14 12:55:25 -04:00
Richard Cordovano 44ebf04ffc Merge pull request #3852 from dgrove727/3655_SupressPmdErrorsInUiCode_8
3655 supress pmd errors in ui code 8
2018-06-14 12:54:38 -04:00
Richard Cordovano 95b1abc3d4 Merge pull request #3850 from dgrove727/3655_SupressPmdErrorsInUiCode_7
Seventh batch updated for PMD error suppression and correction.
2018-06-14 12:51:59 -04:00
Richard Cordovano 2926c5a7e9 Merge pull request #3841 from dgrove727/3655_SupressPmdErrorsInUiCode_6
Sixth batch updated for PMD error suppression and correction.
2018-06-14 12:50:17 -04:00
Richard Cordovano 976c8dcf12 Merge branch 'develop' into 3655_SupressPmdErrorsInUiCode_5 2018-06-14 12:47:25 -04:00
Richard Cordovano 74091f684c Merge pull request #3807 from wschaeferB/3845-ObjectDetectionModule
3845 object detection module
2018-06-14 12:42:34 -04:00
Richard Cordovano cb0f663a09 Merge pull request #3820 from dgrove727/3873_RefineEncryptionDetectionHeuristics
Added additional rules to qualify files to be processed.
2018-06-14 12:32:50 -04:00
Richard Cordovano 6dd79da09f Merge pull request #3826 from dgrove727/3846_AddViewCommentsCentralRepository
3846 add view comments central repository
2018-06-14 12:17:51 -04:00