jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/335840 )
Change subject: Create help dialog for TwoColConflict ...................................................................... Create help dialog for TwoColConflict This patch introduces a help dialog for the edit conflict view. The module was rewritten to be configurable and re- usable for other extensions. In further patches this could be improved to have the CSS also more flexible and independent. The CSS and JS in this patch were loaded apart from each other. Loading CSS with the module did not quite work. Bug: T156250 Change-Id: I23d16b0d6f8babfbe9983d727f162111c780e12b --- M .eslintrc.json M extension.json M i18n/en.json M i18n/qqq.json M includes/TwoColConflictPage.php A modules/ext.TwoColConflict.HelpDialog.css A modules/ext.TwoColConflict.HelpDialog.js M modules/ext.TwoColConflict.init.js A resources/ext.TwoColConflict.helpDialog/slide1-ltr.svg A resources/ext.TwoColConflict.helpDialog/slide1-rtl.svg A resources/ext.TwoColConflict.helpDialog/slide2-ltr.svg A resources/ext.TwoColConflict.helpDialog/slide2-rtl.svg A resources/ext.TwoColConflict.helpDialog/slide3-ltr.svg A resources/ext.TwoColConflict.helpDialog/slide3-rtl.svg A resources/ext.TwoColConflict.helpDialog/slide4-ltr.svg A resources/ext.TwoColConflict.helpDialog/slide4-rtl.svg 16 files changed, 8,872 insertions(+), 6 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/335840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I23d16b0d6f8babfbe9983d727f162111c780e12b Gerrit-PatchSet: 17 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: Andrew-WMDE <andrew.kos...@wikimedia.de> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de> Gerrit-Reviewer: WMDE-jand <jan.dittr...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
