jmillman
6537ebe92c
show hash hit pin on groups and add hash hit counts to tooltip
2015-07-30 16:32:36 -04:00
jmillman
d4f26d4916
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-30 10:39:43 -04:00
momo
db40bf6104
change init name
2015-07-29 15:53:46 -04:00
momo
38a460d269
cleanup code
2015-07-29 15:49:30 -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
jmillman
852a54fbf7
re-remove thumbnail support check from DataResultViewerThumbnail
2015-07-28 17:19:15 -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
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
5dd33cd80e
Merge pull request #1451 from millmanorama/missing_resource_fix
...
fix missing resource exception
2015-07-28 13:02:35 -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
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
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
jmillman
ed5d546bb5
comments and variable rename
2015-07-24 12:57:31 -04:00
jmillman
915997f3b4
remove extra quotes form bundle.properties string
2015-07-24 12:51:08 -04:00
Richard Cordovano
f1f0b23653
Merge pull request #1420 from sidheshenator/copy_paste_hashes
...
add hashes to databse implemented
2015-07-24 12:31:41 -04:00
jmillman
e4b095681b
convert filters package to NBundle.Messages annotation
2015-07-24 12:11:14 -04:00
jmillman
a95eb009ae
improve handling of datasource filter when databse is rebuilt. clear history when rebuilding database as the filters may not match up
2015-07-24 12:11:10 -04:00
jmillman
1fa2b50a49
inline locking methods that add no value
2015-07-24 12:11:05 -04:00
jmillman
93b35d03de
revert to original database location; cleanup and comments
2015-07-24 12:11:01 -04:00
jmillman
561ebdf1c3
extract message string
2015-07-24 12:10:57 -04:00
jmillman
4238e33534
fix filter disabled state
2015-07-24 12:10:53 -04:00
jmillman
30a4e13fcd
update copyright headers
2015-07-24 12:10:39 -04:00
jmillman
c5a9dddaa3
upgrade database when no datasource_id column is present
...
- make several inner class outer, extract SQLHelper from eventsDB
- pass autopsy case object into TimelineController, EventsRepo, EventsDB etc;
- put events.db in module output folder
- add type paramater to compound filter
- rename active to selected for filters
- remove filter disabling
- prompt to rebuild if database doesn't have datasources_id
- fix errors in VisualizationPanel introduced by localization
2015-07-24 12:10:35 -04:00
jmillman
c6e19bb29e
fix "report" checkbox
2015-07-24 12:10:31 -04:00
jmillman
6bfab0e6d4
update filters with hashcode and equals
2015-07-24 12:10:28 -04:00
jmillman
f125d5486b
first pass at Data Source Filter
...
-cleanup DefaultFilter.java -> DefaultfilterAction.java
-create DataSourceFilter and DataSourcesFilter classes
-create Rootfilter class
-modify EventDB
--create enums for EventDB columns and keys into the DBInfo Table.
--add datasource_id to events table
--add methods to EventDB to get the datasource ids
--added getSQLWhere() variant for DataSourceFilter
-expose datasources from EventsRepository and populate at timeline open / rebuild
-customize default filters supplied by FilteredEventsModel with datasource filters
-put window manipulation on edt in TimeLineController
minor fixes and cleanup;
fix typo in class name; more minor cleanup
2015-07-24 12:10:10 -04:00
sidheshenator
b374e9bb0b
Case class merge conflict - report delete events and tag events - resolved
2015-07-24 09:34:19 -04:00
momo
05b4d42b45
removing the list of carved files from message
2015-07-23 16:32:47 -04:00
momo
cdbb3de0bf
changing to more appropriate variable names and descriptions
2015-07-23 15:51:37 -04:00
momo
f63e84741f
added index message to PhotoRec Module
2015-07-23 15:19:03 -04:00
sidheshenator
7159d7d10c
Event name changed from DELETE_REPORTS to DELETE_REPORT
2015-07-23 12:53:22 -04:00
jmillman
c52607f8f9
fix missing resource exception
2015-07-21 13:54:04 -04:00
Richard Cordovano
be93867c89
Fix results view node count as in collaborative branch
2015-07-20 11:07:03 -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
c8ac16f713
cleanup GstVideoPanel to bring into closer alignment with FXVideoPanel in preparation for further abstraction
...
check if file exists before exporting in GstVideoPanel
move getTempVideoFile and generateVideoThumbnail to new VideoUtils class
2015-07-17 12:50:53 -04:00