mrlan
/
EnglishPal
4
0
Fork 11
Code Issues Pull Requests 22 Projects Releases Wiki Activity

WIP: BugFix394 + Improve #37

Closed
miaochenshuo wants to merge 179 commits from master into Bug394-MiaoChenShuo
pull from: master
merge into: mrlan:Bug394-MiaoChenShuo
Conversation 0 Commits 179 Files Changed 38
miaochenshuo commented 2022-06-12 21:48:27 +08:00

[BUGFIX] Login.py: Function 'change_password', Bug Fix 394

[BUGFIX] Login.py: Function 'change_password', Bug Fix 394
miaochenshuo added 2 commits 2022-06-12 21:48:27 +08:00
miaochenshuo added 1 commit 2022-06-12 21:50:37 +08:00
jiangletian added 1 commit 2022-06-13 11:41:29 +08:00
cjybyjk added 2 commits 2022-06-14 19:40:37 +08:00
cjybyjk force-pushed master from c99f98e0b5 to e48008550a 2022-06-14 19:41:11 +08:00 Compare
mrlan added 1 commit 2022-07-18 13:29:05 +08:00
9d420acd8b [REFACTOR] user_service.py: Added id to user name, word and frequency for click to execute AJAX request in JS (#30) 
1. Add jquery.js and word_operation.js to the static folder.

2. Changed the return type of the familiar, unfamiliar and deleteword methods of user_service.py.
    ```
    original: return redirect(url_for('userpage', username=username))
    now: return "success"
    ```
3. In order to get elements in JS to make ajax requests we add ids in userpage_get.html for familiar, unfamiliar, delete buttons and so on.

4. When the user's word book was retrieved, the list returned was already sorted in descending order of frequency, so redundant code was removed in userpage_get.html.

Co-authored-by: PeterQiu <www.1392993990@qq.com>
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/30
Co-authored-by: 邱忠辉 <1392993990@qq.com>
Co-committed-by: 邱忠辉 <1392993990@qq.com>
mrlan added 1 commit 2022-07-18 16:00:08 +08:00
c21659ba7e Bug477 重构 and 增加功能 (#48) 
Co-authored-by: cjybyjk <cjybyjk@zjnu.edu.cn>
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/48
Co-authored-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>
Co-committed-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>
mrlan added 2 commits 2022-07-18 19:58:02 +08:00
mrlan added 11 commits 2022-07-20 17:31:02 +08:00
mrlan added 1 commit 2022-07-21 23:13:34 +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>
mrlan added 3 commits 2022-07-29 16:20:01 +08:00
mrlan added 3 commits 2022-07-31 09:11:54 +08:00
mrlan added 4 commits 2022-08-02 11:03:40 +08:00
mrlan added 7 commits 2022-08-05 16:18:08 +08:00
mrlan added 1 commit 2022-11-01 21:43:02 +08:00
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>
mrlan added 3 commits 2022-11-03 21:28:56 +08:00
mrlan added 7 commits 2022-11-08 19:53:10 +08:00
mrlan added 1 commit 2022-11-10 19:04:00 +08:00
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>
mrlan added 1 commit 2022-12-03 20:52:01 +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>
ruanyuxuan added 3 commits 2022-12-10 14:09:02 +08:00
ruanyuxuan force-pushed master from d754b3b737 to e74f1ff477 2022-12-10 14:18:47 +08:00 Compare
renyu added 3 commits 2022-12-13 13:39:24 +08:00
5c85041135 Bug 512 - 文章朗读问题 
在fillwowrd.js中添加了stopRead()函数，将其添加给对应按钮或超链接以终止朗读。
mrlan added 2 commits 2023-01-29 10:27:23 +08:00
mrlan added 1 commit 2023-01-29 10:57:59 +08:00
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>
mrlan added 2 commits 2023-01-29 11:06:18 +08:00
mrlan added 3 commits 2023-01-29 11:19:50 +08:00
mrlan added 5 commits 2023-01-29 11:31:42 +08:00
mrlan added 1 commit 2023-01-29 11:49:27 +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>
mrlan added 1 commit 2023-01-29 12:01:19 +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>
mrlan added 1 commit 2023-01-29 12:48:52 +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>
mrlan added 1 commit 2023-01-30 15:44:02 +08:00
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>
mrlan added 2 commits 2023-01-31 16:45:51 +08:00
guhan added 105 commits 2023-06-04 12:39:37 +08:00
dingchengye added 1 commit 2024-05-06 11:36:39 +08:00
dingchengye added 1 commit 2024-05-06 11:42:35 +08:00
lisinan added 1 commit 2024-05-24 22:00:31 +08:00
mrlan closed this pull request 2024-09-06 08:56:53 +08:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
9 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: mrlan/EnglishPal#37
There is no content yet.
Delete Branch "master"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?