 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 |
|
mrlan
|
3b6d88bd68
|
Merge pull request 'Bug570_CaiShuHuang' (#170) from Bug570_CaiShuHuang into Alpha-snapshot20240618
Reviewed-on: #170
|
2024-08-27 08:18:44 +08:00 |
|
Lan Hui
|
eff0d01fa0
|
word_operation.js: Resolve conflict
|
2024-08-27 08:15:18 +08:00 |
|
mrlan
|
8f38e5fd87
|
Merge pull request 'Bug571-TongQi' (#166) from Bug571-TongQi into Alpha-snapshot20240618
Reviewed-on: #166
|
2024-08-27 08:03:04 +08:00 |
|
mrlan
|
b39cf2e4fa
|
Merge pull request 'Remove wordfreqapp.db from app/static' (#178) from Bug578-ChenChen2 into Alpha-snapshot20240618
Reviewed-on: #178
|
2024-08-27 07:59:02 +08:00 |
|
Lan Hui
|
6f4b91fd73
|
Remove wordfreqapp.db from app/static
|
2024-08-27 07:58:26 +08:00 |
|
mrlan
|
09beaff831
|
Merge pull request 'Bug578-ChenChen' (#167) from Bug578-ChenChen into Alpha-snapshot20240618
Reviewed-on: #167
|
2024-08-27 07:53:20 +08:00 |
|
Lan Hui
|
ebfe7416e6
|
userpaget_get.html: Resolve conflict
|
2024-08-27 07:43:57 +08:00 |
|
mrlan
|
98027158b5
|
Merge pull request 'Bug577-JiangXueQin' (#163) from Bug577-JiangXueQin into Alpha-snapshot20240618
Reviewed-on: #163
|
2024-08-27 07:39:25 +08:00 |
|
Lan Hui
|
92a1af4222
|
userpaget_get.html: Resolve conflict
|
2024-08-27 07:39:04 +08:00 |
|
mrlan
|
79dff9a3b5
|
Merge pull request 'Bug576-XiaBaizhi' (#162) from Bug576-XiaBaizhi into Alpha-snapshot20240618
Reviewed-on: #162
|
2024-08-27 07:21:05 +08:00 |
|
Lan Hui
|
bd4fb6846b
|
userpaget_get.html: Do not disable the 'Next Article' button
|
2024-08-27 07:20:20 +08:00 |
|
Lan Hui
|
2e203699c0
|
userpaget_get.html: Resolve merge conflicts
|
2024-08-27 07:15:22 +08:00 |
|
mrlan
|
d502b3f474
|
Merge pull request 'Bug564-JiangChao' (#152) from Bug564-JiangChao into Alpha-snapshot20240618
Reviewed-on: #152
|
2024-08-26 10:29:26 +08:00 |
|
Lan Hui
|
66899376c3
|
userpaget_get.html: Resolve merge conflicts
|
2024-08-26 10:27:43 +08:00 |
|
mrlan
|
6cc7f043da
|
Merge pull request 'Bug572-ZhongYi2' (#159) from Bug572-ZhongYi2 into Alpha-snapshot20240618
Reviewed-on: #159
|
2024-08-26 10:05:45 +08:00 |
|
Lan Hui
|
1d80fa8886
|
userpaget_get.html: Resolve merge conflicts
|
2024-08-26 10:03:47 +08:00 |
|
mrlan
|
dc3ef2bc9f
|
Merge pull request 'Bug533-ZhangXuDong' (#161) from Bug533-ZhangXuDong into Alpha-snapshot20240618
Reviewed-on: #161
|
2024-08-26 09:49:38 +08:00 |
|
Lan Hui
|
9eac40493b
|
userpaget_get.html and mainpage_gethtml: improve display information.
|
2024-08-26 09:49:00 +08:00 |
|
Lan Hui
|
fe6a28a81d
|
userpaget_get.html: Resolve merge conflicts
|
2024-08-26 09:41:53 +08:00 |
|
mrlan
|
bf8bb1a6bc
|
Merge pull request 'Bug568-SongHaiyan' (#158) from Bug568-SongHaiyan into Alpha-snapshot20240618
Reviewed-on: #158
|
2024-08-26 09:28:18 +08:00 |
|
mrlan
|
7a97e25b8c
|
Merge pull request 'Bug567-YuZheChen' (#155) from Bug567-YuZheChen into Alpha-snapshot20240618
Reviewed-on: #155
|
2024-08-26 09:18:24 +08:00 |
 卢康阳
|
eb3268a139
|
Fix bug 579
|
2024-07-06 16:34:54 +08:00 |
|
卢康阳
|
220e108ee1
|
解决合并冲突
|
2024-07-06 16:33:43 +08:00 |
 潘彬杰
|
af59afc7e0
|
解决合并冲突
|
2024-07-05 17:54:11 +08:00 |
蔡书煌
|
3049a4314a
|
只是修改名字
|
2024-07-05 13:35:16 +08:00 |
|
Caroline
|
d8263d17e0
|
Fix bug 570
|
2024-07-04 19:50:34 +08:00 |