mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,492 Commits 1 Branch 0 Tags
Commit Graph

2563 Commits

Author SHA1 Message Date
millmanorama
886356dcd5 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AbstractCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/timeline/snapshot/SnapShotReportWriter.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java
 2019-03-22 09:11:46 +01:00
William Schaefer
962bfc2467 4865 handle null reader in better manner 2019-03-20 17:13:21 -04:00
William Schaefer
dbff27ef39 4865 fix NPE possible with null Reader 2019-03-20 16:59:19 -04:00
William Schaefer
f442ee4df6 4865 check if results of TextFileExtractor are null 2019-03-20 16:13:06 -04:00
Richard Cordovano
d6e2f0ebbe
Merge pull request #4622 from dannysmyda/4848-Multi-case-list 
4848 multi case list
 2019-03-20 10:15:36 -04:00
U-BASIS\dsmyda
46729e8ded Added bundle comments back in 2019-03-19 09:47:04 -04:00
U-BASIS\dsmyda
cc1924faca Removed some warnings 2019-03-19 09:44:40 -04:00
U-BASIS\dsmyda
fd688a21c5 Changed the case list panel on the left hand side 2019-03-19 09:16:27 -04:00
Kelly Kelly
a063ec1087 Merged in develop branch 2019-03-18 16:53:52 -04:00
Kelly Kelly
b8fb023f44 Updated based on review comments 2019-03-15 11:13:02 -04:00
Richard Cordovano
80f11cc488
Merge pull request #4603 from dannysmyda/4486-Cross-Case-Keyword-Search 
4486 cross case keyword search
 2019-03-14 15:51:19 -04:00
U-BASIS\dsmyda
7644693f12 Fixed the NPE experienced when searching for certain keywords on the Cambridge cluster 2019-03-14 13:24:51 -04:00
millmanorama
bea96b6ac1 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 
# Conflicts:
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
 2019-03-14 15:00:18 +01:00
U-BASIS\dsmyda
7297678f30 Fixed merged file missing comments, THE PR IS NOW GOOD 2019-03-12 13:52:51 -04:00
U-BASIS\dsmyda
88c5b62de5 Fixed the repaint issue that I was previously unsuccessful fixing, added a listener interface to fix the warning on build 2019-03-12 13:40:36 -04:00
U-BASIS\dsmyda
6cc77655b1 Requested changes, API change, and new CaseMetadata method for locating metadata file 2019-03-12 12:15:42 -04:00
Richard Cordovano
7cedf2220b
Merge pull request #4595 from kellykelly3/1208-zoneidentifier 
1208 zoneidentifier
 2019-03-12 09:30:18 -04:00
U-BASIS\dsmyda
04a132f3b4 Fixed merged bundle issue 2019-03-11 15:31:57 -04:00
U-BASIS\dsmyda
ae60e0a819 Added a refresh button 2019-03-11 15:01:41 -04:00
U-BASIS\dsmyda
8787f225e9 Removed problematic references 2019-03-11 13:38:25 -04:00
U-BASIS\dsmyda
1d60335340 Applied source code formatting 2019-03-11 12:50:34 -04:00
U-BASIS\dsmyda
564d281489 Moved Cross case keyword search into Autopsy 2019-03-11 12:43:40 -04:00
millmanorama
47c7ed69bb Merge branch 'develop' into timeline-event-mgr 2019-03-08 12:29:08 +01: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
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
Kelly Kelly
a153cfb4cd Completed zone identifier code and merged in progress bar changes from develop 2019-03-06 10:25:16 -05:00
Richard Cordovano
ac754393e2 Fix MERGED bundle for KWS, update MERGED bundle for RA 2019-03-05 16:33:46 -05:00
Kelly Kelly
706005772f removed commented out line from ivy.xml 2019-03-05 16:12:58 -05:00
Kelly Kelly
4421caef74 Removed a \ from the keywordsearch bundles.properties file 2019-03-05 15:56:15 -05:00
Kelly Kelly
91bd0e9e9d Inital work on zone identifier parsing 2019-03-05 15:46:01 -05:00
Richard Cordovano
2b739fe313 Bundle.properties-MERGE file fixes 2019-03-05 15:14:26 -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
William Schaefer
67d57cce53 4755 resolve merge conflict with develop 2019-03-05 10:20:50 -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
millmanorama
1975c0e369 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 2019-03-04 10:08:20 +01: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
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
Raman
9575bba204 Merge from develop. 2019-02-28 17:36:09 -05:00
Brian Carrier
38cf5f570b remove escaping that causes inconsisencies in merged version 2019-02-28 14:23:27 -05:00
Richard Cordovano
35260bdb82 Fix Bundle.properties for the KeywordSearch NBM 2019-02-26 18:57:05 -05:00
Richard Cordovano
034d0fe226 Bundle.properties-MERGED 'slash removal' 2019-02-26 14:37:00 -05:00
Richard Cordovano
84b2660ffc
Revert "Revert "Copy merged bundles into src folder so that they can be checked in."" 2019-02-23 14:24:44 -05:00
Richard Cordovano
bd2866819f
Revert "Copy merged bundles into src folder so that they can be checked in." 2019-02-15 13:33:42 -05:00
millmanorama
a73455fb78 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/Case.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/coreutils/History.java
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
 2019-02-14 11:39:26 +01:00
Brian Carrier
00c92f5bf6 Fixed line ending 2019-02-13 12:55:58 -05:00
Brian Carrier
c4548389ca Copy merged buncles into src folder so that they can be checked in 2019-02-12 15:39:53 -05:00
William Schaefer
f3c224208e 4632-4630-4629 reduce versions of gson to single version in corelibs 2019-02-01 14:38:45 -05:00