ELYSIA\meibi
							
						 | 
						
							
							
							
							
								
							
								ff6e20cabf
								
							
								
							
						 | 
						
							
							
								
								Fix bug 536
							
							
							
							
							
						 | 
						
							2024-06-04 13:09:35 +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 | 
						
					
				
					
						
							
							
								 
								zzhaofisher
							
						 | 
						
							
							
							
							
								
							
								11ae093fd7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Alpha' into Bug522-HuangZirui
							
							
							
							
							
						 | 
						
							2023-04-18 21:52:01 +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 | 
						
					
				
					
						
							
							
								
								 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 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								ecc354bc0d
								
							
								
							
						 | 
						
							
							
								
								Refactor: use better function
							
							
							
							
							
						 | 
						
							2022-08-02 12:33:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								1d8671c5c7
								
							
								
							
						 | 
						
							
							
								
								Refactor: use better function name
							
							
							
							
							
						 | 
						
							2022-08-02 12:30:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								8cb34e56ba
								
							
								
							
						 | 
						
							
							
								
								Refactor: remove duplicate code block
							
							
							
							
							
						 | 
						
							2022-08-02 12:26:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								b5dacb9ad2
								
							
								
							
						 | 
						
							
							
								
								Improve comments
							
							
							
							
							
						 | 
						
							2022-08-02 11:52:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								47e745e774
								
							
								
							
						 | 
						
							
							
								
								Use better variable name (use articleContent instead of txt, and use camelCase)
							
							
							
							
							
						 | 
						
							2022-08-02 11:45:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								1dfe370983
								
							
								
							
						 | 
						
							
							
								
								Use better variable names
							
							
							
							
							
						 | 
						
							2022-08-02 11:39:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								c15746bbb2
								
							
								
							
						 | 
						
							
							
								
								Resolve conflicts
							
							
							
							
							
						 | 
						
							2022-08-02 11:00:33 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 陈靖毅
							
						 | 
						
							
							
							
							
								
							
								c21659ba7e
								
							
								
							
						 | 
						
							
							
								
								Bug477 重构 and 增加功能 (#48)
							
							
							
							
							
							
							
							Co-authored-by: cjybyjk <cjybyjk@zjnu.edu.cn>
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/48
Co-authored-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>
Co-committed-by: 陈靖毅 <cjybyjk@zjnu.edu.cn> 
							
						 | 
						
							2022-07-18 16:00:08 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 蒋乐天
							
						 | 
						
							
							
							
							
								
							
								041cbd97fc
								
							
								
							
						 | 
						
							
							
								
								更新 'app/static/js/highlight.js'
							
							
							
							
							
						 | 
						
							2022-06-13 21:32:49 +08:00 | 
						
					
				
					
						
							
							
								 
								lin
							
						 | 
						
							
							
							
							
								
							
								b53e7031e5
								
							
								
							
						 | 
						
							
							
								
								Bug412-JiangLetian
							
							
							
							
							
						 | 
						
							2022-06-13 11:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								4d2dd2b68e
								
							
								
							
						 | 
						
							
							
								
								Repalce old app folder with SoftArch王炫/english-pal-master/app/
							
							
							
							
							
						 | 
						
							2022-01-26 21:10:09 +08:00 |