485 Commits

Author SHA1 Message Date
jmillman
6f84a33422 fix potential NPE in GroupManager 2015-09-04 10:54:37 -04:00
jmillman
80b92f5cb5 fix potenial NPE when case is closed out from underneath IG 2015-09-04 10:44:36 -04:00
jmillman
b9610d7aff rework NAvPanel threading; simplify logic
ensure setFocusedGroup always called from javafx thread.
2015-08-31 16:31:40 -04:00
jmillman
f2e00216e9 WIP Merge remote-tracking branch 'upstream/develop' into temp_merge
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
2015-08-31 13:48:50 -04:00
jmillman
362084e8bc don't reselct when tree changes; use proper logging 2015-08-28 17:24:59 -04:00
jmillman
048530e61c fix bug in sql query; remove unneccesary runLater 2015-08-28 17:24:54 -04:00
jmillman
a08611e8b7 reduce unneeded synchronization 2015-08-28 17:24:50 -04:00
jmillman
7b4216cd4f minor cleanup 2015-08-28 17:24:47 -04:00
jmillman
1f495546f7 synchonizization fix and comment 2015-08-28 17:24:37 -04:00
Richard Cordovano
b1d27128fb Merge in develop and resolve conflicts 2015-08-28 13:00:50 -04:00
jmillman
0289c333df turn on IG 2015-08-28 10:07:02 -04:00
Richard Cordovano
0e7222dabb Merge develop->collaborative, resolve merge conflict, compile errors 2015-08-26 14:39:59 -04:00
jmillman
2622edd4bd show contents tree when next group button pressed; expand tab labels to clarify relationship between them 2015-08-05 14:42:57 -04:00
jmillman
43103e1b2f delegate hash set name lookup to new method in Content. 2015-08-04 13:37:53 -04:00
jmillman
8b9032bca8 Merge remote-tracking branch 'upstream/develop' into timeline_hash_set_filter
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2015-07-30 16:21:22 -04:00
jmillman
5df73e7895 Merge branch 'develop' into timeline_hash_set_filter
Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2015-07-30 13:29:40 -04:00
jmillman
38162049b4 Merge remote-tracking branch 'upstream/develop' into metadata_copyable
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
2015-07-30 10:36:41 -04:00
Richard Cordovano
1e0adc3e6c Merge pull request #1450 from millmanorama/double_click_activate_tile_view
Double click activates tile view
2015-07-30 10:03:27 -04:00
jmillman
199d2e6d2a initial pass at timeline hash set filters 2015-07-29 19:09:08 -04:00
jmillman
5c4bd438e8 Merge remote-tracking branch 'upstream/develop' into double_click_activate_tile_view
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java
2015-07-28 14:02:55 -04:00
jmillman
b9d41e95e2 Merge remote-tracking branch 'upstream/develop' into metadata_copyable
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
2015-07-28 13:51:15 -04:00
jmillman
de6805cdc2 Merge remote-tracking branch 'upstream/develop' into show_hash_in_metadata
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
2015-07-28 13:39:15 -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
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
26c979395d fix image/video support in content viewer 2015-07-27 16:44:33 -04:00
jmillman
33faf9cba8 fix merge problems 2015-07-27 14:05:10 -04:00
jmillman
3715e717e7 merge resolution to support both twelvemonkey image loading and opencv video thumbnails 2015-07-24 17:16:31 -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
909c8ad7ea cleanup 2015-07-21 12:30:58 -04:00
jmillman
6d4ea60f5f double click images to toggle between slidehsow and tile mode 2015-07-21 12:18:17 -04:00
jmillman
0a84265ba7 keyboard based copying of metadata; cleanup; 2015-07-20 16:18:26 -04:00
jmillman
4aac1ce021 work on keyboard shortcut to copy values 2015-07-20 14:16:41 -04:00
jmillman
b46ba2c34f make values in metadata pane copiable to clipboard 2015-07-20 13:48:28 -04:00
jmillman
332d90222d minor cleanup 2015-07-20 12:44:05 -04:00
jmillman
7e042b3abc show md5 hash for file in metadata pane; other minor cleanup; 2015-07-20 11:51:36 -04:00
jmillman
ac180ab68a remove the dialog informing the user about duplicate tags as it provides little value, and can overwhelm the UI 2015-07-20 11:21:14 -04:00
jmillman
210f36b642 add progressHandle to video export for playback in Ig ; export video to same loation for IG as for FXVideoPanel 2015-07-17 12:57:50 -04:00
jmillman
bec0644e0b rename SlideShow.fxml to SlideShowView.fxml to be consistent 2015-07-17 11:03:49 -04:00
jmillman
e835222379 refactor isGIF check to better place and make more robust 2015-07-17 11:02:50 -04:00
jmillman
bd3b38c6b6 prevent MetaDataPane catagory border from collapsing 2015-07-16 15:29:35 -04:00
jmillman
84d96d38ec fixes and cleanup
pull up imageRef to DrawableFile and make sure both image and media are bing cahce din videofile
distinguish isDisplayableAsImage and isdisplayableAsMedia
ignore defaut icon for .swf files in IG
restore error display for undisplayable file sin slideshowview
2015-07-16 15:29:05 -04:00
jmillman
a755d56b9d mroe refactoring of asynch loader tasks 2015-07-16 13:40:43 -04:00
jmillman
d1a1519ed5 load gifs with JavaFX to ensure animated playback. 2015-07-16 13:19:38 -04:00
jmillman
f7dd01c260 Merge remote-tracking branch 'upstream/develop' into data_result_viewer_video_thumbnails 2015-07-16 10:09:06 -04:00
jmillman
64fd5aaea8 more refactoring and inclusion of MetaDataPane in async loading scheme. 2015-07-15 17:49:52 -04:00
jmillman
eae9b25330 rename static constant 2015-07-15 16:45:05 -04:00
jmillman
8368665a53 show Preview collage for videos rather thanjust warning about undisplayable media
factor common background loading code into DrawableTileBase
only rebuild cached image if it is smaller than max icon size
2015-07-15 16:44:27 -04:00
jmillman
c2eb9af862 fix implementation of Background loading of video thumbs in IG
don't transition through null file when reassigning file to DrawableTiles, prevents buildup of load tasks
bring GrouPane methods in line with current nomenclature
reduce calls to FileSyncListener
2015-07-15 14:27:28 -04:00