zzhaofisher
							
						 | 
						
							
							
							
							
								
							
								cc8ca47f8c
								
							
								
							
						 | 
						
							
							
								
								refactor: remove sql sentences
							
							
							
							
							
						 | 
						
							2023-04-18 21:50:54 +08:00 | 
						
					
				
					
						
							
							
								 
								zzhaofisher
							
						 | 
						
							
							
							
							
								
							
								5d20e92061
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into DevLocal
							
							
							
							
							
						 | 
						
							2023-04-18 21:50:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								f3d609c92b
								
							
								
							
						 | 
						
							
							
								
								Merge Wang Ziming's work and Wu Yuhan's work.
							
							
							
							
							
						 | 
						
							2023-04-07 06:41:49 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								15bb925024
								
							
								
							
						 | 
						
							
							
								
								将记录阅读过文章的数据结果改为字典,以及修改了flag的问题
							
							
							
							
							
						 | 
						
							2023-04-04 22:31:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								688ed72473
								
							
								
							
						 | 
						
							
							
								
								Correct grammar。
							
							
							
							
							
						 | 
						
							2023-04-01 16:07:59 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								1f150fc847
								
							
								
							
						 | 
						
							
							
								
								refactor: use ajax to get expiry_date
							
							
							
							
							
						 | 
						
							2023-03-31 13:39:28 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								7107f634c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'test' into dev-fixBug509-reconstruction
							
							
							
							
							
						 | 
						
							2023-03-31 04:58:21 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								6f1dd13419
								
							
								
							
						 | 
						
							
							
								
								测试的print忘删了
							
							
							
							
							
						 | 
						
							2023-03-31 04:50:41 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								4417cf7017
								
							
								
							
						 | 
						
							
							
								
								Article.py: remove debug statement.
							
							
							
							
							
						 | 
						
							2023-03-30 16:10:22 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								0c16a4dc6f
								
							
								
							
						 | 
						
							
							
								
								判断文章是否已经出现的语句写错位置了,改正下
							
							
							
							
							
						 | 
						
							2023-03-29 20:53:38 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								5b2f5199a8
								
							
								
							
						 | 
						
							
							
								
								1. 取消userpage_get.html中提示删除单词信息的代码 和 取消user_service.userpage中render_template的flashed_messages参数。因为删除单词操作已经是异步了,而提示信息的出现是同步执行,所以就注释了代码且没有产生太大影响。
							
							
							
							
							
							
							
							2. 修改取消user_service.deleteword中对注释flash代码的注释,根据上一步进行了重新解释。 
							
						 | 
						
							2023-03-27 14:28:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								0ce1c6eb6e
								
							
								
							
						 | 
						
							
							
								
								文章管理页面:每篇文章中保留换行,方便查看。
							
							
							
							
							
						 | 
						
							2023-03-26 21:14:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								d4ac709385
								
							
								
							
						 | 
						
							
							
								
								将删除按钮移到第一行,避免因为文章的标题过长跨行导致删除按钮形状改变。
							
							
							
							
							
						 | 
						
							2023-03-26 21:05:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								9eb5210d3f
								
							
								
							
						 | 
						
							
							
								
								Level与Date的冒号后面加个空格,使得后面的信息更加看得清楚。
							
							
							
							
							
						 | 
						
							2023-03-26 20:58:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								0e25737381
								
							
								
							
						 | 
						
							
							
								
								管理文章页面的文章列表中,每篇文章不再在内容部分重新显示标题。
							
							
							
							
							
						 | 
						
							2023-03-26 20:56:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								b3b154a24f
								
							
								
							
						 | 
						
							
							
								
								简化管理文章与管理用户页面信息。
							
							
							
							
							
						 | 
						
							2023-03-26 19:06:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								4d99405bfa
								
							
								
							
						 | 
						
							
							
								
								简化管理员页面信息。删除退出登录按钮,可以返回到前一页后再退出,不影响使用体验。删除'管理员您好'欢迎词,没啥意义。
							
							
							
							
							
						 | 
						
							2023-03-26 18:59:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								8d8b9197b6
								
							
								
							
						 | 
						
							
							
								
								手动输入的文字最高难度等级是4
							
							
							
							
							
						 | 
						
							2023-03-26 09:59:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								3bc61a602f
								
							
								
							
						 | 
						
							
							
								
								添加文章成功后,修改用户信息成功后,页面显示成功信息(flash messages)。
							
							
							
							
							
						 | 
						
							2023-03-26 09:44:39 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								fb6d0b23ce
								
							
								
							
						 | 
						
							
							
								
								admin_manage_user.html: 修改 JavaScript 函数名.
							
							
							
							
							
						 | 
						
							2023-03-25 22:21:49 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								c6010ccbbd
								
							
								
							
						 | 
						
							
							
								
								admin_manage_user.html: 不再需要,所以删除.
							
							
							
							
							
						 | 
						
							2023-03-25 21:45:37 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								f17995a35c
								
							
								
							
						 | 
						
							
							
								
								fix: using new pagination mod func
							
							
							
							
							
						 | 
						
							2023-03-25 21:31:32 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								ce28a5bf65
								
							
								
							
						 | 
						
							
							
								
								feat: auto select expiry_date when select user
							
							
							
							
							
						 | 
						
							2023-03-25 21:20:19 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								99aa4e0990
								
							
								
							
						 | 
						
							
							
								
								fix: fix article title show
							
							
							
							
							
						 | 
						
							2023-03-25 20:41:09 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								a220450b03
								
							
								
							
						 | 
						
							
							
								
								mainpage_get.html: 首页不显示管理链接(可能会安全点).
							
							
							
							
							
						 | 
						
							2023-03-23 22:05:36 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								7eb276937a
								
							
								
							
						 | 
						
							
							
								
								admin_manage_user.html: 将默认过期时间设为365天以后.
							
							
							
							
							
						 | 
						
							2023-03-23 21:54:21 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								b97210a9e0
								
							
								
							
						 | 
						
							
							
								
								admin_manage_article.html: 更为详细的 placeholder 内容.
							
							
							
							
							
						 | 
						
							2023-03-23 21:19:20 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								e27985127a
								
							
								
							
						 | 
						
							
							
								
								admin_manage_article.html: 文章最高难度等级是4.
							
							
							
							
							
						 | 
						
							2023-03-23 21:00:31 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								7941e5d1eb
								
							
								
							
						 | 
						
							
							
								
								fix: fix the way to show article title
							
							
							
							
							
						 | 
						
							2023-03-23 17:34:37 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								2cf65123e9
								
							
								
							
						 | 
						
							
							
								
								feat: admin can manage articles and users without interfering with each other
							
							
							
							
							
						 | 
						
							2023-03-23 17:12:23 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								3e35679a91
								
							
								
							
						 | 
						
							
							
								
								refactor: refactor the model
							
							
							
							
							
						 | 
						
							2023-03-23 17:09:25 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								82896de336
								
							
								
							
						 | 
						
							
							
								
								update .gitignore
							
							
							
							
							
						 | 
						
							2023-03-23 16:21:02 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								13ccbaf25c
								
							
								
							
						 | 
						
							
							
								
								fix: use select to choose article level
							
							
							
							
							
						 | 
						
							2023-03-23 13:58:11 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								ec6a2249ae
								
							
								
							
						 | 
						
							
							
								
								fix: fix the pagination
							
							
							
							
							
						 | 
						
							2023-03-23 13:47:53 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								bdda754af6
								
							
								
							
						 | 
						
							
							
								
								fix: check current user is admin
							
							
							
							
							
						 | 
						
							2023-03-23 13:40:22 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								52025d55bc
								
							
								
							
						 | 
						
							
							
								
								fix: add a blankspace
							
							
							
							
							
						 | 
						
							2023-03-23 13:35:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								5cffa1fada
								
							
								
							
						 | 
						
							
							
								
								fix: use single quotation mark 'admin'
							
							
							
							
							
						 | 
						
							2023-03-23 13:32:11 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								c9bfa08658
								
							
								
							
						 | 
						
							
							
								
								注释flash的使用,因为其对页面会有影响
							
							
							
							
							
						 | 
						
							2023-03-21 19:19:51 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 王梓铭
							
						 | 
						
							
							
							
							
								
							
								6df25c58b4
								
							
								
							
						 | 
						
							
							
								
								查漏,业务中的两处前端标签不做修改,因为不被使用了
							
							
							
							
							
						 | 
						
							2023-03-21 18:57:00 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								2909b4d973
								
							
								
							
						 | 
						
							
							
								
								admin_service.py: 管理员页面显示的用户名按照名字排序。
							
							
							
							
							
						 | 
						
							2023-03-21 16:22:45 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								9075fe9eea
								
							
								
							
						 | 
						
							
							
								
								Resolve merge conflicts.
							
							
							
							
							
						 | 
						
							2023-03-21 16:08:55 +08:00 | 
						
					
				
					
						
							
							
								
								 Hui Lan
							
						 | 
						
							
							
							
							
								
							
								691c5b0d43
								
							
								
							
						 | 
						
							
							
								
								build.sh: Install requirements first.
							
							
							
							
							
						 | 
						
							2023-03-21 16:07:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								44db2218c1
								
							
								
							
						 | 
						
							
							
								
								fix: Use better conditional judgment methods
							
							
							
							
							
						 | 
						
							2023-03-21 12:45:57 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								48de496caa
								
							
								
							
						 | 
						
							
							
								
								fix: Remove 'Assignment Expresions' & Fix annotation words
							
							
							
							
							
						 | 
						
							2023-03-21 12:42:59 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								1015704e23
								
							
								
							
						 | 
						
							
							
								
								fix: fix the way to check article level
							
							
							
							
							
						 | 
						
							2023-03-21 12:35:27 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								cabf6702a7
								
							
								
							
						 | 
						
							
							
								
								fix: add one way to set article level & rename some functions and vars
							
							
							
							
							
						 | 
						
							2023-03-21 12:35:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								b34f260d98
								
							
								
							
						 | 
						
							
							
								
								requirements.txt: use an older version of Flask to avoid deployment ERROR: No matching distribution found for Flask==2.1.0.
							
							
							
							
							
						 | 
						
							2023-03-21 11:48:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Lan Hui
							
						 | 
						
							
							
							
							
								
							
								70d44fcf5c
								
							
								
							
						 | 
						
							
							
								
								Login.py: fix SyntaxWrning: 'is not' with a literal.
							
							
							
							
							
						 | 
						
							2023-03-21 11:44:05 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								b80fbc936c
								
							
								
							
						 | 
						
							
							
								
								fix: fix admin_name
							
							
							
							
							
						 | 
						
							2023-03-20 20:19:56 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 吴宇涵
							
						 | 
						
							
							
							
							
								
							
								ade10e5843
								
							
								
							
						 | 
						
							
							
								
								feat: add admin_service blueprint
							
							
							
							
							
						 | 
						
							2023-03-20 20:16:48 +08:00 |