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 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								5c7096a96b
								
							
								
							
						 | 
						
							
							
								
								test_add_word.py: do not print many things out.
							
							
							
							
							
						 | 
						
							2021-07-14 18:47:55 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								1786651aa5
								
							
								
							
						 | 
						
							
							
								
								test_add_word.py: use a longer word
							
							
							
							
							
						 | 
						
							2021-07-14 18:06:12 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								0e77dc449d
								
							
								
							
						 | 
						
							
							
								
								Jenkinsfile: use selenium/standalone-firefox
							
							
							
							
							
						 | 
						
							2021-07-14 17:58:37 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								5ce9b6167c
								
							
								
							
						 | 
						
							
							
								
								test_*.py: use FIREFOX instead of CHROME
							
							
							
							
							
						 | 
						
							2021-07-14 17:50:38 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								e9358a627f
								
							
								
							
						 | 
						
							
							
								
								Learn english smartly.
							
							
							
							
							
						 | 
						
							2021-07-13 12:56:05 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								7f69d9a14d
								
							
								
							
						 | 
						
							
							
								
								test scripts: change port from 5000 to 91.
							
							
							
							
							
						 | 
						
							2021-07-13 12:46:31 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								2e543b6790
								
							
								
							
						 | 
						
							
							
								
								Jenkinsfile: install pytest-html package for generating html test report.
							
							
							
							
							
						 | 
						
							2021-07-13 12:32:57 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								de7a140cbd
								
							
								
							
						 | 
						
							
							
								
								Jenkinsfile: stop all containers.
							
							
							
							
							
						 | 
						
							2021-07-13 12:24:29 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								7163b6032f
								
							
								
							
						 | 
						
							
							
								
								Jenkinsfile: stop container with image name englishpal.
							
							
							
							
							
						 | 
						
							2021-07-13 12:15:00 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								9144623621
								
							
								
							
						 | 
						
							
							
								
								Delete Readme.md
							
							
							
							
							
						 | 
						
							2021-07-13 11:48:57 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								e83de4bffc
								
							
								
							
						 | 
						
							
							
								
								README.md: add stuff fropm Readme.md
							
							
							
							
							
						 | 
						
							2021-07-13 11:48:40 +08:00 | 
						
					
				
					
						
							
							
								
								 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 |