8544 Commits

Author SHA1 Message Date
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
Richard Cordovano
48841264d6 Merge pull request #1446 from millmanorama/show_hash_in_metadata
Show hash in metadata
2015-07-29 17:42:10 -04:00
jmillman
b4e900000a show hash hit pin on groups and add hash hit counts to tooltip 2015-07-29 16:08:20 -04:00
Richard Cordovano
980034d570 Merge pull request #1471 from mhmdfy/photorec-fix
Photorec fix
2015-07-29 15:55:12 -04:00
momo
db40bf6104 change init name 2015-07-29 15:53:46 -04:00
Richard Cordovano
497d3680e7 Merge pull request #1473 from sidheshenator/native_python_doc
jython native library exception documented
2015-07-29 15:49:49 -04:00
momo
38a460d269 cleanup code 2015-07-29 15:49:30 -04:00
sidheshenator
abc79c1c6c jython native library exception documented 2015-07-29 15:48:07 -04:00
jmillman
b5c02cdc13 Merge remote-tracking branch 'upstream/develop' into timeline_hash_hits 2015-07-29 13:43:00 -04:00
momo
899369a0ed initialized IngestJobs at startup for photorec, and making sure we are using the same monitor for IngestJobs in both photorec and hashdb 2015-07-29 13:15:27 -04:00
momo
a04de48c02 fix nullpointer exception 2015-07-29 12:22:49 -04:00
Brian Carrier
4d10808923 Merge pull request #1469 from millmanorama/re-remove_thumbnail_support_check
re-remove thumbnail support check from DataResultViewerThumbnail
2015-07-28 17:50:15 -04:00
jmillman
852a54fbf7 re-remove thumbnail support check from DataResultViewerThumbnail 2015-07-28 17:19:15 -04:00
jmillman
52a164fc7f WIP 2015-07-28 17:16:24 -04:00
jmillman
9996ef95f5 Merge remote-tracking branch 'upstream/develop' into timeline_hash_hits
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-28 14:29:48 -04:00
jmillman
d88d98bf39 Merge remote-tracking branch 'upstream/develop' into timeline_datasource_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-28 14:28:18 -04:00
jmillman
2a45a74245 Merge remote-tracking branch 'upstream/develop' into update_jfxtras
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-28 14:12:25 -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
jmillman
a3055094ae WIP 2015-07-28 13:22:39 -04:00
Richard Cordovano
cbffefae60 Merge pull request #1458 from mhmdfy/photorec-index-message
Photorec index message
2015-07-28 13:21:24 -04:00
Richard Cordovano
30f38c7077 Merge pull request #1465 from sidheshenator/patch-1
Unassigned moduleSettingsFilePath variable assigned
2015-07-28 13:05:42 -04:00
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
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
Brian Carrier
edb4b13eed Fixed order of diff arguments 2015-07-28 11:22:14 -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
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
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
momo
ec0cc450c0 changed variable name to represent more than just photos 2015-07-27 09:42:35 -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
8dba655ad6 Merge remote-tracking branch 'upstream/develop' into timeline_datasource_filter 2015-07-24 14:10:59 -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
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