[stable10] Release 10.2.0 rebased by phil-davis · Pull Request #35262 · owncloud/core

phil-davis · 2019-05-18T00:49:02Z

Description

git checkout release-10.2.0
git checkout -b release-10.2.0-rebased
git rebase stable10

resolve reported conflicts along the way...

git push --set-upstream origin release-10.2.0-rebased

The git rebase command happily drops commits where the code is already exactly in stable10. So that removes a lot of "rubbish" from the list.

The only conflicts were in README.md and tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature - both of these were easy to sort out and do not effect run-time code anyway.

Motivation and Context

There is a mix of commits in release-10.2.0 branch. Some of them are also already in stable10 and some are not. There are other PRs that did not make it into 10.2 and are just in stable10 branch. When doing just a "straight" PR online from release-10.2.0 branch to stable10 there are various conflicts and it shows a long list of many commits that are actually in stable10 - e.g. see PR #35261

This PR tries to tidy things up a bit to make it easier to comprehend...

How Has This Been Tested?

CI

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Database schema changes (next release will require increase of minor version instead of patch)
Breaking change (fix or feature that would cause existing functionality to change)
Technical debt
Tests only (no source changes)

Checklist:

Code changes
Unit tests added
Acceptance tests added
Documentation ticket raised:

Open tasks:

Backport (if applicable set "backport-request" label and remove when the backport was done)

phil-davis · 2019-05-18T23:27:41Z

drone is not starting. There is currently some general problem with drone.

phil-davis · 2019-05-20T14:30:49Z

Rebased again just now to trigger drone CI.

codecov · 2019-05-20T21:35:17Z

Codecov Report

Merging #35262 into stable10 will increase coverage by 0.09%.
The diff coverage is 78.43%.

@@              Coverage Diff               @@
##             stable10   #35262      +/-   ##
==============================================
+ Coverage       64.52%   64.61%   +0.09%     
- Complexity      20080    20089       +9     
==============================================
  Files            1289     1289              
  Lines           76947    76966      +19     
  Branches         1299     1300       +1     
==============================================
+ Hits            49650    49734      +84     
+ Misses          26916    26848      -68     
- Partials          381      384       +3

Flag	Coverage Δ	Complexity Δ
#javascript	`53.85% <85.71%> (+0.64%)`	`0 <0> (ø)`	⬇️
#phpunit	`65.75% <75.67%> (+0.03%)`	`20089 <13> (+9)`	⬆️

Impacted Files	Coverage Δ	Complexity Δ
apps/files/lib/Capabilities.php	`100% <ø> (+100%)`	`2 <0> (ø)`	⬇️
core/js/sharedialoglinkshareview.js	`83.46% <ø> (ø)`	`0 <0> (ø)`	⬇️
apps/files_sharing/js/PublicUploadView.js	`67.39% <0%> (ø)`	`0 <0> (ø)`	⬇️
...s/federatedfilesharing/lib/AppInfo/Application.php	`45.89% <0%> (-0.97%)`	`19 <0> (ø)`
version.php	`100% <100%> (ø)`	`0 <0> (ø)`	⬇️
...atedfilesharing/lib/Command/PollIncomingShares.php	`98.52% <100%> (+0.41%)`	`13 <2> (+2)`	⬆️
apps/federatedfilesharing/lib/FedShareManager.php	`80.37% <100%> (+0.25%)`	`25 <0> (+1)`	⬆️
lib/private/legacy/app.php	`63.45% <100%> (+1.31%)`	`179 <0> (+5)`	⬆️
...ederatedfilesharing/lib/FederatedShareProvider.php	`62.66% <100%> (ø)`	`85 <4> (ø)`	⬇️
...es_sharing/lib/Controller/Share20OcsController.php	`87.29% <15.38%> (+1.38%)`	`204 <6> (-1)`	⬇️
... and 12 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1a964a1...eb9b6b5. Read the comment docs.

codecov · 2019-05-20T21:35:59Z

Codecov Report

Merging #35262 into stable10 will increase coverage by 0.09%.
The diff coverage is 78.43%.

@@              Coverage Diff               @@
##             stable10   #35262      +/-   ##
==============================================
+ Coverage       64.54%   64.64%   +0.09%     
- Complexity      20080    20089       +9     
==============================================
  Files            1289     1289              
  Lines           76923    76943      +20     
  Branches         1299     1300       +1     
==============================================
+ Hits            49651    49738      +87     
+ Misses          26891    26821      -70     
- Partials          381      384       +3

Flag	Coverage Δ	Complexity Δ
#javascript	`53.85% <85.71%> (+0.64%)`	`0 <0> (ø)`	⬇️
#phpunit	`65.78% <75.67%> (+0.03%)`	`20089 <13> (+9)`	⬆️

Impacted Files	Coverage Δ	Complexity Δ
apps/files/lib/Capabilities.php	`100% <ø> (+100%)`	`2 <0> (ø)`	⬇️
core/js/sharedialoglinkshareview.js	`83.46% <ø> (ø)`	`0 <0> (ø)`	⬇️
apps/files_sharing/js/PublicUploadView.js	`67.39% <0%> (ø)`	`0 <0> (ø)`	⬇️
...s/federatedfilesharing/lib/AppInfo/Application.php	`45.89% <0%> (-0.97%)`	`19 <0> (ø)`
version.php	`100% <100%> (ø)`	`0 <0> (ø)`	⬇️
...atedfilesharing/lib/Command/PollIncomingShares.php	`98.52% <100%> (+0.41%)`	`13 <2> (+2)`	⬆️
apps/federatedfilesharing/lib/FedShareManager.php	`80.37% <100%> (+0.25%)`	`25 <0> (+1)`	⬆️
lib/private/legacy/app.php	`63.45% <100%> (+1.31%)`	`179 <0> (+5)`	⬆️
...ederatedfilesharing/lib/FederatedShareProvider.php	`62.66% <100%> (ø)`	`85 <4> (ø)`	⬇️
...es_sharing/lib/Controller/Share20OcsController.php	`87.29% <15.38%> (+1.38%)`	`204 <6> (-1)`	⬇️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1c084bf...7fe2d2c. Read the comment docs.

The uploader is expecting the progress bar element to be in the DOM when created. This fix makes sure to append the PublicUploadView's element to the DOM before rendering it.

…load Remove share permission check from the file upload js file. Signed-off-by: Sujith H <sharidasan@owncloud.com>

File uploads should also be checked if they are aborted or not. This would help to check if the file is aborted or not. If aborted then it would be cleared from the list. Signed-off-by: Sujith H <sharidasan@owncloud.com>

…cepted

When user tries to change the permission from permission 15 to permission 7 ( i.e, View/Download/ Upload), the permissions are not updated properly. The reason for this is due to the overwriting of newpermission variable with permission 15. This changeset removes the overwriting to newpermission variable. Signed-off-by: Sujith H <sharidasan@owncloud.com>

Remove update permission for Download/View/Upload option for public link. And hence the behaviour of public links created using this option has changed. 1. User cannot delete the files/folders inside this public link. 2. User cannot update the files which are already present in the public link 3. User cannot rename files. Signed-off-by: Sujith H <sharidasan@owncloud.com>

phil-davis · 2019-05-21T15:49:40Z

I rebased again to try and get clean CI. It would be good to get this PR merged.

… upload check The public link edit template was outside public upload check. And hence for creating the public link for files the full permission option was shown. This change tries to address the issue. Signed-off-by: Sujith H <sharidasan@owncloud.com>

Signed-off-by: Patrick Jahns <github@patrickjahns.de>

phil-davis added the 2 - Developing label May 18, 2019

phil-davis self-assigned this May 18, 2019

phil-davis mentioned this pull request May 18, 2019

Relase 10.2.0 changes #35261

Closed

10 tasks

phil-davis added 3 - To Review and removed 2 - Developing labels May 18, 2019

phil-davis requested review from DeepDiver1975 and patrickjahns May 18, 2019 06:49

phil-davis force-pushed the release-10.2.0-rebased branch from 80babf0 to 74e4058 Compare May 18, 2019 07:20

phil-davis force-pushed the release-10.2.0-rebased branch from 74e4058 to 6f69def Compare May 20, 2019 14:28

phil-davis requested a review from micbar May 20, 2019 14:28

phil-davis force-pushed the release-10.2.0-rebased branch from 6f69def to eb9b6b5 Compare May 20, 2019 21:34

patrickjahns and others added 15 commits May 21, 2019 21:32

Set version to 10.2.0 RC1

56bdb43

Fix missing progress bar in files drop view

c8a5933

The uploader is expecting the progress bar element to be in the DOM when created. This fix makes sure to append the PublicUploadView's element to the DOM before rendering it.

Filter unavailable users

b2c56a4

Remove unavailable shares

a8584cd

[stable10] Backport of Remove share permission check from the file up…

05725ec

…load Remove share permission check from the file upload js file. Signed-off-by: Sujith H <sharidasan@owncloud.com>

Respect 'writable' appdir flag on update

103a234

add new capability privateLinksDetailsParam

f75c464

Avoid headers set twice in some situations

1bbc3e9

Add the requiredPermissions property for extra share attributes

f0e25a4

Add js tests for share attributes

9c87af1

Refactor share attribute js tests

6a4958e

When reshared disallow changing share attributes

57e2e0d

[stable10] Backport of Aborted uploads are not cleared properly

8e5d341

File uploads should also be checked if they are aborted or not. This would help to check if the file is aborted or not. If aborted then it would be cleared from the list. Signed-off-by: Sujith H <sharidasan@owncloud.com>

[10.2.0] Backport of dont show notification if federated share autoac…

8ea76aa

…cepted

Set mail_send via old share API

89fa785

Vincent Petry and others added 4 commits May 21, 2019 21:32

Update changelog for 10.2.0 RC2

f68f12f

Set version to 10.2.0RC2

40fe2a6

phil-davis force-pushed the release-10.2.0-rebased branch from eb9b6b5 to 8402aed Compare May 21, 2019 15:48

patrickjahns and others added 9 commits May 22, 2019 05:50

Set version to 10.2.0RC3

1de4ca6

Treat send attempt unsuccessful when there is a message.

f5ef4ad

Update changelog for 10.2.0 RC4

f29eb61

Signed-off-by: Patrick Jahns <github@patrickjahns.de>

set version to 10.2.0RC4

f025bf4

Signed-off-by: Patrick Jahns <github@patrickjahns.de>

Update README.md file with 10.2 version

f436487

Add webUI tests for share mail notification

27cf63d

Unskip behat step and remove issue tag

073cff9

set version to 10.2.0

7fe2d2c

Signed-off-by: Patrick Jahns <github@patrickjahns.de>

phil-davis force-pushed the release-10.2.0-rebased branch from 8402aed to 7fe2d2c Compare May 22, 2019 00:05

micbar approved these changes May 22, 2019

View reviewed changes

individual-it merged commit a0c9b39 into stable10 May 22, 2019

delete-merged-branch Bot deleted the release-10.2.0-rebased branch May 22, 2019 06:57

This was referenced May 22, 2019

[10.2.0] Add acceptance test for checking changing sharing permissions #35279

Closed

[10.2.0] API acceptance tests for public link share permissions #35278

Closed

phil-davis added the release:10.2 label Aug 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[stable10] Release 10.2.0 rebased#35262

[stable10] Release 10.2.0 rebased#35262
individual-it merged 28 commits into
stable10from
release-10.2.0-rebased

phil-davis commented May 18, 2019 •

edited

Loading

Uh oh!

phil-davis commented May 18, 2019

Uh oh!

phil-davis commented May 20, 2019

Uh oh!

codecov Bot commented May 20, 2019

Uh oh!

codecov Bot commented May 20, 2019 •

edited

Loading

Uh oh!

phil-davis commented May 21, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Conversation

phil-davis commented May 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

Open tasks:

Uh oh!

phil-davis commented May 18, 2019

Uh oh!

phil-davis commented May 20, 2019

Uh oh!

codecov Bot commented May 20, 2019

Codecov Report

Uh oh!

codecov Bot commented May 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

phil-davis commented May 21, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

phil-davis commented May 18, 2019 •

edited

Loading

codecov Bot commented May 20, 2019 •

edited

Loading