Maniphest T182007

Select paragraph versions using a switch button
Closed, ResolvedPublic
Actions

Description

Task

Add switch buttons between the conflicting paragraphs
When the switch button is moved to a side, the chosen paragraph receives a little pen as an editing symbol in it
The not chosen paragraph is greyed out
On save, all selected paragraphs are saved
If not all switch buttons have been set to a paragraph, you cannot save the page

Mock

check which version to choose-2.jpg (1×1 px, 1 MB)

Details

	Subject	Repo	Branch	Lines +/-
	[WIP] Let the user save the currently selected parts	mediawiki/extensions/TwoColConflict	master	+125 -22

Customize query in gerrit

Related Objects
Search...

Status	Assigned	Task
Open	None	T72163 Edit conflicts (tracking)
Resolved	None	T139601 Better solutions to edit conflicts (#1)
Resolved	Lea_WMDE	T180972 Create prototype for new edit conflict merge approach
Resolved	WMDE-Fisch	T182007 Select paragraph versions using a switch button

Event Timeline

Lea_WMDE created this task.Dec 4 2017, 5:01 PM

Lea_WMDE moved this task from Proposed to Todo on the WMDE-TechWish board.Dec 4 2017, 5:03 PM

Lea_WMDE moved this task from Backlog to TwoColConflict revamping spike on the Two-Column-Edit-Conflict-Merge board.Dec 4 2017, 5:22 PM

• Hanna_Petruschat_WMDE updated the task description. (Show Details)Dec 5 2017, 12:08 PM

Tobi_WMDE_SW added a project: WMDE-QWERTY-Sprint-2017-12-05.Dec 5 2017, 3:34 PM

Lea_WMDE moved this task from Todo to Currently in sprint on the WMDE-TechWish board.Dec 11 2017, 11:39 AM

Charlie_WMDE moved this task from Incoming to Reported TCB on the WMDE-Design board.Dec 11 2017, 2:32 PM

Change 397591 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] [WIP] Let the user save the currently selected parts

https://gerrit.wikimedia.org/r/397591

gerritbot added a project: Patch-For-Review.Dec 11 2017, 6:21 PM

WMDE-Fisch mentioned this in rESCCf95bdb181dcf: [WIP] Let the user save the currently selected parts.Dec 11 2017, 6:23 PM

WMDE-Fisch mentioned this in rESCC2cb294e52e46: [WIP] Let the user save the currently selected parts.Dec 13 2017, 12:45 PM

WMDE-Fisch mentioned this in rESCC4e204e21863d: [WIP] Let the user save the currently selected parts.Dec 22 2017, 4:21 PM

WMDE-Fisch mentioned this in rESCC4ebc61dad821: [WIP] Let the user save the currently selected parts.Dec 22 2017, 7:08 PM

WMDE-Fisch mentioned this in rESCC91c52b4b231b: [WIP] Let the user save the currently selected parts.Jan 2 2018, 1:18 PM

WMDE-Fisch mentioned this in rESCC7f4893cbf40c: [WIP] Let the user save the currently selected parts.Jan 3 2018, 1:44 PM

WMDE-Fisch mentioned this in rESCC0281c1f9ee69: [WIP] Let the user save the currently selected parts.Jan 5 2018, 10:12 AM

WMDE-Fisch mentioned this in rESCCf4bf5f614211: [WIP] Let the user save the currently selected parts.Feb 5 2018, 1:41 PM

Addshore mentioned this in rESCCfdc552a48002: [WIP] Let the user save the currently selected parts.Feb 9 2018, 12:15 PM

thiemowmde moved this task from Incoming to Edit Conflict Handling on the TCB-Team (now WMDE-TechWish) board.Jun 12 2018, 4:09 PM