Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3019b6f
Code Improvements
Martinski4GitHub Aug 4, 2025
67ae04a
Merge pull request #21 from Martinski4GitHub/develop
Martinski4GitHub Aug 4, 2025
9165d73
Bump actions/checkout from 4.2.2 to 5.0.0 in the all-actions group
dependabot[bot] Aug 25, 2025
4ae62f6
Merge pull request #22 from AMTM-OSR/dependabot/github_actions/develo…
ExtremeFiretop Aug 25, 2025
aa3e821
Bump softprops/action-gh-release in the all-actions group
dependabot[bot] Sep 8, 2025
dd0c59f
Merge pull request #23 from AMTM-OSR/dependabot/github_actions/develo…
ExtremeFiretop Sep 8, 2025
25638ab
Bump softprops/action-gh-release in the all-actions group
dependabot[bot] Oct 6, 2025
f31a883
Merge pull request #24 from AMTM-OSR/dependabot/github_actions/develo…
ExtremeFiretop Oct 6, 2025
7e1e053
Bump softprops/action-gh-release in the all-actions group
dependabot[bot] Oct 13, 2025
2f6f62a
Merge pull request #25 from AMTM-OSR/dependabot/github_actions/develo…
Martinski4GitHub Oct 15, 2025
691ef2a
Code Improvements
Martinski4GitHub Oct 25, 2025
e2aed30
Update .gitattributes
Martinski4GitHub Oct 26, 2025
d1e29fd
Code Improvements
Martinski4GitHub Oct 26, 2025
9482fd7
Merge pull request #26 from Martinski4GitHub/develop
Martinski4GitHub Oct 26, 2025
3b53ead
Removed Tomato JS Dependencies
Martinski4GitHub Oct 30, 2025
51b5026
Merge pull request #27 from Martinski4GitHub/develop
Martinski4GitHub Oct 30, 2025
9351f57
Code Improvements
Martinski4GitHub Nov 5, 2025
8faa8e2
Merge pull request #28 from Martinski4GitHub/develop
Martinski4GitHub Nov 5, 2025
f855435
Update README.md
Martinski4GitHub Nov 9, 2025
8057edb
Merge pull request #29 from Martinski4GitHub/develop
Martinski4GitHub Nov 9, 2025
9c115e6
Merge branch 'master' into develop
Martinski4GitHub Nov 9, 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
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
* text eol=lf
*.sh text eol=lf
*.md text eol=lf
*.asp text eol=lf
*.js text eol=lf
*.css text eol=lf
*.gz binary
*.png binary
*.jpg binary
*.jpeg binary
*.zip binary
*.tar.gz binary
4 changes: 2 additions & 2 deletions .github/workflows/Create-NewReleases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
# 1--- Check out master so we tag the exact merge commit
- name: Checkout source code
uses: actions/checkout@v4.2.2
uses: actions/checkout@v5.0.0
with:
fetch-depth: 0
ref: 'master'
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

# 7--- Publish a GitHub Release with auto-generated notes
- name: Create Release with Automated Release Notes
uses: softprops/action-gh-release@v2.3.2
uses: softprops/action-gh-release@v2.4.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ steps.nextver.outputs.tag }}
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# ntpMerlin

## v3.4.10
### Updated on 2025-Jul-31
## v3.4.11
### Updated on 2025-Nov-08

## About
ntpMerlin implements an NTP time server for AsusWRT Merlin with charts for daily, weekly and monthly summaries of performance. A choice between ntpd and chrony is available.

Expand Down
4 changes: 1 addition & 3 deletions ntpdstats_www.asp
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ p{font-weight:bolder}thead.collapsible-jquery{color:#fff;padding:0;width:100%;bo
<script language="JavaScript" type="text/javascript" src="/popup.js"></script>
<script language="JavaScript" type="text/javascript" src="/help.js"></script>
<script language="JavaScript" type="text/javascript" src="/ext/shared-jy/detect.js"></script>
<script language="JavaScript" type="text/javascript" src="/tmhist.js"></script>
<script language="JavaScript" type="text/javascript" src="/tmmenu.js"></script>
<script language="JavaScript" type="text/javascript" src="/client_function.js"></script>
<script language="JavaScript" type="text/javascript" src="/validator.js"></script>
<script>

/**----------------------------------------**/
/** Modified by Martinski W. [2025-Feb-20] **/
/** Modified by Martinski W. [2025-Oct-27] **/
/**----------------------------------------**/

var custom_settings;
Expand Down
Loading