Skip to content

Include rooms in the list of candidates to share with - #10256

Merged
MorrisJobke merged 2 commits into
add-support-for-room-sharesfrom
include-rooms-in-the-list-of-candidates-to-share-with
Aug 24, 2018
Merged

Include rooms in the list of candidates to share with#10256
MorrisJobke merged 2 commits into
add-support-for-room-sharesfrom
include-rooms-in-the-list-of-candidates-to-share-with

Conversation

@danxuliu

Copy link
Copy Markdown
Member

Requires #10255 (this pull request should be rebased onto master once #10255 is merged)
Requires nextcloud/spreed#1050

@danxuliudanxuliu mentioned this pull request Jul 16, 2018
@danxuliu
danxuliuforce-pushed the add-support-for-room-shares branch 3 times, most recently from d9d2cc2 to aa5c1d1CompareJuly 16, 2018 16:45
throw new QueryException();
}

return $this->serverContainer->query(\OCA\Spreed\Share\Helper\DeletedShareAPIController::class);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

meh

throw new QueryException();
}

return $this->serverContainer->query(\OCA\Spreed\Share\Helper\ShareAPIController::class);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I dont like all this hardcoding :(

@danxuliu
danxuliuforce-pushed the add-support-for-room-shares branch 3 times, most recently from cd65e3e to a693e11CompareJuly 25, 2018 07:59
@MorrisJobkeMorrisJobke added this to the Nextcloud 15 milestone Jul 25, 2018
@danxuliu
danxuliuforce-pushed the add-support-for-room-shares branch from a0c1f49 to 4b7fa4aCompareAugust 8, 2018 12:51
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
danxuliuforce-pushed the include-rooms-in-the-list-of-candidates-to-share-with branch from dbc1277 to 49e6926CompareAugust 8, 2018 12:52

@schiessleschiessle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

tested and works as expected 👍

@MorrisJobke

Copy link
Copy Markdown
Member

@danxuliu@schiessle@nickvergessen 14 or 15?

@nickvergessennickvergessen added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Aug 24, 2018
@MorrisJobke
MorrisJobke merged commit 69d18cc into add-support-for-room-sharesAug 24, 2018
@MorrisJobke
MorrisJobke deleted the include-rooms-in-the-list-of-candidates-to-share-with branch August 24, 2018 13:11
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishenhancementfeature: sharing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@danxuliu@MorrisJobke@nickvergessen@schiessle