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

Merge stable 7.1 to master #9582

Merged
merged 54 commits into from
Aug 16, 2023
Merged

Merge stable 7.1 to master #9582

merged 54 commits into from
Aug 16, 2023

Conversation

JammingBen
Copy link
Contributor

@JammingBen JammingBen commented Aug 16, 2023 •
edited
Loading

Forward-ports the following PRs:

#9520
#9528
#9565
#9575
#9577
#9567
#9513

KarunAtreya and others added 30 commits July 25, 2023 16:10
@KarunAtreya
bump latest ocis commit (#9476)
2b437d6
@ownclouders @JammingBen
[tx] updated from transifex
db32096
@JammingBen
Merge pull request #9480 from owncloud/backport-translations-20230725
8a43cd5 
Backport translations from master
@JammingBen
chore: prepare release v7.1.0-rc.2
373eac4
@JammingBen
chore: move changelog items back to unreleased
c9b113c
@phil-davis
Merge pull request #9484 from owncloud/merge-back-v7.1.0-rc.2
dfe2369 
Merge back v7.1.0 rc.2
@JammingBen
fix: respect supportedClouds config
5a89392
@JammingBen
test: add unit tests for cloud import action handler
e1fb408
@JammingBen
Merge pull request #9487 from owncloud/respect-supported-cloud-config
22e68f2 
fix: respect supportedClouds config
@jacob-nv
Initialize Drop Target after load time
5bfedd4
@JammingBen
Merge pull request #9489 from jacob-nv/stable-7.1
3c7a0b5 
Initialize Drop Target after load time
@JammingBen
fix: logo not showing
c073642
@JammingBen
Merge pull request #9496 from owncloud/fix-hidden-logo
38b5765 
fix: logo not showing
@JammingBen
chore: prepare release v7.1.0-rc.3
793bab8
@JammingBen
chore: move changelog items back to unreleased
67305f4
@JammingBen
Merge pull request #9499 from owncloud/merge-back-v7.1.0-rc.3
a444508 
Merge back v7.1.0 rc.3
@JammingBen
feat: add tx config for importer app
342a69f
@JammingBen
feat: add missing cloud importer translations
dc743b6
@JammingBen
chore: bump owncloud uppy
4087f1e
@JammingBen
Merge pull request #9501 from owncloud/importer-translations
d05f6c1 
Cloud importer translations
@lookacat
Bugfix: Space description edit modal is cut off vertically (#9507)
ed61af8
Fix: Double items after moving a file with the same name (#9510)
ee60d77 
* identify files by path

* Rm new line
@ownclouders @JammingBen
[tx] updated from transifex
d1c84af
@JammingBen
fix: ApplicationTranslations type
c95dcb0
@JammingBen
Merge pull request #9512 from owncloud/backport-translations-20230801
86a63d9 
Backport translations from master
@JammingBen
chore: prepare release v7.1.0-rc.4
45f6a7f
@JammingBen
chore: move changelog items back to unreleased
18efb7a
@JammingBen
Merge pull request #9516 from owncloud/merge-back-v7.1.0-rc.4
95e87e3 
Merge back v7.1.0 rc.4
@jacob-nv
Share links, Roles, mobile view fix
219a27e
@JammingBen
Merge pull request #9520 from jacob-nv/mobile-view-permissions-71
a36d3cb 
Share links, Roles, mobile view fix
S-Panta and others added 21 commits August 2, 2023 15:06
@S-Panta
bumped ocis commit id for tests (#9521)
95d8b8b
Add showErrorMessage store action (#9448)
da8e960 
* Add showErrorMessage store action

* fix

* fix unit tests

* lint

* Fix unit tests

* Apply to ConflictDialog

* fix unit tests

* Fix interface not fullfilled

* Fix

* Fix error message don't disappear automatially

* Reintroduce title testing

* Clear error messages

* Fix clearErrorMessage selector

* Fix synthax

* Kick wait for closing error automatically

* adjust line numbers
Show error log in graph requests (#9466)
9585b0b 
* Show error log in graph requests

* Add more

* Fix

* Reformat

* Fix

* Access response headers

* Fix bug

* Fix bug
errorLog: Handle multiple errors (graph) (#9474)
71641e0
Enable error log for ocs and webdav requests (#9482)
bce11d2
@JammingBen
Merge pull request #9523 from owncloud/backport-x-request-id
657b913 
Backport x-request-id to 7.1 stable
@JammingBen
chore: prepare release v7.1.0-rc.5
779be73
@JammingBen
chore: move changelog items back to unreleased
1f8acda
@JammingBen
Merge pull request #9526 from owncloud/merge-back-v7.1.0-rc.5
56e5098 
Merge back v7.1.0 rc.5
Fix set or remove expiration date on groups not possible (#9513)
eb25832 
* Fix set or remove expiration date on groups not possible

* Add changelog item

* Rm unused snapshot
@jacob-nv
Search Bar filter translation (#9528)
dd2c63c 
* Search Bar filter translation

* SearchBar filter fixing translation
@JammingBen
chore: bump sonarcloud to v5.0
1344b58
@JammingBen
Merge pull request #9557 from owncloud/cherry-pick-sc-bump
c683cc6 
chore: bump sonarcloud to v5.0 (backport from master)
@JammingBen
fix: loading pdf files with Safari
6845e4d 
Due to a Safari bug, we must not use `application/pdf` as object type when loading PDF files.
@JammingBen
Merge pull request #9565 from owncloud/fix-pdf-loading-safari
c5a8024 
fix: loading pdf files with Safari
@lookacat
Close on click stable fix
8cd4e7b
@JammingBen
Merge pull request #9575 from owncloud/close-on-click-stable-fix
ec1df44 
Close on click stable fix
@SwikritiT
add e2e tests for searching renamed and reshared resources (#9574)
8898f68
Fix: show unrestricted as total quota if applies (#9577)
98887c7
ct perm link (#9567)
8b8c699 
* Change uri

* Update snapshots
@JammingBen
Merge branch 'stable-7.1' into merge-stable-7.1-to-master-20230816
e45953e
@JammingBen JammingBen self-assigned this Aug 16, 2023
@CLAassistant
Copy link

CLAassistant commented Aug 16, 2023 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
8 out of 9 committers have signed the CLA.

✅ JammingBen
✅ KarunAtreya
✅ jacob-nv
✅ lookacat
✅ JanAckermann
✅ SwikritiT
✅ S-Panta
✅ phil-davis
❌ ownclouders
You have signed the CLA already but the status is still pending? Let us recheck it.

@sonarcloud
Copy link

sonarcloud bot commented Aug 16, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

25.8% 25.8% Coverage
11.6% 11.6% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@JammingBen JammingBen merged commit d91742f into master Aug 16, 2023
@delete-merged-branch delete-merged-branch bot deleted the merge-stable-7.1-to-master-20230816 branch August 16, 2023 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexAndBear AlexAndBear AlexAndBear approved these changes

@dschmidt dschmidt Awaiting requested review from dschmidt

@lookacat lookacat Awaiting requested review from lookacat

Assignees

@JammingBen JammingBen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@JammingBen @CLAassistant @AlexAndBear @KarunAtreya @ownclouders @phil-davis @jacob-nv @lookacat @S-Panta @SwikritiT