11446 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver Spohngellert	f0b262b9ae	Updated documentation.	2016-05-03 14:21:57 -04:00
Oliver Spohngellert	9db7bdfe4f	Merge remote-tracking branch 'upstream/develop' into aut-2100	2016-05-03 13:56:42 -04:00
Oliver Spohngellert	0e4717f190	Added documentation.	2016-05-03 13:42:10 -04:00
Oliver Spohngellert	25f954c4d3	Updated cancellation policy.	2016-05-03 12:01:17 -04:00
Oliver Spohngellert	c29f106d3e	Working towards a working cancellation policy.	2016-05-03 10:21:28 -04:00
Oliver Spohngellert	f5fae2c1c6	Started moving to one report in reports code.	2016-05-02 16:20:33 -04:00
Richard Cordovano	076ee69394	Merge pull request #2104 from BasisOlivers/aut-2096-2 ... Fixed outpath writing for both custom config and default.	2016-05-02 14:42:43 -04:00
Oliver Spohngellert	8873e02ca9	Got rid of print statement.	2016-05-02 11:42:43 -04:00
Oliver Spohngellert	c2402d65ba	Fixed outpath writing for both custom config and default.	2016-05-02 11:40:18 -04:00
Richard Cordovano	2e6d1a6dc8	Merge pull request #2099 from karlmortensen/updateNetBeansPlatform ... Update NetBeans Platform	2016-04-29 13:18:43 -04:00
Karl Mortensen	718cddf9bd	Update NetBeans Platform	2016-04-29 12:40:54 -04:00
Richard Cordovano	eb20bba8c6	Move INgestManagerException into ingest/IngestManager	2016-04-29 09:34:17 -04:00
Richard Cordovano	5c7fdbd466	Merge pull request #2094 from karlmortensen/beginIngestJob ... Begin ingest job	2016-04-29 09:17:13 -04:00
Karl Mortensen	33e9cf4dce	code review updates	2016-04-28 16:55:27 -04:00
Richard Cordovano	79a4d0b24f	Merge pull request #2095 from millmanorama/Tl-ZoomSettings-cleanup ... TL zoom settings cleanup	2016-04-28 15:37:11 -04:00
Karl Mortensen	fa16e9e38c	Introduce IngestJobStartResult	2016-04-28 14:29:21 -04:00
Karl Mortensen	09cf29ebcf	code review update	2016-04-28 11:10:39 -04:00
Karl Mortensen	8b74dc7ec3	Code review update	2016-04-28 10:02:04 -04:00
jmillman	5be4cf98ce	more cleanup and comments in ZoomSettingsPane.java	2016-04-27 15:34:23 -04:00
jmillman	6b9f30c57a	use NbBundle.messages for EventTypeZoomLevel	2016-04-27 12:23:16 -04:00
jmillman	373f5cc333	cleanup merge	2016-04-27 12:15:31 -04:00
jmillman	82f27c61dc	cleanup in ZoomSettingsPane	2016-04-27 11:54:17 -04:00
jmillman	40ac476479	move History back/forward out of ZoomSettingsPane. cleanup and comments	2016-04-27 11:53:08 -04:00
Richard Cordovano	e43c7e2b2d	Change label for timeline/ui/HistoryToolBar	2016-04-27 11:50:49 -04:00
Richard Cordovano	806fbed235	Merge pull request #2090 from millmanorama/TL-move-history-out-of-zoom-panel ... move History back/forward out of ZoomSettingsPane. cleanup and comments	2016-04-27 11:46:40 -04:00
Richard Cordovano	526c50ca81	Merge pull request #2089 from millmanorama/TL-show-datasource-name-when-ingest-done ... Tl show datasource name when ingest done	2016-04-27 11:24:56 -04:00
Karl Mortensen	374a29d7ce	Merge branch 'develop' of github.com:sleuthkit/autopsy into beginIngestJob	2016-04-27 11:04:41 -04:00
Karl Mortensen	75bb8fa617	update comment	2016-04-27 10:54:31 -04:00
Richard Cordovano	383445f600	Remove org.netbeans.libs.javafx from diabled modules list in nbproject/platform.properties	2016-04-27 10:53:14 -04:00
Richard Cordovano	ccd868f735	Merge pull request #2093 from BasisOlivers/file-ext-mismatch-fix ... Fixed false positives on file extension mismatch.	2016-04-27 10:52:10 -04:00
Oliver Spohngellert	6856390d7c	Fixed false positives on file extension mismatch.	2016-04-27 10:46:32 -04:00
Karl Mortensen	49e6b93836	add beginIngestJob()	2016-04-27 10:25:58 -04:00
Richard Cordovano	c33d0086ef	Update comment about netbeans-plat-version in build.xml	2016-04-27 09:58:06 -04:00
Richard Cordovano	3e6285f86c	Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop	2016-04-26 17:29:52 -04:00
Richard Cordovano	a4412894fd	Remove jellytools from disabled modules list	2016-04-26 17:29:17 -04:00
Richard Cordovano	2261756547	Merge pull request #2092 from karlmortensen/fixWarnings ... Fix warning for @NbBundle.Messages	2016-04-26 17:03:38 -04:00
Karl Mortensen	4345b4e83b	Fix warning for @NbBundle.Messages	2016-04-26 17:00:50 -04:00
Richard Cordovano	313e8ab179	Synch netbeans-plat-version properties	2016-04-26 16:44:47 -04:00
jmillman	9fd3d3dcab	move History back/forward out of ZoomSettingsPane. cleanup and comments	2016-04-25 12:33:18 -04:00
jmillman	7b14ae9e37	don't prompt for confirmation when the user clicks the update button in the status bar.	2016-04-25 12:15:18 -04:00
jmillman	6d67e2e10b	cleanup in promptDialogManager and TimeLineController ... capitalize comments in PromptDialogManager more cleanup in promptDialogManager and TimeLineController	2016-04-25 12:02:25 -04:00
jmillman	9bd387a819	Merge remote-tracking branch 'upstream/develop' into TL-show-datasource-name-when-ingest-done ... Conflicts: Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java	2016-04-25 10:08:52 -04:00
Richard Cordovano	db15dcc21e	Clarify embedded file extractor module start up error message	2016-04-22 17:33:15 -04:00
Richard Cordovano	18d0f618dc	Merge pull request #2079 from karlmortensen/IngestModuleExceptions ... Messaging for IngestModuleExceptions	2016-04-22 17:21:55 -04:00
Richard Cordovano	fd6429f034	Merge pull request #2086 from millmanorama/TL-reload-button ... add a update database button the "timeline out of date" warning in the status bar.	2016-04-22 15:30:23 -04:00
Richard Cordovano	a1bfaabf14	Merge pull request #2083 from millmanorama/IG-use-alias-in-sql ... use alias in sql query to avoid ambiguity about column name	2016-04-22 14:21:55 -04:00
Richard Cordovano	a7faf8e6c9	Merge pull request #2080 from millmanorama/TL-fix-events-tree ... Tl fix events tree	2016-04-22 14:20:17 -04:00
jmillman	0bb69a45ac	cleanup in PromptDialogManager, CancellationProgressTask, and TimeLineController	2016-04-21 15:43:14 -04:00
jmillman	18c49ce382	cleanup in TimeLineController	2016-04-21 14:41:45 -04:00
jmillman	8163d351cf	show datasource name when ingest completed results in prompt to rebuld timeline db.	2016-04-21 13:54:16 -04:00