huangjihao
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity
370 Commits
186 Branches
4 Tags
18 MiB
Commit Graph

370 Commits (3f200e538416ebb5e635a4c8d6d6581493e73732)

Author SHA1 Message Date
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
Hui Lan fcf71730e6 README.md: fix levels 2021-07-16 20:34:39 +08:00
mrlan f5d0d77ee8 Merge pull request 'README.md: update' (#1) from Lanhui-update-README into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/1
 2021-07-16 20:33:22 +08:00
Hui Lan 7372017a2d README.md: update 2021-07-16 20:31:34 +08:00
Hui Lan b2ec8044fe README.md: how to make wordfreqapp.db? 2021-07-16 20:22:33 +08:00
Hui Lan 0027969f73 README.md: fix levels. 2021-07-16 20:19:42 +08:00
Hui Lan 20784b83d0 README.md: fix levels. 2021-07-16 20:17:12 +08:00
Hui Lan ef0b52a12b README.md: fix levels. 2021-07-16 20:13:53 +08:00
Hui Lan 57451717ee app/README.md: delete. 2021-07-16 20:10:06 +08:00
Hui Lan e19e323e40 README.md: move the content in app/README.md to this one. 2021-07-16 20:09:51 +08:00
Hui Lan 0eaf85bc6e EnglishPal: delete folder .idea 2021-07-16 19:54:06 +08:00
Hui Lan 09bd6b9ddf build.sh: remove redundant build.sh in app/. 2021-07-16 19:20:31 +08:00
Hui Lan c1062eef31 build.sh: give the container a name EnglishPal. 2021-07-16 19:04:43 +08:00
Software Project Management 543458430e
Merge pull request #10 from lanlab-org/Lanhui-show-number-of-total-articles 
Lanhui - show number of total articles
 2021-07-16 18:45:27 +08:00
Hui Lan 317c12e827 wordfreqapp.sql: more articles. 2021-07-16 18:30:32 +08:00
Hui Lan 2584de860d main.py: article count. 2021-07-16 18:13:07 +08:00
Hui Lan fa84a7bbb2 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. 2021-07-14 21:51:03 +08:00
Hui Lan fa8fd4e414 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. 2021-07-14 21:29:32 +08:00
Hui Lan b13df92bf7 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. 2021-07-14 21:22:56 +08:00
Hui Lan cfb8dc6c78 test_page_position.py: let it pass for now (temporary fix). 2021-07-14 18:55:16 +08:00
Hui Lan bbb0c5396e test_page_position.py: change click order. 2021-07-14 18:50:34 +08:00