Skip to content

Create infrastructure to allow files to be shared with circles #6959

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

Closed
viniciuscb wants to merge 9 commits into from
Closed

Create infrastructure to allow files to be shared with circles #6959

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9357b99
Provide calendars shared w/ current user's circles
viniciuscb Sep 14, 2017
253b263
Created infrastructure to show circles' shared files
viniciuscb Sep 29, 2017
fff74e1
Merge branch 'add_circle_to_caldav_and_filepanel' of github.com:colet…
viniciuscb Oct 25, 2017
87c60b6
Changes to comply to https://github.com/coletivoEITA/circles/pull/2
viniciuscb Oct 25, 2017
3e623e1
Polishing: get files shared to circles in caldav
viniciuscb Nov 1, 2017
e840dc5
fixing
ArtificialOwl Nov 7, 2017
70069e2
Merge branch 'master' into add_circle_to_caldav_and_filepanel
ArtificialOwl Nov 8, 2017
7063683
using CIRCLE__PROPERTYNAME
ArtificialOwl Nov 13, 2017
38bfba8
Merge branch 'add_circle_to_caldav_and_filepanel-15' into add_circle_…
ArtificialOwl Oct 29, 2018
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
Changes to comply to coletivoEITA/circles#2 
Signed-off-by: Vinicius Cubas Brand <[email protected]>
  • Loading branch information
@viniciuscb
viniciuscb committed Oct 25, 2017
commit 87c60b65e7b4c5ba1c62f743f941c5fd09c11da0
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ private function getCirclesFileIds($circlesIds) {
}
*/
Copy link
Member

@ArtificialOwl ArtificialOwl Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe cleaning those commented line


return \OCA\Circles\Api\v1\Circles::getObjectIdsForCircles($circlesIds);
return \OCA\Circles\Api\v1\Circles::getFilesForCircles($circlesIds);
}

/**
Expand Down