jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364441 )
Change subject: BlueSpiceVisualEditor: Version info and branding ...................................................................... BlueSpiceVisualEditor: Version info and branding Added correct version to version info and removed the on-screen branding. Change-Id: I24d259a49629c15c7fbd2c08e0e3e9769ec64b4e --- M THIRD_PARTY_LICENSES.md M VisualEditor/VisualEditor.class.php 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md index 545fd5b..2cbb425 100644 --- a/THIRD_PARTY_LICENSES.md +++ b/THIRD_PARTY_LICENSES.md @@ -13,7 +13,7 @@ | [PHP Identicons](https://sourceforge.net/projects/identicons/) | Bong Cosca | 1.0.1 | [GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.txt) | | [Solr-php-client](https://github.com/PTCInc/solr-php-client) | Donovan Jimenez, PTC Inc. | - | [BSD-modified](https://opensource.org/licenses/BSD-3-Clause) | | [SyntaxHighlighter](http://alexgorbatchev.com/SyntaxHighlighter/download/) | Alex Gorbatchev | 3.0.83 | [MIT](https://opensource.org/licenses/MIT) | -| [TinyMCE](https://www.tinymce.com) | Moxiecode Systems AB | 4.1.3 | [LGPL-2.1](http://www.tinymce.com/license) | +| [TinyMCE](https://www.tinymce.com) | Moxiecode Systems AB | 4.6.4 | [LGPL-2.1](http://www.tinymce.com/license) | | [xhtmlrenderer](https://github.com/flyingsaucerproject/flyingsaucer) | Patrick Wright | 9.0.9 | [LGPL-2.1](https://github.com/flyingsaucerproject/flyingsaucer/blob/master/LICENSE-LGPL-2.1.txt) | | [Solr](http://lucene.apache.org/solr/) | Apache Software Foundation | 4.5.0 | [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) | diff --git a/VisualEditor/VisualEditor.class.php b/VisualEditor/VisualEditor.class.php index e99d826..cc847b1 100644 --- a/VisualEditor/VisualEditor.class.php +++ b/VisualEditor/VisualEditor.class.php @@ -186,7 +186,8 @@ array( 'title' => 'bs-visualeditor-greyscale', 'format' => 'table-style-greyscale' ), array( 'title' => 'bs-visualeditor-greyscale-narrow', 'format' => 'table-style-greyscale-narrow' ) ), - 'contextmenu' => 'bsContextMenuMarker image | inserttable tableprops deletetable cell row column' + 'contextmenu' => 'bsContextMenuMarker image | inserttable bstableprops bsdeletetable bscell bsrow bscolumn', + 'branding' => false // do not use table_class_list, as this breaks any existing classes upon editing ); -- To view, visit https://gerrit.wikimedia.org/r/364441 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24d259a49629c15c7fbd2c08e0e3e9769ec64b4e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Mglaser <[email protected]> Gerrit-Reviewer: Robert Vogel <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
