9851 Commits

Author SHA1 Message Date
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
William Schaefer
15e27e12ce 3919 fix merge conflicts with EmbeddedFileExtractor 2018-06-14 14:27:56 -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
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
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
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
Ann Priestman
06b72eb558 Use new class for other occurrence data 2018-06-13 13:35:22 -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
Raman
c02f503388 Remove unused imports. 2018-06-13 10:27:47 -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
U-BASIS\dgrove
aa7ae523ff Codacy fixes. 2018-06-12 18:26:33 -04:00
U-BASIS\dgrove
06900f2931 Codacy issues addressed. 2018-06-12 17:55:50 -04:00
U-BASIS\dgrove
d93580422b Merge conflicts fixed. 2018-06-12 17:33:38 -04:00
U-BASIS\dgrove
9f4894950a Fixed bug with missing data source. 2018-06-12 16:41:38 -04:00
Richard Cordovano
93f865a1c4
Merge pull request #3827 from rishwanth1995/go_to_result_s
added logic to respond for selection in DirectoryTreeComponent.viewArtifact
2018-06-12 16:04:46 -04:00