millmanorama
|
a500ef01e6
|
fix issues found in code review
|
2019-03-10 15:32:02 +01:00 |
|
millmanorama
|
4bb8e44947
|
Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events
|
2019-03-08 15:29:35 +01:00 |
|
Richard Cordovano
|
184ccce273
|
Merge pull request #4601 from millmanorama/timeline-event-mgr
merge develop into Timeline event mgr
|
2019-03-08 09:09:03 -05: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 |
|
Richard Cordovano
|
cc96803548
|
Merge pull request #4594 from wschaeferB/20190306-FixNullCheck
Add a null check of type before type is used
|
2019-03-06 12:15:10 -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 |
|
Richard Cordovano
|
e17ccc62a1
|
Merge pull request #4592 from rcordovano/merged-bundle-fixes
Fix MERGED bundle for KWS, update MERGED bundle for RA
|
2019-03-05 16:34:39 -05:00 |
|
Richard Cordovano
|
ac754393e2
|
Fix MERGED bundle for KWS, update MERGED bundle for RA
|
2019-03-05 16:33:46 -05:00 |
|
Richard Cordovano
|
db98ac1111
|
Merge pull request #4587 from kellykelly3/1207-progressbar-message
Modify Extract and subclasses to take a progress bar in process function
|
2019-03-05 16:20:37 -05:00 |
|
Richard Cordovano
|
2bf654bfe3
|
Merge pull request #4585 from kellykelly3/1202-fix-recentactive-plistjar
Removed the plist jar from recentActivity, it should be using the one…
|
2019-03-05 16:17:45 -05:00 |
|
Kelly Kelly
|
706005772f
|
removed commented out line from ivy.xml
|
2019-03-05 16:12:58 -05:00 |
|
Kelly Kelly
|
28b3bd34a1
|
Merge remote-tracking branch 'upstream/develop' into 1202-fix-recentactive-plistjar
|
2019-03-05 16:00:47 -05:00 |
|
Richard Cordovano
|
2b739fe313
|
Bundle.properties-MERGE file fixes
|
2019-03-05 15:14:26 -05:00 |
|
Richard Cordovano
|
ca24aacd53
|
Merge pull request #4584 from kellykelly3/1194-edge-download
1194 edge download
|
2019-03-05 15:11:54 -05:00 |
|
Richard Cordovano
|
cd480a8f9a
|
Merge pull request #4590 from rcordovano/fix-for-compile-warning
Fix cause of compile warning for DataContentViewerOtherCases.java
|
2019-03-05 14:51:45 -05:00 |
|
rcordovano
|
6b6f38d550
|
Fix cause of compile warning for DataContentViewerOtherCases.java
|
2019-03-05 14:51:02 -05:00 |
|
Richard Cordovano
|
39cf9b881c
|
Merge pull request #4575 from wschaeferB/4626-CrDataSourcesUniqueConstraint
4626 cr data sources unique constraint
|
2019-03-05 13:53:26 -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 |
|
William Schaefer
|
3837da1f4b
|
4755 add shortcut for open in external viewer to image gallery
|
2019-03-05 12:48:40 -05:00 |
|
Richard Cordovano
|
2d4f7e7f50
|
Merge pull request #4589 from rcordovano/bundle-merge-updates
Update bundle MERGE files
|
2019-03-05 12:02:40 -05:00 |
|
Richard Cordovano
|
449955bfb6
|
Update bundle MERGE files
|
2019-03-05 12:00:39 -05:00 |
|
Kelly Kelly
|
b776821ce4
|
Merge branch 'develop' into 1202-fix-recentactive-plistjar
|
2019-03-05 10:36:57 -05:00 |
|
Kelly Kelly
|
a82bcc603e
|
Modified code based on review comments
|
2019-03-05 10:33:44 -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 |
|
Kelly Kelly
|
0cb11be390
|
Merge branch 'develop' into 1194-edge-download
|
2019-03-05 10:09:09 -05:00 |
|
Richard Cordovano
|
a1d426569c
|
Merge pull request #4588 from sleuthkit/edge_support
Merge edge_support branch into develop branch
|
2019-03-05 09:56:38 -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 |
|
Kelly Kelly
|
151e4218da
|
Modify Extract and subclasses to take a progress bar in process function
|
2019-03-04 15:57:14 -05: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
|
93cf20e363
|
4755 remove ctrl+e shortcut text from image gallery merged files
|
2019-03-04 14:31:10 -05:00 |
|