300 Commits

Author SHA1 Message Date
Richard Cordovano
114944dd45 Revert "Revert "enable ImageGallery"" 2015-10-14 17:16:05 -04:00
Richard Cordovano
e53e302ed1 Revert "enable ImageGallery" 2015-10-14 17:10:22 -04:00
jmillman
bc39b62e75 enable ImageGallery 2015-10-14 16:57:08 -04:00
Richard Cordovano
90fc49632b Merge develop into collab for SevenZipExtractor bug fix 2015-09-16 14:40:40 -04:00
Richard Cordovano
cd8c14cc60 Convert incorrect imports of java.utils.logging.Logger 2015-09-15 16:04:40 -04:00
jmillman
8d391fd077 fix SQL query when there are no FileSystems in an Image 2015-09-14 17:03:17 -04:00
Richard Cordovano
494a5331be Resolve develop branch conflict 2015-09-14 13:53:14 -04:00
Richard Cordovano
018a8acbc8 Merge pull request #1564 from millmanorama/IG_in_front
add versions of doDialog that take a owner window as a paramater and …
2015-09-14 13:29:09 -04:00
Richard Cordovano
2469f46e40 Merge pull request #1559 from millmanorama/IG_prepopulation_performance_fix
remove useless calls to isVideoFile() to improve performance
2015-09-14 13:25:04 -04:00
Richard Cordovano
4ce1569c71 Merge pull request #1557 from millmanorama/IG_npe_fix
fix potenial NPE when case is closed out from underneath IG
2015-09-14 13:24:48 -04:00
Richard Cordovano
11d65913bf Merge pull request #1550 from millmanorama/IG_cleanup
review NavPanel threading
2015-09-14 13:24:08 -04:00
jmillman
314ac85c2f add versions of doDialog that take a owner window as a paramater and use them to show the tagging dialogs over IG without bringing the main autopsy window to the front. 2015-09-10 12:28:09 -04:00
jmillman
c855fe7fdf remove useless calls to isVideoFile() to improve performance 2015-09-04 13:07:54 -04:00
Richard Cordovano
813994e0f3 Revert "turn on IG" 2015-09-04 11:19:35 -04:00
Richard Cordovano
27649f3fbe Image Gallery module disabled by default 2015-09-04 11:14:51 -04:00
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