Commit Graph
18776 Commits
Author SHA1 Message Date
jmillman 2abdeaee8c Merge branch 'develop' into data_result_viewer_video_thumbnails
Conflicts:
	Core/nbproject/project.xml
	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
	Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
2015-06-10 13:44:07 -04:00
Richard Cordovano 3e1ae507fa Make CollaborationMonitor use CaseDbConnection.canConnect() 2015-06-10 13:08:16 -04:00
Richard Cordovano 8d6d86264c Merge pull request #1334 from millmanorama/refactoring_and_bug_fixes
Refactoring and bug fixes
2015-06-10 12:24:37 -04:00
jmillman b9f25256c3 Lots of cleanup and comments
rename and comment DrawableViewBase

more cleanup of category related code

comments

license header;  cleanup in DrawableDB, GroupManager, and ImageGalleryController

cleanup HashSetManager and DrawableGroup

cleanup/commetns DrawableTile, DrawableView, DrawableViewBase

more cleanup ind DrawableDB
2015-06-10 12:12:29 -04:00
Richard Cordovano c420c36383 Merge pull request #1333 from karlmortensen/jar
Force copy of jar files from TSK to Autopsy upon build
2015-06-10 10:57:44 -04:00
jmillman c2bdb0fc31 clear last selected effect from tiles as they scroll out of view 2015-06-10 10:11:43 -04:00
jmillman bcca575c9d bug fixes 2015-06-10 10:11:40 -04:00
jmillman a20f040066 use event bus for category change events 2015-06-10 10:11:38 -04:00
jmillman 06e0a33499 interim refactor of towards HashSetManager 2015-06-10 10:11:37 -04:00
jmillman eb9f4750ad refactor CategoryCounts 2015-06-10 10:11:27 -04:00
Karl Mortensen ea11b6db0c Force copy of jar files from TSK to Autopsy upon build 2015-06-10 09:50:03 -04:00
Richard Cordovano e07f6a358d Merge remote-tracking branch 'upstream/develop' into collaborative 2015-06-10 09:39:00 -04:00
Brian Carrier 47a0a6f9c0 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2015-06-09 22:23:04 -04:00
Richard Cordovano cbb0a5e5a4 Merge pull request #1331 from sleuthkit/collaboration-monitor
Update new case wizard for change in CaseDbConnectionInfo API
2015-06-09 16:11:50 -04:00
Richard Cordovano 4af23213e9 Update new case wizard for change in CaseDbConnectionInfo API 2015-06-09 16:09:11 -04:00
Richard Cordovano dc2b7e4255 Merge pull request #1323 from karlmortensen/cp
Connection Pooling
2015-06-09 15:30:14 -04:00
Richard Cordovano 2563fe5946 Merge pull request #1330 from esaunders/photorec_message_change
Modified PhotoRec module message to indicate that it was the saving (…
2015-06-09 15:18:08 -04:00
Richard Cordovano a54a17eb75 Merge pull request #1329 from millmanorama/scroll_to_tile_infinite_loop_fix
use ui thread model for scrolling
2015-06-09 15:16:18 -04:00
Eamonn Saunders 362ab0ebae Modified PhotoRec module message to indicate that it was the saving (and not the carving) of unallocated space that failed. 2015-06-09 14:58:53 -04:00
Richard Cordovano 199aa180f4 Merge pull request #1328 from sidheshenator/collab_regression
account for new Swing control in the New Case Information wizard
2015-06-09 14:51:20 -04:00
jmillman 733987b617 use ui thread model for scrolling 2015-06-09 14:43:42 -04:00
sidheshenator 30b5acce22 account for new Swing control in the New Case Information wizard 2015-06-09 14:22:16 -04:00
Richard Cordovano 6849f7d52c Merge pull request #1326 from millmanorama/scroll_to_tile_infinite_loop_fix
attempt to fix infinite loop
2015-06-09 14:10:51 -04:00
Richard Cordovano 77a6078061 Merge pull request #1327 from sidheshenator/embedded_file_extractor_misc
removed unused imports and update dox
2015-06-09 14:01:09 -04:00
sidheshenator 5a16859fc8 Updated dox for embedded file extractor 2015-06-09 12:01:11 -04:00
jmillman f3bcb66efc attempt to fix infinite loop 2015-06-09 10:47:20 -04:00
sidheshenator 6592492e0d removed unused imports 2015-06-09 10:43:39 -04:00
Karl Mortensen 5f0b5165a3 fix silly merge 2015-06-09 09:42:34 -04:00
Karl Mortensen 1459ff6f56 merge in monitor 2015-06-09 09:31:17 -04:00
Richard Cordovano 6d42317b4d Merge pull request #1325 from rcordovano/collaboration-monitor
Collaboration monitor
2015-06-08 18:05:35 -04:00
Richard Cordovano 9950ffea93 Increase number of threads in CollaborationMonitor periodic tasks pool 2015-06-08 17:43:32 -04:00
Richard Cordovano 5adce9a623 Fix CollaboratinoMonitor stale remote task detection 2015-06-08 16:50:32 -04:00
Richard Cordovano 19137adcc3 Merge pull request #1324 from eugene7646/fix_for_aim
Fix to get AIM to work
2015-06-08 16:40:54 -04:00
Eugene Livis 5911c0911b Fix to get AIM to work 2015-06-08 16:36:08 -04:00
Richard Cordovano e910fac7e8 Fix local task reporting bug in CollaborationMonitor 2015-06-08 16:12:27 -04:00
Richard Cordovano caddaccb37 Refine CollaborationMonitor service status reporting 2015-06-08 15:43:27 -04:00
Karl Mortensen 437301a4ba Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into cp 2015-06-08 15:41:05 -04:00
Richard Cordovano 755e4fcd86 Merge pull request #1322 from sidheshenator/add_derived_files_after_closing_resources
Add the derived files to the job after closing open resources
2015-06-08 15:05:20 -04:00
sidheshenator 4993e48d66 Add the derived files to the job after closing open resources 2015-06-08 14:59:56 -04:00
Karl Mortensen c2deb82a1b Connection Pooling 2015-06-08 14:31:38 -04:00
Richard Cordovano 2d030aef8e Complete first implementation of CollaboratinoMonitor 2015-06-08 13:52:41 -04:00
Richard Cordovano b6c8c28d49 Correct merge of upstream 2015-06-08 11:38:05 -04:00
Richard Cordovano 0117cb72f8 Merge upstream 2015-06-08 11:36:45 -04:00
Richard Cordovano 6affa596c0 Remove public access to IngestManager.isRunningInteractively(), fix deprecated method calls 2015-06-08 11:12:50 -04:00
Richard Cordovano 5c61fc15b9 Merge pull request #1321 from eugene7646/tree_view_fix
Removed duplicate call to CoreComponentControl.openCoreWindows()
2015-06-08 11:07:32 -04:00
Richard Cordovano 7d3bc0c4cc Merge develop branch into collabortive branch 2015-06-08 11:05:50 -04:00
Eugene Livis 207857f45c Removed duplicate call to CoreComponentControl.openCoreWindows() 2015-06-08 10:45:37 -04:00
Richard Cordovano ea0ab09c3c Merge pull request #1320 from millmanorama/multiselect_npe_fix
prevent index out of bounds during multiselect
2015-06-08 10:24:02 -04:00
Richard Cordovano 8c9e1f0d70 Merge pull request #1319 from eugene7646/rename_warning
Changed warning text per Brian's request
2015-06-08 10:23:50 -04:00
Richard Cordovano ae0a3b71e4 Merge pull request #1318 from eugene7646/tree_view_fix
Fixed a bug where directory free was not showing up
2015-06-08 10:23:34 -04:00