Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
cd5b7f5
Merge pull request #600 from ExtremeFiretop/main
ExtremeFiretop Sep 8, 2026
d208706
Delete merlin-sha256.txt
ExtremeFiretop Sep 8, 2026
ee06d2a
Prevent mesh firmware checks from interrupting node updates
ExtremeFiretop Sep 16, 2026
6212bf4
Stop logging out early, allow _GetNodeInfo_ to logout
ExtremeFiretop Sep 16, 2026
c2c2e46
Tightening up the Flash Order
ExtremeFiretop Sep 16, 2026
1089887
Fix for Copy&Paste into Password Entry
Martinski4GitHub Sep 17, 2026
b6ce1c0
Merge pull request #602 from Martinski4GitHub/dev
ExtremeFiretop Sep 17, 2026
6135b27
Merge branch 'dev' into Fix-Race-Condition
ExtremeFiretop Sep 17, 2026
a30bff4
Merge pull request #601 from ExtremeFiretop/Fix-Race-Condition
Martinski4GitHub Sep 19, 2026
22cc424
Fixes and Improvements
Martinski4GitHub Sep 21, 2026
0fca04f
Merge pull request #603 from Martinski4GitHub/dev
ExtremeFiretop Sep 22, 2026
e9d6189
Account for Concurrent AiMesh Node Operations
Martinski4GitHub Sep 22, 2026
749892c
Merge branch 'dev' of https://github.com/Martinski4GitHub/MerlinAutoU…
Martinski4GitHub Sep 22, 2026
190015c
Fixed Typo
Martinski4GitHub Sep 22, 2026
c94caaa
Fixed Typo
Martinski4GitHub Sep 22, 2026
d179552
Merge pull request #604 from Martinski4GitHub/dev
ExtremeFiretop Sep 22, 2026
627f35e
Render downloaded changelog as text
maghuro Sep 23, 2026
b4226ce
Harden pull request source check
maghuro Sep 23, 2026
63e4df3
Preserve failures during MerlinAU self-update
maghuro Sep 24, 2026
190edc6
Safely escape values written through sed
maghuro Sep 24, 2026
58d93df
Fix dependabot
ExtremeFiretop Sep 24, 2026
6ee931d
Merge pull request #607 from maghuro/security/render-changelog-as-text
ExtremeFiretop Sep 24, 2026
0f0104e
Merge pull request #608 from maghuro/security/harden-pr-source-check
ExtremeFiretop Sep 24, 2026
d39d4f6
Merge pull request #606 from maghuro/fix/script-update-partial-failure
ExtremeFiretop Sep 24, 2026
0ef0824
Merge pull request #610 from maghuro/fix/settings-sed-escaping
ExtremeFiretop Sep 24, 2026
4e779db
Extension of PR: #590 and #610
ExtremeFiretop Sep 24, 2026
a2fd184
Fixes and Code Improvements
Martinski4GitHub Sep 25, 2026
8149d29
Update MerlinAU.sh
ExtremeFiretop Sep 25, 2026
cd06e44
Fix Logout Request... Standardizing node logouts
ExtremeFiretop Sep 25, 2026
4d3b2ff
Add httpd restart to allow login
ExtremeFiretop Sep 25, 2026
b98caf8
Cleanup
ExtremeFiretop Sep 25, 2026
41a2034
improve wording
ExtremeFiretop Sep 25, 2026
4e06a48
Merge pull request #614 from Martinski4GitHub/dev
ExtremeFiretop Sep 25, 2026
3e9c49a
Merge branch 'dev' into Fix-AiMesh-2nd-Login
ExtremeFiretop Sep 25, 2026
bd1a761
improve notes
ExtremeFiretop Sep 25, 2026
1563e45
Moving the flashing wording
ExtremeFiretop Sep 26, 2026
ee394bb
wording improvements
ExtremeFiretop Sep 26, 2026
3218bbb
Additional cleanup
ExtremeFiretop Sep 26, 2026
187f801
Correct date
ExtremeFiretop Sep 26, 2026
94ec8bb
Merge pull request #615 from ExtremeFiretop/Fix-AiMesh-2nd-Login
Martinski4GitHub Sep 27, 2026
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
11 changes: 0 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,6 @@
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
groups:
all-actions:
patterns: [ "*" ]
target-branch: "main"

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/Check-PRsource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ on:
- reopened
- synchronize
- edited

permissions: {}

jobs:
check-branches:
runs-on: ubuntu-latest
steps:
- name: Check branches
- name: Reject non-dev pull requests to main
if: github.base_ref == 'main' && github.head_ref != 'dev'
run: |
if [ ${{ github.head_ref }} != "dev" ] && [ ${{ github.base_ref }} == "main" ]; then
echo "Merge requests to main branch are only allowed from dev branch."
exit 1
fi
echo "Merge requests to main branch are only allowed from dev branch."
exit 1
17 changes: 10 additions & 7 deletions MerlinAU.asp
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ input[value="Uninstall"] {
<script language="JavaScript" type="text/javascript">

/**----------------------------**/
/** Last Modified: 2026-May-16 **/
/** Last Modified: 2026-Sep-25 **/
/**----------------------------**/

// Separate variables for shared and AJAX settings //
Expand Down Expand Up @@ -1228,7 +1228,7 @@ function FetchChangelog(startTime)
timeout: 1500, // each attempt times out after 9 seconds //
success: function(data)
{
$('#changelogData').html('<pre>' + data + '</pre>');
$('#changelogData').empty().append($('<pre>').text(data));
},
error: function()
{
Expand Down Expand Up @@ -2337,8 +2337,9 @@ function GetConfigSettings()
keyName = tokenStr.substring(0, splitIndex).trim();
keyValue = tokenStr.substring(splitIndex + 1).trim();

// Remove surrounding quotes if present //
if (keyValue.startsWith('"') && keyValue.endsWith('"'))
// Remove surrounding single or double quotes if present //
if ((keyValue.startsWith('"') && keyValue.endsWith('"')) ||
(keyValue.startsWith("'") && keyValue.endsWith("'")))
{ keyValue = keyValue.substring(1, keyValue.length - 1); }

AssignAjaxSetting(keyName, keyValue);
Expand All @@ -2354,8 +2355,9 @@ function GetConfigSettings()
{
keyValue = tokenList[kIndx + 1].trim();

// Remove surrounding quotes if present //
if (keyValue.startsWith('"') && keyValue.endsWith('"'))
// Remove surrounding single or double quotes if present //
if ((keyValue.startsWith('"') && keyValue.endsWith('"')) ||
(keyValue.startsWith("'") && keyValue.endsWith("'")))
{ keyValue = keyValue.substring(1, keyValue.length - 1); }

AssignAjaxSetting(keyName, keyValue);
Expand Down Expand Up @@ -2456,7 +2458,8 @@ function AssignAjaxSetting (keyName, keyValue)
try
{
var decoded = atob(keyValue);
var password = decoded.split(':')[1] || '';
var splitIndex = decoded.indexOf(':');
var password = (splitIndex > 0) ? decoded.slice(splitIndex + 1) : '';
ajax_custom_settings.routerPassword = password;
}
catch (e)
Expand Down
Loading
Loading