Skip to content
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

Jump to bottom

[stable25] Share type sciencemesh #37347

Merged
merged 2 commits into from
Mar 24, 2023
Merged

[stable25] Share type sciencemesh #37347

merged 2 commits into from
Mar 24, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 22, 2023 •
edited by artonge
Loading

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #37139

@backportbot-nextcloud backportbot-nextcloud bot added enhancement javascript php Pull requests that update Php code labels Mar 22, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25.0.5 milestone Mar 22, 2023
github-advanced-security[bot]
github-advanced-security bot found potential problems Mar 22, 2023
View reviewed changes
apps/files_sharing/lib/Controller/ShareAPIController.php
*/
private function getSciencemeshShareHelper() {
if (!$this->appManager->isEnabledForUser('sciencemesh')) {
throw new QueryException();

Check notice

Code scanning / Psalm

DeprecatedClass

OCP\AppFramework\QueryException is marked deprecated
apps/files_sharing/lib/Controller/DeletedShareAPIController.php
*/
private function getSciencemeshShareHelper() {
if (!$this->appManager->isEnabledForUser('sciencemesh')) {
throw new QueryException();

Check notice

Code scanning / Psalm

DeprecatedClass

OCP\AppFramework\QueryException is marked deprecated
@artonge

This comment was marked as outdated.

Sign in to view
@artonge artonge force-pushed the backport/37139/stable25 branch from 23455e0 to 2c1556a Compare March 22, 2023 14:24
michielbdejong and others added 2 commits March 22, 2023 15:25
@michielbdejong @artonge
Add SHARE_TYPE_SCIENCEMESH
57611db 
Signed-off-by: Michiel de Jong <michiel@unhosted.org>
@artonge
Compile assets
597104b 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge artonge force-pushed the backport/37139/stable25 branch from 2c1556a to 597104b Compare March 22, 2023 14:25
@artonge artonge marked this pull request as ready for review March 22, 2023 14:28
@blizzz blizzz mentioned this pull request Mar 22, 2023
Merged
@juliusknorr juliusknorr merged commit 81e8da2 into stable25 Mar 24, 2023
@juliusknorr juliusknorr deleted the backport/37139/stable25 branch March 24, 2023 08:53
@skjnldsv skjnldsv mentioned this pull request Apr 13, 2023
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@artonge artonge artonge approved these changes

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees
No one assigned
Labels
enhancement javascript php Pull requests that update Php code
Projects
None yet
Milestone
Nextcloud 25.0.6
Development

Successfully merging this pull request may close these issues.
5 participants
@artonge @AndyScherzinger @blizzz @juliusknorr @michielbdejong