Commit Graph
20607 Commits
Author SHA1 Message Date
rishwanth1995 b551734461 Merge branch 'release-4.6.0-linux-beta-1' of https://github.com/sleuthkit/autopsy into preinstall_script 2018-03-14 12:48:08 -04:00
Brian Carrier 29dfde8d7b fixed error autopsy-4.6.0-linux1 2018-03-14 12:42:11 -04:00
Richard Cordovano 0b16889960 Merge pull request #3551 from millmanorama/cvt-graph-view
Cvt graph view
2018-03-14 11:40:01 -04:00
Richard Cordovano 402a468dea Merge pull request #3548 from millmanorama/942-enable-tag-actions-on-attachements
Enable actions on Attachments
2018-03-14 11:38:46 -04:00
U-BASIS\dgrove 6f85d9832e Moved Mode object instantiation to optimize. 2018-03-14 11:22:12 -04:00
millmanorama 61e1cf0d26 Merge remote-tracking branch 'upstream/develop' into cvt-graph-view
# Conflicts:
#	Core/nbproject/project.xml
#	Core/src/org/sleuthkit/autopsy/communications/AccountsRootChildren.java
#	Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.form
#	Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java
#	Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
#	build.xml
2018-03-14 16:18:47 +01:00
U-BASIS\dgrove 9695ea496f Merge remote-tracking branch 'upstream/develop' into 3583_AutoIngestDashboardInstances 2018-03-14 11:05:09 -04:00
U-BASIS\dgrove 0918ba5558 Added additional commentary. 2018-03-14 11:04:33 -04:00
millmanorama 872c92c8c8 resolve codacy issues 2018-03-14 15:35:52 +01:00
Richard Cordovano 3b7a28a7ef Merge pull request #3549 from eugene7646/reduce_SM_checks_3581
Reduce ServicesMonitor checks (3581)
2018-03-14 09:24:05 -04:00
Eugene Livis 786ac9d8cb Merge branch 'develop' of github.com:sleuthkit/autopsy into reduce_SM_checks_3581 2018-03-14 09:14:06 -04:00
millmanorama 3eaa5f1017 Enable actions on Attachements 2018-03-14 10:57:02 +01:00
Richard Cordovano 10720546d3 Merge pull request #3547 from rcordovano/3413-new-public-ingest-apis
Add DataSourceProcessorRunner test utility
2018-03-13 21:15:21 -04:00
Richard Cordovano 35cad4f123 Add DataSourceProcessorRunner test utility 2018-03-13 21:13:16 -04:00
Richard Cordovano f68b593da3 Merge pull request #3546 from rcordovano/3413-new-public-ingest-apis
Update copyright for IngestFileFiltersTest.java, imports for IngestJo…
2018-03-13 20:31:20 -04:00
Richard Cordovano 4f7a444cd6 Update copyright for IngestFileFiltersTest.java, imports for IngestJobSettings.java 2018-03-13 20:30:20 -04:00
Richard Cordovano 3cb04a3b39 Merge pull request #3545 from rcordovano/3413-new-public-ingest-apis
Create IngestRunner test utility class
2018-03-13 20:08:52 -04:00
Richard Cordovano c48aecc5a8 Create IngestRunner test utility class 2018-03-13 20:07:45 -04:00
Richard Cordovano b35c3108ac Merge pull request #3544 from rcordovano/3413-new-public-ingest-apis
3413 Make IngestJobSettings a public class
2018-03-13 18:58:51 -04:00
Richard Cordovano 44e58f327e Make IngestJobSettings a public class 2018-03-13 18:57:23 -04:00
U-BASIS\dgrove a4374da87e Merge remote-tracking branch 'upstream/develop' into 3583_AutoIngestDashboardInstances 2018-03-13 17:57:50 -04:00
U-BASIS\dgrove 42e264ea68 Added logic to remove existing dashboard instance. 2018-03-13 17:56:59 -04:00
Richard Cordovano 2a61c68633 Merge branch 'tidy-ingest-job-settings' into 3413-new-public-ingest-apis 2018-03-13 16:58:35 -04:00
Eugene Livis 6eab4305c8 Switched all scheduleAtFixedRate to scheduleWithFixedDelay 2018-03-13 16:58:02 -04:00
Richard Cordovano a767ff5e81 Merge pull request #3543 from rcordovano/3413-new-public-ingest-apis
Make IngestModuleTemplate for testing, etc.
2018-03-13 16:45:42 -04:00
Richard Cordovano 4ff945519e Make IngestModuleTemplate for testing, etc. 2018-03-13 16:44:43 -04:00
Richard Cordovano 2c9344561b Merge pull request #3542 from rcordovano/3413-new-public-ingest-apis
Make FilesSet class public for testing, etc.
2018-03-13 16:40:51 -04:00
Richard Cordovano 6999b56ebc Make FilesSet class public for testing, etc. 2018-03-13 16:38:19 -04:00
Richard Cordovano 32a1772370 Merge pull request #3541 from rcordovano/3413-new-public-ingest-apis
Minor IDE hint resolution for FilesSet.java
2018-03-13 16:20:27 -04:00
Richard Cordovano 9796d3d276 Minor IDE hint resolution for FilesSet.java 2018-03-13 16:19:15 -04:00
Eugene Livis dac720c48f ServicesMonitor uses periodicTasksExecutor.scheduleWithFixedDelay with 15 min interval 2018-03-13 16:16:06 -04:00
U-BASIS\dgrove b01b197556 Simplified getIngestJobSettingsPanel(). 2018-03-13 14:36:43 -04:00
U-BASIS\dgrove 43187f2e1c Updated IngestEventsListener to track last CE module setting. 2018-03-13 14:05:21 -04:00
rishwanth1995 05af81c463 Merge branch 'gui_changes' into preinstall_script 2018-03-13 11:27:33 -04:00
rishwanth1995 e2a85e030e Merge branch 'release-4.6.0-linux-beta-1' of https://github.com/sleuthkit/autopsy into preinstall_script 2018-03-13 11:26:47 -04:00
U-BASIS\dgrove caf3d6ce0a Merge remote-tracking branch 'upstream/develop' into 3537_CorrelationEngineSettingsPanel 2018-03-13 10:33:15 -04:00
U-BASIS\dgrove 6397c0e936 Fixed merge issue regarding LOGGER variable. 2018-03-13 10:31:17 -04:00
rishwanth1995 739edc437e Merge branch 'gui_changes' into developorig7 2018-03-13 10:31:07 -04:00
rishwanth1995 b812a7981c central repository config dialog buttons does not disappear anymore 2018-03-13 10:28:55 -04:00
rishwanth1995 0efb49cb2a changed the build type to RELEASE 2018-03-12 17:59:21 -04:00
Brian Carrier 05bef8b8cd Update unix_setup.sh 2018-03-12 17:22:01 -04:00
Brian Carrier 75ff764e93 Merge pull request #3538 from sleuthkit/bcarrier-patch-1
Updated comments.
2018-03-12 17:01:51 -04:00
Brian Carrier baf04f327b Updated comments. 2018-03-12 16:58:38 -04:00
Brian Carrier b36912acd4 Merge pull request #3527 from rishwanth1995/preinstall_script
added setup script to copy the sleuthkit-jar to autopsy folder
2018-03-12 16:52:21 -04:00
U-BASIS\zhaohui 5087904d94 2229: Part 27 Remove unused imports and correct the log message. 2018-03-12 16:24:53 -04:00
U-BASIS\zhaohui 4cec521f8b 2229: Part 27: Add comments. 2018-03-12 16:13:17 -04:00
Richard Cordovano fafc9131d8 Merge pull request #3534 from millmanorama/942-tagged-status
942 tagged status
2018-03-12 16:13:09 -04:00
Richard Cordovano 7ae70957be Merge pull request #3528 from dgrove727/3563_ApplicationOptionsPanelScrollBars
3563 application options panel scroll bars
2018-03-12 16:12:27 -04:00
Richard Cordovano e93c5310ce Merge pull request #3523 from dgrove727/3575_PhotoRecCorruptedFilesSetting
3575 photo rec corrupted files setting
2018-03-12 16:11:53 -04:00
Richard Cordovano d99dc9c489 Disbaled publicMethodCommentRequirement rule 2018-03-12 16:03:19 -04:00