Commit Graph
9739 Commits
Author SHA1 Message Date
momo e0678eb09a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2015-10-23 10:22:42 -04:00
Richard Cordovano 8637639031 Merge pull request #1629 from karlmortensen/clarifySqlErrors
better error messages when unable to create or open remote database
2015-10-23 09:29:38 -04:00
Karl Mortensen 0a5575fb37 code review updates 2015-10-23 09:28:44 -04:00
momo 66f06773e3 Merge branch 'develop' of https://github.com/mhmdfy/autopsy into develop 2015-10-23 09:03:02 -04:00
momo 2b1a5ae994 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2015-10-23 09:02:31 -04:00
Richard Cordovano 7d0569c7d0 Lint of keywordsearch.Server 2015-10-23 08:59:13 -04:00
Karl Mortensen 283f826282 fix up properties 2015-10-22 17:18:08 -04:00
Karl Mortensen 1583ec99ba merge 2015-10-22 16:41:40 -04:00
Karl Mortensen f365d5d28f remove finally blocks 2015-10-22 16:37:21 -04:00
Karl Mortensen 4e2659e810 comment out suggested edits 2015-10-22 16:18:34 -04:00
Karl Mortensen 5e1a557e9e merge 2015-10-22 16:05:56 -04:00
Karl Mortensen 4425143888 merge 2015-10-22 15:13:21 -04:00
U-Mhmdfy-PC\Mhmdfy 0cfee9e2a0 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2015-10-22 15:06:00 -04:00
Richard Cordovano 158907a654 Merge pull request #1647 from millmanorama/IG_bug_fixes
Ig bug fixes
2015-10-22 14:46:16 -04:00
Richard Cordovano ac181bdbf0 Merge pull request #1648 from eugene7646/tsk_32_bit
32-bit PostgreSQL support
2015-10-22 13:52:00 -04:00
jmillman 6a81eeefba catch EOF exception from image load in MediaViewImagePanel.java 2015-10-22 12:29:07 -04:00
jmillman a64afe318b use 32x32 icon for image callery in options panels to mathc other tabs 2015-10-22 11:38:28 -04:00
jmillman 16ee1eb325 catch null db and log friendlier message 2015-10-22 11:37:59 -04:00
Eugene Livis d18684ace4 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into tsk_32_bit 2015-10-22 11:37:54 -04:00
jmillman 6eb6c8165f catch EOF error and don't print stacktrace in log 2015-10-22 11:30:22 -04:00
jmillman c1aa377538 cancel db tasks when case is closed 2015-10-22 10:35:14 -04:00
jmillman cf99248f4a Merge branch 'IG-case-close' into IG_prepopulation_cancellable 2015-10-22 10:32:08 -04:00
Eugene Livis cc94bf1733 Changes to run 32-bit Autopsy with PostgreSQL 2015-10-22 10:23:09 -04:00
Richard Cordovano 7bb51bb8e0 Merge pull request #1646 from rcordovano/jdk_u66_update
Jdk u66 update
2015-10-22 10:11:06 -04:00
Richard Cordovano ee396f3271 Resolve merge conflict for com.sun.javafx.Utils 2015-10-22 10:09:35 -04:00
Richard Cordovano ee8fa5b3a2 Deprecate the JavaFX shim 2015-10-22 10:06:42 -04:00
Richard Cordovano 6fdd4ae2de Merge pull request #1643 from millmanorama/TL-initialization-refactor
Tl initialization refactor
2015-10-22 10:05:26 -04:00
Richard Cordovano 85d6438792 Merge pull request #1639 from millmanorama/u60_shim
add com.sun.javafx.Utils shim class.  requires Java 8u60
2015-10-21 17:49:07 -04:00
jmillman ad72f5e41f Merge remote-tracking branch 'upstream/develop' into TL-initialization-refactor
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
2015-10-21 16:51:06 -04:00
jmillman 41bd608256 Merge remote-tracking branch 'upstream/develop' into TL-initialization-refactor
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractVisualizationPane.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/TimeLineChart.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailsChart.java
2015-10-21 16:49:38 -04:00
Richard Cordovano 1d7bf119bb Merge pull request #1642 from millmanorama/zoom-out-fixes
fix stack overflow when zooming way out by disabling zooming out further than the entire case... other minor cleanup
2015-10-21 16:36:05 -04:00
jmillman 7c90264368 Merge remote-tracking branch 'upstream/develop' into zoom-out-fixes
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties
	Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
2015-10-21 16:26:02 -04:00
jmillman 849919ae72 add com.sun.javafx.Utils shim class. requires Java 8u60 2015-10-21 16:19:05 -04:00
U-Mhmdfy-PC\Mhmdfy 1615df7cf7 Merge branch 'develop' of https://github.com/mhmdfy/autopsy into develop 2015-10-21 15:49:43 -04:00
Richard Cordovano c0a43b677d Merge pull request #1634 from mhmdfy/remove-template-tools
Remove template tools
2015-10-21 15:47:07 -04:00
Richard Cordovano 676b29ffe3 Merge pull request #1632 from millmanorama/screenshot-report
fix screenshot functionality to include entire visualization, and min…
2015-10-21 15:46:16 -04:00
Richard Cordovano 16489d6398 Merge pull request #1630 from millmanorama/emphasize_interval_selector
Emphasize interval selector
2015-10-21 15:45:58 -04:00
Richard Cordovano 2149b06095 Merge pull request #1628 from mhmdfy/jython-dox
add more details for intillij
2015-10-21 15:45:27 -04:00
jmillman 6f779f0787 refactor Timeline initialization code to align with ImageGallery and use more constructor style dependency injection. 2015-10-21 12:52:23 -04:00
Brian Carrier 12f673457a Merge pull request #1640 from sleuthkit/file_type_fix
File type fix
2015-10-21 12:38:13 -04:00
Brian Carrier 1b3f9ad2fb Made use of new API for predefined file types 2015-10-21 12:36:08 -04:00
Brian Carrier bfc316b342 Added API for raw bytes for signature 2015-10-21 11:53:56 -04:00
Brian Carrier 387f7919ee Added question about what to log 2015-10-21 11:42:41 -04:00
Brian Carrier 55255d491c Fix new file type sigs, catch parse exceptions, log when case can't be created 2015-10-21 11:40:52 -04:00
jmillman 6e8b47b7f6 add com.sun.javafx.Utils shim class. requires Java 8u60 2015-10-21 10:45:37 -04:00
Brian Carrier 486460ae8b Merge pull request #1638 from sleuthkit/new_docs
Updated to reflect new ant target names
2015-10-21 09:48:32 -04:00
Brian Carrier 47d1b4be54 Updated to reflect new ant target names 2015-10-21 09:48:07 -04:00
Richard Cordovano af876d3c76 Remove rule for .cur from predefined file types 2015-10-21 09:30:07 -04:00
Richard Cordovano 052efc147d Merge pull request #1627 from mhmdfy/predefined-mime-types
Predefined mime types
2015-10-21 09:27:01 -04:00
momo e4d21bbdde Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2015-10-20 11:20:57 -04:00