Commit Graph
18812 Commits
Author SHA1 Message Date
Raman c4d09ebdb0 Addressed review comments. 2018-06-15 16:01:21 -04:00
Raman 7c0ab48373 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3802_group_tree_by_datasource 2018-06-15 15:42:15 -04:00
Richard Cordovano a4b3bd7c39 Merge pull request #3838 from wschaeferB/3819-7ZipDepthFix
3819 7 zip depth fix
2018-06-15 15:26:04 -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
U-BASIS\zhaohui 73a2f35fa2 3908: Use correct file url 2018-06-15 10:31:23 -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
Raman 43d42cf0a7 3894: Clean up Tag & Comment dialog
- Leaving the New Tag button intact this time.
2018-06-14 19:46:15 -04: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
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
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
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
William Schaefer 563baf0f32 3845 add @message, fix exception logging, remove unnecessary/unexplained change to manifest.mf 2018-06-14 11:59:05 -04:00
U-BASIS\dgrove cecfd036fc Removed bundle messages for exceptions. 2018-06-14 11:50:56 -04:00
Richard Cordovano dad29fd447 Merge pull request #3847 from rishwanth1995/queryApi_CR
query api to process each instances in the instances table.
2018-06-14 11:46:44 -04:00
Richard Cordovano 3b7b6481a7 Merge pull request #3815 from rishwanth1995/runexe
Updated runexe.py to check for ingestModule cancellation
2018-06-14 11:38:21 -04:00
Ann Priestman ea9f59914f Reset periodic health monitor writes to one hour 2018-06-14 10:28:04 -04:00
U-BASIS\dgrove 98f4cc4241 Removed use of 'closePreparedStatement()' from AbstractSqlEamDb. 2018-06-13 17:52:16 -04:00
U-BASIS\dgrove 222e43c014 More Codacy changes. 2018-06-13 17:44:35 -04:00
U-BASIS\dgrove adcaff9694 Merge remote-tracking branch 'upstream/develop' into 3846_AddViewCommentsCentralRepository 2018-06-13 16:59:21 -04:00
U-BASIS\dgrove 4a8f6b8645 Improved exception and query text. 2018-06-13 16:58:31 -04:00
William Schaefer 1b0e35122e 3845 handle exception with bad classifier image combo, log but otherwise hide from user 2018-06-13 14:51:44 -04:00
Richard Cordovano 55c21cf627 Merge pull request #3853 from sleuthkit/revert-3824-3570-UpdateJavaBindings
Revert "3570 Update sevenzipjbinding jars and commands"
2018-06-13 13:00:14 -04:00
Richard Cordovano 2eef2a2c1a Revert "3570 Update sevenzipjbinding jars and commands" 2018-06-13 12:58:42 -04:00
U-BASIS\dgrove 105312bc28 Fixed null value stack trace. 2018-06-13 12:29:53 -04:00
Raman b78a682170 Merge branch '3865_replace_tag' of https://github.com/raman-bt/autopsy into 3866_tag_context_menu_reorder
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java
#	Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java
2018-06-13 11:32:57 -04:00
U-BASIS\dgrove c78b4f5328 Removed unnecessary change. 2018-06-13 11:16:19 -04:00
U-BASIS\dgrove ac619182ea Eighth batch updated for PMD error suppression and correction. 2018-06-13 11:11:42 -04:00
William Schaefer 7f32cfa261 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3845-ObjectDetectionModule 2018-06-13 11:01:55 -04:00
William Schaefer cb0753975a 3832 remove stray letter n 2018-06-13 10:53:29 -04:00
Raman c02f503388 Remove unused imports. 2018-06-13 10:27:47 -04:00
Richard Cordovano bc314d6d42 Fix spelling error on AutoIngestJob.java 2018-06-13 10:25:10 -04:00
Raman 4b20882076 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3865_replace_tag 2018-06-13 09:53:23 -04:00
Raman 169897916b 3865: Examiner can replace a tag with another tag
- Reworded context menu items
 - Show all Tag related menu items together
2018-06-13 09:53:10 -04:00
U-BASIS\dgrove d20fd16703 Seventh batch updated for PMD error suppression and correction. 2018-06-13 09:25:58 -04:00
U-BASIS\dgrove 0f7372d079 More Codacy fixes. 2018-06-12 18:34:57 -04:00