Lan Hui
							
						 | 
						
							
							
							
							
								
							
								fb1f927e83
								
							
								
							
						 | 
						
							
							
								
								word_operation.js: do not alert each time
							
							
							
							
							
						 | 
						
							2024-08-27 08:19:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								eff0d01fa0
								
							
								
							
						 | 
						
							
							
								
								word_operation.js: Resolve conflict
							
							
							
							
							
						 | 
						
							2024-08-27 08:15:18 +08:00 | 
						
					
				
					
						
							
							
								
								 mrlan
							
						 | 
						
							
							
							
							
								
							
								8f38e5fd87
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'Bug571-TongQi' (#166) from Bug571-TongQi into Alpha-snapshot20240618
							
							
							
							
							
							
							
							Reviewed-on: mrlan/EnglishPal#166 
							
						 | 
						
							2024-08-27 08:03:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								ebfe7416e6
								
							
								
							
						 | 
						
							
							
								
								userpaget_get.html: Resolve conflict
							
							
							
							
							
						 | 
						
							2024-08-27 07:43:57 +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 | 
						
					
				
					
						
							
							
								
									
								
								 陈晨
							
						 | 
						
							
							
							
							
								
							
								9dab83219a
								
							
								
							
						 | 
						
							
							
								
								Fix bug 578
							
							
							
							
							
						 | 
						
							2024-07-04 15:02:57 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 钟埸
							
						 | 
						
							
							
							
							
								
							
								18472acd3d
								
							
								
							
						 | 
						
							
							
								
								Fix bug 572
							
							
							
							
							
						 | 
						
							2024-07-04 11:04:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								eb2051ca3f
								
							
								
							
						 | 
						
							
							
								
								Fix bug 570
							
							
							
							
							
						 | 
						
							2024-07-03 09:45:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								8664da12de
								
							
								
							
						 | 
						
							
							
								
								删了几条注释
							
							
							
							
							
						 | 
						
							2024-07-02 16:07:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								2d765b5c63
								
							
								
							
						 | 
						
							
							
								
								随机抽取10个生词,并显示
							
							
							
							
							
						 | 
						
							2024-07-02 16:03: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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								fcd2c83904
								
							
								
							
						 | 
						
							
							
								
								change
							
							
							
							
							
						 | 
						
							2024-05-25 12:03:37 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								29a673cd92
								
							
								
							
						 | 
						
							
							
								
								change
							
							
							
							
							
						 | 
						
							2024-05-25 11:59:38 +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 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								c9c0ef60d8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha-snapshot20230621' into Bug551-DingZeYu
							
							
							
							
							
						 | 
						
							2024-05-06 11:34:44 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 丁晟晔
							
						 | 
						
							
							
							
							
								
							
								393264a6fe
								
							
								
							
						 | 
						
							
							
								
								更新 app/static/js/highlight.js
							
							
							
							
							
						 | 
						
							2024-04-19 10:51:18 +08:00 | 
						
					
				
					
						
							
							
								
								 AliasJeff
							
						 | 
						
							
							
							
							
								
							
								83491ce28c
								
							
								
							
						 | 
						
							
							
								
								refactor: Add comments & optimize code
							
							
							
							
							
						 | 
						
							2024-04-09 21:21:19 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 唐欣媛
							
						 | 
						
							
							
							
							
								
							
								2966a8162f
								
							
								
							
						 | 
						
							
							
								
								Fix bug 544
							
							
							
							
							
						 | 
						
							2024-03-27 12:39:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								9a156ebf7e
								
							
								
							
						 | 
						
							
							
								
								Fix Bug 539
							
							
							
							
							
						 | 
						
							2023-07-08 18:23:45 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 黄子睿
							
						 | 
						
							
							
							
							
								
							
								9816596cf8
								
							
								
							
						 | 
						
							
							
								
								删除 'app/static/js/tanyanmei-fillword.js'
							
							
							
							
							
						 | 
						
							2023-06-02 21:34:27 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 黄子睿
							
						 | 
						
							
							
							
							
								
							
								682247bff1
								
							
								
							
						 | 
						
							
							
								
								refactor partial function and code writing specifications
							
							
							
							
							
						 | 
						
							2023-06-02 21:33:21 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 倪玲丽
							
						 | 
						
							
							
							
							
								
							
								d402bb45cb
								
							
								
							
						 | 
						
							
							
								
								刷新屏幕,点击上下篇,加入生词库,停止阅读(更改)
							
							
							
							
							
						 | 
						
							2023-05-31 18:37:05 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 倪玲丽
							
						 | 
						
							
							
							
							
								
							
								cdf6180901
								
							
								
							
						 | 
						
							
							
								
								刷新屏幕,点击上下篇,加入生词库,停止阅读
							
							
							
							
							
						 | 
						
							2023-05-30 18:48:37 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 倪玲丽
							
						 | 
						
							
							
							
							
								
							
								38837c9c2f
								
							
								
							
						 | 
						
							
							
								
								合并最新的Alpha-snapshot20230529
							
							
							
							
							
						 | 
						
							2023-05-30 18:45:23 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 黄子睿
							
						 | 
						
							
							
							
							
								
							
								a0ddf4bdad
								
							
								
							
						 | 
						
							
							
								
								上传文件至 'app/static/js'
							
							
							
							
							
							
							
							修复了 Bug492 选中问号出现多个问号的问题。
解决了选中紧跟标点符号的单词,单词能正常显示。
优化了选中较长的文章时页面容易出现卡顿的问题。 
							
						 | 
						
							2023-05-27 17:33:37 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 寻宇灿
							
						 | 
						
							
							
							
							
								
							
								1543b3095d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/Alpha-snapshot20230519' into Refactor-XunYucan
							
							
							
							
							
						 | 
						
							2023-05-25 22:30:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 寻宇灿
							
						 | 
						
							
							
							
							
								
							
								c6bf323c60
								
							
								
							
						 | 
						
							
							
								
								修改格式
							
							
							
							
							
						 | 
						
							2023-05-25 21:23:25 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 寻宇灿
							
						 | 
						
							
							
							
							
								
							
								03ccb3527a
								
							
								
							
						 | 
						
							
							
								
								重构前端阅读js,新增阅读器全局对象,新增生词朗读按钮
							
							
							
							
							
						 | 
						
							2023-05-25 17:35:31 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 倪玲丽
							
						 | 
						
							
							
							
							
								
							
								ce28b91bd5
								
							
								
							
						 | 
						
							
							
								
								屏幕刷新,停止阅读
							
							
							
							
							
						 | 
						
							2023-05-06 18:18:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhuZhihao
							
						 | 
						
							
							
							
							
								
							
								18ca48b422
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug522-HuangZirui
							
							
							
							
							
						 | 
						
							2023-05-05 17:21:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhuZhihao
							
						 | 
						
							
							
							
							
								
							
								a80b062b87
								
							
								
							
						 | 
						
							
							
								
								refactor: remove variable 'count'
							
							
							
							
							
						 | 
						
							2023-05-05 17:20:58 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								320a99d479
								
							
								
							
						 | 
						
							
							
								
								Move Tan Yanmei's fillword.js to app/static/js/tanyanmei-fillword.js. Delete the strange folder static js.
							
							
							
							
							
						 | 
						
							2023-04-24 11:38:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zzhaofisher
							
						 | 
						
							
							
							
							
								
							
								11ae093fd7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha' into Bug522-HuangZirui
							
							
							
							
							
						 | 
						
							2023-04-18 21:52:01 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								a1955341c6
								
							
								
							
						 | 
						
							
							
								
								Fix bug 501 - 特殊字符&加入生词库后删除按钮失效
							
							
							
							
							
						 | 
						
							2023-01-31 16:39:11 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王志豪
							
						 | 
						
							
							
							
							
								
							
								e10dbf9d67
								
							
								
							
						 | 
						
							
							
								
								Bug507-WuWenZhuo (#70)
							
							
							
							
							
							
							
							### 修复了生词簿为空时,双击文章单词无法高亮的问题
通过增加一个判断,判断生词簿为空时,不把生词簿的内容进行处理,仅处理选中单词。
### 修复了生词簿为空时,取消高亮后,导致文章格式混乱的问题
原代码中,从数据库提取文章放到网页上时,使用的是.innerText的方法,导致原文章里包含的<br>标签丢失,导致文章格式混乱的问题。
Co-authored-by: unknown <Alcatraz@qq.com>
Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/70
Co-authored-by: 王志豪 <1594799762@qq.com>
Co-committed-by: 王志豪 <1594799762@qq.com> 
							
						 | 
						
							2023-01-29 12:48:52 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 李雨峰
							
						 | 
						
							
							
							
							
								
							
								9cdc9c6f7f
								
							
								
							
						 | 
						
							
							
								
								Bug521-LiYuFeng-Refactor (#72)
							
							
							
							
							
							
							
							@mrlan
蓝老师:
    本次改进内容如下:
        1. 对生词居中问题进行修改,现在已经不会居中了。
        2. 对于单词数量基数大而导致的排序速度慢的问题,我们进行了优化,提升了排序的速度。
        3. 对用户交互进行了优化,当用户点击“熟悉”或“不熟悉”之后,会自动进行排序,并会跳转到那个单词的位置,用抖动的效果来提示用户。
Co-authored-by: isaac <1141730046@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/72
Co-authored-by: 李雨峰 <1141730046@qq.com>
Co-committed-by: 李雨峰 <1141730046@qq.com>
							
						 | 
						
							2023-01-29 12:01:19 +08:00 | 
						
					
				
					
						
							
							
								 
								mrlan
							
						 | 
						
							
							
							
							
								
							
								ca8c1bf8de
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'Bug508-CenHaotian' (#62) from Bug508-CenHaotian into master
							
							
							
							
							
							
							
							Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/62 
							
						 | 
						
							2023-01-29 11:19:49 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								3bce450620
								
							
								
							
						 | 
						
							
							
								
								黄子睿: 修复 'Otherwise,' 这种情况无法高亮的问题,即 Otherwise 后面跟了个逗号
							
							
							
							
							
						 | 
						
							2022-12-15 10:50:04 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								417dbc22f8
								
							
								
							
						 | 
						
							
							
								
								highlight.js: fix Bug 522.
							
							
							
							
							
						 | 
						
							2022-12-09 13:19:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 岑昊天
							
						 | 
						
							
							
							
							
								
							
								d58dacd71c
								
							
								
							
						 | 
						
							
							
								
								修复Bug508,解决带有特殊字符|的单词在文章中的高亮问题
							
							
							
							
							
						 | 
						
							2022-12-06 14:40:50 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 任榆
							
						 | 
						
							
							
							
							
								
							
								5c85041135
								
							
								
							
						 | 
						
							
							
								
								Bug 512 - 文章朗读问题
							
							
							
							
							
							
							
							在fillwowrd.js中添加了stopRead()函数,将其添加给对应按钮或超链接以终止朗读。 
							
						 | 
						
							2022-11-25 15:42:37 +08:00 |