Commit Graph
18776 Commits
Author SHA1 Message Date
Richard Cordovano 06f66690e6 Merge pull request #1637 from karlmortensen/casePropertiesInfo
add database info to case properties
2015-10-23 10:26:58 -04:00
Richard Cordovano b9b6f38844 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2015-10-23 10:25:47 -04:00
Richard Cordovano a76821e123 Additional linting of keywordsearch.Server 2015-10-23 10:24:22 -04:00
momo e0678eb09a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2015-10-23 10:22:42 -04:00
Karl Mortensen d45ba54f9a bump version 2015-10-23 09:53:46 -04:00
Karl Mortensen 2568cb45d8 remove extraneous UI element 2015-10-23 09:43:39 -04:00
Karl Mortensen add51c6ecd merge 2015-10-23 09:39:59 -04:00
Karl Mortensen 9e74498fa1 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into scrollPane 2015-10-23 09:38:04 -04:00
Karl Mortensen fc7f8003fe Merge branch 'develop' of https://github.com/sleuthkit/autopsy into noMultiIsNotAnError 2015-10-23 09:37:27 -04:00
Eugene Livis 4b6500263a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2015-10-23 09:33:56 -04:00
Karl Mortensen 042c907403 merge 2015-10-23 09:32:02 -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 98193f300d Merge branch 'develop' of https://github.com/mhmdfy/autopsy into multi-sig-mime-type 2015-10-23 09:03:50 -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 84eb267903 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into casePropertiesInfo 2015-10-22 19:45:20 -04:00
Karl Mortensen 476f89d006 code review updates 2015-10-22 18:22:55 -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
U-Mhmdfy-PC\Mhmdfy 8a222c1ae9 fix conflict 2015-10-22 16:38:35 -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
Eugene Livis 783226a8c9 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into disable_mu_linux 2015-10-22 14:48:59 -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
Eugene Livis ac37ab94e1 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into disable_mu_linux 2015-10-22 14:45:43 -04:00
Eugene Livis 24e661afc7 Disable multi-user cases for non-Windows platforms 2015-10-22 14:45:25 -04:00
Karl Mortensen b6130fe935 refactor case importer 2015-10-22 13:52:02 -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
Eugene Livis 99d04c4bd2 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2015-10-22 13:28:23 -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
Eugene Livis 2592254a0b Changes to run 32-bit Autopsy with PostgreSQL 2015-10-22 10:09:31 -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