Skip to content

Dev 1.4.2 as Next Stable Release #456

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.

Sign up for GitHub

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

Merged
ExtremeFiretop merged 22 commits into from
Apr 14, 2025
Merged

Dev 1.4.2 as Next Stable Release #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bd2089f
Minor Fixes
ExtremeFiretop Apr 9, 2025
b017713
Update MerlinAU.sh
ExtremeFiretop Apr 9, 2025
42bb8b1
Update MerlinAU.asp
ExtremeFiretop Apr 9, 2025
412f735
Update version.txt
ExtremeFiretop Apr 9, 2025
66a45da
Update README.md
ExtremeFiretop Apr 9, 2025
37a57bc
Update MerlinAU.asp
ExtremeFiretop Apr 9, 2025
ccdfd31
Update README.md
ExtremeFiretop Apr 10, 2025
75e7a11
Merge pull request #451 from ExtremeFiretop/ExtremeFiretop-SmallFixes
Martinski4GitHub Apr 10, 2025
b515766
Code Improvements
Martinski4GitHub Apr 10, 2025
2436bbc
Merge pull request #452 from Martinski4GitHub/dev
ExtremeFiretop Apr 10, 2025
46d4f90
Patch Changelog and Email Notifications
ExtremeFiretop Apr 11, 2025
789254e
Update MerlinAU.sh
ExtremeFiretop Apr 11, 2025
ab43a44
Update MerlinAU.sh
ExtremeFiretop Apr 11, 2025
299ad79
Merge pull request #453 from ExtremeFiretop/ExtremeFiretop-ChangelogN…
ExtremeFiretop Apr 11, 2025
149b1c8
Fix and Improvements
Martinski4GitHub Apr 11, 2025
8854210
Merge pull request #454 from Martinski4GitHub/dev
ExtremeFiretop Apr 12, 2025
59f4b24
Code Improvement
Martinski4GitHub Apr 12, 2025
eec4ebf
Merge pull request #455 from Martinski4GitHub/dev
ExtremeFiretop Apr 14, 2025
f8e404d
Merge branch 'main' into dev
ExtremeFiretop Apr 14, 2025
4d47294
Update MerlinAU.sh
ExtremeFiretop Apr 14, 2025
b2d1fb5
Update README.md
ExtremeFiretop Apr 14, 2025
9f2b4e4
Update version.txt
ExtremeFiretop Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions MerlinAU.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<script language="JavaScript" type="text/javascript">

/**----------------------------**/
/** Last Modified: 2025-Apr-02 **/
/** Last Modified: 2025-Apr-09 **/
/** Intended for 1.4.x Release **/
/**----------------------------**/

Expand Down Expand Up @@ -2684,7 +2684,7 @@ function initializeCollapsibleSections()
<td>
<div style="display: inline-block;">
<input type="password" id="routerPassword" name="routerPassword" placeholder="Enter password"
style="width: 278px; display: inline-block; margin-left:2px; margin-top:3px;" maxlength="64"
style="width: 275px; display: inline-block; margin-left:2px; margin-top:3px;" maxlength="64"
onKeyPress="return validator.isString(this, event)"
onblur="ValidatePasswordString(this,'onBLUR')"
onkeyup="ValidatePasswordString(this,'onKEYUP')"/>
Expand Down Expand Up @@ -2784,7 +2784,7 @@ function initializeCollapsibleSections()
<div id="fwCronScheduleHOUR">
<span style="margin-left:1px; margin-top:10px; font-size: 12px; font-weight: bolder;">Hour:</span>
<input type="text" autocomplete="off" autocapitalize="off" data-lpignore="true"
style="width: 7%; margin-left: 20px; margin-top:10px; margin-bottom:7px" maxlength="2"
style="width: 7%; margin-left: 19px; margin-top:10px; margin-bottom:7px" maxlength="2"
id="fwScheduleHOUR" name="fwScheduleHOUR" value="0"
onKeyPress="return validator.isNumber(this,event)"
onkeyup="ValidateFWUpdateTime(this,'HOUR')"
Expand Down Expand Up @@ -2881,7 +2881,7 @@ function initializeCollapsibleSections()
</label>
</td>
<td>
<select id="rogFWBuildType" name="rogFWBuildType" style="width: 20%;" onchange="handleTUFROGChange(this)">
<select id="rogFWBuildType" name="rogFWBuildType" style="width: 21%;" onchange="handleTUFROGChange(this)">
<option value="ROG">ROG</option>
<option value="Pure">Pure</option>
</select>
Expand All @@ -2899,7 +2899,7 @@ function initializeCollapsibleSections()
</label>
</td>
<td>
<select id="tuffFWBuildType" name="tuffFWBuildType" style="width: 20%;" onchange="handleTUFROGChange(this)">
<select id="tuffFWBuildType" name="tuffFWBuildType" style="width: 21%;" onchange="handleTUFROGChange(this)">
<option value="TUF">TUF</option>
<option value="Pure">Pure</option>
</select>
Expand Down
Loading