Commit Graph
12342 Commits
Author SHA1 Message Date
William Schaefer edebefca3f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4989-TranslationServiceChanges 2019-04-30 14:00:02 -04:00
Richard Cordovano 237ea66025 Merge pull request #4511 from dannysmyda/4367-Upgrade-Tika-1.20
4367 - upgrade to tika 1.20
2019-04-26 17:05:49 -04:00
William Schaefer 74ba54f918 4989 move translation ui elements to one package 2019-04-26 13:49:34 -04:00
William Schaefer 08ea96b7e0 4809 second attempt to address some codacy complaints 2019-04-26 13:45:13 -04:00
Richard Cordovano 75bf67616d Merge pull request #4683 from kellykelly3/1218-communications-history
1218 communications history
2019-04-26 13:39:11 -04:00
William Schaefer 15faac352a 4809 address some codacy complaints 2019-04-26 12:52:20 -04:00
William Schaefer 477f011f72 Merge branch '4978-TextContentViewer' of https://github.com/wschaeferB/autopsy into 4809-AddTranlationTextViewer 2019-04-25 18:33:38 -04:00
William Schaefer 70ece59df5 4978 fix issues caused when fixing codacy issues 2019-04-25 18:25:06 -04:00
William Schaefer e53656a6da Merge branch '4978-TextContentViewer' of https://github.com/wschaeferB/autopsy into 4809-AddTranlationTextViewer 2019-04-25 18:05:55 -04:00
William Schaefer 07baa3f52a 4978 address codacy complaints 2019-04-25 18:05:20 -04:00
William Schaefer 5b85081d85 4978 lowercase package name 2019-04-25 17:53:32 -04:00
William Schaefer f1e9f562b4 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4809-AddTranlationTextViewer 2019-04-25 17:44:32 -04:00
William Schaefer cb00382185 4809 move translation content viewer into autopsy core from kws module 2019-04-25 17:17:35 -04:00
Richard Cordovano 0368f07f8d Merge pull request #4727 from dannysmyda/4867-Add-Tika-Log-Statement
4867 Add Tika Log Statement
2019-04-25 13:51:42 -04:00
William Schaefer 9df9befc29 4978 clean up comments regarding DataContentViewers becoming TextViewers 2019-04-25 13:47:09 -04:00
William Schaefer 555ac55073 4978 fix comments for TextViewer and DataContentViewer 2019-04-25 13:15:15 -04:00
William Schaefer 8cecefd7bc 4978 update merged bundle messages, fix typo in bundle message 2019-04-25 12:05:23 -04:00
William Schaefer e562b2e31f 4978 minor clean up changes white space and annotations 2019-04-25 11:29:49 -04:00
William Schaefer 859439080e 4978 remove no longer used ChangeViewAction 2019-04-25 11:25:38 -04:00
William Schaefer b812151a64 4978 fix disabling of combobox for extracted text viewer 2019-04-24 17:05:21 -04:00
William Schaefer 7b9c342ba1 4978 fix npe and disabling of combo box 2019-04-24 16:55:57 -04:00
William Schaefer 6cee5e15b6 4978 make resizing for textviewers as consistant as I can 2019-04-24 15:46:51 -04:00
William Schaefer 0f95314e12 4978 fix reseting of sub viewers when unselection occurs 2019-04-24 12:57:34 -04:00
William Schaefer f935de2894 4978 minor clean up, bundle message added, unused logger removed 2019-04-24 11:31:14 -04:00
William Schaefer d9bb876f6e 4978 add Bundle messages 2019-04-24 11:17:29 -04:00
William Schaefer dcd3cd7999 4978 add merged bundle files 2019-04-23 17:45:07 -04:00
William Schaefer a55e8b3f92 4978 fix bundle messages issue and support for createinstance 2019-04-23 17:44:40 -04:00
William Schaefer 2aa254a3c9 4978 move StringsTextViewer to non-exported package 2019-04-23 14:55:38 -04:00
William Schaefer b1b77f7248 4978 initial TextContentViewer with subviewers 2019-04-23 13:56:18 -04:00
U-BASIS\dsmyda eae8425e07 Removed non-needed overrides and redundant jar references 2019-04-22 17:05:48 -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 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
U-BASIS\dsmyda 29f6664257 Added a reference to the Tika log when an exception is encountered during extraction 2019-04-17 09:43:35 -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