9854 Commits

Author SHA1 Message Date
Richard Cordovano
58133cba13 Merge pull request #1454 from sidheshenator/encase_formatted_KWL
encase keyword list support made more obvious
2015-07-28 13:03:54 -04:00
Richard Cordovano
7e5ef75b2c Merge pull request #1452 from sidheshenator/non-ascii-usersitepackages-path-handles
exceptions handled in case usersitepackage paths contain nonascii cha…
2015-07-28 13:03:02 -04:00
Richard Cordovano
5dd33cd80e Merge pull request #1451 from millmanorama/missing_resource_fix
fix missing resource  exception
2015-07-28 13:02:35 -04:00
Richard Cordovano
0106aef1c3 Merge pull request #1445 from millmanorama/remove_duplicate_tag_dialog
remove the dialog informing the user about duplicate tags as it provides little value, and can overwhelm the UI
2015-07-28 13:00:51 -04:00
Richard Cordovano
49270e4a67 Merge pull request #1440 from millmanorama/data_result_viewer_video_thumbnails
video thumbnails
2015-07-28 12:59:44 -04:00
Karl Mortensen
d1473d0add Solr now tries to use UNC path if it can when opening Solr cores 2015-07-28 12:35:54 -04:00
Karl Mortensen
428d0bd90a use hostname in UNC paths for photorec 2015-07-28 12:30:08 -04:00
Richard Cordovano
2d0a6b65b7 Merge pull request #1466 from sleuthkit/fix_diff_order
Fixed order of diff arguments
2015-07-28 11:50:20 -04:00
Richard Cordovano
e8779a86fb Merge pull request #1467 from rcordovano/ingest-cancel-fix
Ingest cancel fix
2015-07-28 11:48:54 -04:00
Richard Cordovano
711bd367a8 Correct startup/cancellation and event publishing for data source ingest jobs 2015-07-28 11:43:02 -04:00
Brian Carrier
edb4b13eed Fixed order of diff arguments 2015-07-28 11:22:14 -04:00
Richard Cordovano
87e4353dbf Add job cancelled guards to IngestTaskScheduler scheduling methods 2015-07-28 10:13:57 -04:00
Richard Cordovano
b0e488c692 Add early out for cancelled jobs to process() for ingest module pipelines 2015-07-28 10:09:21 -04:00
rcordovano
682d142263 Synchronize IngestJob.start() and cancel() sochiuld jobs are started/cancelled atomically 2015-07-28 09:58:29 -04:00
jmillman
e19131476c Merge branch 'timeline_datasource_filter' into timeline_hash_hits 2015-07-27 17:22:06 -04:00
jmillman
6aca5cb6b7 Merge branch 'missing_resource_fix' into timeline_hash_hits 2015-07-27 17:21:57 -04:00
jmillman
e5f08dd7da Merge branch 'develop' into update_jfxtras
Conflicts:
	CoreLibs/ivy.xml
	CoreLibs/nbproject/project.xml
2015-07-27 17:17:56 -04:00
jmillman
b58bb6f230 Merge branch 'develop' into double_click_activate_tile_view
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java
2015-07-27 17:10:51 -04:00
jmillman
ea15231b98 Merge branch 'develop' into metadata_copyable
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java
2015-07-27 17:08:54 -04:00
jmillman
692cd8a4a5 Merge branch 'video_thumbs_merge_resolution' into data_result_viewer_video_thumbnails 2015-07-27 17:03:22 -04:00
Richard Cordovano
331402faee Merge pull request #1464 from karlmortensen/handlefiles
Place files in appropriate locations
2015-07-27 17:01:37 -04:00
jmillman
26c979395d fix image/video support in content viewer 2015-07-27 16:44:33 -04:00
jmillman
5638cf790b fix image/video support in content viewer 2015-07-27 16:40:17 -04:00
Sidhesh Mhatre
a90d8d2d07 Unassigned moduleSettingsFilePath variable assigned 2015-07-27 15:53:54 -04:00
Karl Mortensen
5a1408100b Place files in appropriate locations 2015-07-27 15:50:10 -04:00
sidheshenator
9a9255b2a8 AbstractFileChunk sanitization code refactored 2015-07-27 14:32:08 -04:00
jmillman
33faf9cba8 fix merge problems 2015-07-27 14:05:10 -04:00
Richard Cordovano
34cdcc149f Merge pull request #1462 from APriestman/loggerLock
Removed lock that was occasionally causing a deadlock when closing a …
2015-07-27 13:29:08 -04:00
momo
ec0cc450c0 changed variable name to represent more than just photos 2015-07-27 09:42:35 -04:00
Richard Cordovano
a6e455c188 Merge pull request #1461 from eugene7646/service_messages
Service monitor messages
2015-07-27 09:14:49 -04:00
Richard Cordovano
4103739459 Merge pull request #1460 from esaunders/directory_tree_refresh_work
Directory tree refresh work
2015-07-27 09:12:46 -04:00
Ann Priestman
0155e6b7f6 Removed lock that was occasionally causing a deadlock when closing a case. 2015-07-27 09:02:29 -04:00
jmillman
3715e717e7 merge resolution to support both twelvemonkey image loading and opencv video thumbnails 2015-07-24 17:16:31 -04:00
esaunders
2cd9cbd858 Made DataSourcesNodeChildren private again. 2015-07-24 16:55:16 -04:00
Eugene Livis
169ac58914 Removed unused file 2015-07-24 16:33:07 -04:00
Eugene Livis
5ec4f336e2 Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into service_messages 2015-07-24 16:25:02 -04:00
Eugene Livis
f0a1a82713 Service monitor only runs if multi user mode is enabled 2015-07-24 16:24:45 -04:00
jmillman
f15ee9426a Merge remote-tracking branch 'upstream/develop' into data_result_viewer_video_thumbnails
Conflicts:
	Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
	Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
	Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ThumbnailCache.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/ImageFile.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/VideoFile.java
2015-07-24 16:07:34 -04:00
Richard Cordovano
19d525e87e Merge pull request #1433 from millmanorama/expand_image_format_support
Expand image format support
2015-07-24 15:17:24 -04:00
jmillman
8dba655ad6 Merge remote-tracking branch 'upstream/develop' into timeline_datasource_filter 2015-07-24 14:10:59 -04:00
esaunders
d30ce3c785 No need to refresh entire tree when ingest completes or new data added. Only need to trigger openCoreWindows() when the first data source is added. 2015-07-24 14:04:38 -04:00
jmillman
2f64f75dfa fix updating of datasource filter when new datasources are added 2015-07-24 14:03:54 -04:00
jmillman
bf41e5b523 more cleanup; convert org.sleuthkit.autopsy.timeline.ui.filter to @NbBundle.Messages
-
2015-07-24 13:54:45 -04:00
esaunders
f32a70cdad Merge branch 'collaborative' of github.com:sleuthkit/autopsy into directory_tree_refresh_work 2015-07-24 13:46:09 -04:00
Richard Cordovano
549653872d Merge pull request #1437 from mhmdfy/aut-1699-close-confirmation
Aut 1699 close confirmation
2015-07-24 13:23:51 -04:00
Richard Cordovano
1db36b28c4 Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into collaborative 2015-07-24 13:22:13 -04:00
Richard Cordovano
226d73cc6d Remove worker thread from remote event publishing to free database connections 2015-07-24 13:21:11 -04:00
jmillman
648b97d6a1 more minor cleanup 2015-07-24 13:18:30 -04:00
jmillman
5197ca8f4c move dialog response comparison inside methods; comments 2015-07-24 13:13:39 -04:00
jmillman
586ee9d53e relax parameter type 2015-07-24 13:02:21 -04:00