11960 Commits

Author SHA1 Message Date
millmanorama
a500ef01e6 fix issues found in code review 2019-03-10 15:32:02 +01:00
millmanorama
1cf785b8cb fix merge 2019-03-08 12:39:58 +01:00
millmanorama
8fccb3d845 Merge branch 'timeline-event-mgr' into 1192-manually_created_events 2019-03-08 12:31:35 +01:00
millmanorama
47c7ed69bb Merge branch 'develop' into timeline-event-mgr 2019-03-08 12:29:08 +01:00
millmanorama
2a30fa1a12 add alerts on errors 2019-03-08 12:28:09 +01:00
millmanorama
b7f1e42ab8 Merge branch 'timeline-event-mgr' into 1192-manually_created_events 2019-03-08 10:49:04 +01:00
Richard Cordovano
f80dbca870
Merge pull request #4596 from dannysmyda/4790-Sort-Datasources-in-Tree
4790 sort datasources in tree
2019-03-07 08:22:34 -05:00
Richard Cordovano
b2957ad1e1
Merge pull request #4586 from wschaeferB/4755-OpenInExternalViewerShortcut
4755 open in external viewer shortcut
2019-03-06 17:05:33 -05:00
William Schaefer
0ab6f73186 4755 remove parens from main application Ctrl+C shortcut txt 2019-03-06 14:55:56 -05:00
William Schaefer
b5cd66fe7f Move checks for argument validity to public methods 2019-03-06 11:46:31 -05:00
U-BASIS\dsmyda
d3338d57e0 Removed the comments 2019-03-06 11:36:43 -05:00
U-BASIS\dsmyda
836486717c Added sorting of the data sources to the classical tree view and the group by data source tree view 2019-03-06 11:35:40 -05:00
millmanorama
ce6807b96e Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
2019-03-06 16:32:42 +01:00
William Schaefer
1c6286f3bc Add a null check of type before type is used 2019-03-06 10:22:46 -05:00
millmanorama
24d73bb34e use correct class name in Bundle 2019-03-06 12:11:42 +01:00
millmanorama
07a23ac0f9 set time at invocation note creation of action. comments 2019-03-06 11:52:06 +01:00
rcordovano
6b6f38d550 Fix cause of compile warning for DataContentViewerOtherCases.java 2019-03-05 14:51:02 -05:00
William Schaefer
fc356fc3e3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-03-05 12:55:43 -05:00
William Schaefer
9a2d5f410a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-05 12:50:33 -05:00
Richard Cordovano
449955bfb6 Update bundle MERGE files 2019-03-05 12:00:39 -05:00
millmanorama
95adcb96f0 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events 2019-03-05 16:31:23 +01:00
millmanorama
aecc229345 add right click menu option to add event with datetime prepopulated;
other small cleanup and refactoring
2019-03-05 16:30:52 +01:00
William Schaefer
67d57cce53 4755 resolve merge conflict with develop 2019-03-05 10:20:50 -05:00
Richard Cordovano
2db8920e39
Merge branch 'develop' into edge_support 2019-03-05 09:56:14 -05:00
Richard Cordovano
96e87f6b7d
Merge pull request #4569 from wschaeferB/4757-InterCaseSearchQueryChanges
4757 inter case search query changes
2019-03-05 09:17:14 -05:00
millmanorama
397f9694ee inline methods 2019-03-05 12:38:22 +01:00
millmanorama
58913c6970 remove notification cooldown timer 2019-03-05 12:37:59 +01:00
millmanorama
d9fe0134cc support User Created events 2019-03-05 12:37:40 +01:00
Richard Cordovano
7abee59bfe
Merge pull request #4578 from raman-bt/1188-cache-artifact
1188 Web cache artifact
2019-03-04 15:31:42 -05:00
William Schaefer
2cc861d8f3 4755 fix copyright for new file 2019-03-04 13:01:46 -05:00
William Schaefer
e399ae4594 4755 add modified merged bundle files 2019-03-04 12:35:49 -05:00
William Schaefer
094f576e5b 4755 add (Ctrl+E) to end of Open in External Viewer to identify shortcut 2019-03-04 12:27:31 -05:00
William Schaefer
5b72595367 3921 add merged bundle files and diamond typing for html viewer 2019-03-04 11:39:46 -05:00
William Schaefer
e5733efd62 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 11:36:34 -05:00
Richard Cordovano
5462b9f8c7
Merge pull request #4579 from wschaeferB/4782-UniqueNamedDocImages
4782 unique named doc images
2019-03-04 10:30:10 -05:00
William Schaefer
874f239f0e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 10:19:54 -05:00
Richard Cordovano
de9277ea56
Merge pull request #4573 from dgrove727/4663_OtherOccurrencesCount
Case and data source counts added.
2019-03-04 10:18:42 -05:00
Richard Cordovano
26b125f97c
Merge pull request #4566 from dgrove727/3921_HtmlContentViewer
3921 html content viewer
2019-03-04 10:18:03 -05:00
William Schaefer
d21ee983de Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 10:17:12 -05:00
Richard Cordovano
dc2fa3f8d4
Merge pull request #4580 from dgrove727/4777_ApplicationContentViewerSize
Reset viewport.
2019-03-04 10:16:45 -05:00
millmanorama
1975c0e369 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 2019-03-04 10:08:20 +01:00
William Schaefer
31dc94d794 4755 Add Shortcut for opening files in external viewer Ctrl+E 2019-03-01 17:17:06 -05:00
Raman
18beac06e8 1204: Show TSK_DOWNLOAD_SOURCE artifact in MetaData viewer
Also addressed review comments on previous commit.
2019-03-01 14:45:57 -05:00
William Schaefer
ec3903cdb6 4626 make connect(bool foreignKeys) an additional method instead of a replacement method 2019-03-01 11:51:52 -05:00
William Schaefer
1f92057a5f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-03-01 11:42:25 -05:00
U-BASIS\dgrove
672e20bd6b Typo fix. 2019-03-01 11:42:15 -05:00
U-BASIS\dgrove
fa60adcb26 Additional count parameter; handling edge case. 2019-03-01 11:40:38 -05:00
millmanorama
0e0d41185a Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/Case.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
#	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
#	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
#	thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
2019-03-01 12:20:18 +01:00
millmanorama
233b89495d remove the new event notification cooldown 2019-03-01 11:35:21 +01:00
millmanorama
3e51321102 comments and minor refactoring 2019-03-01 11:30:16 +01:00