8671 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
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
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
Richard Cordovano
5fe2a486d3 Merge pull request #1403 from sidheshenator/delete_report
Delete report
2015-07-24 09:49:32 -04:00
sidheshenator
b374e9bb0b Case class merge conflict - report delete events and tag events - resolved 2015-07-24 09:34:19 -04:00
sidheshenator
cfc965917e invalid utf-8 data sanitized before feeding to the Solr Ingester 2015-07-24 09:26:18 -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