Krinkle has submitted this change and it was merged. Change subject: (bug 37828) Handle edit conflicts ......................................................................
(bug 37828) Handle edit conflicts ApiVisualEditor * Added basetimestamp and starttimestamp to all methods where appropriate * Added new serialize method which converts HTML to Wikitext ve.init.mw.ViewPageTarget * Added edit conflict handling * Moved form value reading code into getSaveOptions method * Prevented edit warning from appearing while submitting ve.init.mw.Target * Added serialize and submit methods * Fixed some documentation * Added support for baseTimeStamp and startTimeStamp VisualEditor.i18n * Added edit conflict confirmation box message VisualEditor * Included new edit conflict message to resource loader module Change-Id: I002c5aa23704c1c46ef46fa1970a4254614b9eb1 --- M ApiVisualEditor.php M VisualEditor.i18n.php M VisualEditor.php M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js M modules/ve/init/mw/ve.init.mw.Target.js 5 files changed, 299 insertions(+), 78 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/35829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I002c5aa23704c1c46ef46fa1970a4254614b9eb1 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Trevor Parscal <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Trevor Parscal <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
