Commit Graph
8528 Commits
Author SHA1 Message Date
jmillman bbc5256e23 Merge remote-tracking branch 'upstream/develop' into timeline_tags_visualiztion 2015-08-04 17:49:24 -04:00
jmillman 1e3a0ebaeb fix bug when expanding/collapsing aggergate event nodes and events where always marked as tagged 2015-08-04 17:49:12 -04:00
Richard Cordovano c398605693 Merge pull request #1491 from sleuthkit/revert-1463-sanitize_utf-8-solr
Revert "invalid utf-8 data sanitized before feeding to the Solr Inges…
2015-08-04 12:40:52 -04:00
Richard Cordovano 80e26328df Revert "invalid utf-8 data sanitized before feeding to the Solr Ingester" 2015-08-04 12:39:17 -04:00
Richard Cordovano 435c328eeb Merge pull request #1490 from mhmdfy/search-history
Search history
2015-08-04 10:15:23 -04:00
jmillman 4da81bf2c4 Merge branch 'dont_break_on_duplicate_tags' into timeline_tags_visualiztion 2015-08-03 16:43:11 -04:00
jmillman e9e5075a5a don't abort tagging as soon as one file was previously tagged; suppress duplicate tag popup; minor cleanup 2015-08-03 16:20:03 -04:00
jmillman 85f04d8429 use solution to updating tags visualization that maintains immutability of AggregateEvent
increase synchronizatio, bug fixes, and cleanup
2015-08-03 16:08:49 -04:00
jmillman 4790f84a0e have tags visualization update in response to tag creation/deletion
make aggregateEvent mutable.... ( i am not sure I like this)
remove overzealos usage of enums for db table columns
wire new tag related events from timeline controller through filtered events eventbus to aggregateeventnode
created new timeline internal tag events
2015-08-03 13:29:36 -04:00
jmillman c501bee88a Merge remote-tracking branch 'upstream/develop' into timeline_tags_visualiztion 2015-08-03 10:04:44 -04:00
momo cf2ad6ef81 remove extra space 2015-08-03 10:01:57 -04:00
momo a2fec5a9b7 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into search-history 2015-08-03 09:47:33 -04:00
Brian Carrier 55530ac708 Merge pull request #1483 from sidheshenator/photorec_inbox_message
Photorec inbox message
2015-07-31 21:21:34 -04:00
jmillman 10f7a45eb1 WIP keep tagged column in sync with autopsy. 2015-07-31 16:58:29 -04:00
momo c4d52fdd74 adding the keywork "search" to bing split tokens to filter out non-search values such as "tstitch?" 2015-07-31 16:23:53 -04:00
jmillman 703c780f27 show tag icons on detail view event groups, and tag counts in tooltip;
cleanup;  use NbBundle.messages to generate bundle strings
2015-07-31 15:37:48 -04:00
sidheshenator 42f96c2467 reverted externalized log messages 2015-07-31 13:33:33 -04:00
sidheshenator 4c0a230fd6 Photorec errors posted to inbox 2015-07-31 12:27:28 -04:00
jmillman 6259869baf Merge branch 'develop' into timeline_hash_set_filter
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/events/FilteredEventsModel.java
	Core/src/org/sleuthkit/autopsy/timeline/events/db/EventDB.java
	Core/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java
	Core/src/org/sleuthkit/autopsy/timeline/events/db/SQLHelper.java
	Core/src/org/sleuthkit/autopsy/timeline/filters/RootFilter.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/AggregateEventNode.java
2015-07-30 16:56:05 -04:00
Richard Cordovano 6869a82564 Merge pull request #1476 from millmanorama/timeline_hash_hits_details
show hash hit pin on groups and add hash hit counts to tooltip
2015-07-30 16:39:51 -04:00
jmillman 6537ebe92c show hash hit pin on groups and add hash hit counts to tooltip 2015-07-30 16:32:36 -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 2b6b3550a9 add helper method for hash hit queries 2015-07-30 16:18:17 -04:00
jmillman a8080b482a force usage of RootFilter, improve performance of hash set hit filter part of where query. 2015-07-30 16:08:21 -04:00
Richard Cordovano 497ce91da4 Merge pull request #1459 from millmanorama/timeline_datasource_filter
Timeline datasource filter
2015-07-30 14:36:36 -04:00
Richard Cordovano 086aff9a4b Merge pull request #1456 from millmanorama/update_jfxtras
update JFXtras to 8.0-r3 resolved some bugs with the date/time pickers
2015-07-30 14:34:40 -04:00
Richard Cordovano 0a39771f9d Merge pull request #1448 from millmanorama/metadata_copyable
make Metadata copyable
2015-07-30 14:34:00 -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
momo 5a8bb361cb change date to 0 if not in search query 2015-07-30 11:36:43 -04:00
Brian Carrier 1eb39955fc Merge pull request #1463 from sidheshenator/sanitize_utf-8-solr
invalid utf-8 data sanitized before feeding to the Solr Ingester
2015-07-30 10:53:39 -04:00
Sidhesh Mhatre d75ad1b21f Avoid duplicate logging of propagated exception. 2015-07-30 10:48:55 -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
jmillman f89ce249db 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-30 10:38:44 -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
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