Commit Graph
18776 Commits
Author SHA1 Message Date
William Schaefer 70aaab6f12 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1922-KeywordSearchEdit 2017-02-13 13:42:28 -05:00
William Schaefer 14d999212b 1922 - deleted commented out block of code 2017-02-13 13:41:48 -05:00
William Schaefer f01bdc6bc2 1922 added comments, edit keyword disabled with multiselect now 2017-02-13 13:28:44 -05:00
esaunders 96d5c6ff41 Merge branch 'search_improvements' of github.com:sleuthkit/autopsy into 2290-store-doc-ids 2017-02-13 12:29:18 -05:00
William Schaefer 25408e43f7 1922 Keyword Options panel is fully functional 2017-02-13 11:57:50 -05:00
esaunders fa8b191cdb Don't show keyword search type or document ids in search results pane. 2017-02-13 11:57:35 -05:00
Eugene Livis bc3649fdcd Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2017-02-13 08:41:09 -05:00
Richard Cordovano cd8ec4f36b Merge remote-tracking branch 'upstream/develop' into search_improvements 2017-02-11 14:26:35 -05:00
Richard Cordovano 865458e248 Merge branch 'search_improvements' of https://github.com/sleuthkit/autopsy into search_improvements 2017-02-11 14:26:17 -05:00
Richard Cordovano 2c5462b730 Merge remote-tracking branch 'upstream/develop-4.3.1' into develop 2017-02-11 14:12:56 -05:00
Richard Cordovano 043e0fb288 Disable CustomArtifactsCreatorIngestModuleFactory 2017-02-11 13:48:34 -05:00
Richard Cordovano bd729b3ea7 Reset of build.type in project properties 2017-02-11 11:16:30 -05:00
Richard Cordovano de0157e529 Merge pull request #2521 from eugene7646/build_fix
Fixed build errors
2017-02-11 10:53:46 -05:00
William Schaefer 37a285d8d6 1922 fixed copy to actually create a different list 2017-02-10 16:02:45 -05:00
Eugene Livis e816fe71f8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2017-02-10 15:53:05 -05:00
William Schaefer fa56e080a9 1922 Edit keyword implemented 2017-02-10 15:50:26 -05:00
Eugene Livis f7bab28858 Fixed build error 2017-02-10 13:03:00 -05:00
Eugene Livis 843473a380 Merge branch 'search_improvements' of https://github.com/sleuthkit/autopsy into core_name 2017-02-09 15:30:24 -05:00
Eugene Livis 1216dabd5a Properly Handling UNC paths 2017-02-09 15:29:58 -05:00
Dmitry Charit 74fea7bcce corrected the update 2017-02-09 18:43:05 +00:00
Richard Cordovano 8377953e62 Turn off CustomArtifactsCreatorIngestModuleFactory 2017-02-09 10:03:21 -05:00
Richard Cordovano fa9cfbc40b Update comment in ArtifactStringContent.java 2017-02-09 06:36:46 -05:00
Richard Cordovano 2d2c1db850 Repair merge errors 2017-02-08 20:26:51 -05:00
Richard Cordovano 32a457808a Merge in develop branch 2017-02-08 20:13:19 -05:00
Richard Cordovano d18ef89bf1 Merge remote-tracking branch 'upstream/develop-4.3.1' into develop 2017-02-08 19:57:21 -05:00
Richard Cordovano 34c549615b Merge pull request #2517 from rcordovano/attrs_with_multiple_sources
Attrs with multiple sources
2017-02-08 19:50:50 -05:00
Richard Cordovano 7a467d0e91 Improvements to attributes with multiple sources code 2017-02-08 19:48:46 -05:00
Richard Cordovano 3ed67b1df8 Add attribute sources to ArtifactStringContent 2017-02-08 19:06:35 -05:00
Richard Cordovano 332110c003 Merge pull request #2516 from rcordovano/attrs_with_multiple_sources
Change custom artifact names for test ingest module
2017-02-08 18:12:23 -05:00
Richard Cordovano 2ca451b46e Change custom artifact names for test ingest module 2017-02-08 18:10:53 -05:00
Richard Cordovano bc5cd4b31e Merge pull request #2515 from rcordovano/attrs_with_multiple_sources
Attrs with multiple sources
2017-02-08 18:03:56 -05:00
Richard Cordovano f22a453377 Clean and fix ArtifactStringContent 2017-02-08 17:59:18 -05:00
Richard Cordovano e908001ee5 Merge pull request #2514 from esaunders/ip_addr_kws_fix
Modified IP address regex so that it picks up addresses ending in 3 d…
2017-02-08 17:41:20 -05:00
William Schaefer 998571f8b7 1922 Rename keyword list implemented 2017-02-08 17:32:32 -05:00
esaunders 9a07bec10b Modified IP address regex so that it picks up addresses ending in 3 digits correctly. 2017-02-08 17:26:37 -05:00
Richard Cordovano 764c01e820 Merge pull request #2513 from esaunders/2290-store-doc-ids
Add document ids and search type to keyword hit artifacts
2017-02-08 16:59:24 -05:00
Eugene Livis 758b4a07a1 Minor 2017-02-08 16:54:18 -05:00
Eugene Livis 8567154e8f Minor 2017-02-08 16:53:35 -05:00
Eugene Livis 47695c7d75 Storing relative paths for text index directories 2017-02-08 16:47:03 -05:00
esaunders 5b348fce97 Merge branch 'search_improvements' of github.com:sleuthkit/autopsy into 2290-store-doc-ids 2017-02-08 16:11:58 -05:00
esaunders 0e81aba4ab Add document ids to keyword hit artifacts. 2017-02-08 16:11:36 -05:00
Eugene Livis d975cb39b4 Merge branch 'search_improvements' of https://github.com/sleuthkit/autopsy into core_name 2017-02-08 16:01:14 -05:00
Eugene Livis 59dc528a28 Added source code for Solr upgrade JARs 2017-02-08 16:00:34 -05:00
William Schaefer 9286078126 1922 minor fixes to gui formatting 2017-02-08 13:39:33 -05:00
William Schaefer 61dabf34e0 1922 - Buttons moved and copy fixed 2017-02-08 13:30:37 -05:00
Richard Cordovano 4234d2c82d Merge pull request #2510 from millmanorama/2249-scroll-thumb
remove bottom gap and make scroll pane vertically resizable.
2017-02-08 12:12:55 -05:00
Brian Carrier 8c0a8bad64 Merge pull request #2511 from APriestman/imageWriter
Allow Local Disk processor to use image writer and update UI
2017-02-08 12:12:41 -05:00
Richard Cordovano 3e72fd2228 Merge pull request #2512 from millmanorama/2260-cancel
cancel the future if something goes wrong.
2017-02-08 12:10:44 -05:00
William Schaefer ce1771f685 Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard 2017-02-08 10:59:07 -05:00
William Schaefer bfa75149da 2198 default run ingest modules context renamed for backwards compatability 2017-02-08 10:58:13 -05:00