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

807 Commits

Author SHA1 Message Date
millmanorama
549d480468 update Bundle.properties-MERGED 2019-04-15 18:19:33 +02:00
millmanorama
2119625f5a Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1157-collapse_file_events 
# Conflicts:
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
#	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
 2019-03-27 12:37:10 +01:00
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
Richard Cordovano
4947c739bc
Revert "Revert "4841: RecentActivity not making progress on large image"" 2019-03-21 11:51:54 -04:00
Richard Cordovano
81b2938fd3
Revert "4841: RecentActivity not making progress on large image" 2019-03-21 08:32:12 -04:00
Raman
99e447af90 4841: RecentActivity not making progress on SANS. 2019-03-20 14:30:48 -04:00
millmanorama
c158e71fec Merge branch 'timeline-event-mgr' into 1157-collapse_file_events 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
 2019-03-20 12:50:24 +01: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
Raman
d9d6c8aa6c Address review comments. 2019-03-13 19:21:10 -04:00
Raman
c8fc5a9765 4706: detect Android media cards. 2019-03-13 15:24:56 -04:00
Richard Cordovano
7cedf2220b
Merge pull request #4595 from kellykelly3/1208-zoneidentifier 
1208 zoneidentifier
 2019-03-12 09:30:18 -04:00
Kelly Kelly
1636a5d815 Fixed zone string format 2019-03-12 09:27:53 -04:00
Kelly Kelly
459e558593 Addressed review comments from Raman 2019-03-11 10:41:42 -04:00
Kelly Kelly
260014d0a0 moved semi-colon 2019-03-07 11:44:21 -05:00
Kelly Kelly
637f8c6a4f Added static imports 2019-03-07 11:36:41 -05:00
Kelly Kelly
b6a552c2a1 Addressed Jonathan's review comments 2019-03-07 11:00:45 -05:00
Kelly Kelly
05da0c83b5 Changed the logic per Brian's comments 2019-03-06 17:25:01 -05:00
Kelly Kelly
c14b8d55fc Updated based on Brian's comments 2019-03-06 15:44:14 -05:00
Raman
e6a0c3bbaf Address review comments. 2019-03-06 11:09:14 -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
Raman
acacd03017 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 
# Conflicts:
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
 2019-03-05 16:41:34 -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
Kelly Kelly
706005772f removed commented out line from ivy.xml 2019-03-05 16:12:58 -05:00
Raman
ddfe63c6ab Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-05 16:10:53 -05:00
Kelly Kelly
28b3bd34a1 Merge remote-tracking branch 'upstream/develop' into 1202-fix-recentactive-plistjar 2019-03-05 16:00:47 -05:00
Kelly Kelly
91bd0e9e9d Inital work on zone identifier parsing 2019-03-05 15:46:01 -05:00
Raman
24e310374d 1205: create TSK_DOWNLOAD_SOURCE artifact for downloaded files. 2019-03-05 15:25:38 -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
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
Kelly Kelly
0cb11be390 Merge branch 'develop' into 1194-edge-download 2019-03-05 10:09:09 -05:00
Richard Cordovano
2db8920e39
Merge branch 'develop' into edge_support 2019-03-05 09:56:14 -05:00
Kelly Kelly
151e4218da Modify Extract and subclasses to take a progress bar in process function 2019-03-04 15:57:14 -05:00
Kelly Kelly
67ebffac6c Removed the plist jar from recentActivity, it should be using the one from corelib now. 2019-03-04 12:50:01 -05:00
Raman
ff5195eeff Close temp file copy in case of error. 2019-03-04 10:42:43 -05:00
Kelly Kelly
512d716e3f merge edge_support into 1194-edge-download 2019-03-04 10:28:02 -05:00
Kelly Kelly
4065b99967 Cleaned up the download code to put it on hold, fixed code to make sure we clean up the temp files properly and cleaned up a few javadocs 2019-03-04 10:22:42 -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
Kelly Kelly
ab782a4df7 Completed the rest of the review comments that where hidden 2019-03-01 11:35:43 -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
Kelly Kelly
bf53781efd Changes from review comments, plus a few other little cosmetic things. 2019-02-28 15:20:35 -05:00
Kelly Kelly
5122dfba4d Changed absolute path to relative in project.xml 2019-02-28 12:54:00 -05:00
Raman
668e452b75 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1188-cache-artifact 2019-02-28 11:45:26 -05:00
Kelly Kelly
7d556addab Changed absolute path in project.properties to relative 2019-02-28 11:41:29 -05:00