Commit Graph
12309 Commits
Author SHA1 Message Date
U-BASIS\dsmyda b511b22942 Updated local branch with origin changes 2019-04-22 10:01:03 -04:00
U-BASIS\dsmyda 992e12ccd9 Merge branch 'develop' of github.com:sleuthkit/autopsy into 4367-Upgrade-Tika-1.20 2019-04-22 09:56:10 -04:00
Richard Cordovano 2afc59ee39 Revert "merge develop into Timeline event mgr" 2019-04-19 13:16:26 -04:00
U-BASIS\dsmyda be0e2cf059 Removed erroneous Image Gallery project property and manually downloaded the cleartk-ml package in attempt to fix Travis 2019-04-18 17:09:30 -04:00
U-BASIS\dsmyda 59579721b5 Merged in release 4.11.0 branch 2019-04-18 15:29:33 -04:00
Richard Cordovano f8e359f0ba Merge pull request #4721 from millmanorama/timeline-event-mgr
merge develop into Timeline event mgr
2019-04-17 19:04:06 -04:00
Richard Cordovano a55643ae03 Merge pull request #4733 from sleuthkit/release-4.11.0
Merge in release 4.11.0 branch
2019-04-17 15:16:47 -04:00
rcordovano 164543ab64 Update module version numbers for 4.11.0 release 2019-04-17 11:32:33 -04:00
millmanorama 973c235582 Merge remote-tracking branch 'upstream/timeline-event-mgr' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/plaso/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-04-17 11:49:54 +02:00
rcordovano b90ee3d22c Public API IngestJobInfoPanel.updateIngestHistoryData -> setDataSource 2019-04-16 19:09:02 -04:00
rcordovano eede6b04a4 Reverse exported public API change for DirectoryTreeTopComponent 2019-04-16 18:39:21 -04:00
millmanorama e93f6ffea7 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1220-turn-off-parsers
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/plaso/Bundle.properties-MERGED
#	Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java
2019-04-16 20:29:35 +02:00
millmanorama 01966ad498 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/build.xml
#	Core/src/org/sleuthkit/autopsy/casemodule/Case.java
#	Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
#	Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionDataSourceIngestModule.java
#	Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
#	Core/src/org/sleuthkit/autopsy/timeline/db/EventsRepository.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties-MERGED
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchErrorDialog.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchOpenAction.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchPanel.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseSearcher.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SearchQuery.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SelectMultiUserCasesDialog.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SelectMultiUserCasesPanel.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
2019-04-16 18:40:34 +02:00
millmanorama 77cfb5faa2 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1150-limit_plaso_workers
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java
2019-04-16 13:10:55 +02:00
millmanorama 0c377a2b0d remove redundant message pop-up. internationalize exception messages that end up in ui. 2019-04-16 12:06:00 +02:00
millmanorama 4819f6254d address review comments 2019-04-15 14:43:51 +02:00
millmanorama bfd4589704 refactor PlasoIngestModule 2019-04-15 14:35:32 +02:00
millmanorama 5cdbff1e17 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1220-turn-off-parsers
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java
#	Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoModuleFactory.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
2019-04-15 14:04:46 +02:00
U-BASIS\dsmyda 21f4847094 Attempting to override cleartk for linux build 2019-04-12 15:20:17 -04:00
Richard Cordovano f6172b59f9 Merge remote-tracking branch 'upstream/release-4.11.0' into develop 2019-04-12 14:57:51 -04:00
U-BASIS\dsmyda 59f6e9507a Merged in develop 2019-04-12 14:09:01 -04:00
Richard Cordovano 6e4fca2c02 Merge pull request #4688 from wschaeferB/4792-OtherOccurrences4thColumn
4792 other occurrences4th column
2019-04-12 13:27:29 -04:00
Richard Cordovano 0876b2e5ec Merge pull request #4711 from wschaeferB/4943-TabsOrCommasForReportDelimiting
4943 tabs or commas for report delimiting
2019-04-12 13:25:51 -04:00
William Schaefer 616fa54840 4943 address codacy complaints 2019-04-12 10:47:23 -04:00
William Schaefer 9cbed00a7e 4792 fix misspelled separator 2019-04-11 18:35:49 -04:00
William Schaefer 680aa5460a 4792 document empty constructors 2019-04-11 18:23:46 -04:00
William Schaefer ef11d3da79 4792 check all collection sizes and indexes before use 2019-04-11 18:21:11 -04:00
William Schaefer 1adb0cf1e4 4792 more string builder codacy adjustments 2019-04-11 17:12:16 -04:00
William Schaefer 6c45e32909 4792 make codacy a little happier 2019-04-11 16:56:13 -04:00
William Schaefer f5860b67f8 4792 2nd attempt to make codacy happy 2019-04-11 16:30:12 -04:00
William Schaefer a6af2924c6 4792 first batch of codacy fixes 2019-04-11 16:06:11 -04:00
William Schaefer 1301920a4a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4792-OtherOccurrences4thColumn 2019-04-11 15:51:13 -04:00
William Schaefer 9d5aa7fc63 4943 wrap fields in quotes to avoid delimiter in field from being used as delimiter 2019-04-11 12:21:07 -04:00
William Schaefer 48250a49a4 4943 update merged file and comment 2019-04-10 19:29:01 -04:00
William Schaefer fb91ac3384 4943 adjust description and cleanup 2019-04-10 19:15:02 -04:00
William Schaefer 44f6f14944 4943 add option to choose delimiter for text file report 2019-04-10 19:10:59 -04:00
Richard Cordovano 648d24f001 Make the multi-user case browser name column fixed width 2019-04-10 18:13:14 -04:00
Richard Cordovano c819ad739a Merge pull request #4636 from millmanorama/1135-plaso_status
1135 plaso progress messages in UI
2019-04-10 17:38:45 -04:00
Richard Cordovano 277717b8d6 Merge pull request #4632 from millmanorama/1124_disable_plaso_by_default
1124 set Plaso module disabled by default
2019-04-10 17:38:20 -04:00
Richard Cordovano d7c9c62e65 Merge pull request #4626 from millmanorama/1215-datasource-query
1215 use simpler query from sleuthkit to determine datasources for the fil…
2019-04-10 17:37:51 -04:00
Richard Cordovano 5885e3da89 Merge pull request #4593 from millmanorama/1192-manually_created_events
1192 manually created events
2019-04-10 17:37:17 -04:00
Ann Priestman 3515bac8f8 Fixed param name 2019-04-10 11:40:52 -04:00
Richard Cordovano 7860c71abb Merge pull request #4701 from dannysmyda/4926-Fix-Memory-Leak
4926 fix memory leak
2019-04-10 11:22:01 -04:00
U-BASIS\dsmyda 5f6a4433bb Upgraded to gst1-core 1.0.0 bindings which include the GC fixes that were a problem in the last version. 2019-04-09 17:29:33 -04:00
Richard Cordovano 1639e83af7 Merge pull request #4691 from APriestman/encryptionDetectionCancellation
Added cancellation checks to EncryptionDetection
2019-04-09 14:06:51 -04:00
Richard Cordovano 4fb9e83e29 Merge pull request #4681 from APriestman/2940_NPEinTimeline
2940 Change to Content object to prevent NPE.
2019-04-09 14:00:56 -04:00
Richard Cordovano 375ccbefac Merge pull request #4692 from sleuthkit/release-4.11.0
Release 4.11.0
2019-04-08 14:21:57 -04:00
Ann Priestman c0fa9f9caf Added one more check 2019-04-08 12:48:11 -04:00
Ann Priestman 3e3f6c8cda Added cancellation checks to EncryptionDetection 2019-04-08 12:44:25 -04:00
Richard Cordovano e3b1318768 Merge branch '4915-case-node-data-fixes-and-improvements' into 4921-extended-admin-case-delete 2019-04-07 20:57:46 -04:00