Skip to content

Commit e986858

Browse files
authored
Merge branch 'master' into ui-updates
2 parents 667a82c + 6ba1ffe commit e986858

357 files changed

Lines changed: 4323 additions & 2293 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@
594594
"error",
595595
"block",
596596
{
597-
"pattern": " \\* Copyright \\(C\\) (\\d+-)?2023 Yomitan Authors(\n \\* Copyright \\(C\\) (\\d+-)?2022 Yomichan Authors)?\n \\*\n \\* This program is free software: you can redistribute it and/or modify\n \\* it under the terms of the GNU General Public License as published by\n \\* the Free Software Foundation, either version 3 of the License, or\n \\* \\(at your option\\) any later version\\.\n \\*\n \\* This program is distributed in the hope that it will be useful,\n \\* but WITHOUT ANY WARRANTY; without even the implied warranty of\n \\* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\\. See the\n \\* GNU General Public License for more details\\.\n \\*\n \\* You should have received a copy of the GNU General Public License\n \\* along with this program\\. If not, see <https://www\\.gnu\\.org/licenses/>\\.\n "
597+
"pattern": " \\* Copyright \\(C\\) (2023-)?2024 Yomitan Authors(\n \\* Copyright \\(C\\) (20(16|17|18|19|20|21)-)?2022 Yomichan Authors)?\n \\*\n \\* This program is free software: you can redistribute it and/or modify\n \\* it under the terms of the GNU General Public License as published by\n \\* the Free Software Foundation, either version 3 of the License, or\n \\* \\(at your option\\) any later version\\.\n \\*\n \\* This program is distributed in the hope that it will be useful,\n \\* but WITHOUT ANY WARRANTY; without even the implied warranty of\n \\* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\\. See the\n \\* GNU General Public License for more details\\.\n \\*\n \\* You should have received a copy of the GNU General Public License\n \\* along with this program\\. If not, see <https://www\\.gnu\\.org/licenses/>\\.\n "
598598
}
599599
]
600600
}

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ assignees: ''
1717
(e.g. 20.11.1.1)
1818

1919
**Exported settings file**
20-
(If you think it might be relevant, create a settings export file using the _Export Settings_ button on the settings page; zip or rename the resulting file to .txt to attach to the issue.)
20+
(If you think it might be relevant, create a settings export file using the _Export Settings_ button on the settings page and attach it to this issue.)

README.md

Lines changed: 42 additions & 354 deletions
Large diffs are not rendered by default.

dev/bin/build-libs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2023 Yomitan Authors
2+
* Copyright (C) 2023-2024 Yomitan Authors
33
* Copyright (C) 2020-2022 Yomichan Authors
44
*
55
* This program is free software: you can redistribute it and/or modify

dev/bin/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2023 Yomitan Authors
2+
* Copyright (C) 2023-2024 Yomitan Authors
33
* Copyright (C) 2020-2022 Yomichan Authors
44
*
55
* This program is free software: you can redistribute it and/or modify

dev/bin/dictionary-validate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2023 Yomitan Authors
2+
* Copyright (C) 2023-2024 Yomitan Authors
33
* Copyright (C) 2020-2022 Yomichan Authors
44
*
55
* This program is free software: you can redistribute it and/or modify

dev/bin/generate-css-json.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2023 Yomitan Authors
2+
* Copyright (C) 2023-2024 Yomitan Authors
33
* Copyright (C) 2020-2022 Yomichan Authors
44
*
55
* This program is free software: you can redistribute it and/or modify

dev/bin/schema-validate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2023 Yomitan Authors
2+
* Copyright (C) 2023-2024 Yomitan Authors
33
* Copyright (C) 2020-2022 Yomichan Authors
44
*
55
* This program is free software: you can redistribute it and/or modify

dev/build-libs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2023 Yomitan Authors
2+
* Copyright (C) 2023-2024 Yomitan Authors
33
* Copyright (C) 2020-2022 Yomichan Authors
44
*
55
* This program is free software: you can redistribute it and/or modify

dev/data-error.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2023 Yomitan Authors
2+
* Copyright (C) 2023-2024 Yomitan Authors
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)