lixiaofeng
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity
527 Commits
148 Branches
4 Tags
11 MiB
Commit Graph

527 Commits (Bug546-Lixiaofeng)

Author SHA1 Message Date
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
Hui Lan f8acf03acc main.py: let the user have a small chance to get a much more difficult article than his vocabulary level. 2021-08-31 21:25:17 +08:00
mrlan 6754930707 Merge pull request 'BugFix293' (#14) from BugFix293 into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/14
 2021-08-30 08:31:56 +08:00
Hui Lan baf333678a main.py and build.sh: shuffle the articles first before select one, relax selection range, keep the database 
main.py:

- shuffle the articles first before select one

- relax selection range (see the function call within_range)

build.sh:

- keep the database wordfreqapp.db so that the user could login again next time after the program is rebuilt.

Hui
 2021-08-30 08:18:47 +08:00
Hui Lan 868104da6c main.py: let the range be more flexible. 2021-08-30 07:43:41 +08:00
Lan Hui 7091969703 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal 2021-08-20 19:33:58 +08:00
Lan Hui ac227c4c1a Downloaded this repository using ftp. file mode changed. 2021-08-20 19:33:51 +08:00
mrlan 943c50f964 Merge pull request 'requirements.txt includes dependencies of the program. difficulty.py is modified in this fix. Not sure why build.sh is included.' (#13) from BugFix284 into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/13
 2021-08-20 19:29:52 +08:00
Lan Hui 5e322f067b requirements.txt includes dependencies of the program. difficulty.py is modified in this fix. Not sure why build.sh is included. 2021-08-20 19:27:44 +08:00
mrlan 3c588e55c5 Merge pull request 'Lanhui-flash-messages' (#12) from Lanhui-flash-messages into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/12
 2021-08-02 19:30:53 +08:00
Hui Lan c6b620b272 app/main.py: flash a message after deleting a word (use bootstrap alerts -- it seems that dismissable alert does not work, so forget about it.). 2021-08-02 19:27:22 +08:00
Hui Lan aace6c033e app/main.py: flash a message after deleting a word (use bootstrap alerts -- make the alert dismissable 2). 2021-08-02 19:24:00 +08:00
Hui Lan c3dcc62879 app/main.py: flash a message after deleting a word (use bootstrap alerts -- make the alert dismissable). 2021-08-02 19:21:41 +08:00
Hui Lan 3d5130d68d app/main.py: flash a message after deleting a word (use bootstrap alerts -- add additional content, e.g., a bolder congratulations). 2021-08-02 19:17:54 +08:00
Hui Lan 08bb7e0c40 app/main.py: flash a message after deleting a word (use bootstrap alerts). 2021-08-02 19:11:53 +08:00
Hui Lan 4773a6d131 app/main.py: flash a message after deleting a word from the new word list (put f in the right place). 2021-08-02 17:26:35 +08:00
Hui Lan 8abbf458a2 app/main.py: flash a message after deleting a word from the new word list (fix error - import get_flashed_messages). 2021-08-02 17:10:05 +08:00
Hui Lan f5086732f3 app/main.py: flash a message after deleting a word from the new word list (fix error). 2021-08-02 17:07:01 +08:00
Hui Lan 451feb7bba app/main.py: flash a message after deleting a word from the new word list. 2021-08-02 16:52:02 +08:00
mrlan 274578d380 Merge pull request 'Lanhui-go-bootstrap' (#11) from Lanhui-go-bootstrap into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/11

Appearance stuff.

Hui
 2021-08-01 22:21:50 +08:00
Hui Lan b6209bdde6 app/main.py: the secnd line and after (if any) should also show. 2021-08-01 22:10:23 +08:00