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
1721a530fc
Merge pull request #1494 from karlmortensen/import_updates
...
Import updates
2015-08-05 10:10:35 -04:00
Karl Mortensen
6a3b13052a
update logging
2015-08-05 09:57:28 -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
Karl Mortensen
1f93a32f55
Import updates
2015-08-04 17:55:46 -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
Karl Mortensen
60d291a185
Import updates
2015-08-04 16:56:17 -04:00
Richard Cordovano
4895924d49
Complete making case opening multi-user case aware
2015-08-04 15:18:31 -04:00
jmillman
43103e1b2f
delegate hash set name lookup to new method in Content.
2015-08-04 13:37:53 -04:00
Richard Cordovano
5e74324272
Restore code to Case.open() to throw for invalid case metadata file name
2015-08-04 12:56:01 -04:00
Richard Cordovano
6215a5d3e5
Merge remote-tracking branch 'upstream/collaborative' into multi-user-settings-checks
2015-08-04 10:29:40 -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
Karl Mortensen
a88a00defc
add start of batch log
2015-07-31 17:40:13 -04:00
jmillman
10f7a45eb1
WIP keep tagged column in sync with autopsy.
2015-07-31 16:58:29 -04:00
Karl Mortensen
9d8daa7813
update log messages
2015-07-31 16:36:17 -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
Karl Mortensen
461128fd96
Standardize terminology on import instead of convert
2015-07-31 14:37:08 -04:00
Karl Mortensen
2a876ff4c9
option to add timestamp to case folders
2015-07-31 13:36:08 -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
Karl Mortensen
38003c1809
remove %
2015-07-31 12:18:18 -04:00
Karl Mortensen
354ca9a01b
create file in temp folder
2015-07-31 11:58:19 -04:00
Richard Cordovano
85cdf8eddb
Make open case check multiuser setting for multiuser cases, part 1
2015-07-31 11:34:19 -04:00
Karl Mortensen
222ba0cbdf
merge
2015-07-31 11:28:40 -04:00
Karl Mortensen
dd251cefa6
Handle input image folders in case import
2015-07-31 09:41:28 -04:00
Richard Cordovano
eac41f8c7d
Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into collaborative
2015-07-31 07:37:31 -04:00
Richard Cordovano
a8b0d73994
Fix faulty merge conflict resolution
2015-07-31 07:31:08 -04:00
Richard Cordovano
bdab0febce
Make Case.open() throw if attempt to open multi-user case with no settings
2015-07-31 07:24:35 -04:00
Richard Cordovano
4fa911aabd
Merge conflict resolution
2015-07-30 17:26:49 -04:00
Richard Cordovano
69b7d3ed9d
Make NewCaseWizardPanel1 track multi-user cases enabled
2015-07-30 17:23:44 -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
Karl Mortensen
25bebee8d9
ignore C: for single user case
2015-07-30 14:13:17 -04:00
Karl Mortensen
252619bd3b
rename to SingleUserCaseImporter
2015-07-30 13:32:06 -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
Karl Mortensen
e0afc0c29a
lowercamcelcase method names
2015-07-30 12:45:27 -04:00