linshan
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity
227 Commits
131 Branches
4 Tags
10 MiB
Commit Graph

227 Commits (65d78d5250a47f2534f2230fa5b64296fbe20492)

Author SHA1 Message Date
Hui Lan 65d78d5250 build.sh: automatically restart docker container after Ubuntu reboot 2022-11-01 21:35:22 +08:00
Hui Lan a1e20e4149 build.sh: change deployment path 2022-11-01 21:33:56 +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
mrlan 9a89510f4e Merge pull request 'Improvement-Stewart' (#49) from Improvement-Stewart into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/49
 2022-07-20 17:31:01 +08:00
Lan Hui e9eb604a22 Improve spacing and indentation. 2022-07-20 17:10:03 +08:00
Lan Hui 9beb1ad1d2 Make up the enclosing >. 2022-07-20 17:09:04 +08:00
Lan Hui 8998d6e4af Improve spacing. 2022-07-20 17:08:07 +08:00
Lan Hui 8747f35fd8 Make up the enclosing >. 2022-07-20 17:07:09 +08:00
Lan Hui fdb432031f Better indentation. 2022-07-20 17:06:11 +08:00
Lan Hui 1401870591 Use Chinese UI language. 2022-07-20 17:04:34 +08:00
Lan Hui 1ca90bb2a9 Remove superfluous 'jjj'. 2022-07-20 17:00:13 +08:00
Lan Hui ea19658212 Merge branch 'Improvement-Stewart' 2022-07-20 16:57:31 +08:00
mrlan 028e2f9d56 Merge pull request '[Refactor]: Remove loop.index0, as it is hard to understand.' (#52) from Bug400-QiuZhonghui-Refactor into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/52
 2022-07-18 19:58:01 +08:00
Lan Hui 50a1093781 Remove loop.index0, as it is hard to understand. 2022-07-18 19:51:23 +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>
 2022-07-18 16:00:08 +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>
 2022-07-18 13:29:04 +08:00
stewy 6823c10043 improved 2022-06-14 13:25:42 +08:00
stewy ee44372848 improved 2022-06-14 12:37:28 +08:00
蒋乐天 041cbd97fc 更新 'app/static/js/highlight.js' 2022-06-13 21:32:49 +08:00
lin b53e7031e5 Bug412-JiangLetian 2022-06-13 11:40:20 +08:00
缪宸硕 e48008550a Merge branch 'Bug394-MiaoChenShuo' into master 2022-06-12 21:50:36 +08:00
李凯 fde3be4c23 更新 'app/Article.py' 2022-06-11 23:21:17 +08:00
李凯 4817557099 更新 'app/Article.py' 2022-06-11 23:20:41 +08:00
李凯 5d5f4cf8f2 更新 'app/Article.py' 2022-06-11 23:13:08 +08:00
李凯 e40ebac452 更新 'app/static/css/bootstrap.css' 2022-06-11 23:08:29 +08:00
miaochenshuo 260f62967b 修复 Bug394 2022-06-05 23:36:55 +08:00
mrlan b9cf94da74 Merge pull request 'build.sh: use a variable DEPLOYMENT_DIR to represent the code folder' (#24) from Deployment into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/24
 2022-02-07 13:58:04 +08:00
Lan Hui 8647af3158 build.sh: use a variable DEPLOYMENT_DIR to represent the code folder 2022-02-07 13:56:14 +08:00
Hui Lan 2a92881581 README.md: update path 2022-02-05 23:05:00 +08:00
Hui Lan 2d4c516676 README.md: new code repository folder for deployment 2022-02-05 23:03:43 +08:00
Hui Lan 5976f758a0 Remove pyc files. 2022-02-05 23:01:01 +08:00
Hui Lan 18684ada6b build.sh: deploy the new code 2022-02-05 22:59:45 +08:00
mrlan e288b19678 Merge pull request 'ChenTianle-TypoCorrection' (#23) from ChenTianle-TypoCorrection into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/23
 2022-01-27 20:18:17 +08:00
Lan Hui f675870401 templates/mainpage_get.html: Use more appropriate word. 将'登出'按钮改为'退出' -- 陈天乐 2022-01-27 20:15:26 +08:00
Lan Hui 8dab62df7e templates/mainpage_get.html: fix typo -- 陈天乐 2022-01-27 20:12:10 +08:00
mrlan c43e4c3f7c Merge pull request 'Use named style for sqlite3 execute()' (#22) from Hui-SaferSQL into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/22
 2022-01-27 17:09:29 +08:00
Lan Hui 18dfad910b Use named style for sqlite3 execute() 2022-01-27 17:01:03 +08:00