Editing conflict handling with Notification, Merge and create Copy options#372
Open
vidhyasagargm wants to merge 65 commits intohumhub:masterfrom
Open
Editing conflict handling with Notification, Merge and create Copy options#372vidhyasagargm wants to merge 65 commits intohumhub:masterfrom
vidhyasagargm wants to merge 65 commits intohumhub:masterfrom
Conversation
Co-authored-by: Marius Meißner <info@marius-meissner.net>
…om/Neo-Atlas/humhub_wiki into 1-content-overview-title-numbering
…github.com/Neo-Atlas/humhub_wiki into 1-content-overview-title-numbering" This reverts commit b1e21c5, reversing changes made to 59ee21d.
removed addditional empty spaces
removed additional space and tabspace
Co-authored-by: Marius Meißner <info@marius-meissner.net>
Co-authored-by: Marius Meißner <info@marius-meissner.net>
Co-authored-by: Marius Meißner <info@marius-meissner.net>
Content title numbering
#4 Wiki Editing in tree structure - toggle button
Contributor
|
@vidhyasagargm Thank you for the contribution. Please give us some time to check and review and come back to you. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Currently, only one user can edit a wiki article. If more than one user edit at the same time, they will only know after one user has saved and the other also tries to save it, as the module throws a "do you really want to overwrite changes" error. This can easily lead to data loss, either as one user is overwriting the changes or potentially losing their own changes if they decide not to overwrite - and the "back" button does not bring them back to their own changed version.
So for better user experience and usability, I created 3 different features:
An internal code review process has already been done upfornt for all the changes in this PR and Issue
Here is some screenshots:
