3148 Commits

Author SHA1 Message Date
jmillman
b9e7793f1f Merge remote-tracking branch 'upstream/develop' into timeline_tags_visualiztion
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/events/AggregateEvent.java
	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/ui/detailview/AggregateEventNode.java
	Core/src/org/sleuthkit/autopsy/timeline/zooming/DescriptionLOD.java
2015-08-10 12:48:10 -04:00
Karl Mortensen
332a08f07d Bulk format code with new settings 2015-08-07 13:23:40 -04:00
Brian Carrier
b6d911fa6b Cleaned up samples, added files associated with data source tutorial 2015-08-05 23:15:19 -04:00
jmillman
084125ca3c move the registering for tag events to EventDetailChart and let it forward to all the aggregate nodes. this avoids a build up of references to unused nodes in the eventbus 2015-08-05 13:00:46 -04:00
jmillman
685934fa55 cleanup, comments 2015-08-05 11:57:56 -04:00
momo
4cc30d0d68 getting new version from TSK 2015-08-05 11:28:55 -04:00
jmillman
2241e29529 Merge remote-tracking branch 'upstream/develop' into timeline_tags_visualiztion
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/AggregateEventNode.java
2015-08-05 11:23:51 -04:00
momo
c6cf98baaa Merge branch 'develop' of https://github.com/sleuthkit/autopsy into upgrade-jar 2015-08-05 10:25:29 -04:00
momo
974bbe3e18 using the path for 3.8.11 2015-08-05 10:21:44 -04:00
Richard Cordovano
bd3b4a2bba Merge pull request #1489 from millmanorama/dont_break_on_duplicate_tags
don't abort tagging as soon as one file was previously tagged; suppre…
2015-08-05 08:44:05 -04:00
Richard Cordovano
5d8a59a10a Merge pull request #1475 from millmanorama/application/octet-stream_fix
Application/octet stream fix
2015-08-05 08:42:20 -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
jmillman
43103e1b2f delegate hash set name lookup to new method in Content. 2015-08-04 13:37:53 -04:00
jmillman
6d53f33447 Merge remote-tracking branch 'upstream/develop' into timeline_hash_set_filter 2015-08-04 10:21:51 -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
jmillman
10f7a45eb1 WIP keep tagged column in sync with autopsy. 2015-07-31 16:58:29 -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
jmillman
6537ebe92c show hash hit pin on groups and add hash hit counts to tooltip 2015-07-30 16:32:36 -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
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
4f04fa641a add mimetypes that are supported but seam to be missing from the ones reported. 2015-07-30 13:19:58 -04:00
jmillman
c74f204808 fix potential NPE 2015-07-30 13:01:17 -04:00
jmillman
9fe0e26cef cleanup DataContentViewerMedia.isSupported 2015-07-30 12:51:12 -04:00
jmillman
240a46221c refactor isSupportedLogic to provide a clearer distinction between video and images while reusing more code. 2015-07-30 12:38:50 -04:00
jmillman
ea0cdffe1c only show application/octet-stream if the file has a supported extension 2015-07-30 11:30:46 -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
199d2e6d2a initial pass at timeline hash set filters 2015-07-29 19:09:08 -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
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
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
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
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
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