@Pikne Thanks for your comments. You're right, "automatic" is not be the best term here. This request, as I understand it, is about a more comfortable way to restore local files. It doesn't need to be automatic, though. I've updated the description accordingly.
Fri, Jan 18
Thu, Jan 17
Wed, Jan 16
Tue, Jan 15
Dec 14 2018
Works now on frWP, see https://fr.wikipedia.org/wiki/%C3%89tats-Unis#cite_note-cia-46 for example.
Dec 11 2018
Adding some user feedback:
Dec 5 2018
Dec 3 2018
Nov 29 2018
Nov 27 2018
Text for the user preference
Nov 26 2018
Thanks for the update, @WMDE-Fisch!
Thanks, @thiemowmde for the writeup!
Nov 23 2018
Nov 21 2018
@MichaelSchoenitzer_WMDE will add the text in the description.
Oct 12 2018
Please use this text schema for the header in the other user's column:
Sep 25 2018
The view differs between Chrome and Firefox.
Sep 13 2018
Sep 10 2018
Sep 9 2018
Mock expanded view after clicking on edit
The Save button should say "Save changes".
Sep 7 2018
Sep 4 2018
Tested this on https://tools.wmflabs.org/wmde-editconflict-test/core/index.php?title=Spezial:SimulateTwoColEditConflict and couldn't reproduce. Lines are now shown in the right order:
Aug 16 2018
Aug 14 2018
Live and demoed.
Demoed. It works, but not in the simulation. @WMDE-Fisch: Please make a new task for that.
Aug 13 2018
Aug 7 2018
Aug 6 2018
Aug 1 2018
- prototype has been recorded with screen video
- on our pages, links to the test server have been replaced by links to the screen video
Jul 31 2018
Jul 30 2018
Jul 26 2018
@Hanna_Petruschat_WMDE Do we need a design for the back arrow's confirmation prompt?
Some background on why I updated the texts for the tour:
It's quite likely that e.g. the other user changed a line in their version, but I didn't. So these two lines in particular don't show conflicting changes (as I didn't change anything in my line). "Diverging versions" or "difference between the two versions" is more fitting.
Jul 19 2018
Jul 17 2018
Jul 16 2018
Jul 13 2018
@Lea_WMDE Will the back arrow also have a checkbox like "Don't notify me again"?
Jul 12 2018
Jul 9 2018
Jul 5 2018
Jul 4 2018
Jul 3 2018
Jul 2 2018
Jun 29 2018
Jun 28 2018
- "pre-saved" indicates it is saved in some way, which it isn't.
- "not saved" might worry people (even though they can still see the text on the page).
- *"from XXYYBB" sounds like the best option to me.
That would also work for me.
I'm finding it startling to read the "not saved" part at this position. In my opinion, "Your version, not saved November..." makes the info that the text isn't saved more prominent than it needs to be.
How about "Your version, November 29th 2017, 11:46 (not saved)"?
Jun 27 2018
@Hanna_Petruschat_WMDE I changed the task description. Feel free to tweak it.