baoyuelin
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
262 Commits
105 Branches
0 Tags
5.9 MiB
Commit Graph

262 Commits (36c100b1a8b04b20ce32fd1f8029355c785e76b8)

Author SHA1 Message Date
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
keli_Chuang 40c86b2050 Bug359 修改位置pickle_idea2.py line71 2022-06-05 22:00:43 +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
mrlan 1d7939acf4 Merge pull request 'templates/signup.html: user name must not be empty. Bug reported and fixed by 丁宇超. For more details, see http://118.25.96.118/bugzilla/show_bug.cgi?id=347 and http://118.25.96.118/kanboard/?controller=BoardViewController&action=show&project_id=183' (#21) from BugFix347 into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/21
 2022-01-27 13:04:26 +08:00
Lan Hui 788bca8873 templates/signup.html: user name must not be empty. Bug reported and fixed by 丁宇超. For more details, see http://118.25.96.118/bugzilla/show_bug.cgi?id=347 and http://118.25.96.118/kanboard/?controller=BoardViewController&action=show&project_id=183 2022-01-27 13:02:27 +08:00
mrlan 922e1ee652 Merge pull request 'WangXuan-Highlight-Pronounce' (#20) from WangXuan-Highlight-Pronounce into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/20
 2022-01-27 12:57:45 +08:00
Lan Hui 42356c222d templates/mainpage_get.html: remove superfluous () 2022-01-27 12:48:25 +08:00
Lan Hui edb801b95e Show the expiry notice if the account has expired. 2022-01-27 12:45:09 +08:00
Lan Hui 718b98ef02 Login.py: use password instead of psd because psd may cause confusion. 2022-01-27 12:28:41 +08:00
Lan Hui 0c923f7db2 Login.py: simplify md5. 2022-01-27 12:24:20 +08:00
Lan Hui d4c1b1fdcc Login.py: update expiry date. 2022-01-27 11:57:40 +08:00
Lan Hui a94a333366 Remove redundant css files. 2022-01-27 11:49:41 +08:00
Lan Hui ba2ff7dee2 Remove music player js because that is not the focus of EnglishPal. If people want to listen music, they have better options than EnglishPal. 2022-01-27 11:40:58 +08:00
Lan Hui b0d80096d6 templates/userpage_get.html: change the position and order of the checkboxes. 2022-01-27 11:27:26 +08:00
Lan Hui 4d2dd2b68e Repalce old app folder with SoftArch王炫/english-pal-master/app/ 2022-01-26 21:10:09 +08:00
Lan Hui 72deae7d3a requirements.txt: include PyYAML. 2022-01-26 21:03:03 +08:00
mrlan abd8882541 Merge pull request 'Lanhui-Selenium' (#19) from Lanhui-Selenium into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/19
 2021-12-03 09:19:56 +08:00
Hui Lan 246ddcc62a Remove HOME_PAGE as we use URL now. 2021-12-03 09:18:34 +08:00