Change Details

**Warning**: This task is preliminary, based on all the prototype feedback received until August 22nd 2016. However, the request for feedback is still ongoing, hence the task is subject to change. **Task**: Allow the users to select between showing only their, only the conflicting, or both changes in the left text field. See mock TODO IS SUGGESTION OOUI COMPATIBLE? **Background**: This is part of fulfilling wish #1 of the German-speaking community wishlist 2015 (T143823). The solution is a result of on-wiki discussion and Wikimania 2016 sessions and testings, as well as feedback we received to the prototype.

**Warning**: This task is preliminary, based on all the prototype feedback received until August 31st 2016. However, the request for feedback is still ongoing, hence the task is subject to change. **Task**: Allow the users to select between showing only their, only the conflicting, or both changes in the left text field. This means: - Below the subtitle of the "Conflicting Changes" section there is a selection option which changes are shown - Title: //Show changes// - Options: //mine//, //currently published//, //both// - When a user selects //mine//, only their changes are being shown in the diff parts. When a user selects //currently published//, only the other party's changes are shown. Both is the default - Ideally, there is a version without page reload for people with js, and a version with page reload for people without js. **Mock**: See also the [[ https://meta.wikimedia.org/wiki/File:Edit_Conflict_-_Mock_with_js_(as_of_August_2016).pdf | mock]] for a general idea. **Background**: This is part of fulfilling wish #1 of the German-speaking community wishlist 2015 (T143823). The solution is a result of on-wiki discussion and Wikimania 2016 sessions and testings, as well as feedback we received to the prototype.

**Warning**: This task is preliminary, based on all the prototype feedback received until August 22nd31st 2016. However, the request for feedback is still ongoing, hence the task is subject to change. **Task**: Allow the users to select between showing only their, only the conflicting, or both changes in the left text field. See mock TODO IS SUGGESTION OOUI COMPATIBLE?This means: - Below the subtitle of the "Conflicting Changes" section there is a selection option which changes are shown - Title: //Show changes// - Options: //mine//, //currently published//, //both// - When a user selects //mine//, only their changes are being shown in the diff parts. When a user selects //currently published//, only the other party's changes are shown. Both is the default - Ideally, there is a version without page reload for people with js, and a version with page reload for people without js. **Mock**: See also the [[ https://meta.wikimedia.org/wiki/File:Edit_Conflict_-_Mock_with_js_(as_of_August_2016).pdf | mock]] for a general idea. **Background**: This is part of fulfilling wish #1 of the German-speaking community wishlist 2015 (T143823). The solution is a result of on-wiki discussion and Wikimania 2016 sessions and testings, as well as feedback we received to the prototype.