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
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
sidheshenator
d8f3f35dfe
silently ignore shellfolders registry datatype
2015-08-03 14:46:11 -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
Richard Cordovano
2498ec159e
Merge pull request #1487 from karlmortensen/updatelogs
...
update log messages
2015-07-31 17:44:49 -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
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
Richard Cordovano
c6e9980b68
Merge pull request #1485 from karlmortensen/standardterminology
...
Standardterminology
2015-07-31 14:56:54 -04:00
Richard Cordovano
d1ced1f754
Merge pull request #1484 from karlmortensen/add_timestamp
...
Add timestamp
2015-07-31 14:56: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
9042df3949
Merge pull request #1480 from karlmortensen/handle_input_images
...
Handle input image folders in case import
2015-07-31 11:40:07 -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
035d53345a
Merge pull request #1479 from rcordovano/res-bundle-fix
...
Fix faulty merge conflict resolution
2015-07-31 07:33:00 -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
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
Richard Cordovano
6a0a4fd4cb
Merge pull request #1468 from karlmortensen/hostname_not_ip
...
use hostname in UNC paths for photorec
2015-07-30 14:31:29 -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