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: #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 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								92a1af4222
								
							
								
							
						 | 
						
							
							
								
								userpaget_get.html: Resolve conflict
							
							
							
							
							
						 | 
						
							2024-08-27 07:39:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								bd4fb6846b
								
							
								
							
						 | 
						
							
							
								
								userpaget_get.html: Do not disable the 'Next Article' button
							
							
							
							
							
						 | 
						
							2024-08-27 07:20:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								2e203699c0
								
							
								
							
						 | 
						
							
							
								
								userpaget_get.html: Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2024-08-27 07:15:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								66899376c3
								
							
								
							
						 | 
						
							
							
								
								userpaget_get.html: Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2024-08-26 10:27:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								1d80fa8886
								
							
								
							
						 | 
						
							
							
								
								userpaget_get.html: Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2024-08-26 10:03:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								9eac40493b
								
							
								
							
						 | 
						
							
							
								
								userpaget_get.html and mainpage_gethtml: improve display information.
							
							
							
							
							
						 | 
						
							2024-08-26 09:49:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								fe6a28a81d
								
							
								
							
						 | 
						
							
							
								
								userpaget_get.html: Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2024-08-26 09:41:53 +08:00 | 
						
					
				
					
						
							
							
								
								 mrlan
							
						 | 
						
							
							
							
							
								
							
								bf8bb1a6bc
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'Bug568-SongHaiyan' (#158) from Bug568-SongHaiyan into Alpha-snapshot20240618
							
							
							
							
							
							
							
							Reviewed-on: #158 
							
						 | 
						
							2024-08-26 09:28:18 +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 | 
						
					
				
					
						
							
							
								 
								“jxq”
							
						 | 
						
							
							
							
							
								
							
								dc3fd67b02
								
							
								
							
						 | 
						
							
							
								
								解决合并冲突
							
							
							
							
							
						 | 
						
							2024-07-04 14:56:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Kikky666
							
						 | 
						
							
							
							
							
								
							
								02f3c4fdfa
								
							
								
							
						 | 
						
							
							
								
								Fix bug 576-XiaBaizhi
							
							
							
							
							
						 | 
						
							2024-07-04 11:35:59 +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 | 
						
					
				
					
						
							
							
								
									
								
								 姜潮
							
						 | 
						
							
							
							
							
								
							
								4b06915dc4
								
							
								
							
						 | 
						
							
							
								
								解决合并冲突
							
							
							
							
							
						 | 
						
							2024-07-02 16:17:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Caroline
							
						 | 
						
							
							
							
							
								
							
								2d765b5c63
								
							
								
							
						 | 
						
							
							
								
								随机抽取10个生词,并显示
							
							
							
							
							
						 | 
						
							2024-07-02 16:03:03 +08:00 | 
						
					
				
					
						
							
							
								
								 lixiaofeng
							
						 | 
						
							
							
							
							
								
							
								eed852cd66
								
							
								
							
						 | 
						
							
							
								
								上传文件至 app/templates
							
							
							
							
							
						 | 
						
							2024-05-28 19:55:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 李思楠
							
						 | 
						
							
							
							
							
								
							
								8cbc7c9a0c
								
							
								
							
						 | 
						
							
							
								
								修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面
							
							
							
							
							
						 | 
						
							2024-05-24 22:00:08 +08:00 | 
						
					
				
					
						
							
							
								 
								1994836463@qq.com
							
						 | 
						
							
							
							
							
								
							
								101506a511
								
							
								
							
						 | 
						
							
							
								
								test and fix
							
							
							
							
							
						 | 
						
							2024-05-21 20:00:32 +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
							
						 | 
						
							
							
							
							
								
							
								d9e28e3a2b
								
							
								
							
						 | 
						
							
							
								
								Tweak button size so it looks better on tablets.
							
							
							
							
							
						 | 
						
							2023-08-13 21:08:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								30b54f8023
								
							
								
							
						 | 
						
							
							
								
								Tweak button style
							
							
							
							
							
						 | 
						
							2023-08-12 17:59:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								1e3ac7a379
								
							
								
							
						 | 
						
							
							
								
								Use larger buttons
							
							
							
							
							
						 | 
						
							2023-08-12 17:42:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								8dd6a2a343
								
							
								
							
						 | 
						
							
							
								
								Use an arrow for Next Article or Previsou Article
							
							
							
							
							
						 | 
						
							2023-08-12 17:36:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								e9ac50422b
								
							
								
							
						 | 
						
							
							
								
								Make the flash message dismissible.
							
							
							
							
							
						 | 
						
							2023-08-11 19:28:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								f4df263d6e
								
							
								
							
						 | 
						
							
							
								
								Flash message is informative. Why not add it?
							
							
							
							
							
						 | 
						
							2023-08-11 19:14:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								10c291bed2
								
							
								
							
						 | 
						
							
							
								
								Highlight user difficulty level too.
							
							
							
							
							
						 | 
						
							2023-08-10 19:12:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								6d15b65e3c
								
							
								
							
						 | 
						
							
							
								
								Make highlighting text difficulty level work.
							
							
							
							
							
						 | 
						
							2023-08-10 19:09:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								14ab63c85c
								
							
								
							
						 | 
						
							
							
								
								文章段落正确分段(在 lead class 中添加 white-space: pre-wrap;)
							
							
							
							
							
						 | 
						
							2023-08-10 10:03:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								43419ab4b6
								
							
								
							
						 | 
						
							
							
								
								Enlarge text difficult level for one second (make it work using vanilla JavaScript)
							
							
							
							
							
						 | 
						
							2023-07-17 16:28:08 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								78d9a66e88
								
							
								
							
						 | 
						
							
							
								
								After loading the next article, show its difficulty level in a larger size for one second.
							
							
							
							
							
						 | 
						
							2023-07-17 16:13:56 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 张艺腾
							
						 | 
						
							
							
							
							
								
							
								582f399f73
								
							
								
							
						 | 
						
							
							
								
								Bug537 and Bug538
							
							
							
							
							
						 | 
						
							2023-06-21 16:48:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Laugh
							
						 | 
						
							
							
							
							
								
							
								bb2d0363e4
								
							
								
							
						 | 
						
							
							
								
								Feat: update fontsize and margin of some elements
							
							
							
							
							
						 | 
						
							2023-06-15 15:54:46 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 寻宇灿
							
						 | 
						
							
							
							
							
								
							
								1543b3095d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/Alpha-snapshot20230519' into Refactor-XunYucan
							
							
							
							
							
						 | 
						
							2023-05-25 22:30:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 寻宇灿
							
						 | 
						
							
							
							
							
								
							
								03ccb3527a
								
							
								
							
						 | 
						
							
							
								
								重构前端阅读js,新增阅读器全局对象,新增生词朗读按钮
							
							
							
							
							
						 | 
						
							2023-05-25 17:35:31 +08:00 | 
						
					
				
					
						
							
							
								 
								huangdan
							
						 | 
						
							
							
							
							
								
							
								d9f6df7fbe
								
							
								
							
						 | 
						
							
							
								
								AJAX载入文章数据
							
							
							
							
							
						 | 
						
							2023-05-11 15:51:10 +08:00 | 
						
					
				
					
						
							
							
								 
								huangdan
							
						 | 
						
							
							
							
							
								
							
								5039f5710e
								
							
								
							
						 | 
						
							
							
								
								AJAX载入文章数据
							
							
							
							
							
						 | 
						
							2023-05-08 14:33:48 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								779dafefe8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Bug509-XieQiuHan-WangZiming' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427
							
							
							
							
							
						 | 
						
							2023-04-27 07:21:15 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								d30a434b2a
								
							
								
							
						 | 
						
							
							
								
								修改变量名had_read_articles->visited_articles
							
							
							
							
							
						 | 
						
							2023-04-25 17:47:51 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								ef786795e2
								
							
								
							
						 | 
						
							
							
								
								Resolve merge conflict
							
							
							
							
							
						 | 
						
							2023-04-25 08:47:22 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								fc3e27488b
								
							
								
							
						 | 
						
							
							
								
								给标签添加id,方便测试
							
							
							
							
							
						 | 
						
							2023-04-21 05:33:26 +08:00 |