5380 Commits

Author SHA1 Message Date
jmillman
e53469de17 there is still a timing issue preventing the selection from getting picked up in the ListView 2016-06-06 11:02:28 -04:00
jmillman
05416c603f aborted atempt to break circular updates 2016-06-06 09:46:55 -04:00
jmillman
437927ec94 fix merge conflicts, part way to working "view in timeline" action 2016-06-03 17:57:31 -04:00
jmillman
1a9d86b88d Merge remote-tracking branch 'upstream/develop' into 479-view-in-timeline 2016-06-03 15:16:54 -04:00
jmillman
6cd071577e Merge remote-tracking branch 'upstream/TL-list-view' into 479-view-in-timeline 2016-06-03 15:15:15 -04:00
Richard Cordovano
90c04012b3 Merge remote-tracking branch 'upstream/251' into develop 2016-06-02 12:59:59 -04:00
Richard Cordovano
a3d8efa78f Merge in release-4.1.0 branch 2016-06-02 12:57:54 -04:00
Richard Cordovano
5952d9c066 Merge pull request #2202 from BasisOlivers/file-types-ui-fix
Fixed panel from run ingest modules.
2016-06-02 12:52:45 -04:00
Richard Cordovano
37acb134d5 Merge pull request #2203 from rcordovano/file-type-detector-fix
FileTypeDetector/CustomFileTypesManager handle custom typers correctly
2016-06-02 12:47:50 -04:00
Richard Cordovano
4128d66138 FileTypeDetector/CustomFileTypesManager handle custom typers correctly 2016-06-02 12:45:55 -04:00
Oliver Spohngellert
630ebbe56b Fixed panel from run ingest modules. 2016-06-02 12:04:19 -04:00
Oliver Spohngellert
8de0683a8e Fixed file type UI. 2016-06-02 11:45:53 -04:00
Karl Mortensen
73adaf4bfe Fix cut and paste error with MIME types 2016-06-02 10:09:54 -04:00
Richard Cordovano
7b080e19b1 Fix redundant method header comment in FileManager 2016-05-31 14:57:39 -04:00
jmillman
2639ee7f6a improve filesystem tooltips 2016-05-31 14:41:24 -04:00
jmillman
4dc73cdb8d cleanup and internationalize ListTimeline.java 2016-05-31 14:23:02 -04:00
jmillman
60c2d367ab remove unneeded columns from sql select 2016-05-31 11:37:27 -04:00
jmillman
c6e9b6717e add tooltips to Tag column 2016-05-31 11:22:30 -04:00
millmanorama
77598c0e26 Merge remote-tracking branch 'upstream/develop' into 799-tags-and-hashhit-columns-in-list-view 2016-05-28 11:40:58 -04:00
millmanorama
9e15fe6270 Merge remote-tracking branch 'upstream/TL-list-view' into 799-tags-and-hashhit-columns-in-list-view 2016-05-28 11:40:39 -04:00
Richard Cordovano
086e823f7f Resolve NBM dependency warnings for NetBeans 8.1 2016-05-27 16:22:42 -04:00
Richard Cordovano
b3665a65dc Add FileManager.findFilesByMimeType API 2016-05-27 15:56:42 -04:00
Richard Cordovano
e271a66d88 Temporarily remove FileManager.findFilesByMimeType API 2016-05-27 15:21:51 -04:00
Richard Cordovano
e6fad48c0a Make Blackboard use SleuthkitCase field 2016-05-27 15:19:39 -04:00
Richard Cordovano
9095e927be Make TagsManager use SleuthkitCase field 2016-05-27 15:16:59 -04:00
Richard Cordovano
0ebfb0d7da Revert AUT-2158 changes 2016-05-27 15:13:59 -04:00
Richard Cordovano
baef70a6bf Merge remote-tracking branch 'upstream/develop' into TL-list-view 2016-05-27 13:08:19 -04:00
Richard Cordovano
02233f5ce2 Merge remote-tracking branch 'upstream/release-4.1.0' into develop 2016-05-27 13:07:17 -04:00
Richard Cordovano
1e50ff8c98 Correct documentation for Blackboard class 2016-05-27 13:01:29 -04:00
Richard Cordovano
f746f455c8 Complete docs/deprecation for FileManager API 2016-05-27 12:53:10 -04:00
Richard Cordovano
a855009740 Merge remote-tracking branch 'upstream/develop' into new-file-mamager-api-1737 2016-05-27 10:15:05 -04:00
jmillman
d9da840e0f add tooltips to hash hit column 2016-05-26 17:12:12 -04:00
Richard Cordovano
ea4d923293 Merge remote-tracking branch 'upstream/develop' into TL-list-view 2016-05-26 15:38:40 -04:00
jmillman
a96443c8b8 Merge remote-tracking branch 'upstream/TL-list-view' into 799-tags-and-hashhit-columns-in-list-view 2016-05-26 15:35:29 -04:00
Richard Cordovano
3f64275466 Merge pull request #2184 from eugene7646/favicon_1446
Use custom favicon when one is available
2016-05-26 15:23:04 -04:00
jmillman
37f2bee2de Merge remote-tracking branch 'upstream/TL-list-view' into 792-truncate-descriptions-in-list-view
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/CombinedEvent.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java
2016-05-26 15:05:39 -04:00
jmillman
d6167968b5 Merge remote-tracking branch 'upstream/TL-list-view' into 799-tags-and-hashhit-columns-in-list-view
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/CombinedEvent.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java
2016-05-26 15:04:32 -04:00
Richard Cordovano
0dc71f43a0 Merge pull request #2183 from BasisOlivers/aut-2135
Fixed index artifact error messages.
2016-05-26 15:04:26 -04:00
Eugene Livis
448b5420ec Use custom favicon when one is available 2016-05-26 15:04:00 -04:00
jmillman
f044c824a9 Merge remote-tracking branch 'upstream/TL-list-view' into 799-tags-and-hashhit-columns-in-list-view 2016-05-26 15:02:45 -04:00
Richard Cordovano
2fe6c99b5e Fix compilation error in ListTimeline.java 2016-05-26 14:59:43 -04:00
Oliver Spohngellert
7c994b591a Fixed error messages. 2016-05-26 14:48:19 -04:00
Richard Cordovano
d2c2c83701 Merge pull request #2179 from millmanorama/787-reset-selection-on-mode-change
787 reset selection on mode change
2016-05-26 14:46:10 -04:00
jmillman
7eac34aab3 Merge remote-tracking branch 'upstream/TL-list-view' into 792-truncate-descriptions-in-list-view
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java
2016-05-26 14:29:25 -04:00
jmillman
0301793d31 Merge remote-tracking branch 'upstream/TL-list-view' into 788-lazy-context-menus 2016-05-26 14:21:09 -04:00
jmillman
f15199ad29 Merge remote-tracking branch 'upstream/TL-list-view' into 788-lazy-context-menus
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java
2016-05-26 14:20:49 -04:00
Richard Cordovano
b5f48a62c6 Merge remote-tracking branch 'upstream/develop' into TL-list-view 2016-05-26 14:05:11 -04:00
jmillman
fe1612335f Merge remote-tracking branch 'upstream/TL-list-view' into 787-reset-selection-on-mode-change 2016-05-26 14:03:53 -04:00
jmillman
14805d2fb1 Merge remote-tracking branch 'upstream/TL-list-view' into 787-reset-selection-on-mode-change 2016-05-26 14:03:40 -04:00
jmillman
620aa4fcab fix bugs from merge 2016-05-26 13:07:41 -04:00