Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
04f209f
Merge pull request #799 from XMOJ-Script-dev/dev
boomzero May 3, 2025
1b36834
Merge pull request #803 from XMOJ-Script-dev/dev
PythonSmall-Q Jun 7, 2025
256f32a
Merge pull request #807 from XMOJ-Script-dev/dev
PythonSmall-Q Jun 14, 2025
edd01e2
Merge pull request #812 from XMOJ-Script-dev/dev
boomzero Jun 22, 2025
af68fb1
Merge pull request #818 from XMOJ-Script-dev/dev
boomzero Jul 10, 2025
627ec92
Merge pull request #822 from XMOJ-Script-dev/dev
boomzero Aug 9, 2025
517d06b
Merge pull request #830 from XMOJ-Script-dev/dev
boomzero Aug 19, 2025
06acb73
Merge pull request #838 from XMOJ-Script-dev/dev
boomzero Aug 22, 2025
8832af1
Merge pull request #840 from XMOJ-Script-dev/dev
boomzero Aug 24, 2025
b2e8af6
Merge pull request #844 from XMOJ-Script-dev/dev
PythonSmall-Q Sep 5, 2025
f818349
Merge pull request #853 from XMOJ-Script-dev/dev
PythonSmall-Q Sep 27, 2025
233b268
Merge pull request #862 from XMOJ-Script-dev/dev
PythonSmall-Q Oct 2, 2025
0a1055c
Merge pull request #867 from XMOJ-Script-dev/dev
PythonSmall-Q Oct 2, 2025
4a62d57
Merge pull request #884 from XMOJ-Script-dev/dev
PythonSmall-Q Dec 7, 2025
1110d4a
Merge pull request #889 from XMOJ-Script-dev/dev
PythonSmall-Q Feb 6, 2026
16b0af4
Merge pull request #890 from XMOJ-Script-dev/dev
PythonSmall-Q Feb 7, 2026
64775b9
Merge pull request #893 from XMOJ-Script-dev/dev
PythonSmall-Q Feb 8, 2026
5a1c2db
Merge pull request #904 from XMOJ-Script-dev/dev
PythonSmall-Q Feb 11, 2026
76b2b21
Merge pull request #907 from XMOJ-Script-dev/dev
PythonSmall-Q Feb 20, 2026
f072518
Merge pull request #917 from XMOJ-Script-dev/dev
boomzero Feb 22, 2026
6e056e9
Merge pull request #918 from XMOJ-Script-dev/dev
PythonSmall-Q Feb 24, 2026
e52a1f3
Merge pull request #923 from XMOJ-Script-dev/dev
PythonSmall-Q Feb 28, 2026
73291e1
Merge pull request #935 from XMOJ-Script-dev/dev
boomzero Mar 14, 2026
16a44f7
Merge pull request #938 from XMOJ-Script-dev/dev
PythonSmall-Q Mar 15, 2026
627422b
Merge pull request #940 from XMOJ-Script-dev/dev
PythonSmall-Q Mar 15, 2026
9d0d759
Merge pull request #949 from XMOJ-Script-dev/dev
PythonSmall-Q Mar 15, 2026
97e906e
Merge pull request #950 from XMOJ-Script-dev/dev
boomzero Mar 15, 2026
56b21f4
Merge pull request #958 from XMOJ-Script-dev/dev
PythonSmall-Q Mar 28, 2026
fcf5307
Merge pull request #962 from XMOJ-Script-dev/dev
PythonSmall-Q Mar 28, 2026
c1368b2
Merge pull request #964 from XMOJ-Script-dev/dev
PythonSmall-Q Mar 29, 2026
c97777f
Merge pull request #972 from XMOJ-Script-dev/dev
PythonSmall-Q Apr 18, 2026
f1ca323
Merge pull request #979 from XMOJ-Script-dev/dev
PythonSmall-Q May 3, 2026
a2f5278
Merge pull request #987 from XMOJ-Script-dev/dev
PythonSmall-Q May 30, 2026
03c433d
Merge pull request #988 from XMOJ-Script-dev/dev
PythonSmall-Q May 31, 2026
1de0e7e
Merge pull request #990 from XMOJ-Script-dev/dev
PythonSmall-Q Jun 12, 2026
b305b74
Merge pull request #993 from XMOJ-Script-dev/dev
PythonSmall-Q Jun 20, 2026
18f54a0
Merge pull request #998 from XMOJ-Script-dev/dev
PythonSmall-Q Aug 2, 2026
ef0ecbb
Fix https://github.com/XMOJ-Script-dev/XMOJ-Script/issues/1004
zsTree0830 Aug 6, 2026
be3318c
Merge branch 'extern-contrib' into dev
def-WA2025 Aug 6, 2026
89f980a
Merge pull request #1005 from zsTree0830/dev
boomzero Aug 6, 2026
485b5d6
3.6.1
github-actions[bot] Aug 6, 2026
e0d35f1
Update version info to 3.6.1
github-actions[bot] Aug 6, 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: 11 additions & 0 deletions Update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3683,6 +3683,17 @@
}
],
"Notes": "本次发布将 3.5.0 之后的四个预发布版本合并为正式版 3.5.4:\n\n- **#986** 修复 Violentmonkey 下因顶层 `await` 导致的 `SyntaxError`(将异步初始化包进 IIFE)。\n- **#989** 提交代码页面(submitpage.php)改用 Monaco Editor,并支持编辑时保存代码。\n- **#992** 修复 MonochromeUI / NewBootstrap 新界面在深色模式下加载时的白色闪烁(FOUC/CLS)问题。\n- **#997** 将 Monaco 固定到 0.52.2,修复编辑器有时无法加载、退化为纯文本框的问题(0.53.0 上游 bug)。"
},
"3.6.1": {
"UpdateDate": 1785987881994,
"Prerelease": true,
"UpdateContents": [
{
"PR": 1006,
"Description": "Fix #1004"
}
],
"Notes": "No release notes were provided for this release."
}
}
}
6 changes: 5 additions & 1 deletion XMOJ.user.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ==UserScript==
// @name XMOJ
// @version 3.6.0
// @version 3.6.1
// @description XMOJ增强脚本
// @author @XMOJ-Script-dev, @langningchen and the community
// @namespace https://github/langningchen
Expand Down Expand Up @@ -4970,6 +4970,10 @@ async function main() {
</div>
<div id="CompareElement" style="width:100%; height:550px; display: grid; place-items: center;"></div>`;

let compareElementStyle = document.createElement("style");
compareElementStyle.textContent = `#CompareElement .monaco-merge-host { height: 95%; }`;
document.head.appendChild(compareElementStyle);

let LeftCode = "";
await fetch("https://www.xmoj.tech/getsource.php?id=" + SearchParams.get("left"))
.then((Response) => {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xmoj-script",
"version": "3.6.0",
"version": "3.6.1",
"description": "an improvement script for xmoj.tech",
"main": "AddonScript.js",
"scripts": {
Expand Down
Loading