|  Lan Hui | 3abebdfb21 | Fix bug 394 | 2024-09-06 08:54:11 +08:00 | 
				
					
						|  Lan Hui | 1166d3499f | Fix bug 478 | 2024-09-05 10:11:20 +08:00 | 
				
					
						|  Lan Hui | aaf2db8657 | Fix Bug 501. The key fix is the first line in funciton wordTemplate() from word_operation.js, i.e., using double quotes instead of single quotes. | 2024-09-04 15:15:03 +08:00 | 
				
					
						|  Lan Hui | b43174ffba | Resolve merge conflicts | 2024-09-01 07:35:50 +08:00 | 
				
					
						|  Lan Hui | d00432cee1 | Resolve merge conflicts | 2024-09-01 07:27:46 +08:00 | 
				
					
						|  Lan Hui | b2e11aea6f | 将标记文章按钮移到页面上方;标记文章时不要alert | 2024-08-29 07:52:58 +08:00 | 
				
					
						|  Lan Hui | 2bec0642dd | Resolve merge conflicts | 2024-08-29 07:34:32 +08:00 | 
				
					
						|  Lan Hui | 61a0b39507 | Resolve merge conflict | 2024-08-28 07:48:50 +08:00 | 
				
					
						|  Lan Hui | 146781df50 | Resolve merge conflict | 2024-08-28 07:23:30 +08:00 | 
				
					
						|  Lan Hui | 0bfb35b978 | Make translation tooltip work | 2024-08-27 11:29:09 +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: #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 | 
				
					
						|  夏栢芝 | 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 | 
				
					
						|  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 | 
				
					
						|  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 | 
				
					
						|  姜潮 | 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 | 
				
					
						|  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 | 2d765b5c63 | 随机抽取10个生词,并显示 | 2024-07-02 16:03:03 +08:00 | 
				
					
						|  Lan Hui | 2095550f33 | Fix bug 547 | 2024-06-22 09:04:25 +08:00 | 
				
					
						|  熊佳明 | d83809dcc7 | Fix bug 540 | 2024-06-03 13:49:53 +08:00 | 
				
					
						|  熊佳明 | 2785ded52b | 解决冲突 | 2024-06-03 11:58: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 |