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

297 Commits (3bc61a602f1ae4d7675e75dbecc4a3616ce63dd5)

Author SHA1 Message Date
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
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
Hui Lan f8a5cc2a40 test: use localhost to test 2021-12-03 09:16:18 +08:00
Hui Lan 3c118a53e2 add conftest.py 2021-12-03 09:08:45 +08:00
mrlan 5cc430714a Merge pull request 'README.md: correct section levels.' (#18) from Lanhui-update-README into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/18
 2021-10-17 15:03:30 +08:00
Lan Hui 9ffc124ac3 README.md: correct section levels. 2021-10-17 15:02:54 +08:00
mrlan 9bba40d31b Merge pull request 'Lanhui-update-README' (#17) from Lanhui-update-README into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/17
 2021-10-17 14:55:49 +08:00
Lan Hui 4c9b471317 README.md: better organization. 2021-10-17 14:54:48 +08:00
Lan Hui 84e98d8bd9 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into Lanhui-update-README 2021-10-17 14:32:10 +08:00
Lan Hui a3de113751 commit build.sh 2021-10-17 14:31:58 +08:00
mrlan 7153c5aeb5 Merge pull request 'BugFix300' (#16) from BugFix300 into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/16
 2021-09-05 20:52:31 +08:00
Lan Hui ffc33852ae main.py: make sure the key articleID exists. 2021-09-05 20:51:28 +08:00
Lan Hui 91ca6fe33b Merge branch 'BugFix300' of http://121.4.94.30:3000/mrlan/EnglishPal into BugFix300 2021-09-05 20:44:55 +08:00
Lan Hui 23288f5282 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal 2021-09-05 20:44:14 +08:00
Hui Lan 02a5d4bd47 main.py: fix bug300: http://118.25.96.118/bugzilla/show_bug.cgi?id=300 2021-09-05 20:42:18 +08:00
mrlan ba2a48611e Merge pull request 'Lanhui-IncreaseChanceOfGettingDifficultArticles' (#15) from Lanhui-IncreaseChanceOfGettingDifficultArticles into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/15
 2021-08-31 21:32:19 +08:00
Hui Lan 2a509f83cc Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into BugFix293 2021-08-31 21:27:37 +08:00