9384 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard Cordovano	776cf8e0d1	Clamp down synchronization in CollaborationMonitor due to ConcurrentModificationException	2015-09-17 17:04:51 -04:00
Richard Cordovano	f5dd822128	Correct semantics of LocalEventPublisher	2015-09-17 16:16:33 -04:00
Richard Cordovano	76c85f3a44	Remove unused import in RemoteEventPublsiher.java	2015-09-17 15:23:15 -04:00
Richard Cordovano	56d5ac674e	Tighten up immutability in event publisher classes	2015-09-17 15:20:52 -04:00
Richard Cordovano	22224bb0d0	Format and resolve hints in event publisher classes	2015-09-17 15:12:32 -04:00
Richard Cordovano	90fc49632b	Merge develop into collab for SevenZipExtractor bug fix	2015-09-16 14:40:40 -04:00
Richard Cordovano	2fea9be4cd	Merge pull request #1577 from mhmdfy/fix-paths ... uncomment path initialization code	2015-09-16 14:28:24 -04:00
momo	e35fa1ed90	uncomment path initialization code	2015-09-16 13:53:36 -04:00
Richard Cordovano	88d19c045c	Merge pull request #1576 from rcordovano/logger_fixes ... Logger fixes	2015-09-15 18:21:04 -04:00
Richard Cordovano	f61109de19	REsolve merge conflict in Logger class	2015-09-15 18:19:28 -04:00
Richard Cordovano	021467e4c4	Add code from mysteriously unmerged commit	2015-09-15 17:21:28 -04:00
Richard Cordovano	847efc234f	Enahnce comments in modified Logger code	2015-09-15 16:53:50 -04:00
Richard Cordovano	cd8c14cc60	Convert incorrect imports of java.utils.logging.Logger	2015-09-15 16:04:40 -04:00
Richard Cordovano	75fa7f1d31	Correct Logger code	2015-09-15 14:08:46 -04:00
Richard Cordovano	e7bb22c346	Complete merge: ExifParserFileIngestModule.java	2015-09-15 09:44:34 -04:00
Richard Cordovano	6823537a6f	Merge pull request #1573 from APriestman/collaborative ... Adding check that solr host name is filled in	2015-09-15 09:39:25 -04:00
Richard Cordovano	ef020a6b56	Merge pull request #1572 from millmanorama/fix_IG_no_fs_sql ... fix SQL query when there are no FileSystems in an Image	2015-09-15 09:39:07 -04:00
Ann Priestman	d680c65cdd	Adding check that solr host name is filled in	2015-09-15 08:29:46 -04:00
jmillman	8d391fd077	fix SQL query when there are no FileSystems in an Image	2015-09-14 17:03:17 -04:00
Richard Cordovano	494a5331be	Resolve develop branch conflict	2015-09-14 13:53:14 -04:00
Richard Cordovano	780f0fa2ce	Merge pull request #1570 from mhmdfy/hashdb-null-pointer ... Hashdb null pointer	2015-09-14 13:36:05 -04:00
Richard Cordovano	018a8acbc8	Merge pull request #1564 from millmanorama/IG_in_front ... add versions of doDialog that take a owner window as a paramater and …	2015-09-14 13:29:09 -04:00
Richard Cordovano	092c249133	Merge pull request #1562 from millmanorama/jfxtras_r4 ... upgrade to jfxtras r4	2015-09-14 13:26:11 -04:00
Richard Cordovano	2469f46e40	Merge pull request #1559 from millmanorama/IG_prepopulation_performance_fix ... remove useless calls to isVideoFile() to improve performance	2015-09-14 13:25:04 -04:00
Richard Cordovano	4ce1569c71	Merge pull request #1557 from millmanorama/IG_npe_fix ... fix potenial NPE when case is closed out from underneath IG	2015-09-14 13:24:48 -04:00
Richard Cordovano	11d65913bf	Merge pull request #1550 from millmanorama/IG_cleanup ... review NavPanel threading	2015-09-14 13:24:08 -04:00
Richard Cordovano	1451bf49ce	Merge pull request #1568 from mhmdfy/remove-face-detect ... removing face detection code	2015-09-11 17:33:58 -04:00
momo	e3da44aacf	remove redundant code	2015-09-11 16:07:17 -04:00
momo	9d5470d93a	create a new jobs total for each job	2015-09-11 16:06:16 -04:00
momo	97a244fc86	adding null check for jobTotals in case jobId was not found	2015-09-11 15:16:31 -04:00
Richard Cordovano	4e73b26eff	Merge pull request #1566 from APriestman/collaborative ... Adding manual save and load to UserPreferences	2015-09-11 14:13:51 -04:00
momo	f780c3f946	removing face detection code	2015-09-11 13:49:10 -04:00
Brian Carrier	d22b18913a	Merge branch 'develop' of github.com:sleuthkit/autopsy into develop	2015-09-11 11:11:11 -04:00
Brian Carrier	85b17a5326	Added initial Python report module tutorial final file	2015-09-10 19:12:14 -04:00
Ann Priestman	3a4456b945	Changed exception type	2015-09-10 16:23:12 -04:00
Ann Priestman	414df9fd77	Cleanup	2015-09-10 13:48:24 -04:00
Ann Priestman	063ce3da89	Merge remote-tracking branch 'upstream/collaborative' into collaborative	2015-09-10 13:45:34 -04:00
Ann Priestman	e7f6fe01b3	Cleanup	2015-09-10 13:45:24 -04:00
Ann Priestman	cd549922a5	Merge remote-tracking branch 'upstream/develop' into collaborative	2015-09-10 13:27:43 -04:00
Ann Priestman	9151c241b9	Adding manual save and load to UserPreferences	2015-09-10 13:27:14 -04:00
jmillman	314ac85c2f	add versions of doDialog that take a owner window as a paramater and use them to show the tagging dialogs over IG without bringing the main autopsy window to the front.	2015-09-10 12:28:09 -04:00
Richard Cordovano	0962851a4b	Merge pull request #1561 from mhmdfy/7zipfix ... adding underscore between file name and item index	2015-09-10 12:02:06 -04:00
Richard Cordovano	e7a621c587	Merge pull request #1563 from mhmdfy/face-detect-fix ... Face detect fix	2015-09-09 14:10:27 -04:00
momo	3b76ec80a9	removed commented code	2015-09-09 14:04:03 -04:00
jmillman	7c0f2e8664	make members private	2015-09-09 13:58:36 -04:00
momo	bc73e4db39	fix closing if statement	2015-09-09 13:50:07 -04:00
momo	e4e46067db	keeping only three makernotes with face detect tags	2015-09-09 13:33:14 -04:00
jmillman	fc9073d23c	upgrade to jfxtras r4	2015-09-09 12:53:12 -04:00
Richard Cordovano	1e5d66332a	Merge remote-tracking branch 'upstream/develop' into collaborative	2015-09-09 10:14:29 -04:00
Richard Cordovano	350fc355c0	Merge pull request #1556 from robertolarcher/develop ... Email Parser: NegativeArraySizeException patch	2015-09-09 10:12:34 -04:00