[stable9] Add repair step and revert "Open updater" button#1501
Merged
LukasReschke merged 4 commits intostable9from Sep 26, 2016
Merged
[stable9] Add repair step and revert "Open updater" button#1501LukasReschke merged 4 commits intostable9from
LukasReschke merged 4 commits intostable9from
Conversation
This reverts commit b42ee95. Signed-off-by: Morris Jobke <[email protected]>
This reverts commit 997e4cf. Signed-off-by: Morris Jobke <[email protected]>
Signed-off-by: Morris Jobke <[email protected]>
|
@MorrisJobke, thanks for your PR! By analyzing the annotation information on this pull request, we identified @nickvergessen and @LukasReschke to be potential reviewers |
Member
Author
|
stable9 doesn't need the fixed from stable10 and master: https://github.com/nextcloud/server/blob/stable9/lib/public/util.php#L83 (there the channel is already set in the config.php |
2 tasks
Member
|
👍 |
Member
|
Worked 👍 |
LukasReschke
requested changes
Sep 26, 2016
| <strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong> | ||
| <?php if ($_['downloadLink']): ?> | ||
| <a href="<?php p($_['downloadLink']); ?>" class="button"><?php p($l->t('Download now')) ?></a> | ||
| <?php if($updaterRequirementsFulfilled === true): ?> |
Member
There was a problem hiding this comment.
Shouldn't we remove that as well now? :)
Member
Author
There was a problem hiding this comment.
Correct. This is also not on master. (no idea how this came in here)
Member
Author
There was a problem hiding this comment.
Ah gotcha ... it was only added in stable9.
This reverts commit 5e2bf16.
Member
|
LGTM |
LukasReschke
approved these changes
Sep 26, 2016
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
5 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.
data/updater-INSTANCEID/.stepto a file named.step-previous-updateto not show all steps as done on the next updatecc @LukasReschke @nickvergessen @karlitschek