Commit Graph
13702 Commits
Author SHA1 Message Date
millmanorama c068da3fcb make fields final 2017-03-11 23:28:31 +01:00
millmanorama 3c1701ea5a cleanup and refactoring in LuceneQuery.java 2017-03-11 23:17:59 +01:00
millmanorama 42511628a1 replace broken paging with cursor based paging 2017-03-11 16:57:17 +01:00
Richard Cordovano d3af39c0fc Merge pull request #2582 from rcordovano/2323_highlighted_text_exception_throwing
2323 highlighted text exception throwing
2017-03-09 10:30:20 -05:00
Richard Cordovano 3d4d83e239 Format keywordsearch/HighlightedText.java 2017-03-09 10:19:09 -05:00
Richard Cordovano 681f2da55d Format keywordsearch/HighlightedText.java 2017-03-09 10:06:31 -05:00
Richard Cordovano b331e7d3a1 Merge remote-tracking branch 'upstream/develop' into 2323_highlighted_text_exception_throwing 2017-03-09 10:05:45 -05:00
Richard Cordovano 2ce24a4a8c Resolve IDE code hints in keywordsearch/HighlightedText.java 2017-03-09 09:56:05 -05:00
Richard Cordovano 53b0823a16 Merge pull request #2581 from millmanorama/cleanup-QueryResults
remove unnecessary field and constructor parameter
2017-03-09 09:27:49 -05:00
Richard Cordovano 3d4b530590 Merge pull request #2580 from millmanorama/2324-save-hits-w/out-snippets
2324 save hits w/out snippets
2017-03-09 09:17:46 -05:00
millmanorama d676148af8 remove unnecessary field and constructor parameter 2017-03-09 11:08:58 +01:00
millmanorama 6fa88eb132 improve comment about snippet queries 2017-03-09 10:53:09 +01:00
millmanorama 40b3a52f92 save hits even if we never get a snippet 2017-03-09 10:53:08 +01:00
Richard Cordovano 5dab7337cb Merge pull request #2579 from rcordovano/2372_improve_artifacts_content_viewer
Improvements to table header for artifact content viewer
2017-03-08 17:38:36 -05:00
Richard Cordovano a77e23a655 Improvements to table header for artifact contetn viewer 2017-03-08 17:35:57 -05:00
Richard Cordovano fe54f03e9b Merge pull request #2578 from wschaeferB/2367-DisableEditProfile
2367 disable edit profile
2017-03-08 17:10:22 -05:00
Richard Cordovano e17ae9ec1a Merge pull request #2577 from wschaeferB/2355-FixFileIngestFilter
2355 fix file ingest filter
2017-03-08 16:50:57 -05:00
William Schaefer d61042a6a4 2355 Adjusted comments in IngestOptionsPanel to come before what they refer to 2017-03-08 16:35:46 -05:00
William Schaefer 9f0004d40b 2367 - simplified logic while disabling and enabling buttons on Profile panel 2017-03-08 16:17:38 -05:00
William Schaefer 78739087c1 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2367-DisableEditProfile 2017-03-08 15:48:59 -05:00
William Schaefer a9a9ae24fa 2355 simplified approach to handling multiple FileIngestFilter panels 2017-03-08 15:37:06 -05:00
William Schaefer 799c25d7a2 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2355-FixFileIngestFilter 2017-03-08 14:57:17 -05:00
Richard Cordovano 0f0cb1d726 Merge pull request #2570 from wschaeferB/2361-SelectNewFilter
2361 Newly created Filter saved as selected choice
2017-03-08 14:50:01 -05:00
Richard Cordovano 87f61ed469 Merge pull request #2572 from wschaeferB/2352-AddProfilePanelText
2352 Profile Info Text box added to Profile Defs Panel
2017-03-08 14:40:14 -05:00
Richard Cordovano 60b2eba2dd Merge pull request #2576 from narfindustries/correlationengine_dev
Update RecentActivity NBM to attach artifacts to ModuleDataEvents
2017-03-08 12:06:21 -05:00
William Schaefer e9027d0c9e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2367-DisableEditProfile 2017-03-07 17:26:52 -05:00
Richard Cordovano d8c023c605 Fix ad hoc search toolbar enabling and indexed files count 2017-03-07 15:32:00 -05:00
William Schaefer fc4fe7afd3 2367 Edit and delete now check if new is enabled prior to enabling 2017-03-06 18:29:14 -05:00
William Schaefer 52335d3e1c 2352 Profile Info Text box added to Profile Defs Panel 2017-03-06 18:04:42 -05:00
William Schaefer fc291be124 2361 Newly created Filter saved as selected choice 2017-03-06 17:39:17 -05:00
William Schaefer 480e3a1dfa Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2355-FixFileIngestFilter 2017-03-06 15:46:16 -05:00
William Schaefer 7f18e67d22 2355 Should prevent over-writing of filters list with older list 2017-03-06 15:44:24 -05:00
Richard Cordovano a3a070f22a Merge pull request #2566 from wschaeferB/2273-AquiringLocksText
2273 aquiring locks text
2017-03-06 12:32:32 -05:00
William Schaefer c2590f17d4 2273 Modified message and wrapped it in HTML to support two lines of message 2017-03-06 11:33:21 -05:00
William Schaefer 7cbdb1a518 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2273-AquiringLocksText 2017-03-06 11:01:00 -05:00
Maxwell Koo 6ec814e6c3 Update RecentActivity NBM to attach artifacts to ModuleDataEvents 2017-03-06 10:59:56 -05:00
Richard Cordovano 3323a69f2f Merge pull request #2565 from millmanorama/2327-merge-filternodes
2327 merge filternodes
2017-03-06 09:32:32 -05:00
millmanorama 92987e9de6 make more stuff private 2017-03-06 14:17:08 +01:00
millmanorama 0398525561 Merge branch 'develop' into 2327-merge-filternodes 2017-03-06 13:59:16 +01:00
Richard Cordovano ef7cc0b687 Merge pull request #2538 from wschaeferB/2094-ExportImportFilesSets
2094 export import files sets
2017-03-04 19:57:19 -05:00
Richard Cordovano 6273395523 Merge pull request #2529 from wschaeferB/2306-FileTypesTreeFix
2306 warning for non standard mime types added
2017-03-04 19:04:35 -05:00
Richard Cordovano ddfd415f61 Minor lint issue fixes for GlobalListsManagementPanel.java 2017-03-04 17:35:57 -05:00
Richard Cordovano 4bc7352f15 Fix enabling of keyword search list import button 2017-03-04 17:33:14 -05:00
Richard Cordovano 26b578db01 Merge pull request #2523 from wschaeferB/1922-KeywordSearchEdit
1922 keyword search edit
2017-03-04 17:18:11 -05:00
Richard Cordovano d4ba865aec Merge pull request #2549 from APriestman/virtualMachine
Remove possible colon from Virtual Machine Extractor output directory…
2017-03-04 17:12:46 -05:00
Richard Cordovano 52c1e1289e Merge pull request #2528 from wschaeferB/2307-WaitCursorForSettings
2307 wait cursor for settings
2017-03-04 17:08:44 -05:00
Richard Cordovano bb994a13b0 Merge pull request #2550 from wschaeferB/2267-UpgradeCancellation
2267 upgrade cancellation
2017-03-04 15:29:56 -05:00
Richard Cordovano 38b37571b3 Merge pull request #2556 from dgrove727/2291_MetadataCompatability
No longer converting case metadata upon load
2017-03-04 15:08:56 -05:00
Richard Cordovano d7cb40c8d5 Merge pull request #2555 from wschaeferB/2272-UnwrapException
2272 throwing exception seperately displaying message details of cause
2017-03-04 15:04:54 -05:00
Richard Cordovano 67916294c2 Merge pull request #2557 from millmanorama/2244-fallback-on-strings
2244 fallback on strings
2017-03-04 14:52:25 -05:00