Commit Graph
5306 Commits
Author SHA1 Message Date
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
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 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
jmillman b4565fd098 Merge remote-tracking branch 'upstream/TL-list-view' into 793-collapse-file-system-events-in-list-view
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListViewPane.java
2016-05-26 11:10:50 -04:00
jmillman 8e31a21033 Merge remote-tracking branch 'upstream/TL-list-view' into 787-reset-selection-on-mode-change 2016-05-26 10:34:27 -04:00
jmillman 43d14c0276 Merge remote-tracking branch 'upstream/TL-list-view' into 783-remove-zoom-in-list-mode 2016-05-26 10:25:02 -04:00
jmillman 21c9e5a5c0 Merge remote-tracking branch 'upstream/TL-list-view' into TL-list-view-Visualisation-to-View
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListViewPane.java
2016-05-26 10:19:31 -04:00
Richard Cordovano a65ad714ae Merge remote-tracking branch 'upstream/develop' into TL-list-view 2016-05-25 20:34:13 -04:00
Richard Cordovano 504190534f Merge pull request #2165 from eugene7646/report_title_1763
Corrected report name
2016-05-25 14:48:33 -04:00
jmillman e931c9c582 update copyright headers, comments 2016-05-25 14:44:37 -04:00
Richard Cordovano 8f25020ec4 Merge pull request #2157 from eugene7646/utf8_sanitization
UTF-8 sanitizing all text before it is passed to Solr
2016-05-25 14:35:13 -04:00
Richard Cordovano 2afa6aee11 Merge pull request #2153 from eugene7646/hash_db_save_folder_1723
Default location for saving custom hash databases
2016-05-25 14:25:01 -04:00
jmillman 290e77c814 cleanup and comments focused on CombinedEvent 2016-05-25 13:25:55 -04:00
jmillman c5bbe274fb clean up selection management in TimeLineTopComponent and ListTimeline 2016-05-25 11:52:49 -04:00
jmillman 536d772502 fix off by factor of 1000 bug in times, use the event id not the fileID 2016-05-25 11:27:29 -04:00
jmillman 37a2c07a98 dedupe lookup results in AddTagAction.addTag() 2016-05-25 10:41:34 -04:00
Eugene Livis 0a8dff191e Corrected report name 2016-05-24 15:27:21 -04:00
jmillman f495b7051b multiselect partly working 2016-05-24 15:23:34 -04:00
jmillman 4a014270b9 begin work to collapse file system events into one row in list ViewRefreshTask
new MergedEvent that corresponds to one row in the table.
updated List View  columns to show MACB for file system EventsRepository
2016-05-24 15:06:03 -04:00
jmillman 22ef82ead4 reset the selected events when the view mode changes 2016-05-24 11:39:18 -04:00
jmillman f372f2ccf1 remove the whole zoom panel in list mode 2016-05-24 11:06:42 -04:00
jmillman aeaa059de9 Merge remote-tracking branch 'upstream/develop' into TL-list-view 2016-05-24 10:27:13 -04:00
Richard Cordovano e4850e4212 Merge pull request #2152 from eugene7646/attr_id_1669
Converted attribute id from short to int
2016-05-24 09:29:43 -04:00
jmillman c1aedce880 change visualizaion -> view in more places in code, ui, and comments 2016-05-23 17:04:33 -04:00
jmillman 1db35dc915 cleanup ListViewPane.java and ListTimeline.java 2016-05-23 16:39:27 -04:00
jmillman 795c40d169 maintain selection when the table contents change 2016-05-23 16:39:22 -04:00
jmillman 4d6c4240c6 change visualizaion -> view in code, ui, and comments 2016-05-23 16:37:28 -04:00
Eugene Livis 9283e0079c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into utf8_sanitization 2016-05-20 16:30:37 -04:00
jmillman 0b03435b23 add message to UnsupportedOperationException 2016-05-20 16:18:56 -04:00
jmillman 4d018f45d5 fix actions which were broken by flawed refactoring 2016-05-20 16:16:39 -04:00
jmillman 835df96a78 cleanup ListTimeline 2016-05-20 15:54:23 -04:00
jmillman 7a0bfb4980 cleanup and refactor TimeLineTopComponent 2016-05-20 15:24:21 -04:00
Eugene Livis fbb0023b99 default location for saving custom hash database 2016-05-20 15:12:01 -04:00
jmillman ffef4926a1 cleanup EventNode and EventRootNode 2016-05-19 17:46:10 -04:00
jmillman edb5642140 rename SwingMenuItemAdapter.java -> SwingFXMenuUtils.java and cleanup 2016-05-19 17:05:59 -04:00
jmillman 41a1776c13 Merge branch 'TL-list-view-actions-global-context' into TL-list-view 2016-05-19 16:24:43 -04:00
jmillman fbf9a68b89 Merge remote-tracking branch 'upstream/develop' into TL-list-view 2016-05-19 16:24:32 -04:00
Eugene Livis 9680df5ce0 Converted attribute id from short to int 2016-05-19 16:23:43 -04:00
jmillman b5edf4d486 actions that depend on actionsGlobalContext work. 2016-05-19 16:22:22 -04:00
Richard Cordovano 7697455017 Remove EM selection listener DataResultPanel.close 2016-05-19 14:27:52 -04:00
Richard Cordovano 23e107e78d Merge pull request #2149 from karlmortensen/1761
Move some menu items
2016-05-19 13:24:26 -04:00
Karl Mortensen edf1c75524 code review update 2016-05-19 13:24:03 -04:00
Karl Mortensen ce8904f8c4 code review update 2016-05-19 13:20:56 -04:00
jmillman 3dd157de1b build context menus directly from Actions rather than from the swing/netbeans contenxtmenu 2016-05-19 11:45:53 -04:00
jmillman 87358d3ee1 closer to working actions. 2016-05-18 17:17:03 -04:00
jmillman 8623f216c8 Merge branch 'TL-list-view' into TL-list-view-actions 2016-05-18 14:45:26 -04:00
jmillman f7e7404ec4 address review comments: fix typos, rename variables, catch exceptions higher up. 2016-05-18 14:34:08 -04:00
jmillman a185a43d11 Merge remote-tracking branch 'upstream/develop' into TL-list-view 2016-05-18 13:42:15 -04:00