Dev 1.6.1 as Next Stable Release#563
Merged
ExtremeFiretop merged 14 commits intomainfrom Apr 14, 2026
Merged
Conversation
Reverse Sync Back Into Dev
Set file type attributes.
Create .gitattributes
1. After updating the firmware, the script runs: sh /jffs/scripts/MerlinAU.sh **postUpdateEmail** - However, that function does not currently handle resetting the setting value of **FW_New_Update_Notification_Vers** back to "TBD" and instead would only reset the value of **"FW_New_Update_Changelog_Approval" back to "TBD" for some reason. Due to this, it retrained a stale firmware-update notification version in the settings for: **FW_New_Update_Notification_Vers** 2. The WebUI was consistently setting a static weight value of -100 for Beta/Alpha releases, regardless of the setting for **Beta-to-Release F/W Updates** -The WebUI should only set the weight penalty of beta/alpha releases if the setting is enabled for: **Beta-to-Release F/W Updates** Additionally, when enabled, it should compare the numeric segments first and only use beta/alpha status as a tie-breaker within the SAME numeric version.
Correction
Changed my mind
Bug Fix for Report: 558
Modified code to properly reset configuration settings after a F/W Update has been successfully completed and followed by a router reboot.
Reset Configuration Settings After F/W Update
Added messages to the "Router Login Password" prompt to let user know how to show/hide the password string, and how to exit the input prompt.
Messaging Improvement when entering Login Password.
ExtremeFiretop
added
bug
Update release date to 2026-Apr-13
Bumps the all-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.6.1 to 3.0.0 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@v2.6.1...v3.0.0) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-actions ... Signed-off-by: dependabot[bot] <support@github.com>
…/dev/all-actions-cf84dd4d0c Bump softprops/action-gh-release from 2.6.1 to 3.0.0 in the all-actions group
Martinski4GitHub
approved these changes
Apr 14, 2026
Collaborator
Martinski4GitHub
left a comment
Martinski4GitHub
left a comment
There was a problem hiding this comment.
Approved and good to go live!!!
Owner
Author
Whoot whoot! |
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
2 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.
Forms post update = READY
Readme update = COMPLETED
Version.txt update = COMPLETED
Dev 1.6.1 as Next Stable Release
What's Changed/Fixed?:
PR: [ #559 ] - BUG FIX: For Github Report: 558
PR: [ #560 ] - Reset Configuration Settings After F/W Update
PR: [ #561 ] - Messaging Improvement when entering Login Password.
As always, we highly recommend you update ASAP as this includes functional improvements and little bug fixes.
Thanks!