卢康阳
							
						 | 
						
							
							
							
							
								
							
								220e108ee1
								
							
								
							
						 | 
						
							
							
								
								解决合并冲突
							
							
							
							
							
						 | 
						
							2024-07-06 16:33:43 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 潘彬杰
							
						 | 
						
							
							
							
							
								
							
								af59afc7e0
								
							
								
							
						 | 
						
							
							
								
								解决合并冲突
							
							
							
							
							
						 | 
						
							2024-07-05 17:54:11 +08:00 | 
						
					
				
					
						
							
							
								 
								蔡书煌
							
						 | 
						
							
							
							
							
								
							
								3049a4314a
								
							
								
							
						 | 
						
							
							
								
								只是修改名字
							
							
							
							
							
						 | 
						
							2024-07-05 13:35:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								d8263d17e0
								
							
								
							
						 | 
						
							
							
								
								Fix bug 570
							
							
							
							
							
						 | 
						
							2024-07-04 19:50:34 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 宋海燕
							
						 | 
						
							
							
							
							
								
							
								794dcf399c
								
							
								
							
						 | 
						
							
							
								
								fix Bug571
							
							
							
							
							
						 | 
						
							2024-07-04 19:22:20 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 陈宇航
							
						 | 
						
							
							
							
							
								
							
								9bbd3a978d
								
							
								
							
						 | 
						
							
							
								
								Fix bug 533
							
							
							
							
							
						 | 
						
							2024-07-04 15:37:37 +08:00 | 
						
					
				
					
						
							
							
								 
								夏栢芝
							
						 | 
						
							
							
							
							
								
							
								6b3efad1dc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug576-XiaBaizhi
							
							
							
							
							
						 | 
						
							2024-07-04 15:05:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 陈晨
							
						 | 
						
							
							
							
							
								
							
								faf5ec14a4
								
							
								
							
						 | 
						
							
							
								
								Fix bug 578
							
							
							
							
							
						 | 
						
							2024-07-04 15:04:34 +08:00 | 
						
					
				
					
						
							
							
								 
								“jxq”
							
						 | 
						
							
							
							
							
								
							
								70fc469f5e
								
							
								
							
						 | 
						
							
							
								
								Fix bug 577
							
							
							
							
							
						 | 
						
							2024-07-04 15:03:31 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 陈晨
							
						 | 
						
							
							
							
							
								
							
								9dab83219a
								
							
								
							
						 | 
						
							
							
								
								Fix bug 578
							
							
							
							
							
						 | 
						
							2024-07-04 15:02:57 +08:00 | 
						
					
				
					
						
							
							
								 
								“jxq”
							
						 | 
						
							
							
							
							
								
							
								7bf1a958b5
								
							
								
							
						 | 
						
							
							
								
								Fix bug 577
							
							
							
							
							
						 | 
						
							2024-07-04 15:01:22 +08:00 | 
						
					
				
					
						
							
							
								 
								“jxq”
							
						 | 
						
							
							
							
							
								
							
								55eac68160
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug577-JiangXueQin
							
							
							
							
							
						 | 
						
							2024-07-04 14:56:26 +08:00 | 
						
					
				
					
						
							
							
								 
								“jxq”
							
						 | 
						
							
							
							
							
								
							
								dc3fd67b02
								
							
								
							
						 | 
						
							
							
								
								解决合并冲突
							
							
							
							
							
						 | 
						
							2024-07-04 14:56:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Kikky666
							
						 | 
						
							
							
							
							
								
							
								02f3c4fdfa
								
							
								
							
						 | 
						
							
							
								
								Fix bug 576-XiaBaizhi
							
							
							
							
							
						 | 
						
							2024-07-04 11:35:59 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 陈灵婕
							
						 | 
						
							
							
							
							
								
							
								109a9447a7
								
							
								
							
						 | 
						
							
							
								
								Fix bug 574
							
							
							
							
							
						 | 
						
							2024-07-04 11:16:32 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 陈灵婕
							
						 | 
						
							
							
							
							
								
							
								84e0fc51f7
								
							
								
							
						 | 
						
							
							
								
								解决合并冲突
							
							
							
							
							
						 | 
						
							2024-07-04 11:13:47 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 钟埸
							
						 | 
						
							
							
							
							
								
							
								18472acd3d
								
							
								
							
						 | 
						
							
							
								
								Fix bug 572
							
							
							
							
							
						 | 
						
							2024-07-04 11:04:38 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 钟埸
							
						 | 
						
							
							
							
							
								
							
								75c96a60df
								
							
								
							
						 | 
						
							
							
								
								解决合并冲突
							
							
							
							
							
						 | 
						
							2024-07-04 11:00:17 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 张旭东
							
						 | 
						
							
							
							
							
								
							
								5657d8d5ee
								
							
								
							
						 | 
						
							
							
								
								Fix Bug533
							
							
							
							
							
						 | 
						
							2024-07-04 10:44:41 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 张旭东
							
						 | 
						
							
							
							
							
								
							
								1f718e201f
								
							
								
							
						 | 
						
							
							
								
								init
							
							
							
							
							
						 | 
						
							2024-07-04 10:18:47 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 宋海燕
							
						 | 
						
							
							
							
							
								
							
								7cf9c7cf56
								
							
								
							
						 | 
						
							
							
								
								fix Bug568
							
							
							
							
							
						 | 
						
							2024-07-04 09:54:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Yzccc
							
						 | 
						
							
							
							
							
								
							
								6633df7b70
								
							
								
							
						 | 
						
							
							
								
								Fix bug 567
							
							
							
							
							
						 | 
						
							2024-07-04 09:33:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Yzccc
							
						 | 
						
							
							
							
							
								
							
								ccf22af9df
								
							
								
							
						 | 
						
							
							
								
								Fix bug 567
							
							
							
							
							
						 | 
						
							2024-07-04 09:29:55 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 姜潮
							
						 | 
						
							
							
							
							
								
							
								3383e411ec
								
							
								
							
						 | 
						
							
							
								
								Fix bug 564 添加注释版
							
							
							
							
							
						 | 
						
							2024-07-03 15:19:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Fighoh
							
						 | 
						
							
							
							
							
								
							
								db66c8ed86
								
							
								
							
						 | 
						
							
							
								
								fix BUG543
							
							
							
							
							
						 | 
						
							2024-07-03 14:36:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								9215339b1e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug570_CaiShuHuang
							
							
							
							
							
						 | 
						
							2024-07-03 10:11:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Fighoh
							
						 | 
						
							
							
							
							
								
							
								cb576b40ed
								
							
								
							
						 | 
						
							
							
								
								init
							
							
							
							
							
						 | 
						
							2024-07-03 10:03:55 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 姜潮
							
						 | 
						
							
							
							
							
								
							
								f4488672ec
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug564-JiangChao
							
							
							
							
							
						 | 
						
							2024-07-03 09:46:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								eb2051ca3f
								
							
								
							
						 | 
						
							
							
								
								Fix bug 570
							
							
							
							
							
						 | 
						
							2024-07-03 09:45:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								00ae770195
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Alpha-snapshot20240618
							
							
							
							
							
						 | 
						
							2024-07-03 07:40:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								3db629b57d
								
							
								
							
						 | 
						
							
							
								
								Update version flag on the front page
							
							
							
							
							
						 | 
						
							2024-07-03 07:39:33 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 姜潮
							
						 | 
						
							
							
							
							
								
							
								54d09469f5
								
							
								
							
						 | 
						
							
							
								
								修复Bug564
							
							
							
							
							
						 | 
						
							2024-07-02 16:19:24 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 姜潮
							
						 | 
						
							
							
							
							
								
							
								4b06915dc4
								
							
								
							
						 | 
						
							
							
								
								解决合并冲突
							
							
							
							
							
						 | 
						
							2024-07-02 16:17:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								8664da12de
								
							
								
							
						 | 
						
							
							
								
								删了几条注释
							
							
							
							
							
						 | 
						
							2024-07-02 16:07:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								2d765b5c63
								
							
								
							
						 | 
						
							
							
								
								随机抽取10个生词,并显示
							
							
							
							
							
						 | 
						
							2024-07-02 16:03:03 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 梁自月
							
						 | 
						
							
							
							
							
								
							
								be7ae9e296
								
							
								
							
						 | 
						
							
							
								
								fix bug561
							
							
							
							
							
						 | 
						
							2024-06-27 17:06:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								2095550f33
								
							
								
							
						 | 
						
							
							
								
								Fix bug 547
							
							
							
							
							
						 | 
						
							2024-06-22 09:04:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Fuxinyan
							
						 | 
						
							
							
							
							
								
							
								1c08e80236
								
							
								
							
						 | 
						
							
							
								
								Fix Bug 536
							
							
							
							
							
						 | 
						
							2024-06-04 13:58:47 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 熊佳明
							
						 | 
						
							
							
							
							
								
							
								d2d383f21a
								
							
								
							
						 | 
						
							
							
								
								Fix bug 540
							
							
							
							
							
						 | 
						
							2024-06-03 14:03:27 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 熊佳明
							
						 | 
						
							
							
							
							
								
							
								d83809dcc7
								
							
								
							
						 | 
						
							
							
								
								Fix bug 540
							
							
							
							
							
						 | 
						
							2024-06-03 13:49:53 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 熊佳明
							
						 | 
						
							
							
							
							
								
							
								2785ded52b
								
							
								
							
						 | 
						
							
							
								
								解决冲突
							
							
							
							
							
						 | 
						
							2024-06-03 11:58:03 +08:00 | 
						
					
				
					
						
							
							
								
								 lixiaofeng
							
						 | 
						
							
							
							
							
								
							
								e3db7c30b0
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/static/js
							
							
							
							
							
						 | 
						
							2024-05-28 19:55:38 +08:00 | 
						
					
				
					
						
							
							
								
								 lixiaofeng
							
						 | 
						
							
							
							
							
								
							
								9f03cc49fa
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/static/js
							
							
							
							
							
						 | 
						
							2024-05-28 19:55:26 +08:00 | 
						
					
				
					
						
							
							
								
								 lixiaofeng
							
						 | 
						
							
							
							
							
								
							
								eed852cd66
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/templates
							
							
							
							
							
						 | 
						
							2024-05-28 19:55:07 +08:00 | 
						
					
				
					
						
							
							
								
								 lixiaofeng
							
						 | 
						
							
							
							
							
								
							
								c6f8a3448d
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/test
							
							
							
							
							
						 | 
						
							2024-05-28 19:54:46 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 黄慧玲
							
						 | 
						
							
							
							
							
								
							
								d8af2a7e54
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'Bug545-HuangHuiLing' (#122) from Bug545-HuangHuiLing into Alpha-snapshot20230621
							
							
							
							
							
							
							
							Reviewed-on: #122 
							
						 | 
						
							2024-05-28 13:36:01 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								a0c9b82ee7
								
							
								
							
						 | 
						
							
							
								
								参考了一下tangxinyuan小组的写法,将选取单词的方法由模拟鼠标选取单词改为根据id获取文章,随机从文章中挑选一个单词放入生词框中,这样是一定可以选取到文章中的单词。
							
							
							
							
							
							
							
							然后根据span标签定位到选择的生词,双击再次选择,从而在生词框中删除该单词 
							
						 | 
						
							2024-05-27 14:35:56 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								4a42c5c22c
								
							
								
							
						 | 
						
							
							
								
								我又将tangxinyuan小组的测试代码改回去了,我改完我的测试代码之后,只有使用未经我修改的tangxinyuan小组的测试代码才能通过。
							
							
							
							
							
						 | 
						
							2024-05-27 14:26:54 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								101c359596
								
							
								
							
						 | 
						
							
							
								
								我将tangxinyuan小组的测试文件改了一下,只是改了一下点击按钮的方法,将点击退出按钮,使用ActionChains去点击,因为我测试的时候,用driver去点击大部分会报出'退出'的按钮被浏览器拦截的错误,
							
							
							
							
							
						 | 
						
							2024-05-26 11:32:39 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								64a82bee22
								
							
								
							
						 | 
						
							
							
								
								测试文件也进行了修改,为了避免选择的单词出现空格的情况,增加了一个判断,若选中空格,则更换文章再次选择,这样总会选择到非空格的单词。
							
							
							
							
							
						 | 
						
							2024-05-26 11:27:15 +08:00 |