Commit Graph
23120 Commits
Author SHA1 Message Date
Richard Cordovano 0477de37e6 Merge remote-tracking branch 'upstream/cvt-contacts-view' into cvt-contacts-view-merge-to-develop 2019-05-09 11:14:06 -04:00
Richard Cordovano f32ea86a7a Merge pull request #4771 from kellykelly3/1239-relationships-package
1239 relationships package
2019-05-09 11:09:05 -04:00
Kelly Kelly 1f8a71d933 fixed merge conflicts 2019-05-08 21:44:52 -04:00
Richard Cordovano c7fa007a04 Merge pull request #4778 from wschaeferB/4989-TranslationServiceChanges
4989 translation service changes
2019-05-08 17:59:26 -04:00
Richard Cordovano 9b26c4eca3 Merge pull request #4769 from kellykelly3/1236-account-summary-view
1236 account summary view
2019-05-08 15:28:29 -04:00
Kelly Kelly 7ab5fa6493 Fixed merge issues from cvt branch 2019-05-08 09:22:47 -04:00
William Schaefer 5e9e9c48b9 4989 fix saving of current combo box selection 2019-05-07 19:45:44 -04:00
William Schaefer 4c610eaa66 4989 apply saved selection to default combo box selection 2019-05-07 18:47:42 -04:00
William Schaefer e334058ff4 4989 update the comments and merged bundle file 2019-05-07 18:36:15 -04:00
William Schaefer 16e3040562 4989 adjust text from for Options panel 2019-05-07 18:15:26 -04:00
William Schaefer 6d15afbc58 4989 update service to use translator saved to user preferences 2019-05-07 18:09:36 -04:00
William Schaefer 160d681f9f 4989 save selected translator to userpreferences 2019-05-07 17:01:31 -04:00
Kelly Kelly 97d53efbdc Updated based on review comments 2019-05-07 15:03:36 -04:00
William Schaefer 2c8bf83a89 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4989-TranslationServiceChanges 2019-05-07 12:51:14 -04:00
William Schaefer 7cf3e7c148 4989 changes for recognizing changes and updating settings panel 2019-05-07 12:26:44 -04:00
Richard Cordovano 43f23da38a Merge pull request #4776 from sleuthkit/release-4.11.1
Merge in release 4.11.1
2019-05-07 12:26:26 -04:00
Richard Cordovano d2e39b6244 Merge pull request #4768 from wschaeferB/5003-DataSourceNotAlwaysSelected
5003 create data source summary node children synchronously so it is …
2019-05-07 12:25:14 -04:00
Richard Cordovano 1bf30901ba Merge pull request #4754 from wschaeferB/4809-AddTranlationTextViewer
4809 add tranlation text viewer
2019-05-07 12:21:54 -04:00
Richard Cordovano d05a8e1440 Merge pull request #4752 from wschaeferB/4978-TextContentViewer
4978 text content viewer
2019-05-07 12:19:36 -04:00
Richard Cordovano c040d41b75 Merge pull request #4749 from kellykelly3/1232-thumbnail-view
1232 thumbnail view
2019-05-07 12:17:16 -04:00
William Schaefer 0e367e7a1f 4989 options panel listens for changes in texttranslator panels 2019-05-07 10:28:12 -04:00
William Schaefer 573b4ced9e 4989 add translation options panel 2019-05-06 16:05:29 -04:00
Kelly Kelly e96868240b moved relationship browser code into its own package 2019-05-06 14:45:43 -04:00
William Schaefer edbebe3a8d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4989-TranslationServiceChanges 2019-05-06 11:23:52 -04:00
Kelly Kelly 83f6f1ff84 Removed not needed exceptions and changed a panel title. 2019-05-06 10:45:10 -04:00
Kelly Kelly b5fa09b5f6 new account summary panel for communications window. 2019-05-06 10:07:31 -04:00
Richard Cordovano 616ac03da4 Merge remote-tracking branch 'upstream/release-4.11.1' into develop 2019-05-06 10:00:04 -04:00
Brian Carrier a89ae61b50 Update translations.dox 2019-05-02 22:45:53 -04:00
William Schaefer b903ca5a6a 5003 create data source summary node children synchronously so it is selected correctly 2019-05-02 15:31:03 -04:00
eugene7646 8eaa058130 Merge pull request #4766 from rcordovano/orphan-znode-delete-fix
Orphan znode deletion fixes
2019-05-02 15:14:53 -04:00
Richard Cordovano d2bb237da6 Polish of DeleteOrphanCaseNodesTask, DeleteOrphanManifestNodesTask 2019-05-02 13:01:37 -04:00
Richard Cordovano 80f1f5fa2c Rebuild bundle properties merge file for Experimental 2019-05-02 12:54:00 -04:00
Kelly Kelly 686632fab8 Merge branch 'cvt-contacts-view' into 1236-account-summary-view 2019-05-02 12:51:28 -04:00
Kelly Kelly c8e41658f9 Updated based on comments from Richard and Will, added constructor to DataResultFilterNode that doesn't take an explorermanger 2019-05-02 12:49:04 -04:00
Richard Cordovano 0e3c7890bc Fix DeleteOrphanCaseNodesTask bug, make DeleteOrphanManifestNodesTask more efficient 2019-05-02 12:40:06 -04:00
Kelly Kelly d52b9cfc4d Revert "inital commit with a message of a merge from my other branch"
This reverts commit 806eb76f7f.
2019-05-02 12:15:58 -04:00
Kelly Kelly 806eb76f7f inital commit with a message of a merge from my other branch 2019-05-02 11:43:04 -04:00
Kelly Kelly fd483b1e1d Merge remote-tracking branch 'upstream/cvt-contacts-view' into 1232-thumbnail-view 2019-05-02 10:17:54 -04:00
Kelly Kelly 3f3e8f8591 Updated code fixing issues found in review by Will 2019-05-02 09:18:42 -04:00
Richard Cordovano c75be577ae Merge pull request #4764 from dannysmyda/4972-Remove-Javadocs-From-Autopsy
4972 Exclude javadocs from Ivy
2019-05-01 18:07:20 -04:00
Richard Cordovano 5deea31e7c Merge pull request #4760 from wschaeferB/5001-resizeDataSourceSummary-release
5001 resize data source summary release
2019-05-01 15:09:37 -04:00
Kelly Kelly e082f128a1 Merge branch 'cvt-contacts-view' into 1232-thumbnail-view 2019-05-01 15:09:09 -04:00
William Schaefer e835b802ec Merge branch '4978-TextContentViewer' of https://github.com/wschaeferB/autopsy into 4809-AddTranlationTextViewer 2019-05-01 15:08:32 -04:00
Richard Cordovano 111e8fe477 Merge pull request #4765 from kellykelly3/cvt-contacts-view
Merging develop into my local cvt-contact-view branch
2019-05-01 15:07:57 -04:00
Richard Cordovano b751cb08be Merge pull request #4757 from wschaeferB/5002-OtherOccurrencesColumns
5002 give Case, Data source, and File name more space in OO content v…
2019-05-01 15:04:43 -04:00
Richard Cordovano 8543dd6517 Merge pull request #4756 from APriestman/4906_portableCaseCompression
4906 portable case compression and 4951 interesting items
2019-05-01 15:04:07 -04:00
Kelly Kelly e54f0aed9e Merged in develop 2019-05-01 15:00:24 -04:00
William Schaefer f9adc9b9f1 4978 add exception to logging when getUniquePath fails for textContentViewer 2019-05-01 14:56:38 -04:00
Ann Priestman 8693f3cd6d Addressing review comments 2019-05-01 13:51:50 -04:00
U-BASIS\dsmyda ee90958509 Removed sources and javadoc off class path 2019-05-01 10:00:43 -04:00