HomePhabricator
Diffusion extension-TwoColConflict 5f36db921d08

Implement save/submit functionality in order to resolve conflicts
5f36db921d08Unpublished
Actions

Authored by Andrew-WMDE on Sep 19 2018, 3:10 PM.

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Implement save/submit functionality in order to resolve conflicts

Bug: T195721
Change-Id: I3ecb799fdb790a0dcef347a948d7044b7531ae2e

Details

Committed
WMDE-FischSep 25 2018, 9:23 AM
Parents
rESCC08dbb1ee711b: Add reset (back) button
Branches
Unknown
Tags
Unknown
References
refs/changes/17/461417/2
ChangeId
I3ecb799fdb790a0dcef347a948d7044b7531ae2e

Changes (6)

PathSize
includes/
SplitTwoColConflict/
modules/
SplitTwoColConflict/
tests/
selenium/
pageobjects/
specs/

rESCC5f36db921d08

View Options

includes/SplitTwoColConflict/HtmlSplitConflictView.php

Loading...
View Options

modules/SplitTwoColConflict/ext.TwoColConflict.Split.init.js

Loading...
View Options

modules/SplitTwoColConflict/ext.TwoColConflict.Split.less

Loading...
View Options

tests/selenium/pageobjects/editconflict.page.js

Loading...
View Options

tests/selenium/pageobjects/finishedconflict.page.js

Loading...
View Options

tests/selenium/specs/editmerge.js

Loading...
Content licensed under Creative Commons Attribution-ShareAlike 3.0 (CC-BY-SA) unless otherwise noted; code licensed under GNU General Public License (GPL) or other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL