huangjihao
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity
407 Commits
186 Branches
4 Tags
18 MiB
Commit Graph

407 Commits (dca76969ebcb8a1ccb97c4c2950aba2b3a10f164)

Author SHA1 Message Date
Lan Hui 3bc61a602f 添加文章成功后，修改用户信息成功后，页面显示成功信息（flash messages）。 2023-03-26 09:44:39 +08:00
Hui Lan fb6d0b23ce admin_manage_user.html: 修改 JavaScript 函数名. 2023-03-25 22:21:49 +08:00
Hui Lan c6010ccbbd admin_manage_user.html: 不再需要，所以删除. 2023-03-25 21:45:37 +08:00
吴宇涵 f17995a35c fix: using new pagination mod func 2023-03-25 21:31:32 +08:00
吴宇涵 ce28a5bf65 feat: auto select expiry_date when select user 2023-03-25 21:20:19 +08:00
吴宇涵 99aa4e0990 fix: fix article title show 2023-03-25 20:41:09 +08:00
Hui Lan a220450b03 mainpage_get.html: 首页不显示管理链接（可能会安全点）. 2023-03-23 22:05:36 +08:00
Hui Lan 7eb276937a admin_manage_user.html: 将默认过期时间设为365天以后. 2023-03-23 21:54:21 +08:00
Hui Lan b97210a9e0 admin_manage_article.html: 更为详细的 placeholder 内容. 2023-03-23 21:19:20 +08:00
Hui Lan e27985127a admin_manage_article.html: 文章最高难度等级是4. 2023-03-23 21:00:31 +08:00
吴宇涵 7941e5d1eb fix: fix the way to show article title 2023-03-23 17:34:37 +08:00
吴宇涵 2cf65123e9 feat: admin can manage articles and users without interfering with each other 2023-03-23 17:12:23 +08:00
吴宇涵 3e35679a91 refactor: refactor the model 2023-03-23 17:09:25 +08:00
吴宇涵 82896de336 update .gitignore 2023-03-23 16:21:02 +08:00
吴宇涵 13ccbaf25c fix: use select to choose article level 2023-03-23 13:58:11 +08:00
吴宇涵 ec6a2249ae fix: fix the pagination 2023-03-23 13:47:53 +08:00
吴宇涵 bdda754af6 fix: check current user is admin 2023-03-23 13:40:22 +08:00
吴宇涵 52025d55bc fix: add a blankspace 2023-03-23 13:35:10 +08:00
吴宇涵 5cffa1fada fix: use single quotation mark 'admin' 2023-03-23 13:32:11 +08:00
王梓铭 c9bfa08658 注释flash的使用，因为其对页面会有影响 2023-03-21 19:19:51 +08:00
王梓铭 6df25c58b4 查漏，业务中的两处前端标签不做修改，因为不被使用了 2023-03-21 18:57:00 +08:00
Hui Lan 2909b4d973 admin_service.py: 管理员页面显示的用户名按照名字排序。 2023-03-21 16:22:45 +08:00
Hui Lan 9075fe9eea Resolve merge conflicts. 2023-03-21 16:08:55 +08:00
Hui Lan 691c5b0d43 build.sh: Install requirements first. 2023-03-21 16:07:10 +08:00
吴宇涵 44db2218c1 fix: Use better conditional judgment methods 2023-03-21 12:45:57 +08:00
吴宇涵 48de496caa fix: Remove 'Assignment Expresions' & Fix annotation words 2023-03-21 12:42:59 +08:00
吴宇涵 1015704e23 fix: fix the way to check article level 2023-03-21 12:35:27 +08:00
吴宇涵 cabf6702a7 fix: add one way to set article level & rename some functions and vars 2023-03-21 12:35:27 +08:00
Lan Hui b34f260d98 requirements.txt: use an older version of Flask to avoid deployment ERROR: No matching distribution found for Flask==2.1.0. 2023-03-21 11:48:09 +08:00
Lan Hui 70d44fcf5c Login.py: fix SyntaxWrning: 'is not' with a literal. 2023-03-21 11:44:05 +08:00
吴宇涵 b80fbc936c fix: fix admin_name 2023-03-20 20:19:56 +08:00
吴宇涵 ade10e5843 feat: add admin_service blueprint 2023-03-20 20:16:48 +08:00
吴宇涵 13d8977636 fix: set specific management displays for admin 2023-03-20 20:15:58 +08:00
吴宇涵 e2b165ada8 fix: add url 'admin' into banned url list 2023-03-20 20:12:41 +08:00
吴宇涵 df82748518 feat: create classes necessary for orm operations 2023-03-20 20:09:32 +08:00
吴宇涵 376ef9bcbc feat: add pong orm requirement 2023-03-20 20:08:14 +08:00
吴宇涵 90db6534ab fix: merge latest remote master branch code 2023-03-20 15:08:06 +08:00
王梓铭 944c931c9b 完成了对bug509的修复，以及重构项目（去掉了业务中的前端脚本） 2023-03-08 16:33:13 +08:00
王梓铭 cb0132fd31 pull master代码，并成功运行 2023-02-21 20:23:24 +08:00
王梓铭 93390374ad 标注之前队伍的改动 2023-02-21 20:05:48 +08:00
mrlan 43c719b6b2 Merge pull request 'Fix bug 501 - 特殊字符&加入生词库后删除按钮失效' (#81) from Bug501-Hui into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/81
 2023-01-31 16:45:50 +08:00
Hui Lan a1955341c6 Fix bug 501 - 特殊字符&加入生词库后删除按钮失效 2023-01-31 16:39:11 +08:00
mrlan 92a8b4a994 Lanhui-update-README2 (#80) 
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/80
Co-authored-by: mrlan <mrlan@noreply.121.4.94.30>
Co-committed-by: mrlan <mrlan@noreply.121.4.94.30>
 2023-01-30 15:44:01 +08:00
王志豪 e10dbf9d67 Bug507-WuWenZhuo (#70) 
### 修复了生词簿为空时，双击文章单词无法高亮的问题
通过增加一个判断，判断生词簿为空时，不把生词簿的内容进行处理，仅处理选中单词。

### 修复了生词簿为空时，取消高亮后，导致文章格式混乱的问题
原代码中，从数据库提取文章放到网页上时，使用的是.innerText的方法，导致原文章里包含的<br>标签丢失，导致文章格式混乱的问题。

Co-authored-by: unknown <Alcatraz@qq.com>
Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/70
Co-authored-by: 王志豪 <1594799762@qq.com>
Co-committed-by: 王志豪 <1594799762@qq.com>
 2023-01-29 12:48:52 +08:00
李雨峰 9cdc9c6f7f Bug521-LiYuFeng-Refactor (#72) 
@mrlan
蓝老师：

    本次改进内容如下：
        1. 对生词居中问题进行修改，现在已经不会居中了。
        2. 对于单词数量基数大而导致的排序速度慢的问题，我们进行了优化，提升了排序的速度。
        3. 对用户交互进行了优化，当用户点击“熟悉”或“不熟悉”之后，会自动进行排序，并会跳转到那个单词的位置，用抖动的效果来提示用户。

Co-authored-by: isaac <1141730046@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/72
Co-authored-by: 李雨峰 <1141730046@qq.com>
Co-committed-by: 李雨峰 <1141730046@qq.com>
 2023-01-29 12:01:19 +08:00
陈秋伟 972a1a5524 Bug490-ChenQiuwei (#63) 
修复Bug-490，使注册时确认密码能够发挥作用，在确认密码与所设置密码不一致时,能够提示“确认密码与输入密码不一致”。

Co-authored-by: 2658626578 <2658626578@qq.com>
Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/63
Co-authored-by: 陈秋伟 <2658626578@qq.com>
Co-committed-by: 陈秋伟 <2658626578@qq.com>
 2023-01-29 11:49:27 +08:00
mrlan c52d53596f Merge pull request 'Bug489-DingRui' (#74) from SPM2022F-CONTRIBUTORS-DingRui into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/74
 2023-01-29 11:31:41 +08:00
mrlan ca8c1bf8de Merge pull request 'Bug508-CenHaotian' (#62) from Bug508-CenHaotian into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/62
 2023-01-29 11:19:49 +08:00
mrlan febd0fc932 Merge pull request '用简单的方法（创建 frequency 文件夹）修复Bug 499' (#64) from Bug499-Hui into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/64
 2023-01-29 11:06:17 +08:00
mrlan 03353d49b1 Bug525-Hui (#79) 
Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/79
Co-authored-by: mrlan <mrlan@noreply.121.4.94.30>
Co-committed-by: mrlan <mrlan@noreply.121.4.94.30>
 2023-01-29 10:57:58 +08:00