Skip to content

Ocm cleaning #11

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

Open
michielbdejong wants to merge 69 commits into
base: master
Choose a base branch
from
Open

Ocm cleaning #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
fc16243
OCM via ScienceMesh
michielbdejong Jan 11, 2023
bf104ca
Update changelog/unreleased/40577
michielbdejong Jan 19, 2023
6af94dc
Use DI and declare interface for search plugin
michielbdejong Jan 19, 2023
3bcfcad
whitespace and docs
michielbdejong Jan 19, 2023
1ec92f7
simplify docs
michielbdejong Jan 20, 2023
a1e761e
Accept OCM to groups
michielbdejong Jan 20, 2023
ee1eef1
Merge remote-tracking branch 'pondersource/ocm-via-sciencemesh' into …
michielbdejong Jan 20, 2023
0cb3f48
error_log
michielbdejong Jan 20, 2023
d6ac0b6
adjust variable name
shokri-navid Jan 25, 2023
17e7962
Update ExternalSharesController.php
shokri-navid Jan 27, 2023
b833d9e
Update OcmController.php
shokri-navid Jan 27, 2023
414f841
Use our RemoteOcsController for getShares
michielbdejong Jan 30, 2023
fe54ff0
getRemoteOcsController with 3 args (FIXME)
michielbdejong Jan 30, 2023
844fbb4
group icon added
soltanireza65 Feb 1, 2023
18573fb
share item styles midified
soltanireza65 Feb 1, 2023
225abdb
OC Share constants extended
soltanireza65 Feb 1, 2023
0267583
shareDialog icon implemented
soltanireza65 Feb 1, 2023
73058c0
Merge pull request #3 from pondersource/feat/addGroupIcon
soltanireza65 Feb 1, 2023
061877b
changed group icon size
soltanireza65 Feb 1, 2023
35f72fa
fix SHARE_TYPE_REMOTE_GROUP value
soltanireza65 Feb 1, 2023
21cce7b
icons show logic improved
soltanireza65 Feb 1, 2023
d08189e
changed Icon class
soltanireza65 Feb 2, 2023
572cbf6
decline finished
navid-shokri Feb 3, 2023
7a65b70
add shareType to js
soltanireza65 Feb 5, 2023
e951f6d
Merge branch 'surf-dev' of github.com:pondersource/core into surf-dev
navid-shokri Feb 7, 2023
810f3eb
add shareType to shareActions
soltanireza65 Feb 7, 2023
dfbbdce
add REMOTE_GROUP TYPE to dav share type list
navid-shokri Feb 14, 2023
fa9f0b4
ser constant 'group' as shre type
navid-shokri Feb 16, 2023
06f07b7
check remote group share type to set file as shared
navid-shokri Mar 2, 2023
01e58ba
check SHARE_TYPE_REMOTE_GROUP to enquery the shared items
navid-shokri Mar 2, 2023
e5e3da4
check for SHARE_TYPE_REMOTE_GROUP on format share list
navid-shokri Mar 2, 2023
b77c7da
add federated group logic to find share by token
navid-shokri Mar 10, 2023
0d74414
Merge branch 'master' into surf-dev
michielbdejong Mar 24, 2023
a95a2bf
add oidc-ldap app to core
soltanireza65 Mar 27, 2023
b4ba49d
Merge pull request #7 from pondersource/feat/oidc-ldap
soltanireza65 Mar 28, 2023
b62f502
Cleaning code
yasharpm Mar 30, 2023
7b684b7
Added IRemoteOcsMiddleware to be autoloaded by the system.
yasharpm Mar 30, 2023
b06d7a3
add openidconnect to core/apps
soltanireza65 Mar 31, 2023
3b79c69
introduce federated group share provider
shokri-navid Mar 28, 2023
4ae5057
change unshare approach
shokri-navid Mar 29, 2023
ccbd8ab
change unshare algorithem
shokri-navid Mar 30, 2023
f8eec04
missing using added
shokri-navid Mar 30, 2023
2284e9a
Hint to RemoteOcsMiddleware being used to other apps.
yasharpm Apr 1, 2023
471b938
Broke manager into Manager and AbstractManager
yasharpm Apr 1, 2023
8d04ecb
Cleaned federatedfilesharing app
yasharpm Apr 3, 2023
65d5175
Changed RemoteOcsController back to its untouched state
yasharpm Apr 3, 2023
9a05e10
OcmController to prioritize custom FedShareManager
yasharpm Apr 3, 2023
5f937e0
Removed unneeded apps that were added to the core
yasharpm Apr 3, 2023
88cb572
Basic code cleanup
yasharpm Apr 3, 2023
3b45474
Bug fix
yasharpm Apr 4, 2023
bcbe8bd
Revert "Changed RemoteOcsController back to its untouched state"
yasharpm Apr 4, 2023
c500b7e
Cleaned Share20Ocs controller and provider factory
yasharpm Apr 5, 2023
c75fec9
Cleaned ExternalSharesController
yasharpm Apr 5, 2023
67a74a2
Code cleanup and bug fixes
yasharpm Apr 5, 2023
6f8c8e8
MountProvider split to Abstract and implementation
yasharpm Apr 6, 2023
c65046c
Fixed bug
yasharpm Apr 6, 2023
276bc03
ExternalManager is now received via a callable
yasharpm Apr 7, 2023
1de8e3b
Bug fix
yasharpm Apr 7, 2023
3b2d0e5
Bug fix
yasharpm Apr 7, 2023
624a43b
Bug fix
yasharpm Apr 7, 2023
bbe7eda
Get supported share types from the ShareManager
yasharpm Apr 7, 2023
aa97ac7
Bug fix
yasharpm Apr 7, 2023
70112ad
Pending changes exported from your codespace
yasharpm Apr 10, 2023
d4cb127
Merge pull request #10 from pondersource/codespace-yasharpm-silver-fi…
yasharpm Apr 10, 2023
ced4175
Removed redundant check
yasharpm Apr 10, 2023
999e9d3
bug fix
yasharpm Apr 10, 2023
ab1a3a6
Clean up
yasharpm Apr 10, 2023
d971d7b
Finished accept, decline, change permission notifications
yasharpm Apr 10, 2023
c1da537
Merge branch 'owncloud:master' into ocm-cleaning
michielbdejong Apr 12, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
!/apps/comments
!/apps/dav
!/apps/files
!/apps/user_ldap
!/apps/openidconnect
!/apps/federatedfilesharing
!/apps/federation
!/apps/files_external
Expand Down
7 changes: 1 addition & 6 deletions apps/dav/lib/Connector/Sabre/SharesPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,7 @@ private function convertToHashMap($allShares, $initShareTypes) {
* @return IShare[] array containing shares
*/
private function getSharesForNodeIds($nodeIDs) {
$requestedShareTypes = [
\OCP\Share::SHARE_TYPE_USER,
\OCP\Share::SHARE_TYPE_GROUP,
\OCP\Share::SHARE_TYPE_LINK,
\OCP\Share::SHARE_TYPE_REMOTE
];
$requestedShareTypes = $this->shareManager->getSupportedShareTypes();

// Query DB for share types for specified node IDs
$allShares = $this->shareManager->getAllSharesBy(
Expand Down
Loading