20108 Commits

Author SHA1 Message Date
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
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
rishwanth1995
6f280309ac delete the report file if ingestprocesscancelled in runexe.py 2018-06-12 16:13:44 -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
Richard Cordovano
5273f74894
Merge pull request #3825 from sleuthkit/cr_cleanup1
reduced public API, minor refactor, added some comments
2018-06-12 15:42:32 -04:00
Richard Cordovano
587467651b
Merge pull request #3817 from raman-bt/3877_tag_menu_restructure
3877: Remove "Quick Tag" submenu
2018-06-12 15:38:06 -04:00
Richard Cordovano
ae3d94fb38
Merge pull request #3814 from dgrove727/3847_AlertPasswordProtected
3847 alert password protected
2018-06-12 15:27:26 -04:00
William Schaefer
c298c5fab8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3845-ObjectDetectionModule 2018-06-12 15:23:35 -04:00
William Schaefer
da9825e63e 3845 change default results tab for Object Detected artifacts 2018-06-12 15:23:11 -04:00
esaunders
7f604b7f65 Added support for automatic startup if running as service. 2018-06-12 15:19:20 -04:00
Richard Cordovano
1d37227a73
Merge pull request #3822 from rishwanth1995/file-profiler
new method added in autopsy centralrepository datamodel to get all known bad artifact instances
2018-06-12 15:12:20 -04:00
U-BASIS\dgrove
eb57021c63 Merge remote-tracking branch 'upstream/develop' into 3846_AddViewCommentsCentralRepository 2018-06-12 14:48:31 -04:00
William Schaefer
fce2fc3ed8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3832-FixAidJobOrdering 2018-06-12 14:11:25 -04:00
William Schaefer
2b59ba7ebf 3832 replace default AutoIngestJob.compareTo with priority based impl 2018-06-12 14:11:08 -04:00
Brian Sweeney
2180b5d11e roughed in case column 2018-06-12 11:48:37 -06:00
Brian Carrier
de5e0709ea
Merge branch 'develop' into cr_cleanup1 2018-06-12 11:34:23 -04:00
rishwanth1995
5cb0521b4d refactor centralrepository test cases and callback interface 2018-06-12 11:31:06 -04:00
Richard Cordovano
1bc9932607
Merge pull request #3823 from APriestman/3879_userMetrics
3879 Add user metrics to health monitor
2018-06-12 10:45:02 -04:00
Richard Cordovano
bb6e4ec852
Merge pull request #3824 from wschaeferB/3570-UpdateJavaBindings
3570 Update sevenzipjbinding jars and commands
2018-06-12 10:07:23 -04:00
Richard Cordovano
ae04a87dd4
Merge pull request #3834 from zhhl/3837-reFormatFileSearchByAttributesPanel
3837: Reformat file search by attributes panel.
2018-06-11 18:36:27 -04:00
Richard Cordovano
c5cf757ef9
Merge pull request #3836 from dgrove727/3655_SupressPmdErrorsInUiCode_4
3655 supress pmd errors in ui code 4
2018-06-11 18:35:38 -04:00
Richard Cordovano
d6794795d4
Merge pull request #3832 from dgrove727/3655_SupressPmdErrorsInUiCode_3
Third batch updated for PMD error suppression and correction.
2018-06-11 18:33:16 -04:00
Richard Cordovano
51bf59365d
Merge pull request #3849 from zhhl/3858-moveMonitorButtonToAdminPanel
3858: Move Health Monitor/Auto Ingest Metrics buttons to admin panel
2018-06-11 17:57:20 -04:00
rishwanth1995
0cc0e29ba9 added check for ingest cancellation 2018-06-11 15:10:38 -04:00
rishwanth1995
9f2dbcfccf modified test cases 2018-06-11 13:36:15 -04:00
Richard Cordovano
f771e7cf71
Merge pull request #3831 from dgrove727/3655_SupressPmdErrorsInUiCode_2
3655 supress pmd errors in ui code 2
2018-06-11 12:56:40 -04:00
Richard Cordovano
8c97522906
Merge pull request #3830 from dgrove727/3655_SupressPmdErrorsInUiCode
First batch updated for PMD error suppression and correction.
2018-06-11 12:53:54 -04:00
Richard Cordovano
7664f92f59
Merge pull request #3805 from rishwanth1995/htmlreportrefactor
include modules and configuration of autopsy in html report
2018-06-11 12:32:30 -04:00
Richard Cordovano
bf74a75142
Merge pull request #3793 from zhhl/3844-exportSQLiteTableAsCsv
3844: Export SQLite table as Csv
2018-06-11 12:16:32 -04:00
Richard Cordovano
186ec852c2
Merge pull request #3778 from zhhl/3780-dataSourceFilterForAdHocSearch
3780: Add data source filter for Ad hoc keyword search.
2018-06-11 12:12:01 -04:00
U-BASIS\dgrove
fc8587cd0d Merge remote-tracking branch 'upstream/develop' into 3873_RefineEncryptionDetectionHeuristics 2018-06-11 12:09:41 -04:00
U-BASIS\dgrove
c97b22e7fb Return directly when file is to be ignored. 2018-06-11 12:09:03 -04:00
U-BASIS\zhaohui
fc2e410752 3858: Move Health Monitor/Auto Ingest Metrics buttons to admin panel 2018-06-11 11:57:50 -04:00
Ann Priestman
f979620461 Import the SparseBitSet TSK jar 2018-06-11 11:52:36 -04:00
Richard Cordovano
3fd1c4c0ea
Merge pull request #3821 from APriestman/fixUncheckedCast
Fix unchecked cast warning.
2018-06-11 10:27:36 -04:00
Ann Priestman
661efce4c7 Adding SparseBitSet jar 2018-06-11 10:21:24 -04:00
rishwanth1995
7028872771 query api and tests for central repo 2018-06-11 09:40:28 -04:00