mrlan
/
EnglishPal
7
3
Fork 22
Code Issues Pull Requests 45 Projects Releases Wiki Activity
649 Commits
220 Branches
4 Tags
19 MiB
Commit Graph

649 Commits (6285581bb5ce49b9bdfee048b13b14f3b7108a5e)

Author SHA1 Message Date
Lan Hui 6285581bb5 Fix the webpage CRASH problem when the database has no article or when something bad happened on loading articles. 2026-03-12 16:00:53 +08:00
Lan Hui c9bbf6b6a3 Remove ambiguities: The Oxford word coverage is X% -> X% of the words in this article are in Oxford Word 5000. 2026-03-12 15:50:59 +08:00
Lan Hui 68e4ba33c5 mainpage_get.html: 牛津单词占比率（文章中有多少单词来自 oxford 5000），而不是覆盖率（文章覆盖了多少 oxford 5000 单词） 2025-09-29 15:28:41 +08:00
Lan Hui d9512c929b Add dependency for api_service.py 2025-04-21 15:19:06 +08:00
mrlan ce58f14406 Merge pull request 'Fix bug 580' (#188) from Bug580-Hui into Alpha-snapshot20240618 
Reviewed-on: #188
 2024-09-08 12:19:02 +08:00
Lan Hui 05dc0ecbb7 Fix bug 580 2024-09-08 12:18:07 +08:00
mrlan 8859827eac Merge pull request 'Fix bug 565' (#187) from Bug565-Hui into Alpha-snapshot20240618 
Reviewed-on: #187
 2024-09-07 09:04:35 +08:00
Lan Hui b6a36b1d1a Fix bug 565 2024-09-07 09:03:59 +08:00
mrlan 12752341db Merge pull request 'Fix bug 394' (#185) from Bug394-Hui into Alpha-snapshot20240618 
Reviewed-on: #185
 2024-09-06 08:55:35 +08:00
Lan Hui 3abebdfb21 Fix bug 394 2024-09-06 08:54:11 +08:00
mrlan 92331ca7a0 Merge pull request 'Fix bug 478' (#184) from Bug478-Hui into Alpha-snapshot20240618 
Reviewed-on: #184
 2024-09-05 10:12:21 +08:00
Lan Hui 1166d3499f Fix bug 478 2024-09-05 10:11:20 +08:00
mrlan fe1d4c29ff Merge pull request 'Fix Bug 501. The key fix is the first line in funciton wordTemplate() from word_operation.js, i.e., using double quotes instead of single quotes.' (#183) from Bug501-Hui into Alpha-snapshot20240618 
Reviewed-on: #183
 2024-09-04 15:17:23 +08:00
Lan Hui aaf2db8657 Fix Bug 501. The key fix is the first line in funciton wordTemplate() from word_operation.js, i.e., using double quotes instead of single quotes. 2024-09-04 15:15:03 +08:00
mrlan e478217343 Merge pull request 'main.py: fix Bug 511' (#182) from Bug511-Hui into Alpha-snapshot20240618 
Reviewed-on: #182
 2024-09-04 10:22:56 +08:00
Lan Hui 4f95935037 main.py: fix Bug 511 2024-09-04 10:21:55 +08:00
mrlan 370a215d08 Merge pull request 'pickle_idea.py: Make funciton unfamiliar() more robust' (#181) from Bug518-Hui into Alpha-snapshot20240618 
Reviewed-on: #181
 2024-09-03 11:43:10 +08:00
Lan Hui de81f5966d pickle_idea.py: Make funciton unfamiliar() more robust 2024-09-03 11:42:14 +08:00
Lan Hui 38206271c6 Ignore words with length less than or equal to 2 2024-09-02 15:24:19 +08:00
mrlan 172727f95f Merge pull request 'Fix Bug 563' (#180) from Bug563-Hui into Alpha-snapshot20240618 
Reviewed-on: #180
 2024-09-02 15:18:12 +08:00
Lan Hui 46d1793397 Fix Bug 563 2024-09-02 15:16:11 +08:00
mrlan 74186df292 Merge pull request 'DONE: bug555-fangchen' (#123) from bug555-fangchen into Alpha-snapshot20240618 
Reviewed-on: #123
 2024-09-01 07:39:04 +08:00
Lan Hui db652d3bf2 conftest.py: remove the extra blank line in the file 2024-09-01 07:38:49 +08:00
Lan Hui b43174ffba Resolve merge conflicts 2024-09-01 07:35:50 +08:00
mrlan 74f47b786e Merge pull request 'Fix bug 547' (#146) from Bug547-FanWenQi-Adapted into Alpha-snapshot20240618 
Reviewed-on: #146
 2024-09-01 07:28:15 +08:00
Lan Hui d00432cee1 Resolve merge conflicts 2024-09-01 07:27:46 +08:00
mrlan 19ea14b38c Merge pull request '提供更便利的获取用户单词表的方法，以json数据格式返回' (#93) from SPM2023S-QianJunQi into Alpha-snapshot20240618 
Reviewed-on: #93
 2024-08-31 07:39:00 +08:00
Lan Hui 621ac24991 Give the blueprint a better name: apiService 2024-08-31 07:38:30 +08:00
Lan Hui ceb5f14ee9 Simplify wordCMD.py and rename it to api_service.py 2024-08-31 07:35:50 +08:00
Lan Hui 8f31b030ea Resolve merge conflicts 2024-08-31 06:59:46 +08:00
mrlan 909119b587 Merge pull request 'DONE: Bug536-Jiangwangzhe' (#138) from Bug536-Jiangwangzhe into Alpha-snapshot20240618 
Reviewed-on: #138
 2024-08-30 08:32:48 +08:00
Lan Hui e6c945bac7 fillword.js & highlight.js: fix JavaScript errors on the front page 2024-08-30 08:32:09 +08:00
Lan Hui 0c6616d52c Resolve merge conflicts 2024-08-30 08:11:03 +08:00
mrlan 44d9c39d4b Merge pull request 'DONE: Bug540-XiongJiaming' (#125) from Bug540-XiongJiaming into Alpha-snapshot20240618 
Reviewed-on: #125
 2024-08-29 07:53:48 +08:00
Lan Hui b2e11aea6f 将标记文章按钮移到页面上方；标记文章时不要alert 2024-08-29 07:52:58 +08:00
Lan Hui 2bec0642dd Resolve merge conflicts 2024-08-29 07:34:32 +08:00
Lan Hui 62dd580974 在加入生词簿前，去掉全角方括号【】 2024-08-28 08:08:31 +08:00
mrlan 47a359c798 Merge pull request 'Bug579-LuKangyang' (#172) from Bug579-LuKangyang into Alpha-snapshot20240618 
Reviewed-on: #172
 2024-08-28 07:56:09 +08:00
Lan Hui fb190b0563 Resolve merge conflict 2024-08-28 07:53:26 +08:00
mrlan 262604e761 Merge pull request 'BUG543-JiWenkai' (#153) from BUG543-JiWenkai into Alpha-snapshot20240618 
Reviewed-on: #153
 2024-08-28 07:50:49 +08:00
Lan Hui 61a0b39507 Resolve merge conflict 2024-08-28 07:48:50 +08:00
mrlan 391e859d30 Merge pull request 'Bug574-ChenLingjie2' (#160) from Bug574-ChenLingjie2 into Alpha-snapshot20240618 
Reviewed-on: #160
 2024-08-28 07:43:37 +08:00
Lan Hui c453317ad8 Make sure the user name is not on the black list before proceeding 2024-08-28 07:42:05 +08:00
Lan Hui f9003ece69 Remove unused import 2024-08-28 07:23:52 +08:00
Lan Hui 146781df50 Resolve merge conflict 2024-08-28 07:23:30 +08:00
mrlan 329732038f Merge pull request 'Bug573-PanBinjie' (#169) from Bug573-PanBinjie into Alpha-snapshot20240618 
Reviewed-on: #169
 2024-08-27 11:30:23 +08:00
Lan Hui 0bfb35b978 Make translation tooltip work 2024-08-27 11:29:09 +08:00
Lan Hui 13a091be72 Merge branch 'Bug573-PanBinjie' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug573-PanBinjie 2024-08-27 10:41:33 +08:00
mrlan 30ff57909e Merge pull request 'word_operation.js: do not alert each time' (#179) from Bug570_CaiShuHuang into Alpha-snapshot20240618 
Reviewed-on: #179
 2024-08-27 08:19:54 +08:00
Lan Hui fb1f927e83 word_operation.js: do not alert each time 2024-08-27 08:19:22 +08:00