Add maximum.supported.desktop.version#41183
Closed
flooxo wants to merge 11 commits intonextcloud:masterfrom
Closed
Add maximum.supported.desktop.version#41183flooxo wants to merge 11 commits intonextcloud:masterfrom
maximum.supported.desktop.version#41183flooxo wants to merge 11 commits intonextcloud:masterfrom
Conversation
Signed-off-by: Florian Grabmeier <[email protected]>
szaimen
previously requested changes
Oct 29, 2023
szaimen
requested review from
a team,
ArtificialOwl,
icewind1991 and
sorbaugh
and removed request for
a team
szaimen
reviewed
Oct 30, 2023
Signed-off-by: Florian Grabmeier <[email protected]>
Co-authored-by: Simon L. <[email protected]> Signed-off-by: flox_x <[email protected]> Signed-off-by: Florian Grabmeier <[email protected]>
flooxo
force-pushed
the
feature/max-version
branch
from
ba23f6b to
ed0bcc9
Compare
Signed-off-by: flox_x <[email protected]>
Merged
Author
|
I hope now it's as intended :) |
Merged
Merged
Merged
skjnldsv
reviewed
Mar 15, 2024
Comment on lines
+72
to
+74
| version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1 || | ||
| !empty($maximumSupportedDesktopVersion) && | ||
| version_compare($versionMatches[1], $maximumSupportedDesktopVersion) === 1) { |
Member
There was a problem hiding this comment.
Mixing && and || is confusing, can you add parenthesis to isolate the checks?
Or regroup the checks into dedicated variables :)
You can also probably use a crazy versio number as maximum fallback, like
- $maximumSupportedDesktopVersion = $this->config->getSystemValueString('maximum.supported.desktop.version', '');
+ $maximumSupportedDesktopVersion = $this->config->getSystemValueString('maximum.supported.desktop.version', '99.99.99');
Collaborator
There was a problem hiding this comment.
I think it will be better with two different error messages if the client is too old or too new.
It will help for debugging and solve the missing parenthesis
skjnldsv
added
2. developing
Merged
Member
Member
|
Moving to a local branch to take over and et this in :) |
|
The backport to # Switch to the target branch and update it
git checkout master
git pull origin master
# Create the new backport branch
git checkout -b backport/41183/master
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick a0a7ce64 b998f98d ed0bcc96
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/41183/masterError: Failed to cherry pick commits: error: no cherry-pick or revert in progress Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Member
|
alright 😁 |
4 tasks
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
'maximum.supported.desktop.version'parameter #30143Summary
Add new config parameter
maximum.supported.desktop.version(similar tominimum.supported.desktop.version) in order to prevent sync issues after updates (like nextcloud/desktop#4016 or nextcloud/desktop#5564)Checklist