2290 Commits

Author SHA1 Message Date
U-BASIS\dgrove
8952c5686c Merge. 2018-02-23 14:55:31 -05:00
Richard Cordovano
038542151b
Merge pull request #3454 from esaunders/report_index_and_search
Merged develop into report indexing work and fixed issue with Content not in lookup
2018-02-23 14:32:23 -05:00
U-BASIS\dgrove
9de880bb0f Merge remote-tracking branch 'upstream/develop' into 3353_CenterChildWindows 2018-02-22 15:15:48 -05:00
U-BASIS\dgrove
ee07f777b3 More windows centered. 2018-02-22 15:07:36 -05:00
Richard Cordovano
dea5acbd62 Merge remote-tracking branch 'upstream/custom-release-2.11.1' into develop 2018-02-20 19:22:36 -05:00
esaunders
da5872e132 Modified Solr status command to not request index info. 2018-02-20 19:12:29 -05:00
Richard Cordovano
927f1a578f Updates for Autopsy-Core NBM version number change 2018-02-20 18:42:49 -05:00
esaunders
d7495c0e67 Modified Solr status command to not request index info. 2018-02-20 17:33:54 -05:00
Richard Cordovano
20c2feba60 Update verson numbers for 4.6.0 release 2018-02-20 17:18:25 -05:00
esaunders
665d1a8e0c Merge branch 'develop' of github.com:sleuthkit/autopsy into report_index_and_search 2018-02-20 15:01:45 -05:00
esaunders
288705bb03 Make sure the content gets into the lookup and add support for reports (again). 2018-02-20 14:58:56 -05:00
Richard Cordovano
f87ad41398 Remove global field in keywordsearch/ExtractedContentViewer.java 2018-02-16 14:09:20 -05:00
Richard Cordovano
a6e38b9ea2 Fixes to ExtractedContntViewer for handling node lookup contents correctly 2018-02-14 18:25:43 -05:00
Richard Cordovano
06b272df32 Fixes to ExtractedContntViewer for handling node lookup contents correctly 2018-02-14 18:15:09 -05:00
esaunders
7cab25c2bc Add support for Reports to ExtractedContentViewer. 2018-02-14 17:43:12 -05:00
esaunders
609bc9fe67 Merge branch 'develop' of github.com:sleuthkit/autopsy into report_index_and_search 2018-02-14 17:42:26 -05:00
Richard Cordovano
e5e87942e6
Merge pull request #3389 from dgrove727/3468_ArtifactHits
3468 artifact hits
2018-02-14 10:06:20 -05:00
U-BASIS\dgrove
57fec275f8 Resolved merge conflicts. 2018-02-13 10:35:40 -05:00
Richard Cordovano
e8e5793090
Merge pull request #3413 from zhhl/3281-UseHashSetInsteadOfHashDatabase
3281: Use Hash Set instead of Hash Database
2018-02-12 17:00:51 -05:00
U-BASIS\dgrove
10a216707c Merge remote-tracking branch 'upstream/develop' into 3353_CenterChildWindows 2018-02-12 16:33:30 -05:00
U-BASIS\dgrove
022dbe81fb Merge. 2018-02-12 15:34:34 -05:00
U-BASIS\dgrove
d8be685908 Changed AbstractFile to Content to account for data sources. 2018-02-12 15:31:38 -05:00
U-BASIS\dgrove
eb3987f800 Fixed bugs; cleanup. 2018-02-12 13:19:18 -05:00
U-BASIS\dgrove
b28694743d Fixes. 2018-02-09 23:23:52 -05:00
U-BASIS\dgrove
ebc8d5b73c Minor changes to 'setNode()'. 2018-02-09 15:15:20 -05:00
U-BASIS\dgrove
1621cd5d43 Partial changes. 2018-02-09 14:23:39 -05:00
U-BASIS\dgrove
d8aaf83685 Merge remote-tracking branch 'upstream/release-4.6.0' into 3468_ArtifactHits 2018-02-09 10:23:46 -05:00
U-BASIS\dgrove
afa6ec95b5 Centered more windows. 2018-02-07 22:22:43 -05:00
U-BASIS\dgrove
bb0a7c26c7 Revisions. 2018-02-07 11:41:44 -05:00
U-BASIS\dgrove
a7a2c86ab3 Revisions. 2018-02-07 01:31:04 -05:00
U-BASIS\dgrove
f65c704c3d Merge remote-tracking branch 'upstream/release-4.6.0' into 3344_WrongKeywordSearchMessage 2018-02-06 22:43:13 -05:00
U-BASIS\dgrove
144360a886 Revisions. 2018-02-06 22:42:49 -05:00
esaunders
f080568ac4 Merge branch 'develop' of github.com:sleuthkit/autopsy into report_index_and_search 2018-02-05 16:02:55 -05:00
U-BASIS\zhaohui
5942ae6a9b 3281: Use Hash Set instead of Hash Database 2018-02-02 12:19:55 -05:00
esaunders
0725972d8d Added support for keyword hits discovered in Reports. 2018-01-31 12:35:53 -05:00
esaunders
0e5402b608 Remove arch.xml 2018-01-29 16:28:45 -05:00
esaunders
fc51baa554 Added support for Report indexing. 2018-01-29 16:19:32 -05:00
U-BASIS\dgrove
2ad7f25258 Merge remote-tracking branch 'upstream/release-4.6.0' into 3356_KeywordSearchListMultiSelect 2018-01-29 16:17:26 -05:00
U-BASIS\dgrove
3f208e1a3b Handling multiple files for kws list imports. 2018-01-29 16:10:33 -05:00
U-BASIS\dgrove
a33e4c9b3b Corrected typo. 2018-01-24 17:35:50 -05:00
U-BASIS\dgrove
eeb83e270c Revised some code comments. 2018-01-24 17:31:32 -05:00
U-BASIS\dgrove
71c35d63ec Merge remote-tracking branch 'upstream/release-4.6.0' into 3468_ArtifactHits 2018-01-24 17:24:39 -05:00
U-BASIS\dgrove
c49e33e5b6 Updated logic to properly handle artifact and content nodes. 2018-01-24 17:20:01 -05:00
esaunders
7ad496cb12 Merge branch 'develop' of github.com:sleuthkit/autopsy into report_index_and_search 2018-01-23 16:20:03 -05:00
esaunders
77fd9b4436 Changed TextExtractors to handle Content instead of AbstractFile. 2018-01-23 16:18:58 -05:00
Richard Cordovano
73241a637b Add side effect to FileTypeDetector.getMIMEType 2018-01-23 11:14:12 -05:00
U-BASIS\dgrove
56c82d175a Merge remote-tracking branch 'upstream/custom-release-2.11.0' into 3344_WrongKeywordSearchMessage 2018-01-19 01:09:25 -05:00
U-BASIS\dgrove
e6d269396d Different message for known files. 2018-01-19 01:07:51 -05:00
esaunders
a32fbb8e41 Merge branch 'custom-release-2.11.0' of github.com:sleuthkit/autopsy into 3407_tika_sax_parsers 2018-01-17 12:59:49 -05:00
Richard Cordovano
27437ea5f0 Merge remote-tracking branch 'upstream/release-4.6.0' into custom-release-2.11.0 2018-01-17 12:01:24 -05:00