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

Dev 1.3.0 as Next Beta Release #297

Merged
merged 259 commits into from
Sep 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
259 commits
Select commit Hold shift + click to select a range
e65e5b1
Update MerlinAU.sh
ExtremeFiretop Apr 14, 2024
9509aa5
Update MerlinAU.sh
ExtremeFiretop Apr 15, 2024
3a1b997
Update MerlinAU.sh
ExtremeFiretop Apr 15, 2024
089208f
Update MerlinAU.sh
ExtremeFiretop Apr 15, 2024
18796b7
Update MerlinAU.sh
ExtremeFiretop Apr 15, 2024
d307d7a
Update MerlinAU.sh
ExtremeFiretop Apr 15, 2024
e3db8ad
Update MerlinAU.sh
ExtremeFiretop Apr 16, 2024
5db6c31
Update MerlinAU.sh
ExtremeFiretop Apr 16, 2024
9b1a709
Update MerlinAU.sh
ExtremeFiretop Apr 16, 2024
64d0e06
Update MerlinAU.sh
ExtremeFiretop Apr 16, 2024
d588ca1
Merge branch 'dev' into Gnuton
ExtremeFiretop Apr 16, 2024
4a27b95
Update MerlinAU.sh
ExtremeFiretop Apr 16, 2024
072cae2
Update MerlinAU.sh
ExtremeFiretop Apr 18, 2024
f847418
Update MerlinAU.sh
ExtremeFiretop Apr 18, 2024
ff4b69e
Update MerlinAU.sh
ExtremeFiretop Apr 18, 2024
5a059f2
Update MerlinAU.sh
ExtremeFiretop Apr 18, 2024
7e3d0bb
Update MerlinAU.sh
ExtremeFiretop Apr 18, 2024
84537af
Update MerlinAU.sh
ExtremeFiretop Apr 18, 2024
c6a9bef
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
4e172c3
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
755cf7d
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
27b0628
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
00a5428
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
021bb76
Update version.txt
ExtremeFiretop Apr 19, 2024
b578f08
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
576a134
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
a6e7147
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
5d89d92
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
dff2bf5
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
9dbc854
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
8fecf48
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
1e71943
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
4f51510
Update MerlinAU.sh
ExtremeFiretop Apr 19, 2024
c7f6fe6
Update MerlinAU.sh
ExtremeFiretop Apr 20, 2024
0ba3ed8
Update MerlinAU.sh
ExtremeFiretop Apr 20, 2024
76f7597
Update MerlinAU.sh
ExtremeFiretop Apr 25, 2024
8a5d69d
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
f7531c4
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
190c57f
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
944786c
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
36769c2
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
1d78ea4
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
ba744f9
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
b4806ab
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
a90735d
Update MerlinAU.sh
ExtremeFiretop Apr 26, 2024
b423a70
Update MerlinAU.sh
ExtremeFiretop Apr 27, 2024
2ef76e9
Update MerlinAU.sh
ExtremeFiretop Apr 27, 2024
37ceb59
Update version.txt
ExtremeFiretop Apr 27, 2024
f43ffa6
Update MerlinAU.sh
ExtremeFiretop Apr 27, 2024
98bb803
Update MerlinAU.sh
ExtremeFiretop Apr 27, 2024
9d3788c
Update MerlinAU.sh
ExtremeFiretop Apr 27, 2024
99153a3
Update MerlinAU.sh
ExtremeFiretop Apr 27, 2024
9106e54
Update MerlinAU.sh
ExtremeFiretop Apr 27, 2024
c49334e
Update MerlinAU.sh
ExtremeFiretop Apr 27, 2024
33ec55d
Merge branch 'dev' into Gnuton
ExtremeFiretop Apr 28, 2024
010a835
Update MerlinAU.sh
ExtremeFiretop Apr 30, 2024
d937335
Update MerlinAU.sh
ExtremeFiretop Apr 30, 2024
2694d18
Update MerlinAU.sh
ExtremeFiretop Apr 30, 2024
b20045c
Update version.txt
ExtremeFiretop Apr 30, 2024
ebadc87
Update MerlinAU.sh
ExtremeFiretop May 2, 2024
e1f81d9
Merge branch 'dev' into Gnuton
ExtremeFiretop May 2, 2024
f9519b7
Update MerlinAU.sh
ExtremeFiretop May 3, 2024
ad478ab
Update MerlinAU.sh
ExtremeFiretop May 3, 2024
fee7d7f
Update MerlinAU.sh
ExtremeFiretop May 3, 2024
bb62bfb
Update MerlinAU.sh
ExtremeFiretop May 3, 2024
e33b2e7
Update MerlinAU.sh
ExtremeFiretop May 4, 2024
e82c481
Revert "Update MerlinAU.sh"
ExtremeFiretop May 4, 2024
b62bc93
Update MerlinAU.sh
ExtremeFiretop May 4, 2024
409d015
Update MerlinAU.sh
ExtremeFiretop May 4, 2024
b8cb206
Update MerlinAU.sh
ExtremeFiretop May 4, 2024
3f3ac29
Update MerlinAU.sh
ExtremeFiretop May 5, 2024
0765131
Update MerlinAU.sh
ExtremeFiretop May 5, 2024
f1f5c62
Update MerlinAU.sh
ExtremeFiretop May 10, 2024
3a540a9
Update MerlinAU.sh
ExtremeFiretop May 10, 2024
13a4f0b
Merge branch 'dev' into Gnuton
ExtremeFiretop May 10, 2024
feb8e9c
Update MerlinAU.sh
ExtremeFiretop May 10, 2024
2904cd1
Update MerlinAU.sh
ExtremeFiretop May 10, 2024
495ba23
Update MerlinAU.sh
ExtremeFiretop May 10, 2024
3db441f
Update MerlinAU.sh
ExtremeFiretop May 10, 2024
8ec6f0e
Update MerlinAU.sh
ExtremeFiretop May 10, 2024
71d02ac
Merge branch 'dev' into Gnuton
ExtremeFiretop May 10, 2024
699f58d
Update MerlinAU.sh
ExtremeFiretop May 12, 2024
8211b59
Update MerlinAU.sh
ExtremeFiretop May 12, 2024
eaad5fe
Update MerlinAU.sh
ExtremeFiretop May 12, 2024
22778a8
Update MerlinAU.sh
ExtremeFiretop May 18, 2024
597a697
Merge branch 'dev' into Gnuton
ExtremeFiretop May 18, 2024
8b01691
Update MerlinAU.sh
ExtremeFiretop May 19, 2024
1acc40e
Update MerlinAU.sh
ExtremeFiretop May 19, 2024
45d1eb0
Merge branch 'dev' into Gnuton
ExtremeFiretop May 19, 2024
1c6d664
Merge branch 'dev' into Gnuton
ExtremeFiretop May 19, 2024
54e3aa8
Update MerlinAU.sh
ExtremeFiretop May 21, 2024
0c4a321
Update MerlinAU.sh
ExtremeFiretop May 21, 2024
523a19f
Update MerlinAU.sh
ExtremeFiretop May 21, 2024
11d7390
Update MerlinAU.sh
ExtremeFiretop May 21, 2024
6cf1637
Update MerlinAU.sh
ExtremeFiretop May 21, 2024
930a3dc
Update MerlinAU.sh
ExtremeFiretop May 23, 2024
86f7813
Update MerlinAU.sh
ExtremeFiretop May 23, 2024
7f09581
Merge branch 'dev' into Gnuton
ExtremeFiretop May 23, 2024
1acab76
Update MerlinAU.sh
ExtremeFiretop May 23, 2024
81a795a
Update MerlinAU.sh
ExtremeFiretop May 23, 2024
ac5040d
Merge branch 'dev' into Gnuton
ExtremeFiretop May 23, 2024
7bd5701
Update MerlinAU.sh
ExtremeFiretop May 23, 2024
27d9c54
Update MerlinAU.sh
ExtremeFiretop May 27, 2024
1b3fabd
Update MerlinAU.sh
ExtremeFiretop May 27, 2024
89ca1f6
Update MerlinAU.sh
ExtremeFiretop May 27, 2024
0ce2b54
Merge branch 'dev' into Gnuton
ExtremeFiretop May 27, 2024
f99b53e
Update MerlinAU.sh
ExtremeFiretop May 27, 2024
ba9812d
Merge branch 'dev' into Gnuton
ExtremeFiretop May 27, 2024
e4f7800
Update MerlinAU.sh
ExtremeFiretop May 27, 2024
5fec0a6
Merge branch 'dev' into Gnuton
ExtremeFiretop May 27, 2024
e0d1cde
Update MerlinAU.sh
ExtremeFiretop May 30, 2024
48f819e
Update MerlinAU.sh
ExtremeFiretop May 30, 2024
696d621
Update MerlinAU.sh
ExtremeFiretop May 30, 2024
3197d1c
Merge branch 'dev' into Gnuton
ExtremeFiretop May 31, 2024
9e3dc73
Update MerlinAU.sh
ExtremeFiretop May 31, 2024
e04e264
Update MerlinAU.sh
ExtremeFiretop May 31, 2024
c5fc2da
Update MerlinAU.sh
ExtremeFiretop Jun 2, 2024
bdc679d
Update MerlinAU.sh
ExtremeFiretop Jun 2, 2024
1cd5f15
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 2, 2024
3eb0555
Update MerlinAU.sh
ExtremeFiretop Jun 2, 2024
55dd030
Update MerlinAU.sh
ExtremeFiretop Jun 2, 2024
38d52c6
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 2, 2024
49fb303
Update MerlinAU.sh
ExtremeFiretop Jun 4, 2024
40acb7f
Update MerlinAU.sh
ExtremeFiretop Jun 4, 2024
625fb54
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 4, 2024
535dbcd
Update MerlinAU.sh
ExtremeFiretop Jun 8, 2024
b116791
Update MerlinAU.sh
ExtremeFiretop Jun 8, 2024
bd71310
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 8, 2024
8759186
Update MerlinAU.sh
ExtremeFiretop Jun 8, 2024
a4aa1f2
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
b7745ca
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
ed12efb
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
8b41cf9
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
6dd2172
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
1798872
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
a961749
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
037cf93
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
70e595f
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
ef1a0e8
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
07255da
Update MerlinAU.sh
ExtremeFiretop Jun 10, 2024
98e0d5c
Update MerlinAU.sh
ExtremeFiretop Jun 11, 2024
c2303c1
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 11, 2024
51ca817
Update MerlinAU.sh
ExtremeFiretop Jun 12, 2024
98174d2
Update version.txt
ExtremeFiretop Jun 12, 2024
67427cb
Update README.md
ExtremeFiretop Jun 12, 2024
449a48e
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 12, 2024
82b44c4
Update MerlinAU.sh
ExtremeFiretop Jun 19, 2024
1020108
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 20, 2024
8ab2ab4
Update MerlinAU.sh
ExtremeFiretop Jun 20, 2024
c40a44c
Update MerlinAU.sh
ExtremeFiretop Jun 20, 2024
240d77b
Update MerlinAU.sh
ExtremeFiretop Jun 20, 2024
ac86f4d
Update MerlinAU.sh
ExtremeFiretop Jun 20, 2024
954bb3a
Update MerlinAU.sh
ExtremeFiretop Jun 21, 2024
b3aa26f
Update MerlinAU.sh
ExtremeFiretop Jun 21, 2024
fb58ec0
Revert "Update MerlinAU.sh"
ExtremeFiretop Jun 21, 2024
d404d67
Update MerlinAU.sh
ExtremeFiretop Jun 21, 2024
f8a345d
Update MerlinAU.sh
ExtremeFiretop Jun 21, 2024
721a7a9
Update MerlinAU.sh
ExtremeFiretop Jun 21, 2024
f3a6710
Update MerlinAU.sh
ExtremeFiretop Jun 21, 2024
55154e7
Update MerlinAU.sh
ExtremeFiretop Jun 24, 2024
c196776
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 25, 2024
adff3cc
Update MerlinAU.sh
ExtremeFiretop Jun 26, 2024
8263671
Update MerlinAU.sh
ExtremeFiretop Jun 26, 2024
1c62b1a
Update MerlinAU.sh
ExtremeFiretop Jun 26, 2024
987a966
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 26, 2024
b700ccc
Update MerlinAU.sh
ExtremeFiretop Jun 27, 2024
8fa5914
Update MerlinAU.sh
ExtremeFiretop Jun 27, 2024
0e6ca6f
Update MerlinAU.sh
ExtremeFiretop Jun 27, 2024
2d5e425
Update MerlinAU.sh
ExtremeFiretop Jun 28, 2024
4701fbe
Update MerlinAU.sh
ExtremeFiretop Jun 28, 2024
1d9a415
Update MerlinAU.sh
ExtremeFiretop Jun 28, 2024
081e5ce
Update MerlinAU.sh
ExtremeFiretop Jun 28, 2024
076acf9
Update MerlinAU.sh
ExtremeFiretop Jun 28, 2024
1018be6
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 28, 2024
783a4a6
Update MerlinAU.sh
ExtremeFiretop Jun 28, 2024
b9c219d
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 28, 2024
c68ff03
Update MerlinAU.sh
ExtremeFiretop Jun 28, 2024
b387bc1
Merge branch 'dev' into Gnuton
ExtremeFiretop Jun 28, 2024
af2571e
Update MerlinAU.sh
ExtremeFiretop Jul 1, 2024
ddfd148
Update MerlinAU.sh
ExtremeFiretop Jul 1, 2024
83f87da
Merge branch 'dev' into Gnuton
ExtremeFiretop Jul 1, 2024
a3dd455
Update MerlinAU.sh
ExtremeFiretop Jul 5, 2024
dbaaed9
Merge branch 'dev' into Gnuton
ExtremeFiretop Jul 5, 2024
e1f6e03
Update MerlinAU.sh
ExtremeFiretop Jul 5, 2024
4e6b022
Update MerlinAU.sh
ExtremeFiretop Jul 5, 2024
08eb63a
Update MerlinAU.sh
ExtremeFiretop Jul 6, 2024
91dd449
Merge branch 'dev' into Gnuton
ExtremeFiretop Jul 6, 2024
fd29c6c
Merge branch 'dev' into Gnuton
ExtremeFiretop Jul 9, 2024
7a96268
Merge branch 'dev' into Gnuton
ExtremeFiretop Jul 19, 2024
7afe01f
Update MerlinAU.sh
ExtremeFiretop Jul 25, 2024
80e79ae
Update MerlinAU.sh
ExtremeFiretop Jul 28, 2024
5b7c15c
Update MerlinAU.sh
ExtremeFiretop Aug 4, 2024
1b018f1
Update MerlinAU.sh
ExtremeFiretop Aug 4, 2024
2340cb3
Update MerlinAU.sh
ExtremeFiretop Aug 4, 2024
9f03004
Update MerlinAU.sh
ExtremeFiretop Aug 4, 2024
109148e
Merge branch 'dev' into Gnuton
ExtremeFiretop Aug 4, 2024
7a0601b
Update MerlinAU.sh
ExtremeFiretop Aug 4, 2024
c63a577
Update MerlinAU.sh
ExtremeFiretop Aug 6, 2024
717c904
Update MerlinAU.sh
ExtremeFiretop Aug 6, 2024
7d62991
Merge branch 'dev' into Gnuton
ExtremeFiretop Aug 6, 2024
ac73c10
Update MerlinAU.sh
ExtremeFiretop Aug 6, 2024
0d966ae
Update MerlinAU.sh
ExtremeFiretop Aug 6, 2024
0f63f95
Merge branch 'dev' into Gnuton
ExtremeFiretop Aug 6, 2024
6514ed0
Update MerlinAU.sh
ExtremeFiretop Aug 7, 2024
61e0408
Update MerlinAU.sh
ExtremeFiretop Aug 7, 2024
ef97b76
Update MerlinAU.sh
ExtremeFiretop Aug 7, 2024
11b07de
Update MerlinAU.sh
ExtremeFiretop Aug 7, 2024
1e664df
Update MerlinAU.sh
ExtremeFiretop Aug 8, 2024
6656037
Update MerlinAU.sh
ExtremeFiretop Aug 8, 2024
4dc38f0
Merge branch 'dev' into Gnuton
ExtremeFiretop Aug 8, 2024
c9e109f
Merge branch 'dev' into Gnuton
ExtremeFiretop Aug 8, 2024
f1e66ad
Update MerlinAU.sh
ExtremeFiretop Aug 9, 2024
7166661
Merge branch 'dev' into Gnuton
ExtremeFiretop Aug 9, 2024
dd25292
Merge pull request #287 from ExtremeFiretop/main
ExtremeFiretop Aug 9, 2024
6470009
Merge branch 'dev' into Gnuton
ExtremeFiretop Aug 9, 2024
451b09c
Update MerlinAU.sh
ExtremeFiretop Aug 9, 2024
6a773b9
Update MerlinAU.sh
ExtremeFiretop Aug 9, 2024
91dbcb4
Update MerlinAU.sh
ExtremeFiretop Aug 10, 2024
a0af4e4
Update MerlinAU.sh
ExtremeFiretop Aug 11, 2024
fa55df8
Update MerlinAU.sh
ExtremeFiretop Aug 11, 2024
4a30e59
Merge pull request #186 from ExtremeFiretop/Gnuton
Martinski4GitHub Aug 12, 2024
389079f
Code improvements for Gnuton PR.
Martinski4GitHub Aug 12, 2024
9c768ee
Merge pull request #289 from Martinski4GitHub/dev
ExtremeFiretop Aug 12, 2024
b33c0b1
Update README.md
ExtremeFiretop Aug 15, 2024
af9d164
Update README.md
ExtremeFiretop Aug 15, 2024
85066eb
Update README.md
ExtremeFiretop Aug 15, 2024
1677bdc
Update README.md
ExtremeFiretop Aug 15, 2024
b062567
Update README.md
ExtremeFiretop Aug 15, 2024
2c1eceb
Update README.md
ExtremeFiretop Aug 15, 2024
72ded04
Update README.md
ExtremeFiretop Aug 15, 2024
161a401
Detect Access Restrictions
ExtremeFiretop Aug 16, 2024
8416e46
Modified message when router login failed.
Martinski4GitHub Aug 16, 2024
77872b3
Update MerlinAU.sh
ExtremeFiretop Aug 16, 2024
df582f6
Update MerlinAU.sh
ExtremeFiretop Aug 16, 2024
db06b5a
Update MerlinAU.sh
ExtremeFiretop Aug 16, 2024
7536558
Merge pull request #293 from Martinski4GitHub/dev
ExtremeFiretop Aug 16, 2024
2acd337
Update MerlinAU.sh
ExtremeFiretop Aug 16, 2024
c0d5ea4
Merge branch 'dev' into ExtremeFiretop-AccessRestrictions
ExtremeFiretop Aug 16, 2024
f930c4a
Update MerlinAU.sh
ExtremeFiretop Aug 16, 2024
612032f
Update MerlinAU.sh
ExtremeFiretop Aug 16, 2024
3c5b7d6
Update MerlinAU.sh
ExtremeFiretop Aug 16, 2024
9624d7d
Merge pull request #292 from ExtremeFiretop/ExtremeFiretop-AccessRest…
Martinski4GitHub Aug 17, 2024
33fd2f9
Improvements when detecting WebGUI access rules
Martinski4GitHub Aug 17, 2024
668f2a1
Merge pull request #294 from Martinski4GitHub/dev
ExtremeFiretop Aug 17, 2024
d244e3e
Update README.md
ExtremeFiretop Aug 17, 2024
80bb5d0
More improvements for detecting WebGUI access rules
Martinski4GitHub Aug 19, 2024
a8fdf8a
Merge pull request #295 from Martinski4GitHub/dev
ExtremeFiretop Aug 19, 2024
3444433
Update README.md
ExtremeFiretop Aug 19, 2024
1bf1664
Update MerlinAU.sh
ExtremeFiretop Sep 2, 2024
c6f6661
Merge pull request #296 from ExtremeFiretop/ExtremeFiretop-Small1.3.0…
ExtremeFiretop Sep 2, 2024
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
Prev Previous commit
Next Next commit
Update MerlinAU.sh
ExtremeFiretop authored Apr 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 576a13486d21282abc414d68eb9bb70593303527
2 changes: 1 addition & 1 deletion MerlinAU.sh
Original file line number Diff line number Diff line change
@@ -4940,13 +4940,13 @@ _ShowAdvancedOptionsMenu_()
# Additional Email Notification Options #
if _CheckEMailConfigFileFromAMTM_ 0
then
# F/W Update Email Notifications #
if "$inRouterSWmode"
then
printf "\n ${GRNct}em${NOct}. Toggle F/W Update Email Notifications"
else
printf "\n ${GRNct}em${NOct}. Toggle F/W Email Notifications"
fi
# F/W Update Email Notifications #
if "$sendEMailNotificationsFlag"
then
printf "\n${padStr}[Currently ${GRNct}ENABLED${NOct}, Format: ${GRNct}${sendEMailFormaType}${NOct}]\n"