Karim
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests 1 Activity
109 Commits
146 Branches
4 Tags
11 MiB
Commit Graph

109 Commits (adfc2796dac1b6b1b5d9d7d26a91e3a00174b341)

Author SHA1 Message Date
Hui Lan 905e85f201 Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of https://github.com/lanlab-org/EnglishPal 2021-07-13 11:46:37 +08:00
Hui Lan 1013373c32 Jenkinsfile: remove docker stop as there is nothing stop. 2021-07-13 11:32:13 +08:00
Hui Lan d431c0cb4b update .gitignore to ignore the folder .idea 2021-07-13 11:19:35 +08:00
Hui Lan 0afac2a30e Merge changes made in the branch SPM-Spring2021-2599-张小飞201831990641 2021-07-13 11:06:12 +08:00
Hui Lan 3bddc1ed27 Jenkinsfile: sudo 2021-06-26 00:28:37 +08:00
mmmmmkj ad52e5a90b
change the password 2021-06-23 00:36:34 +08:00
mmmmmkj 515128caab
upload the test code of the function called delete 2021-06-23 00:33:19 +08:00
张小飞 b53b5ed4c3 修改main.py,使得主页显示English Pal -(SPM-Spring2021-2599-张小飞201831990641) 2021-06-22 12:35:01 +08:00
张小飞 10fd9afa6f 修改访问端口，避免和其他组冲突，同时修改main.py,主页显示 English Pal(SPM-Spring2021-2599-张小飞201831990641) 2021-06-22 12:24:34 +08:00
张小飞 5c4810aec1 上传自己的演示视频 2021-06-20 14:36:32 +08:00
Zjh-jc 2ee854285c Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:51:53 +08:00
Zjh-jc f7629f4d1c Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:41:33 +08:00
Zjh-jc 006a144ec0 Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:21:13 +08:00
ArrayYang c3219aef1f
Create Dockerfile 
Create Dockerfile
 2021-06-16 16:31:05 +08:00
ArrayYang 1ba4dcd45e
Create Jenkinsfile 
Create Jenkinsfile
 2021-06-16 16:30:04 +08:00
Zjh-jc b17ef9c331 Solve the problem of page position jump after clicking the familiar or unfamiliar button 2021-06-16 02:17:30 +08:00
Zjh-jc dcfed23d6f Merge branch 'master' of https://github.com/lanlab-org/EnglishPal into SPM-Spring2021-2597-占健豪201831990539 
 Conflicts:
	app/main.py
 2021-06-15 23:30:41 +08:00
张小飞 46dc9328cf 在test_add测试文件里添加输出语句，寻找测试不通过的原因 2021-06-13 11:10:56 +08:00
张小飞 d6e64e3465 删除test_login.py中添加的代码，添加test_login_security_fix.py用来检验bug是否修复 2021-06-11 15:16:28 +08:00
stellafull c6b895e8eb Fix the problem when user click Familiar or Unfamiliar button will refresh page 2021-06-11 08:56:21 +08:00
张小飞 d21dfc8da3 Merge branch 'master' of https://github.com/lanlab-org/EnglishPal into SPM-Spring2021-2599-张小飞201831990641 2021-06-09 22:58:30 +08:00
张小飞 fdb3259e3c 修改测试代码里的端口和master统一为91 2021-06-09 21:44:47 +08:00
张小飞 a9b2bc6fee 和新的master分支合并 2021-06-09 21:39:13 +08:00
张小飞 be0c9f1c8b 修改test_next_eassy.py，修复语法错误 2021-06-09 20:57:09 +08:00
张小飞 ebfd780497 添加wordfreqapp.sql文件，用于生成数据库 2021-06-09 20:39:48 +08:00
张小飞 72b5162a42 修改jenkinsfile,恢复makedatafile阶段 2021-06-09 20:28:41 +08:00
Software Project Management d02da7ba9c
Merge pull request #7 from lanlab-org/Lanhui-update-test_next_essay 
app/test/test_next_essay.py: click Next button 5 times.
 2021-06-09 13:18:58 +08:00
Lan Hui 90ab0be3d6 app/test/test_next_essay.py: click Next 5 times. 2021-06-09 09:17:19 +08:00
Lan Hui 3ef96ae447 Jenkinsfile: correct command line argument 2. 2021-06-09 08:43:50 +08:00
Lan Hui 24ffed751f Jenkinsfile: correct command line argument. 2021-06-09 08:33:22 +08:00
Lan Hui a6328befc7 Merge branch 'master' of https://github.com/lanlab-org/EnglishPal 2021-06-09 08:27:14 +08:00
Lan Hui 3056cb8b9c Jenkinsfile: automatic deployment has not been implemented yet. 2021-06-09 08:15:18 +08:00
Lan Hui 3cc5105c47 Jenkinsfile: generate an HTML test report. 2021-06-09 08:14:21 +08:00
Lan Hui 783a0b22e1 app/test/test_next_essay.py: correct the variable name 'differ'. 2021-06-09 08:05:30 +08:00
Software Project Management 3f0006fa4c
Merge pull request #5 from lanlab-org/SPM-Spring2021-2600-朱文琦201836900114 
Spm spring2021 2600 朱文琦201836900114


Thanks 朱文琦.  For more information about this Pull Request.
See the following Kanban: http://118.25.96.118/kanboard/?controller=BoardViewController&action=readonly&token=746d456a7fc60ccd5ab4dd015dcf3b9dbdddd3207fc26185c956d658bc2f

-Hui
 2021-06-08 22:42:55 +08:00
Lan Hui f4a6921297 app/test/test_add_word_and_essay_does_not_change.py: remove unnecessary test. 2021-06-08 21:48:38 +08:00
Lan Hui 68e8102e12 Add app/static/wordfreqapp.sql for reconstructing the database. 2021-06-08 21:29:39 +08:00
Lan Hui 760d2d5dca README.md: add README author name. 2021-06-08 20:47:35 +08:00
Lan Hui 9e59a45762 Created Jenkinsfile and Dockerfile. 2021-06-08 20:44:58 +08:00
张小飞 f44a4ce90f 修改app\test\test_login.py添加若干代码，测试bug是否修复 2021-06-04 14:58:29 +08:00
张小飞 3aaaa90c6a 修改app\test\test_login.py添加若干代码，测试bug是否修复 2021-06-04 12:22:53 +08:00
张小飞 ae6c44e942 修改app\test\test_login.py访问端口 2021-06-04 12:01:19 +08:00
vicky-ZhuWenqi c88a5dd48b
上传效果演示视频 
视频内演示了“熟悉”与“不熟悉”按钮操作的具体效果
 2021-06-02 22:24:56 +08:00
vicky-ZhuWenqi d7ca4844d3
添加README.md文件 
创建文件，介绍修改内容
 2021-06-02 22:10:53 +08:00
张小飞 03446abe22 修改测试文件中访问端口，删除jenkinsfile中不必要的阶段 2021-06-01 11:35:23 +08:00
张小飞 f475915ab6 之停止即将运行的image失败，回溯一下 2021-06-01 11:09:10 +08:00
张小飞 951e05db47 修改Jenkinsfile,在构建时只停止即将运行的image 2021-06-01 10:53:19 +08:00
张小飞 8c8866548b 修改gitignore,不在推送数据库文件wordfreqapp.db 2021-06-01 09:49:44 +08:00
张小飞 03671c5054 修改gitignore,不在推送数据库文件wordfreqapp.db 2021-06-01 09:45:47 +08:00
vicky-ZhuWenqi 643e0c4eee
Update pickle_idea.py 
在生词簿每个单词后面，加上两个按钮，熟悉与不熟悉。如果点熟悉，就将生词簿中该单词后面记录的添加次数减一，直至减为0，就将该单词从生词簿中移除；如果点不熟悉，就将生词簿中该单词后面记录的添加次数加一。
 2021-05-31 08:48:03 +08:00