Merged
Conversation
Contributor
ColonelMoutarde
left a comment
There was a problem hiding this comment.
Small recommendations ;)
Co-authored-by: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com>
Member
|
I have updated a bit the terminology 8dd4a38 |
Contributor
Author
|
Ready for final review |
math-GH
added a commit
to math-GH/FreshRSS
that referenced
this pull request
Jul 4, 2023
* prependTitle() * do not need the "damn" in the alert * update page layout improved * release channel * i18n labels * add log messages while updating * Delete updatee.php * Update updateController.php * Update updateController.php * Update updateController.php * Update updateController.php * add getCurrentGitBranch() * Update updateController.php * state2 buttons * i18n * loading * Update feedback.php * Update feedback.php * Update feedback.php * Update extra.js * Apply suggestions from code review Co-authored-by: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> * Update updateController.php * Update terminology * update button is now armed --------- Co-authored-by: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
This was referenced Sep 5, 2023
Merged
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
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.
Goal: The update page has the default style and looks more clean.
The update mechanism itself was not touched
Before:

After:
Development/NightlyorStable), based on the current version number (Development = with-dev, stable = without-dev)The branch name is shown, if it will update via git

When user clicks on the

Start updatebutton, then the button turns into a grey deactivated button inkl. a loading gif until the update is done.Here a picture if the update is via update.freshrss.org and not via git:

How it looks like if it is a

stableversionWhile/After updating an entry will added to the log with information about the update.
How to test the feature manually:
How to manipulate:
return false = it will use the update via update.freshrss.org
https://github.com/FreshRSS/FreshRSS/blob/445cc23abdda5767b622d70cf7b5eb5310dcf908/app/Controllers/updateController.php#LL7C1-L9C3
release channel (
Development/NightlyorStable), based on the current version number (Development = with-dev, stable = without-dev)FreshRSS/constants.php
Line 6 in 445cc23
Pull request checklist: