Skip to content

Collaborative locking #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 22 commits into from
May 2, 2022
Merged

Collaborative locking #54

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
46da347
Implement separate lock type for collaborative editing
juliusknorr Feb 8, 2022
451f2c5
Switch to OCP proposal
juliusknorr Mar 23, 2022
4ca68cd
Stick to 7.4 for composer dependencies
juliusknorr Mar 24, 2022
a9e379e
Unify lock service methods to use the LockScope and propagate ETag on…
juliusknorr Mar 24, 2022
62dae1e
Adjust to OCP review comments
juliusknorr Mar 25, 2022
ec2899a
Adapt LockScope to LockContext rename
juliusknorr Apr 6, 2022
9e5f510
Add tests for etag changes
juliusknorr Apr 7, 2022
f1cca4d
Update file etag and propagate it with the proper path
juliusknorr Apr 7, 2022
d932fd0
Limit Nextcloud compatibility to 24
juliusknorr Apr 21, 2022
4d70749
Extract displayname fetching
juliusknorr Apr 21, 2022
d0fb12c
Add separate status code if the lock is not found on unlock
juliusknorr Apr 21, 2022
6612dc9
Remove unused method
juliusknorr Apr 26, 2022
8b1a881
Expose token locks the same as user locks through our properties
juliusknorr Apr 26, 2022
d1fd060
Remove unused dependency that tries to obtain the user session too early
juliusknorr Apr 28, 2022
6bd03c5
Add response data to OCS controllers
juliusknorr Apr 30, 2022
a271a40
Some more cleanup
juliusknorr Apr 30, 2022
78e7373
Bump version for 24
juliusknorr Apr 30, 2022
b03835d
Fix tests
juliusknorr Apr 30, 2022
363931a
Implement WebDAV lock backend
juliusknorr Apr 30, 2022
f61ab53
Run litmus on CI
juliusknorr May 2, 2022
9418b4a
Make user overwrite only happen on custom locks
juliusknorr May 2, 2022
4d3f9f2
Skip collection locking for now
juliusknorr May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Stick to 7.4 for composer dependencies 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Apr 30, 2022
commit 4ca68cd2abb876d2e6410eb773b3faca1f6c5ae0
6 changes: 6 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
"nextcloud/coding-standard": "^1.0",
"psalm/phar": "^4.22"
},
"config": {
"platform": {
"php": "7.4"
}
},

"license": "AGPL",
"require": {
"php": "^7.4|^8.0"
Expand Down
Loading