Skip to content

Conversation

@vidhyasagargm
Copy link
Contributor

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:

  1. Notification of conflict edit before entering edit
  2. Create Copy of edit
  3. Soft merge of edit

An internal code review process has already been done upfornt for all the changes in this PR and Issue

Here is some screenshots:
image
image
image

vidhyasagargm and others added 30 commits September 12, 2024 15:30
Co-authored-by: Marius Meißner <info@marius-meissner.net>
…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>
@luke-
Copy link
Contributor

luke- commented Mar 21, 2025

@vidhyasagargm Thank you for the contribution. Please give us some time to check and review and come back to you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants