codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-19 17:21:46 +00:00
Code Issues Releases Wiki Activity
22,939 Commits 24 Branches 52 Tags
d37dc80da98d6fdcc404243fc1ee570c2015078d
Commit Graph
22939 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
U-BASIS\dsmyda d37dc80da9 Removed the unused sqlite jdbc references 2019-04-22 12:31:23 -04:00
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 5c14390212 Merge pull request #4741 from sleuthkit/release-4.11.0 
Merge in release 4.11.0 branch
 2019-04-19 14:53:04 -04:00
Richard Cordovano b6be032d77 Merge pull request #4740 from sleuthkit/revert-4721-timeline-event-mgr 
Revert "merge develop into Timeline event mgr"
 2019-04-19 13:16:54 -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
Brian Carrier e61d519538 Merge pull request #4737 from APriestman/switchSlashes 
Switch to forward slashes for images
autopsy-4.11.0 		2019-04-18 14:16:20 -04:00
Ann Priestman dbf13e6d05 Changed more slashes 2019-04-18 14:14:54 -04:00
Ann Priestman d7e98c5295 Switch to forward slashes for images 2019-04-18 14:01:31 -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 55ddc03ee1 Toggle build.type to after release 4.11.0 2019-04-17 16:51:24 -04:00
Richard Cordovano 8d5d35fa00 Merge pull request #4735 from sleuthkit/release-4.11.0 
Merge in release 4.11.0 branch
 2019-04-17 16:49:29 -04:00
Brian Carrier 90ffdb46c8 made case lowercase 2019-04-17 16:33:00 -04:00
Brian Carrier 848e366808 reorganized NEWS 2019-04-17 16:31:10 -04:00
Richard Cordovano 02137cb9b2 Merge pull request #4734 from sleuthkit/release-4.11.0 
Merge in release 4.11.0 branch
 2019-04-17 16:09:06 -04:00
Richard Cordovano b008eed1e1 Fix typos in portable case doc 2019-04-17 16:02:04 -04:00
Richard Cordovano 17e3102e4a Merge pull request #4719 from sleuthkit/portable_docs 
expanded portable case docs a bit
 2019-04-17 15:48:07 -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
Richard Cordovano 38798f96f5 Merge pull request #4732 from rcordovano/release-notes-update 
Update NEWS for release 4.11.0
 2019-04-17 15:08:23 -04:00
rcordovano 7838daede7 Update NEWS for release 4.11.0 2019-04-17 15:06:22 -04:00
Richard Cordovano ac51bc49cd Merge pull request #4730 from rcordovano/version-number-updates 
Update module dependencies for release 4.11.0
 2019-04-17 12:57:50 -04:00
rcordovano 6aab496d6b Update module dependencies for release 4.11.0 2019-04-17 12:54:17 -04:00
Richard Cordovano 35efd0013e Merge pull request #4729 from rcordovano/version-number-updates 
Toggle to build.type RELEASE for release 4.11.0
 2019-04-17 12:27:55 -04:00
rcordovano 16de0b9bbe Toggle to build.type RELEASE for release 4.11.0 2019-04-17 12:26:43 -04:00
Richard Cordovano dca375ffa6 Merge pull request #4728 from rcordovano/version-number-updates 
Module versioning updates
 2019-04-17 12:24:07 -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
Richard Cordovano a560c0f25b Merge pull request #4726 from rcordovano/exported-public-api-modifications 
Public API IngestJobInfoPanel.updateIngestHistoryData -> setDataSource
 2019-04-16 19:10:19 -04:00
rcordovano b90ee3d22c Public API IngestJobInfoPanel.updateIngestHistoryData -> setDataSource 2019-04-16 19:09:02 -04:00
Richard Cordovano e30d1bb7d8 Merge pull request #4725 from rcordovano/exported-public-api-modifications 
Reverse exported public API change for DirectoryTreeTopComponent
 2019-04-16 18:42:31 -04:00
rcordovano eede6b04a4 Reverse exported public API change for DirectoryTreeTopComponent 2019-04-16 18:39:21 -04:00
Richard Cordovano 90930e224a Merge pull request #4724 from rcordovano/exported-public-api-modifications 
Do not add BinaryCookieReader to exported public API
 2019-04-16 17:16:30 -04:00
rcordovano c799673643 Do not add BinaryCookieReader to exported public API 2019-04-16 17:14:35 -04:00
Richard Cordovano 779e9fdcbb Merge pull request #4666 from millmanorama/1220-turn-off-parsers 
1220 turn off parsers
 2019-04-16 15:10:52 -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
Richard Cordovano 645db52516 Merge pull request #4667 from millmanorama/1150-limit_plaso_workers 
1150 limit plaso to 2 workers
 2019-04-16 10:14:37 -04: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 549d480468 update Bundle.properties-MERGED 2019-04-15 18:19:33 +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
Brian Carrier 027886708d expanded docs a bit 2019-04-12 23:50:37 -04:00
Richard Cordovano 6550d7f6ed Merge pull request #4718 from sleuthkit/release-4.11.0 
Merge in release 4.11.0 branch
 2019-04-12 18:10:47 -04:00
Richard Cordovano 3f06bdbfc9 Merge pull request #4716 from dannysmyda/4916-NBM-Exports 
4916 nbm exports
 2019-04-12 18:09:04 -04:00
U-BASIS\dsmyda 21f4847094 Attempting to override cleartk for linux build 2019-04-12 15:20:17 -04:00
U-BASIS\dsmyda 1eb102912f Merged in release 4.11.0 branch 2019-04-12 15:11:03 -04:00