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

Bug359 修改位置pickle_idea2.py line71 #28

Closed
zhangkeli wants to merge 13 commits from bug359-zhangkeli into master
pull from: bug359-zhangkeli
merge into: mrlan:master
Conversation 1 Commits 13 Files Changed 6
zhangkeli commented 2022-06-09 12:37:43 +08:00
There is no content yet.
zhangkeli added 1 commit 2022-06-09 12:37:44 +08:00
benedict added 115 commits 2023-04-19 15:20:27 +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>
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>
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>
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>
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>
5c85041135 Bug 512 - 文章朗读问题 
在fillwowrd.js中添加了stopRead()函数，将其添加给对应按钮或超链接以终止朗读。
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>
abdulai added 1 commit 2023-05-02 14:35:15 +08:00
4fc557aff3 Delete 'app/Login.pyc' 
deleted run time files.
abdulai added 1 commit 2023-05-02 14:36:37 +08:00
b15df83df4 Delete 'app/UseSqlite.pyc' 
deleting runtime files.
abdulai added 1 commit 2023-05-02 14:38:07 +08:00
abdulai added 1 commit 2023-05-02 14:39:03 +08:00
abdulai added 1 commit 2023-05-02 14:46:26 +08:00
90d64ff447 Delete 'app/difficulty.pyc' 
runtime file deleted.
abdulai added 1 commit 2023-05-02 14:48:01 +08:00
8a900404e7 Delete 'app/WordFreq.pyc' 
runtime file deleted.
abdulai added 1 commit 2023-05-02 14:48:41 +08:00
c3e01b20ce Delete 'app/Article.pyc' 
runtime file deleted
abdulai added 1 commit 2023-05-02 14:49:16 +08:00
0ff73b2213 Delete 'app/Yaml.pyc' 
runtime file deleted
abdulai added 1 commit 2023-05-02 14:50:22 +08:00
abdulai added 1 commit 2023-05-02 15:14:06 +08:00
mrlan commented 2023-07-06 22:01:05 +08:00
Owner

已经并入 Alpha-snapshot

已经并入 Alpha-snapshot
mrlan closed this pull request 2023-07-06 22:01:05 +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
5 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#28
There is no content yet.
Delete Branch "bug359-zhangkeli"

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?