Commit Graph
4112 Commits
Author SHA1 Message Date
Jeff Wallace 2b643d0dfd Merge branch 'macosx'
Conflicts:
	Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
	Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java
2013-09-10 11:08:05 -04:00
Jeff Wallace c76e33cedd Removed unnecessary synchronized in setupVideo method signature. 2013-09-10 10:57:31 -04:00
Jeff Wallace c43b3bfe34 Added stop button to FXVideoPanel, made stylistic improvements, updated documentation. 2013-09-10 10:31:14 -04:00
Jeff Wallace 322ac9b28c Fixed VideoPlayer exceptions on calling reset. 2013-09-10 10:07:25 -04:00
Jeff Wallace 150dcffca8 Improvements to FXVideoPlayer controls and layout. 2013-09-09 16:41:29 -04:00
Jeff Wallace cd4d26442b Switched order of calling setNode and switching tabs to prevent an extra call to setNode 2013-09-09 15:22:57 -04:00
Jeff Wallace 1ab93a81c2 Fixed NullPointerException from JavaFx on case close. 2013-09-09 15:22:30 -04:00
Jeff Wallace f5f469bd3e Merge https://github.com/sleuthkit/autopsy into macosx 2013-09-09 09:27:15 -04:00
Brian Carrier e49294f6f6 Merge branch 'master' of github.com:sleuthkit/autopsy 2013-09-06 16:08:33 -04:00
Brian Carrier eed1343817 Updated instsaller file to have version in path. 2013-09-06 16:08:21 -04:00
Brian Carrier de4b91f6ed removed version script from build process 2013-09-06 16:07:31 -04:00
Brian Carrier b770dce14e Added comments to the USB mapping class 2013-09-06 16:06:56 -04:00
Jeff Wallace 7db3cc8d73 Fixed merge conflict mistake 2013-09-06 15:36:50 -04:00
Jeff Wallace d023a799f1 Merge https://github.com/sleuthkit/autopsy into macosx
Conflicts:
	Core/src/org/sleuthkit/autopsy/core/Installer.java
	Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
	Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java
2013-09-06 15:35:34 -04:00
Jeff Wallace b9a0826412 Updated FX video panel initialization 2013-09-06 15:24:17 -04:00
Jeff Wallace 3553b2efed Merge https://github.com/sleuthkit/autopsy 2013-09-06 15:00:41 -04:00
Jeff Wallace 53551ada7e Merge branch 'forms' into macosx 2013-09-06 14:42:01 -04:00
Brian Carrier 70b0d7121c Merge pull request #271 from rcordovano/artifact_viewer_thread
Moved more work into the backround threads of DataContentViewerArtifact
2013-09-06 08:23:32 -07:00
Brian Carrier 8884242b41 Merge pull request #269 from raman-bt/master
Cleanup of recently added attributes.
2013-09-06 08:21:01 -07:00
Richard Cordovano 809a907832 Moved more work into the backround threads of DataContentViewerArtifact 2013-09-06 11:00:26 -04:00
Jeff Wallace f199859542 Merge branch 'forms' - readded forms to video panels
Conflicts:
	Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
2013-09-05 16:19:53 -04:00
Jeff Wallace b3f7f65824 Updated forms to use correct layout 2013-09-05 16:11:04 -04:00
Brian Carrier d3870da587 removed old sample ingest code that no longer compiled 2013-09-05 15:38:59 -04:00
Jeff Wallace 80c443c3f6 Merge branch 'forms'
Conflicts:
	Core/src/org/sleuthkit/autopsy/core/Installer.java
	Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
	Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java
2013-09-05 14:47:43 -04:00
Jeff Wallace 926ab9f7be Merge https://github.com/jawallace/autopsy into macosx 2013-09-05 13:50:10 -04:00
Jeff Wallace 3209845c10 Updated gstreamer form 2013-09-05 13:48:45 -04:00
Brian Carrier dd37c18aa8 Merge pull request #270 from rcordovano/result_viewer_fix
Disabled lazy setNode() calls from DataResultPanel
2013-09-05 10:17:24 -07:00
Jeff Wallace 437179b4fd Added .form files for Video Panels 2013-09-05 11:14:06 -04:00
Richard Cordovano 31e91f4958 Disabled lazy setNode() calls from DataResultPanel pending shared ExplorerManager fix 2013-09-05 10:18:53 -04:00
raman-bt 20c435e24d Merge branch 'master' of https://github.com/sleuthkit/autopsy 2013-09-04 18:13:46 -04:00
raman-bt 3ff5887495 Cleanup of some recently added attributes. 2013-09-04 18:12:15 -04:00
Brian Carrier 6a802f4dac Fixed video playback issue. 2013-09-04 17:59:23 -04:00
Brian Carrier 97ce900212 Added quick fix to prevent crash when playing videos from recent merge 2013-09-04 17:43:06 -04:00
Richard Cordovano ecef45e984 Synchronize access to DataContentViewerArtifact.setDataView() 2013-09-04 15:29:23 -04:00
Richard Cordovano 3ff70f1606 Remove call of virtual function from DataContentViewerArtifact ctor 2013-09-04 15:24:07 -04:00
Brian Carrier 46aa7f65ab Resolved merge conflict 2013-09-04 15:19:17 -04:00
Brian Carrier 19ac7e5757 updated news and added comments 2013-09-04 15:11:41 -04:00
Brian Carrier 0409d7e17a Merge branch 'master' of git://github.com/jawallace/autopsy into jawallace-master 2013-09-04 14:05:08 -04:00
Brian Carrier 0485564089 Merge pull request #267 from rcordovano/artifact_viewer_thread
Reduced work done by DataContentViewerArtifact objects
2013-09-04 10:45:49 -07:00
Richard Cordovano 27d1d10200 Added worker thread to do display for DataContentViewerArtifact 2013-09-04 13:18:49 -04:00
Richard Cordovano ecf2cecdb3 Merge remote-tracking branch 'upstream/master' into artifact_viewer_thread 2013-09-04 13:08:21 -04:00
Richard Cordovano 43025d2bc6 Eliminated setting the display 2x when a selected artifact is found; removed always false check for ArtifactStringContent object in Lookup of selected node 2013-09-04 12:53:03 -04:00
Brian Carrier 4ffdc5bd72 Added more detailed messages when data is not available for keyword searching 2013-09-04 11:25:04 -04:00
Brian Carrier 2bae58809d Merge branch 'master' of github.com:sleuthkit/autopsy 2013-09-04 09:49:00 -04:00
Brian Carrier 5c764e2ca8 Added notes about javahelp 2013-09-04 09:48:56 -04:00
Brian Carrier 4f8fc5690b updated with hash db mentions, tags, etc. 2013-09-04 09:17:38 -04:00
Brian Carrier e643c32ee5 Merge branch 'master' of github.com:sleuthkit/autopsy 2013-09-03 13:37:52 -04:00
Brian Carrier 13a2a6dcd0 basic clean up, commenting, and renaming 2013-09-03 13:37:44 -04:00
Jeff Wallace 27b401031d Fixed null pointer exception on closing case. 2013-09-03 09:49:59 -04:00
Brian Carrier 0d63414d9d Merge pull request #264 from SynapticNulship/master
Thumbnail resizing
2013-09-03 06:08:22 -07:00