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

2601 Commits

Author SHA1 Message Date
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
U-BASIS\dsmyda
85dece0516 Tracked down the problem dependency that was causing the build errors and fixed it 2019-02-22 13:25:30 -05:00
U-BASIS\dsmyda
38d26d030e Missed on thing in the merge conflict resolution 2019-02-22 11:50:27 -05:00
U-BASIS\dsmyda
3dffc53b44 Merged in develop 2019-02-22 10:25:34 -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
millmanorama
5e51f5d531 Merge remote-tracking branch 'upstream/develop' into 1157-collapse_file_events 
# 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-12 14:49:24 +01:00
William Schaefer
f3c224208e 4632-4630-4629 reduce versions of gson to single version in corelibs 2019-02-01 14:38:45 -05:00
U-BASIS\dsmyda
2c8452ca89 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4367-Upgrade-Tika-1.20 2019-01-31 14:43:34 -05:00
U-BASIS\dsmyda
b7e983d528 Made all absolute jar paths relative 2019-01-29 14:47:06 -05:00
U-BASIS\dsmyda
2e9a1467c3 Readded public packages that Netbeans auto deleted 2019-01-29 14:27:10 -05:00
esaunders
3dc2b6067d Added ability to set max heap size for embedded Solr server. 2019-01-28 15:28:49 -05:00
millmanorama
03c88d9739 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
 2019-01-15 12:14:41 +01:00
U-BASIS\dsmyda
01d6403304 Tika appears to be stable, needs far more testing and verification 2019-01-11 15:54:49 -05:00
U-BASIS\dsmyda
9f97452c2c Upgraded jar reference in ImageGallery, Core, and Keyword Search 2019-01-07 10:18:11 -05:00
millmanorama
16ba64cc51 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 2018-12-31 12:23:34 +01:00
millmanorama
765cff0622 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/services/Services.java
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
 2018-12-27 15:19:27 +01:00
Ann Priestman
f2a4bc917c Fixing some issues from the functional tests 2018-12-26 11:11:55 -05:00
U-BASIS\dsmyda
6d7bf2e30c Merged in develop 2018-12-19 17:09:02 -05:00
U-BASIS\dsmyda
c44847792e Renamed an exception and changed the config package name 2018-12-19 16:26:16 -05:00
U-BASIS\dsmyda
1e1e166f55 Renamed TextExtractor public API 2018-12-19 14:06:26 -05:00
Richard Cordovano
250b322793
Merge pull request #4403 from dannysmyda/4536-Upgrade-To-Tess-4.0 
4536 upgrade to tess 4.0-alpha
 2018-12-19 12:35:01 -05:00
U-BASIS\dsmyda
fdc3272adb Fixed potential bug with setting being erroneously checked 2018-12-19 11:14:43 -05:00
U-BASIS\dsmyda
09748c5531 Changed Tessseract to only work on 64 bit and updated the settings panel 2018-12-19 11:08:50 -05:00