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

190 Commits (4817557099617b241489a5d3cd423c1925f5218a)

Author SHA1 Message Date
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
Hui Lan d08d8a8594 app/main.py: use a container for the front page. 2021-08-01 22:03:27 +08:00
Hui Lan 6e56c1b418 app/main.py: use smaller, ligter font for source. 2021-08-01 21:25:13 +08:00
Hui Lan c71b156203 app/main.py: larger font for article title. 2021-08-01 21:22:45 +08:00
Hui Lan 7043518721 app/main.py: use lighter color for article date. 2021-08-01 21:12:15 +08:00
Hui Lan 0efd2b420b app/main.py: light grey background for the article. 2021-08-01 21:09:38 +08:00
Hui Lan 81e1e795be app/main.py: use container, and use a button for logout. 2021-08-01 20:25:58 +08:00
mrlan e85317dd39 Merge pull request 'Lanhui-go-bootstrap' (#10) from Lanhui-go-bootstrap into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/10
 2021-07-31 22:02:01 +08:00
Hui Lan 58383a51ad app/main.py: use buttons for all words (strange?). 2021-07-31 21:51:48 +08:00
Hui Lan c40f9b61a3 app/main.py: use buttons instead of links for familiar, unfamiliar and delete (for all words). 2021-07-31 21:43:42 +08:00
Hui Lan e65b443f01 app/main.py: use buttons instead of links for familiar, unfamiliar and delete. 2021-07-31 21:41:55 +08:00
Hui Lan 61a848e7d4 app/main.py: use alert for total number of articles. 2021-07-31 21:30:19 +08:00
Hui Lan bef218953b app/main.py: adjust badge color. 2021-07-31 21:22:09 +08:00
Hui Lan 20386033bc app/main.py: green button may look better, more consistent. 2021-07-31 21:18:35 +08:00
Hui Lan aad7f8016e app/main.py: change link to button. 2021-07-31 21:16:38 +08:00
Hui Lan 22af30bc88 app/main.py: move alert bar above 阅读文章并回答问题 (revision). 2021-07-31 21:12:04 +08:00
Hui Lan fbf054d174 app/main.py: move alert bar above 阅读文章并回答问题. 2021-07-31 21:10:27 +08:00
Hui Lan e9c7d0fc00 app/main.py: use a green alert bar. 2021-07-31 21:03:57 +08:00
Hui Lan 1936d2aec5 app/main.py: use alert while showing vocabulary level. 2021-07-31 21:02:17 +08:00
Hui Lan adfc2796da app/main.py: use a different color for badge. 2021-07-31 20:59:08 +08:00
Hui Lan 29f0d02327 app/main.py: bootstrap elements. 2021-07-31 20:54:19 +08:00
mrlan e841ca7d07 Merge pull request 'build.sh: fix error: container name EnglishPal already in use.' (#9) from Lanhui-build.sh into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/9
 2021-07-30 13:21:22 +08:00
Hui Lan 936a3dd1e6 build.sh: fix error: container name EnglishPal already in use. 2021-07-30 13:20:01 +08:00
mrlan 323cfdfd43 Merge pull request 'BugFix254-Author-ZhanJianhao' (#8) from BugFix254-Author-ZhanJianhao into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/8

使用Jenkins进行了CI （见 http://121.4.94.30:8080/job/EnglishPal-Gitea/job/BugFix254-Author-ZhanJianhao/）。

手动测试后Bug已经修复。没有发现新的问题。

-Hui
 2021-07-30 12:36:40 +08:00
Hui Lan c581601bf3 Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of https://github.com/lanlab-org/EnglishPal into BugFix254-Author-ZhanJianhao 2021-07-30 12:18:39 +08:00
mrlan fb27d96b77 Merge pull request 'Lanhui-update-README' (#7) from Lanhui-update-README into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/7
 2021-07-23 14:16:09 +08:00
Hui Lan 08c5553450 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into Lanhui-update-README 2021-07-23 14:14:42 +08:00
Hui Lan 6ac60ae6c5 README.md: remove duplication 'EnglishPal' 
EnglishPal has appeared at the beginning of this sentence.

-Hui
 2021-07-23 14:13:29 +08:00
Zjh-jc 6d8b30e631 fix the bug (After logging in, jump directly to the vocabulary, not to the article.) 2021-07-22 00:11:06 +08:00
mrlan 32ce4cbc3d Merge pull request 'app/static/wordfreqapp.sql: one article on taking photos.' (#6) from Lanhui-add-articles into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/6
 2021-07-17 10:49:14 +08:00
Hui Lan c3dfcba4d0 app/static/wordfreqapp.sql: one article on taking photos. 
Now we have 50 articles to choose from.
 2021-07-17 10:47:12 +08:00
mrlan ebca7dde6a Merge pull request 'README.md: Update articles.' (#5) from Lanhui-update-README into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/5
 2021-07-17 10:08:10 +08:00
Hui Lan fb43e9dfb4 README.md: Update articles. 2021-07-17 09:47:17 +08:00
mrlan ca3e4288cf Merge pull request 'app/static/wordfreqapp.sql: one more article' (#4) from Lanhui-add-articles into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/4
 2021-07-17 09:41:27 +08:00
Hui Lan c04bd016d0 app/static/wordfreqapp.sql: one more article 2021-07-17 09:39:51 +08:00
mrlan b17f86ca8d Merge pull request 'README.md: export wordfreqapp.db to wordfreqapp.sql' (#3) from Lanhui-update-README into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/3
 2021-07-16 20:50:53 +08:00
Hui Lan 4fae58f1b0 README.md: export wordfreqapp.db to wordfreqapp.sql 2021-07-16 20:49:57 +08:00
mrlan 92703c90f7 Merge pull request 'README.md: fix levels' (#2) from Lanhui-update-README into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/2
 2021-07-16 20:35:29 +08:00