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.

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

[stable9] Add repair step and revert "Open updater" button #1501

Merged
merged 4 commits into from
Sep 26, 2016

Conversation

MorrisJobke
Copy link
Member

cc @LukasReschke @nickvergessen @karlitschek

This reverts commit b42ee95.

Signed-off-by: Morris Jobke <[email protected]>
This reverts commit 997e4cf.

Signed-off-by: Morris Jobke <[email protected]>
@mention-bot
Copy link

@MorrisJobke, thanks for your PR! By analyzing the annotation information on this pull request, we identified @nickvergessen and @LukasReschke to be potential reviewers

@MorrisJobke
Copy link
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

@karlitschek
Copy link
Member

👍

@nickvergessen
Copy link
Member

Worked 👍

@@ -20,8 +20,10 @@

<?php if($isNewVersionAvailable === true): ?>
<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): ?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we remove that as well now? :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on master only?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. This is also not on master. (no idea how this came in here)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah gotcha ... it was only added in stable9.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed this.

@LukasReschke
Copy link
Member

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants