Karim
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests 1 Activity

Commit Graph

  • 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
  • 7372017a2d README.md: update Hui Lan 2021-07-16 20:31:34 +0800
  • b2ec8044fe README.md: how to make wordfreqapp.db? Hui Lan 2021-07-16 20:22:33 +0800
  • 0027969f73 README.md: fix levels. Hui Lan 2021-07-16 20:19:42 +0800
  • 20784b83d0 README.md: fix levels. Hui Lan 2021-07-16 20:17:12 +0800
  • ef0b52a12b README.md: fix levels. Hui Lan 2021-07-16 20:13:53 +0800
  • 57451717ee app/README.md: delete. Hui Lan 2021-07-16 20:10:06 +0800
  • e19e323e40 README.md: move the content in app/README.md to this one. Hui Lan 2021-07-16 20:09:51 +0800
  • 0eaf85bc6e EnglishPal: delete folder .idea Hui Lan 2021-07-16 19:54:06 +0800
  • 09bd6b9ddf build.sh: remove redundant build.sh in app/. Hui Lan 2021-07-16 19:20:31 +0800
  • c1062eef31 build.sh: give the container a name EnglishPal. Hui Lan 2021-07-16 19:04:43 +0800
  • 543458430e
         Merge pull request #10 from lanlab-org/Lanhui-show-number-of-total-articles Software Project Management 2021-07-16 18:45:27 +0800
  • 317c12e827 wordfreqapp.sql: more articles. Hui Lan 2021-07-16 18:30:32 +0800
  • 2584de860d main.py: article count. Hui Lan 2021-07-16 18:13:07 +0800
  • fa84a7bbb2 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. Hui Lan 2021-07-14 21:51:03 +0800
  • fa8fd4e414 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. Hui Lan 2021-07-14 21:29:32 +0800
  • b13df92bf7 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. Hui Lan 2021-07-14 21:22:56 +0800
  • cfb8dc6c78 test_page_position.py: let it pass for now (temporary fix). Hui Lan 2021-07-14 18:55:16 +0800
  • bbb0c5396e test_page_position.py: change click order. Hui Lan 2021-07-14 18:50:34 +0800
  • 5c7096a96b test_add_word.py: do not print many things out. Hui Lan 2021-07-14 18:47:55 +0800
  • 1786651aa5 test_add_word.py: use a longer word Hui Lan 2021-07-14 18:06:12 +0800
  • 0e77dc449d Jenkinsfile: use selenium/standalone-firefox Hui Lan 2021-07-14 17:58:37 +0800
  • 5ce9b6167c test_*.py: use FIREFOX instead of CHROME Hui Lan 2021-07-14 17:50:38 +0800
  • e9358a627f Learn english smartly. Hui Lan 2021-07-13 12:56:05 +0800
  • 7f69d9a14d test scripts: change port from 5000 to 91. Hui Lan 2021-07-13 12:46:31 +0800
  • 2e543b6790 Jenkinsfile: install pytest-html package for generating html test report. Hui Lan 2021-07-13 12:32:57 +0800
  • de7a140cbd Jenkinsfile: stop all containers. Hui Lan 2021-07-13 12:24:29 +0800
  • 7163b6032f Jenkinsfile: stop container with image name englishpal. Hui Lan 2021-07-13 12:15:00 +0800
  • 9144623621 Delete Readme.md Hui Lan 2021-07-13 11:48:57 +0800
  • e83de4bffc README.md: add stuff fropm Readme.md Hui Lan 2021-07-13 11:48:40 +0800
  • 905e85f201 Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of https://github.com/lanlab-org/EnglishPal Hui Lan 2021-07-13 11:46:37 +0800
  • 1013373c32 Jenkinsfile: remove docker stop as there is nothing stop. Hui Lan 2021-07-13 11:32:13 +0800
  • d431c0cb4b update .gitignore to ignore the folder .idea Hui Lan 2021-07-13 11:19:35 +0800
  • 0afac2a30e Merge changes made in the branch SPM-Spring2021-2599-张小飞201831990641 Hui Lan 2021-07-13 11:06:12 +0800
  • 3bddc1ed27 Jenkinsfile: sudo Hui Lan 2021-06-26 00:28:37 +0800
  • ad52e5a90b
         change the password mmmmmkj 2021-06-23 00:36:34 +0800
  • 515128caab
         upload the test code of the function called delete mmmmmkj 2021-06-23 00:33:19 +0800
  • b53b5ed4c3 修改main.py,使得主页显示English Pal -(SPM-Spring2021-2599-张小飞201831990641) 张小飞 2021-06-22 12:35:01 +0800
  • 10fd9afa6f 修改访问端口，避免和其他组冲突，同时修改main.py,主页显示 English Pal(SPM-Spring2021-2599-张小飞201831990641) 张小飞 2021-06-22 12:24:34 +0800
  • 5c4810aec1 上传自己的演示视频 张小飞 2021-06-20 14:36:32 +0800
  • 2ee854285c Test the page position after clicking the Familiar or Unfamiliar button. Zjh-jc 2021-06-17 09:51:53 +0800
  • f7629f4d1c Test the page position after clicking the Familiar or Unfamiliar button. Zjh-jc 2021-06-17 09:41:33 +0800
  • 006a144ec0 Test the page position after clicking the Familiar or Unfamiliar button. Zjh-jc 2021-06-17 09:21:13 +0800
  • c3219aef1f
         Create Dockerfile ArrayYang 2021-06-16 16:31:05 +0800
  • 1ba4dcd45e
         Create Jenkinsfile ArrayYang 2021-06-16 16:30:04 +0800
  • b17ef9c331 Solve the problem of page position jump after clicking the familiar or unfamiliar button Zjh-jc 2021-06-16 02:17:30 +0800
  • dcfed23d6f Merge branch 'master' of https://github.com/lanlab-org/EnglishPal into SPM-Spring2021-2597-占健豪201831990539 Zjh-jc 2021-06-15 23:30:41 +0800
  • 46dc9328cf 在test_add测试文件里添加输出语句，寻找测试不通过的原因 张小飞 2021-06-13 11:10:56 +0800
  • d6e64e3465 删除test_login.py中添加的代码，添加test_login_security_fix.py用来检验bug是否修复 张小飞 2021-06-11 15:16:28 +0800
  • c6b895e8eb Fix the problem when user click Familiar or Unfamiliar button will refresh page stellafull 2021-06-11 08:56:21 +0800
  • d21dfc8da3 Merge branch 'master' of https://github.com/lanlab-org/EnglishPal into SPM-Spring2021-2599-张小飞201831990641 张小飞 2021-06-09 22:58:30 +0800
  • fdb3259e3c 修改测试代码里的端口和master统一为91 张小飞 2021-06-09 21:44:47 +0800
  • a9b2bc6fee 和新的master分支合并 张小飞 2021-06-09 21:39:13 +0800
  • be0c9f1c8b 修改test_next_eassy.py，修复语法错误 张小飞 2021-06-09 20:57:09 +0800
  • ebfd780497 添加wordfreqapp.sql文件，用于生成数据库 张小飞 2021-06-09 20:39:48 +0800
  • 72b5162a42 修改jenkinsfile,恢复makedatafile阶段 张小飞 2021-06-09 20:28:41 +0800
  • d02da7ba9c
         Merge pull request #7 from lanlab-org/Lanhui-update-test_next_essay Software Project Management 2021-06-09 13:18:58 +0800
  • 90ab0be3d6 app/test/test_next_essay.py: click Next 5 times. Lan Hui 2021-06-09 09:17:19 +0800
  • 3ef96ae447 Jenkinsfile: correct command line argument 2. Lan Hui 2021-06-09 08:43:50 +0800
  • 24ffed751f Jenkinsfile: correct command line argument. Lan Hui 2021-06-09 08:33:22 +0800
  • a6328befc7 Merge branch 'master' of https://github.com/lanlab-org/EnglishPal Lan Hui 2021-06-09 08:27:14 +0800
  • 3056cb8b9c Jenkinsfile: automatic deployment has not been implemented yet. Lan Hui 2021-06-09 08:15:18 +0800
  • 3cc5105c47 Jenkinsfile: generate an HTML test report. Lan Hui 2021-06-09 08:14:21 +0800
  • 783a0b22e1 app/test/test_next_essay.py: correct the variable name 'differ'. Lan Hui 2021-06-09 08:05:30 +0800
  • 3f0006fa4c
         Merge pull request #5 from lanlab-org/SPM-Spring2021-2600-朱文琦201836900114 Software Project Management 2021-06-08 22:42:55 +0800
  • f4a6921297 app/test/test_add_word_and_essay_does_not_change.py: remove unnecessary test. Lan Hui 2021-06-08 21:48:38 +0800
  • 68e8102e12 Add app/static/wordfreqapp.sql for reconstructing the database. Lan Hui 2021-06-08 21:29:39 +0800
  • 760d2d5dca README.md: add README author name. Lan Hui 2021-06-08 20:47:35 +0800
  • 9e59a45762 Created Jenkinsfile and Dockerfile. Lan Hui 2021-06-08 20:44:58 +0800
  • f44a4ce90f 修改app\test\test_login.py添加若干代码，测试bug是否修复 张小飞 2021-06-04 14:58:29 +0800
  • 3aaaa90c6a 修改app\test\test_login.py添加若干代码，测试bug是否修复 张小飞 2021-06-04 12:22:53 +0800
  • ae6c44e942 修改app\test\test_login.py访问端口 张小飞 2021-06-04 12:01:19 +0800
  • c88a5dd48b
         上传效果演示视频 vicky-ZhuWenqi 2021-06-02 22:24:56 +0800
  • d7ca4844d3
         添加README.md文件 vicky-ZhuWenqi 2021-06-02 22:10:53 +0800
  • 03446abe22 修改测试文件中访问端口，删除jenkinsfile中不必要的阶段 张小飞 2021-06-01 11:35:23 +0800
  • f475915ab6 之停止即将运行的image失败，回溯一下 张小飞 2021-06-01 11:09:10 +0800
  • 951e05db47 修改Jenkinsfile,在构建时只停止即将运行的image 张小飞 2021-06-01 10:53:19 +0800
  • 8c8866548b 修改gitignore,不在推送数据库文件wordfreqapp.db 张小飞 2021-06-01 09:49:44 +0800
  • 03671c5054 修改gitignore,不在推送数据库文件wordfreqapp.db 张小飞 2021-06-01 09:45:47 +0800