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
Merge branch 'master' into add_circle_to_caldav_and_filepanel
  • Loading branch information
@ArtificialOwl
ArtificialOwl authored Nov 8, 2017
commit 70069e2588ca6fa0e0233ff124a6d9e68c6c5525

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.