EnglishPal

Commit Graph

Select branches

Hide Pull Requests

Bug209-LiuChangYou

Bug257-MaJiaBin

Bug260-Mohanad

Bug358-TengJiaQian

Bug391-LiuYiXiu

Bug392-LuoYu

Bug393-QinYanMei

Bug393-TanYanMei

Bug394-MiaoChenShuo

Bug395-Anxiuxiu

Bug400-QiuZhonghui

Bug407-JinHaoLin

Bug410-DuanJiaJie

Bug412-JiangLetian

Bug428-LouJiCheng

Bug473-LuXiaochen

Bug476-ZhangWeiHao

BugFix254-Author-ZhanJianhao

BugFix284

BugFix293

BugFix300

BugFix347

BugFix407-JinHaoLin

ChenTianle-TypoCorrection

Deployment

Hui-SaferSQL

IMPROVE-WangWeiLong

Lanhui-IncreaseChanceOfGettingDifficultArticles

Lanhui-Selenium

Lanhui-add-articles

Lanhui-build.sh

Lanhui-flash-messages

Lanhui-go-bootstrap

Lanhui-update-README

WangXuan-Highlight-Pronounce

bug209-yaaqob

bug209_yaaqobv2

bug359-zhangkeli

master

BeginningOfSpring

ColdDew

GreaterCold

GreaterCold2023

b9cf94da74 Merge pull request 'build.sh: use a variable DEPLOYMENT_DIR to represent the code folder' (#24) from Deployment into master mrlan 2022-02-07 13:58:04 +0800
8647af3158 build.sh: use a variable DEPLOYMENT_DIR to represent the code folder Deployment Lan Hui 2022-02-07 13:56:14 +0800
2a92881581 README.md: update path BeginningOfSpring Hui Lan 2022-02-05 23:05:00 +0800
2d4c516676 README.md: new code repository folder for deployment Hui Lan 2022-02-05 23:03:43 +0800
5976f758a0 Remove pyc files. Hui Lan 2022-02-05 23:01:01 +0800
18684ada6b build.sh: deploy the new code Hui Lan 2022-02-05 22:59:45 +0800
e288b19678 Merge pull request 'ChenTianle-TypoCorrection' (#23) from ChenTianle-TypoCorrection into master GreaterCold mrlan 2022-01-27 20:18:17 +0800
f675870401 templates/mainpage_get.html: Use more appropriate word. 将'登出'按钮改为'退出' -- 陈天乐 ChenTianle-TypoCorrection Lan Hui 2022-01-27 20:15:26 +0800
8dab62df7e templates/mainpage_get.html: fix typo -- 陈天乐 Lan Hui 2022-01-27 20:12:10 +0800
c43e4c3f7c Merge pull request 'Use named style for sqlite3 execute()' (#22) from Hui-SaferSQL into master mrlan 2022-01-27 17:09:29 +0800
18dfad910b Use named style for sqlite3 execute() Hui-SaferSQL Lan Hui 2022-01-27 17:01:03 +0800
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 mrlan 2022-01-27 13:04:26 +0800
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 BugFix347 Lan Hui 2022-01-27 13:02:27 +0800
922e1ee652 Merge pull request 'WangXuan-Highlight-Pronounce' (#20) from WangXuan-Highlight-Pronounce into master mrlan 2022-01-27 12:57:45 +0800
42356c222d templates/mainpage_get.html: remove superfluous () WangXuan-Highlight-Pronounce Lan Hui 2022-01-27 12:48:25 +0800
edb801b95e Show the expiry notice if the account has expired. Lan Hui 2022-01-27 12:45:09 +0800
718b98ef02 Login.py: use password instead of psd because psd may cause confusion. Lan Hui 2022-01-27 12:28:41 +0800
0c923f7db2 Login.py: simplify md5. Lan Hui 2022-01-27 12:24:20 +0800
d4c1b1fdcc Login.py: update expiry date. Lan Hui 2022-01-27 11:57:40 +0800
a94a333366 Remove redundant css files. Lan Hui 2022-01-27 11:49:41 +0800
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. Lan Hui 2022-01-27 11:40:58 +0800
b0d80096d6 templates/userpage_get.html: change the position and order of the checkboxes. Lan Hui 2022-01-27 11:27:26 +0800
4d2dd2b68e Repalce old app folder with SoftArch王炫/english-pal-master/app/ Lan Hui 2022-01-26 21:10:09 +0800
72deae7d3a requirements.txt: include PyYAML. Lan Hui 2022-01-26 21:03:03 +0800
abd8882541 Merge pull request 'Lanhui-Selenium' (#19) from Lanhui-Selenium into master mrlan 2021-12-03 09:19:56 +0800
246ddcc62a Remove HOME_PAGE as we use URL now. Lanhui-Selenium Hui Lan 2021-12-03 09:18:34 +0800
f8a5cc2a40 test: use localhost to test Hui Lan 2021-12-03 09:16:18 +0800
3c118a53e2 add conftest.py Hui Lan 2021-12-03 09:08:45 +0800
5cc430714a Merge pull request 'README.md: correct section levels.' (#18) from Lanhui-update-README into master ColdDew mrlan 2021-10-17 15:03:30 +0800
9ffc124ac3 README.md: correct section levels. Lanhui-update-README Lan Hui 2021-10-17 15:02:54 +0800
9bba40d31b Merge pull request 'Lanhui-update-README' (#17) from Lanhui-update-README into master mrlan 2021-10-17 14:55:49 +0800
4c9b471317 README.md: better organization. Lan Hui 2021-10-17 14:54:48 +0800
84e98d8bd9 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into Lanhui-update-README Lan Hui 2021-10-17 14:32:10 +0800
a3de113751 commit build.sh Lan Hui 2021-10-17 14:31:58 +0800
7153c5aeb5 Merge pull request 'BugFix300' (#16) from BugFix300 into master mrlan 2021-09-05 20:52:31 +0800
ffc33852ae main.py: make sure the key articleID exists. BugFix300 Lan Hui 2021-09-05 20:51:28 +0800
91ca6fe33b Merge branch 'BugFix300' of http://121.4.94.30:3000/mrlan/EnglishPal into BugFix300 Lan Hui 2021-09-05 20:44:55 +0800
23288f5282 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal Lan Hui 2021-09-05 20:44:14 +0800
02a5d4bd47 main.py: fix bug300: http://118.25.96.118/bugzilla/show_bug.cgi?id=300 Hui Lan 2021-09-05 20:42:18 +0800
ba2a48611e Merge pull request 'Lanhui-IncreaseChanceOfGettingDifficultArticles' (#15) from Lanhui-IncreaseChanceOfGettingDifficultArticles into master mrlan 2021-08-31 21:32:19 +0800
2a509f83cc Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into BugFix293 Lanhui-IncreaseChanceOfGettingDifficultArticles Hui Lan 2021-08-31 21:27:37 +0800
f8acf03acc main.py: let the user have a small chance to get a much more difficult article than his vocabulary level. Hui Lan 2021-08-31 21:25:17 +0800
6754930707 Merge pull request 'BugFix293' (#14) from BugFix293 into master mrlan 2021-08-30 08:31:56 +0800
baf333678a main.py and build.sh: shuffle the articles first before select one, relax selection range, keep the database BugFix293 Hui Lan 2021-08-30 08:18:47 +0800
868104da6c main.py: let the range be more flexible. Hui Lan 2021-08-30 07:43:41 +0800
7091969703 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal Lan Hui 2021-08-20 19:33:58 +0800
ac227c4c1a Downloaded this repository using ftp. file mode changed. Lan Hui 2021-08-20 19:33:51 +0800
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 mrlan 2021-08-20 19:29:52 +0800
5e322f067b requirements.txt includes dependencies of the program. difficulty.py is modified in this fix. Not sure why build.sh is included. BugFix284 Lan Hui 2021-08-20 19:27:44 +0800
3c588e55c5 Merge pull request 'Lanhui-flash-messages' (#12) from Lanhui-flash-messages into master mrlan 2021-08-02 19:30:53 +0800
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.). Lanhui-flash-messages Hui Lan 2021-08-02 19:27:22 +0800
aace6c033e app/main.py: flash a message after deleting a word (use bootstrap alerts -- make the alert dismissable 2). Hui Lan 2021-08-02 19:24:00 +0800
c3dcc62879 app/main.py: flash a message after deleting a word (use bootstrap alerts -- make the alert dismissable). Hui Lan 2021-08-02 19:21:41 +0800
3d5130d68d app/main.py: flash a message after deleting a word (use bootstrap alerts -- add additional content, e.g., a bolder congratulations). Hui Lan 2021-08-02 19:17:54 +0800
08bb7e0c40 app/main.py: flash a message after deleting a word (use bootstrap alerts). Hui Lan 2021-08-02 19:11:53 +0800
4773a6d131 app/main.py: flash a message after deleting a word from the new word list (put f in the right place). Hui Lan 2021-08-02 17:26:35 +0800
8abbf458a2 app/main.py: flash a message after deleting a word from the new word list (fix error - import get_flashed_messages). Hui Lan 2021-08-02 17:10:05 +0800
f5086732f3 app/main.py: flash a message after deleting a word from the new word list (fix error). Hui Lan 2021-08-02 17:07:01 +0800
451feb7bba app/main.py: flash a message after deleting a word from the new word list. Hui Lan 2021-08-02 16:52:02 +0800
274578d380 Merge pull request 'Lanhui-go-bootstrap' (#11) from Lanhui-go-bootstrap into master mrlan 2021-08-01 22:21:50 +0800
b6209bdde6 app/main.py: the secnd line and after (if any) should also show. Lanhui-go-bootstrap Hui Lan 2021-08-01 22:10:23 +0800
d08d8a8594 app/main.py: use a container for the front page. Hui Lan 2021-08-01 22:03:27 +0800
6e56c1b418 app/main.py: use smaller, ligter font for source. Hui Lan 2021-08-01 21:25:13 +0800
c71b156203 app/main.py: larger font for article title. Hui Lan 2021-08-01 21:22:45 +0800
7043518721 app/main.py: use lighter color for article date. Hui Lan 2021-08-01 21:12:15 +0800
0efd2b420b app/main.py: light grey background for the article. Hui Lan 2021-08-01 21:09:38 +0800
81e1e795be app/main.py: use container, and use a button for logout. Hui Lan 2021-08-01 20:25:58 +0800
e85317dd39 Merge pull request 'Lanhui-go-bootstrap' (#10) from Lanhui-go-bootstrap into master mrlan 2021-07-31 22:02:01 +0800
58383a51ad app/main.py: use buttons for all words (strange?). Hui Lan 2021-07-31 21:51:48 +0800
c40f9b61a3 app/main.py: use buttons instead of links for familiar, unfamiliar and delete (for all words). Hui Lan 2021-07-31 21:43:42 +0800
e65b443f01 app/main.py: use buttons instead of links for familiar, unfamiliar and delete. Hui Lan 2021-07-31 21:41:55 +0800
61a848e7d4 app/main.py: use alert for total number of articles. Hui Lan 2021-07-31 21:30:19 +0800
bef218953b app/main.py: adjust badge color. Hui Lan 2021-07-31 21:22:09 +0800
20386033bc app/main.py: green button may look better, more consistent. Hui Lan 2021-07-31 21:18:35 +0800
aad7f8016e app/main.py: change link to button. Hui Lan 2021-07-31 21:16:38 +0800
22af30bc88 app/main.py: move alert bar above 阅读文章并回答问题 (revision). Hui Lan 2021-07-31 21:12:04 +0800
fbf054d174 app/main.py: move alert bar above 阅读文章并回答问题. Hui Lan 2021-07-31 21:10:27 +0800
e9c7d0fc00 app/main.py: use a green alert bar. Hui Lan 2021-07-31 21:03:57 +0800
1936d2aec5 app/main.py: use alert while showing vocabulary level. Hui Lan 2021-07-31 21:02:17 +0800
adfc2796da app/main.py: use a different color for badge. Hui Lan 2021-07-31 20:59:08 +0800
29f0d02327 app/main.py: bootstrap elements. Hui Lan 2021-07-31 20:54:19 +0800
e841ca7d07 Merge pull request 'build.sh: fix error: container name EnglishPal already in use.' (#9) from Lanhui-build.sh into master mrlan 2021-07-30 13:21:22 +0800
936a3dd1e6 build.sh: fix error: container name EnglishPal already in use. Lanhui-build.sh Hui Lan 2021-07-30 13:20:01 +0800
323cfdfd43 Merge pull request 'BugFix254-Author-ZhanJianhao' (#8) from BugFix254-Author-ZhanJianhao into master mrlan 2021-07-30 12:36:40 +0800
c581601bf3 Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of https://github.com/lanlab-org/EnglishPal into BugFix254-Author-ZhanJianhao BugFix254-Author-ZhanJianhao Hui Lan 2021-07-30 12:18:39 +0800
fb27d96b77 Merge pull request 'Lanhui-update-README' (#7) from Lanhui-update-README into master mrlan 2021-07-23 14:16:09 +0800
08c5553450 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into Lanhui-update-README Hui Lan 2021-07-23 14:14:42 +0800
6ac60ae6c5 README.md: remove duplication 'EnglishPal' Hui Lan 2021-07-23 14:13:29 +0800
6d8b30e631 fix the bug (After logging in, jump directly to the vocabulary, not to the article.) Zjh-jc 2021-07-22 00:11:06 +0800
32ce4cbc3d Merge pull request 'app/static/wordfreqapp.sql: one article on taking photos.' (#6) from Lanhui-add-articles into master mrlan 2021-07-17 10:49:14 +0800
c3dfcba4d0 app/static/wordfreqapp.sql: one article on taking photos. Lanhui-add-articles Hui Lan 2021-07-17 10:47:12 +0800
ebca7dde6a Merge pull request 'README.md: Update articles.' (#5) from Lanhui-update-README into master mrlan 2021-07-17 10:08:10 +0800
fb43e9dfb4 README.md: Update articles. Hui Lan 2021-07-17 09:47:17 +0800
ca3e4288cf Merge pull request 'app/static/wordfreqapp.sql: one more article' (#4) from Lanhui-add-articles into master mrlan 2021-07-17 09:41:27 +0800
c04bd016d0 app/static/wordfreqapp.sql: one more article Hui Lan 2021-07-17 09:39:51 +0800
b17f86ca8d Merge pull request 'README.md: export wordfreqapp.db to wordfreqapp.sql' (#3) from Lanhui-update-README into master mrlan 2021-07-16 20:50:53 +0800
4fae58f1b0 README.md: export wordfreqapp.db to wordfreqapp.sql Hui Lan 2021-07-16 20:49:57 +0800
92703c90f7 Merge pull request 'README.md: fix levels' (#2) from Lanhui-update-README into master mrlan 2021-07-16 20:35:29 +0800
fcf71730e6 README.md: fix levels Hui Lan 2021-07-16 20:34:39 +0800
f5d0d77ee8 Merge pull request 'README.md: update' (#1) from Lanhui-update-README into master mrlan 2021-07-16 20:33:22 +0800