14695 Commits

Author SHA1 Message Date
William Schaefer
c09085026d 2347 fixed some nbbundle messages for the UI elements in localdiskPanel I broke 2017-03-13 12:18:02 -04:00
William Schaefer
664a591a45 2347 Changed Jcombobox for Local disk selection to table 2017-03-13 11:53:36 -04:00
millmanorama
0d4f43017a Merge remote-tracking branch 'upstream/develop' into 2300-slack-file-oom 2017-03-13 16:51:03 +01:00
millmanorama
cee2cb8b1f make DataResultFilterChildren into a ChildFactory 2017-03-13 16:50:40 +01:00
Eugene Livis
5f7e91b259 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2017-03-13 11:29:35 -04:00
Richard Cordovano
8a4b78daee Merge pull request #2592 from millmanorama/2063-solr-result-paging
some more cleanup and refactoring in LuceneQuery.java
2017-03-13 10:12:34 -04:00
Richard Cordovano
498dcd06e9 Merge pull request #2593 from millmanorama/2319-upgrade-tika
upgrade tika to 1.14
2017-03-13 10:03:17 -04:00
millmanorama
2e8272dba2 upgrade tika to 1.14 2017-03-13 14:55:16 +01:00
Ann Priestman
3f875cd427 Switching to settings 2017-03-13 09:17:31 -04:00
Ann Priestman
1340320bcf Merge remote-tracking branch 'upstream/develop' into iwUpdatePath 2017-03-13 08:55:43 -04:00
Richard Cordovano
8ad946efd4 Revert to full path lock for auto ingest job logger 2017-03-12 16:48:39 -04:00
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
Richard Cordovano
d8b3b8c502 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2017-03-11 17:15:01 -05:00
Richard Cordovano
6c32991bc9 Simplify CoordinationService API and make it thread-safe 2017-03-11 17:14:23 -05:00
Richard Cordovano
621792a68c Merge pull request #2591 from millmanorama/2063-solr-result-paging
replace broken paging with cursor based paging
2017-03-11 16:20:07 -05:00
Richard Cordovano
de8dc8f425 Make app coord svc namespace ext point 2017-03-11 13:21:13 -05:00
Richard Cordovano
bd0649af96 Add getAppNamespaceRoot to CoordinationService 2017-03-11 12:13:33 -05:00
Richard Cordovano
870ddd44fc Tidy up CoordinationService, remove unused category node 2017-03-11 11:45:16 -05:00
Richard Cordovano
2c1c255c5c Remove case path from auto ingest job log lock 2017-03-11 11:15:03 -05:00
millmanorama
42511628a1 replace broken paging with cursor based paging 2017-03-11 16:57:17 +01:00
Richard Cordovano
19ef658bfc Resolve IDE code hygiene hints for AutoIngestJobLogger 2017-03-11 10:45:25 -05:00
Richard Cordovano
5ed4490335 Merge pull request #2590 from sleuthkit/img_writer
Merge image writer into develop
2017-03-10 16:40:34 -05:00
Ann Priestman
b93114ac1f Changing to settings object 2017-03-10 15:26:12 -05:00
Richard Cordovano
5cc08fcf29 Merge pull request #2587 from APriestman/imageWriterService
Finishing up refactoring and the change to use ImageWriterService
2017-03-10 13:50:30 -05:00
Richard Cordovano
e7f8e40b9f Merge pull request #2585 from wschaeferB/2348-DspSelectionPanel
2348 dsp selection panel
2017-03-10 13:28:21 -05:00
Richard Cordovano
6c02d33ff4 Merge pull request #2589 from millmanorama/2300-slack-file-oom
Update AbstractContentChildren.java
2017-03-10 12:45:49 -05:00
Ann Priestman
969828236e Added IllegalStateException case 2017-03-10 11:18:26 -05:00
Jonathan Millman
43ce2ebe57 Update AbstractContentChildren.java 2017-03-10 16:35:59 +01:00
Ann Priestman
bddd918d83 Forgot to make a new Bundle.properties file 2017-03-10 10:23:35 -05:00
Richard Cordovano
fa2364cdbc Merge pull request #2588 from millmanorama/2300-slack-file-oom
turn off lazy loading in the datasources section of the directory tre…
2017-03-10 10:20:27 -05:00
millmanorama
6aa1d2d4b8 turn off lazy loading in the datasources section of the directory tree to stop OOMEs 2017-03-10 16:10:05 +01:00
Ann Priestman
7173bd55bb More refactoring and cleanup.
Updated strings in confirmation dialog.
Moved image writer to new package
2017-03-10 09:57:35 -05:00
Richard Cordovano
9619fcbf0f Merge pull request #2586 from millmanorama/2379-update-netbeans-platform
update netbeans platform to 8.2
2017-03-10 09:41:03 -05:00
millmanorama
c6b65210ea update netbeans platform to 8.2 2017-03-10 11:28:31 +01:00
William Schaefer
b4e2280dc3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2348-DspSelectionPanel 2017-03-09 15:12:49 -05:00
Ann Priestman
d12c5b48a8 More refactoring 2017-03-09 15:00:24 -05:00
Ann Priestman
980efcb326 Adding ImageWriterService 2017-03-09 13:45:14 -05:00
Richard Cordovano
ce14e3465d Merge pull request #2583 from zhhl/fixLogoPathInHTMLReport
fix the logo path using absolute path problem in HTML report
2017-03-09 13:31:35 -05:00
U-BASIS\zhaohui
1dfc018ac1 fix the logo path using absulte path problem in HTML report 2017-03-09 13:23:51 -05:00
William Schaefer
ea6159999b 2348 made some text more clear in AddImageWizardSelectDspPanel 2017-03-09 13:07:52 -05:00
William Schaefer
9bb780792b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2348-DspSelectionPanel 2017-03-09 11:45:06 -05: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