陈灵婕
							
						 | 
						
							
							
							
							
								
							
								87d034306b
								
							
								
							
						 | 
						
							
							
								
								Fix bug 574
							
							
							
							
							
						 | 
						
							2024-07-04 10:09:27 +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 | 
						
					
				
					
						
							
							
								
									
								
								 梁自月
							
						 | 
						
							
							
							
							
								
							
								be7ae9e296
								
							
								
							
						 | 
						
							
							
								
								fix bug561
							
							
							
							
							
						 | 
						
							2024-06-27 17:06:54 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								9537024339
								
							
								
							
						 | 
						
							
							
								
								再次选择高亮单词,由于标记高亮单词的标签由<mark>改为了<span>,所以在取消单词高亮状态时将标签均改为了<span>,替换时的代码也冗余了,所以也进行了一部分删除。
							
							
							
							
							
						 | 
						
							2024-05-26 11:22:20 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								85a3a9ce6a
								
							
								
							
						 | 
						
							
							
								
								这里的代码写多余了,删除了一部分
							
							
							
							
							
						 | 
						
							2024-05-26 11:19:28 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								f3b9fd8790
								
							
								
							
						 | 
						
							
							
								
								change
							
							
							
							
							
						 | 
						
							2024-05-25 15:24:49 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								624426b6cf
								
							
								
							
						 | 
						
							
							
								
								change
							
							
							
							
							
						 | 
						
							2024-05-25 15:20:31 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								d1589f6062
								
							
								
							
						 | 
						
							
							
								
								time.sleep(1)
							
							
							
							
							
						 | 
						
							2024-05-25 15:14:31 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								fcd2c83904
								
							
								
							
						 | 
						
							
							
								
								change
							
							
							
							
							
						 | 
						
							2024-05-25 12:03:37 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								29a673cd92
								
							
								
							
						 | 
						
							
							
								
								change
							
							
							
							
							
						 | 
						
							2024-05-25 11:59:38 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								1bec0bd107
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/Bug545-HuangHuiLing' into Bug545-HuangHuiLing
							
							
							
							
							
						 | 
						
							2024-05-21 20:35:38 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								630cb6befa
								
							
								
							
						 | 
						
							
							
								
								delete
							
							
							
							
							
						 | 
						
							2024-05-21 20:34:28 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 黄慧玲
							
						 | 
						
							
							
							
							
								
							
								5dbdf60a2c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20230621' into Bug545-HuangHuiLing
							
							
							
							
							
						 | 
						
							2024-05-21 20:02:08 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								101506a511
								
							
								
							
						 | 
						
							
							
								
								test and fix
							
							
							
							
							
						 | 
						
							2024-05-21 20:00:32 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								9b3551bbc8
								
							
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2024-05-20 15:30:38 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								90ac789bb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/Bug545-HuangHuiLing' into Bug545-HuangHuiLing
							
							
							
							
							
							
							
							# Conflicts:
#	app/static/js/fillword.js
#	app/static/js/highlight.js 
							
						 | 
						
							2024-05-20 15:26:30 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								8575a0dc33
								
							
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2024-05-20 15:25:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								a4db1edffb
								
							
								
							
						 | 
						
							
							
								
								Close the web browswer after finishing each test case
							
							
							
							
							
						 | 
						
							2024-05-20 13:28:23 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								49ead93bcb
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-20 08:24:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								9afd38a09a
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-20 08:21:02 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								d97743649a
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-19 22:51:32 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								9f6a007426
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-19 21:21:25 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								7fe3feae9a
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-18 09:23:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								b2a53a0e40
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-18 09:18:22 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								0301c39cf0
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-18 09:14:05 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								5857395251
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-18 09:08:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								77ed63441b
								
							
								
							
						 | 
						
							
							
								
								更新 app/static/css/bootstrap.css
							
							
							
							
							
						 | 
						
							2024-05-14 23:26:53 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								b19eabd225
								
							
								
							
						 | 
						
							
							
								
								更新 app/static/config.yml
							
							
							
							
							
						 | 
						
							2024-05-14 23:26:11 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								b9d0ad4a15
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/static/css
							
							
							
							
							
						 | 
						
							2024-05-14 23:24:26 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								aca827a912
								
							
								
							
						 | 
						
							
							
								
								更新 app/static/css/bootstrap.css
							
							
							
							
							
						 | 
						
							2024-05-14 23:24:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								23f0dfd8ca
								
							
								
							
						 | 
						
							
							
								
								更新 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
							
							
							我这边好像没有helper文件所以我直接判断有没有这个账号,如果没有就注册一个来进行测试。这样子可以吗 
							
						 | 
						
							2024-05-12 13:39:14 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								6ee94d1610
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/test
							
							
							
							
							
						 | 
						
							2024-05-06 11:48:19 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								416f40222e
								
							
								
							
						 | 
						
							
							
								
								删除 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-06 11:46:39 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								66f5c28ead
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/test
							
							
							
							
							
						 | 
						
							2024-05-06 11:46:15 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								ff6286cf01
								
							
								
							
						 | 
						
							
							
								
								删除 app/test/test_bug551_DingZeYu.py
							
							
							
							
							
						 | 
						
							2024-05-06 11:42:32 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								1d7e61d751
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/test
							
							
							
							
							
						 | 
						
							2024-05-06 11:36:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								c9c0ef60d8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20230621' into Bug551-DingZeYu
							
							
							
							
							
						 | 
						
							2024-05-06 11:34:44 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 唐娇
							
						 | 
						
							
							
							
							
								
							
								1d23062c47
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao
							
							
							
							
							
						 | 
						
							2024-04-29 13:41:09 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 林杉
							
						 | 
						
							
							
							
							
								
							
								b626df7c4b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan
							
							
							
							
							
						 | 
						
							2024-04-24 18:15:04 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 唐娇
							
						 | 
						
							
							
							
							
								
							
								184656230f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao
							
							
							
							
							
						 | 
						
							2024-04-23 17:35:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 林杉
							
						 | 
						
							
							
							
							
								
							
								bd5f8f63f5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Bug553_LinShan' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan
							
							
							
							
							
						 | 
						
							2024-04-22 12:47:50 +08:00 |