Commit Graph
18776 Commits
Author SHA1 Message Date
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 c2633c43e0 Merge pull request #2190 from sleuthkit/new-file-mamager-api-1737
New file manager API prep
2016-05-27 13:05:03 -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
Oliver Spohngellert 5c72b20f11 Added timeline to the toolbar. 2016-05-27 10:43:42 -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
Oliver Spohngellert 126c12d2d1 Fixed semantics. 2016-05-26 16:06:20 -04:00
Eugene Livis a55ff4d1ea Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-05-26 15:56:56 -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 816245d62f Merge pull request #2185 from millmanorama/792-truncate-descriptions-in-list-view
792 truncate descriptions in list view
2016-05-26 15:34:37 -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
Oliver Spohngellert 305c7a332b Got rid of toolbar updates. 2016-05-26 15:17:54 -04:00
Richard Cordovano 5ea66807e6 Merge pull request #2182 from karlmortensen/1787_gridlines
add gridlines to KWS
2016-05-26 15:08:47 -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
Karl Mortensen b555b7f31f add gridlines to KWS 2016-05-26 14:47:47 -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
Richard Cordovano 7515552a71 Merge pull request #2180 from millmanorama/788-lazy-context-menus
788 lazy context menus
2016-05-26 14:45:26 -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
Oliver Spohngellert 562fd7b8d0 Worked towards adding timeline to the toolbar. 2016-05-26 14:22:36 -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
Richard Cordovano 5c019b5126 Merge pull request #2178 from millmanorama/793-collapse-file-system-events-in-list-view
793 collapse file system events in list view
2016-05-26 14:02:02 -04:00
Richard Cordovano 8fa811254a Merge pull request #2177 from karlmortensen/1724_regex_checkmark
Show checkmark for regular expressions
2016-05-26 14:01:54 -04:00
Oliver Spohngellert fd09fb81eb Made search not happen when an exception would be thrown. 2016-05-26 13:10:39 -04:00
Eugene Livis 304341d983 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-05-26 13:07:41 -04:00
jmillman 620aa4fcab fix bugs from merge 2016-05-26 13:07:41 -04:00
Richard Cordovano 1904aa3eec Merge pull request #2173 from eugene7646/hash_db_default_path_1723
Changed default path for import hash database dialog
2016-05-26 12:48:30 -04:00
Karl Mortensen ce5ae59491 change checkmark 2016-05-26 12:42:09 -04:00
Karl Mortensen e07c066753 Change color of checkmark. 2016-05-26 12:32:02 -04:00
Oliver Spohngellert 4d4bd7b6be Attempted to disable run ingest modules through case (failed). 2016-05-26 12:22:26 -04:00
Karl Mortensen 07511457df Show green checkmark for regular expressions 2016-05-26 12:11:50 -04:00
Oliver Spohngellert 42375d403c Disabled help menu items appropriately. 2016-05-26 12:11:08 -04:00
jmillman e2856da2e7 Merge remote-tracking branch 'upstream/TL-list-view' into 793-collapse-file-system-events-in-list-view
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
2016-05-26 12:09:17 -04:00
Richard Cordovano 3a59c0a595 Merge pull request #2176 from karlmortensen/1734
Write out valid KML for all geospatial artifact/attribute combinations
2016-05-26 12:05:23 -04:00
Richard Cordovano a817c81e4c Merge pull request #2175 from millmanorama/783-remove-zoom-in-list-mode
783 remove zoom in list mode
2016-05-26 11:48:15 -04:00
Richard Cordovano 5776645b08 Merge pull request #2174 from millmanorama/TL-list-view-Visualisation-to-View
782 change visualizaion -> view in code, ui, and comments
2016-05-26 11:22:42 -04:00
Karl Mortensen 24548c0d8a Code review updates 2016-05-26 11:19:55 -04:00
jmillman b5a6a5e9b6 Merge branch '793-collapse-file-system-events-in-list-view' into TL-list-view-scroll-controlls
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java
2016-05-26 11:16:12 -04:00