xieshanghai
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity
368 Commits
148 Branches
4 Tags
11 MiB
Commit Graph

368 Commits (4cf201095d143735002f9dbc5027ef10f7a48deb)

Author SHA1 Message Date
mrlan 1373df2a3e Merge pull request '增加单词默认勾选,并修改提示 Fix Bug 495 - Liang Li Gang' (#77) from Bug495-LiangLiGang into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/77
 2023-01-29 10:27:22 +08:00
yugaoxiang 43bd0bd09d update requirement.txt 2023-01-01 22:05:32 +08:00
yugaoxiang 0209548896 提交作业 2022-12-31 18:25:13 +08:00
徐嘉辉 74eccfbebd 重复文章刷新 2022-12-20 19:55:02 +08:00
dktea b9a6e4407e Bug493-Fix 2022-12-20 12:19:06 +08:00
np1717 086dfcb6eb fix bug 489 2022-12-19 17:54:10 +08:00
Hui Lan 3bce450620 黄子睿: 修复 'Otherwise,' 这种情况无法高亮的问题，即 Otherwise 后面跟了个逗号 2022-12-15 10:50:04 +08:00
徐嘉辉 c76d4f21ec SPM2022F-CONTRIBUTORS-XieQiuHan 2022-12-13 20:01:50 +08:00
任榆 f0afd5f40f Merge pull request 'Bug 512 - 文章朗读问题' (#59) from Bug512-RenYu into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/59
 2022-12-13 13:39:23 +08:00
任榆 5cc981b549 Merge branch 'master' into Bug512-RenYu 2022-12-13 13:28:48 +08:00
dktea 0962d95ce1 Merge branch 'Bug422-XuXing' of http://121.4.94.30:3000/mrlan/EnglishPal into SPM2022F-CONTRIBUTORS-GONGKE 2022-12-11 01:07:52 +08:00
dktea 071d1c968b init me again 2022-12-10 19:40:54 +08:00
dktea 68b254f96c init me 2022-12-10 19:18:56 +08:00
Hui Lan 417dbc22f8 highlight.js: fix Bug 522. 2022-12-09 13:19:36 +08:00
岑昊天 f37ea182f6 加入生词库过滤| 2022-12-06 17:02:59 +08:00
MR LAN 6327b11711 Made folder 'frequency' under folder 'static', and added a README file under folder 'frequency' 2022-12-06 16:06:13 +08:00
岑昊天 d58dacd71c 修复Bug508,解决带有特殊字符|的单词在文章中的高亮问题 2022-12-06 14:40:50 +08:00
张艺腾 e74f1ff477 Bug505-ZhangYiteng (#61) 
bug修改只涉及到account_service.py中新增的5行。
其他增删都是重写reset.html(页面样式和login、signup页面相一致)，并将reset、signup、login三个页面的共同样式抽离出独立的css文件。

Co-authored-by: Q_yt <2483750517@qq.com>
Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/61
Co-authored-by: 张艺腾 <2483750517@qq.com>
Co-committed-by: 张艺腾 <2483750517@qq.com>
 2022-12-03 20:52:01 +08:00
丁锐 89c12337d5 在README中修改内容 2022-12-02 15:48:45 +08:00
梁立港 b65ffa6054 增加单词默认勾选,并修改提示 2022-12-01 21:04:12 +08:00
丁锐 7e3004a2e6 撤回操作 2022-11-29 16:55:48 +08:00
丁锐 3609421976 对确认密码部分保证有数据读入 2022-11-29 16:53:59 +08:00
任榆 5c85041135 Bug 512 - 文章朗读问题 
在fillwowrd.js中添加了stopRead()函数，将其添加给对应按钮或超链接以终止朗读。
 2022-11-25 15:42:37 +08:00
mrlan 671df67723 Bug487-WuYuhan-Refactor (#58) 
将所有用于用户名验证的逻辑放入到 `UserName` 类中。

Hui

Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/58
Co-authored-by: mrlan <mrlan@noreply.121.4.94.30>
Co-committed-by: mrlan <mrlan@noreply.121.4.94.30>
 2022-11-10 19:03:59 +08:00
mrlan f909201615 Merge pull request 'Bug487-WuYuhan-Refactor' (#57) from Bug487-WuYuhan-Refactor into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/57
 2022-11-08 19:53:09 +08:00
Hui Lan 29ffada7eb Login.py: improve comments. 2022-11-03 22:28:25 +08:00
Hui Lan d3a796428d account_service.py: module re is no longer necessary. 2022-11-03 22:21:34 +08:00
Lan Hui 702205940c Login.py: must convert warn to string before comparing to OK 2022-11-03 22:06:24 +08:00
Lan Hui f0b5adc5e4 Login.py: fix function name 2022-11-03 22:02:32 +08:00
Hui Lan 3cfec31c3f Login.py: add missing colon 2022-11-03 22:00:47 +08:00
Hui Lan 286e884dd8 Refactor Wu Yuhan's code 2022-11-03 21:59:12 +08:00
mrlan bfd87c51f6 Merge pull request 'Bug487-WuYuhan' (#56) from Bug487-WuYuhan into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/56
 2022-11-03 21:28:55 +08:00
mrlan ab01b8e19b Hui-Build (#55) 
Make English Pal docker run automatically each time after Ubuntu reboot.

Hui

Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/55
Co-authored-by: mrlan <mrlan@noreply.121.4.94.30>
Co-committed-by: mrlan <mrlan@noreply.121.4.94.30>
 2022-11-01 21:43:01 +08:00
吴宇涵 59d95d8e9f account_service.py: 导入re库使用正则匹配过滤了注册时用户名的非法字符 2022-10-21 11:07:20 +08:00
吴宇涵 5844eab6d5 account_service.py: 添加注册时用户名的非法字符过滤 2022-10-21 10:44:39 +08:00
mrlan 02ffcd3b59 Merge pull request 'Bug412-JiangLetian-Refactor' (#54) from Bug412-JiangLetian-Refactor into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/54
 2022-08-05 16:18:06 +08:00
Lan Hui ecc354bc0d Refactor: use better function 2022-08-02 12:33:41 +08:00
Lan Hui 1d8671c5c7 Refactor: use better function name 2022-08-02 12:30:27 +08:00
Lan Hui 8cb34e56ba Refactor: remove duplicate code block 2022-08-02 12:26:18 +08:00
Lan Hui b5dacb9ad2 Improve comments 2022-08-02 11:52:40 +08:00
Lan Hui 47e745e774 Use better variable name (use articleContent instead of txt, and use camelCase) 2022-08-02 11:45:21 +08:00
Lan Hui 1dfe370983 Use better variable names 2022-08-02 11:39:35 +08:00
mrlan 9927515b11 Merge pull request 'Bug412-JiangLetian' (#39) from Bug412-JiangLetian into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/39
 2022-08-02 11:03:39 +08:00
Lan Hui c15746bbb2 Resolve conflicts 2022-08-02 11:00:33 +08:00
mrlan b745da4c90 Merge pull request 'IMPROVE-WangWeiLong' (#35) from IMPROVE-WangWeiLong into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/35
 2022-07-31 09:11:53 +08:00
mrlan 7663dfb8f4 Merge pull request 'Hui-EscapeUserInput' (#53) from Hui-EscapeUserInput into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/53
 2022-07-29 16:20:01 +08:00
Lan Hui 0098fa8746 Prevent attribute injection 2022-07-29 15:26:19 +08:00
Lan Hui 828cef406c Escape user input first 2022-07-29 15:22:42 +08:00
徐幸 2c1bc98833 Bug422-XuXing (#46) 
增加了返回上一篇的按钮及相关功能的实现，当点击下一篇文章跳转至下一篇时，页面中会增加一个返回上一篇按钮，点击返回上一篇按钮后可以回到上一篇。

Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/46
Co-authored-by: 徐幸 <2567198082@qq.com>
Co-committed-by: 徐幸 <2567198082@qq.com>
 2022-07-21 23:13:33 +08:00
Lan Hui 4fb1cad745 Use a better variable name (fix session variable name error). 2022-07-21 22:28:22 +08:00