ELYSIA\meibi
							
						 
						
							 
							
							
							
								
							
								ff6e20cabf 
								
							
								 
							
						 
						
							
							
								
								Fix bug 536  
							
							 
							
							
							
						 
						
							2024-06-04 13:09:35 +08:00  
						
					 
				
					
						
							
							
								 
								Lan Hui
							
						 
						
							 
							
							
							
								
							
								f3d609c92b 
								
							
								 
							
						 
						
							
							
								
								Merge Wang Ziming's work and Wu Yuhan's work.  
							
							 
							
							
							
						 
						
							2023-04-07 06:41:49 +08:00  
						
					 
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							 
							
							
							
								
							
								bdda754af6 
								
							
								 
							
						 
						
							
							
								
								fix: check current user is admin  
							
							 
							
							
							
						 
						
							2023-03-23 13:40:22 +08:00  
						
					 
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							 
							
							
							
								
							
								ade10e5843 
								
							
								 
							
						 
						
							
							
								
								feat: add admin_service blueprint  
							
							 
							
							
							
						 
						
							2023-03-20 20:16:48 +08:00  
						
					 
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							 
							
							
							
								
							
								944c931c9b 
								
							
								 
							
						 
						
							
							
								
								完成了对bug509的修复,以及重构项目(去掉了业务中的前端脚本)  
							
							 
							
							
							
						 
						
							2023-03-08 16:33:13 +08:00  
						
					 
				
					
						
							
							
								 
								yugaoxiang
							
						 
						
							 
							
							
							
								
							
								0209548896 
								
							
								 
							
						 
						
							
							
								
								提交作业  
							
							 
							
							
							
						 
						
							2022-12-31 18:25:13 +08:00  
						
					 
				
					
						
							
							
								 
								Lan Hui
							
						 
						
							 
							
							
							
								
							
								828cef406c 
								
							
								 
							
						 
						
							
							
								
								Escape user input first  
							
							 
							
							
							
						 
						
							2022-07-29 15:22:42 +08:00  
						
					 
				
					
						
							
							
								 
								Lan Hui
							
						 
						
							 
							
							
							
								
							
								4d2dd2b68e 
								
							
								 
							
						 
						
							
							
								
								Repalce old app folder with SoftArch王炫/english-pal-master/app/  
							
							 
							
							
							
						 
						
							2022-01-26 21:10:09 +08:00  
						
					 
				
					
						
							
							
								 
								Lan Hui
							
						 
						
							 
							
							
							
								
							
								ffc33852ae 
								
							
								 
							
						 
						
							
							
								
								main.py: make sure the key articleID exists.  
							
							 
							
							
							
						 
						
							2021-09-05 20:51:28 +08:00  
						
					 
				
					
						
							
							
								 
								Lan Hui
							
						 
						
							 
							
							
							
								
							
								91ca6fe33b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'BugFix300' of  http://121.4.94.30:3000/mrlan/EnglishPal  into BugFix300  
							
							 
							
							
							
						 
						
							2021-09-05 20:44:55 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								02a5d4bd47 
								
							
								 
							
						 
						
							
							
								
								main.py: fix bug300:  http://118.25.96.118/bugzilla/show_bug.cgi?id=300  
							
							 
							
							
							
						 
						
							2021-09-05 20:42:18 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								f8acf03acc 
								
							
								 
							
						 
						
							
							
								
								main.py: let the user have a small chance to get a much more difficult article than his vocabulary level.  
							
							 
							
							
							
						 
						
							2021-08-31 21:25:17 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								baf333678a 
								
							
								 
							
						 
						
							
							
								
								main.py and build.sh: shuffle the articles first before select one, relax selection range, keep the database  
							
							 
							
							... 
							
							
							
							main.py:
- shuffle the articles first before select one
- relax selection range (see the function call within_range)
build.sh:
- keep the database wordfreqapp.db so that the user could login again next time after the program is rebuilt.
Hui 
							
						 
						
							2021-08-30 08:18:47 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								868104da6c 
								
							
								 
							
						 
						
							
							
								
								main.py: let the range be more flexible.  
							
							 
							
							
							
						 
						
							2021-08-30 07:43:41 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								c6b620b272 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word (use bootstrap alerts -- it seems that dismissable alert does not work, so forget about it.).  
							
							 
							
							
							
						 
						
							2021-08-02 19:27:22 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								aace6c033e 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word (use bootstrap alerts -- make the alert dismissable 2).  
							
							 
							
							
							
						 
						
							2021-08-02 19:24:00 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								c3dcc62879 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word (use bootstrap alerts -- make the alert dismissable).  
							
							 
							
							
							
						 
						
							2021-08-02 19:21:41 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								3d5130d68d 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word (use bootstrap alerts -- add additional content, e.g., a bolder congratulations).  
							
							 
							
							
							
						 
						
							2021-08-02 19:17:54 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								08bb7e0c40 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word (use bootstrap alerts).  
							
							 
							
							
							
						 
						
							2021-08-02 19:11:53 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								4773a6d131 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word from the new word list (put f in the right place).  
							
							 
							
							
							
						 
						
							2021-08-02 17:26:35 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								8abbf458a2 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word from the new word list (fix error - import get_flashed_messages).  
							
							 
							
							
							
						 
						
							2021-08-02 17:10:05 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								f5086732f3 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word from the new word list (fix error).  
							
							 
							
							
							
						 
						
							2021-08-02 17:07:01 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								451feb7bba 
								
							
								 
							
						 
						
							
							
								
								app/main.py: flash a message after deleting a word from the new word list.  
							
							 
							
							
							
						 
						
							2021-08-02 16:52:02 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								b6209bdde6 
								
							
								 
							
						 
						
							
							
								
								app/main.py: the secnd line and after (if any) should also show.  
							
							 
							
							
							
						 
						
							2021-08-01 22:10:23 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								d08d8a8594 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use a container for the front page.  
							
							 
							
							
							
						 
						
							2021-08-01 22:03:27 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								6e56c1b418 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use smaller, ligter font for source.  
							
							 
							
							
							
						 
						
							2021-08-01 21:25:13 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								c71b156203 
								
							
								 
							
						 
						
							
							
								
								app/main.py: larger font for article title.  
							
							 
							
							
							
						 
						
							2021-08-01 21:22:45 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								7043518721 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use lighter color for article date.  
							
							 
							
							
							
						 
						
							2021-08-01 21:12:15 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								0efd2b420b 
								
							
								 
							
						 
						
							
							
								
								app/main.py: light grey background for the article.  
							
							 
							
							
							
						 
						
							2021-08-01 21:09:38 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								81e1e795be 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use container, and use a button for logout.  
							
							 
							
							
							
						 
						
							2021-08-01 20:25:58 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								58383a51ad 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use buttons for all words (strange?).  
							
							 
							
							
							
						 
						
							2021-07-31 21:51:48 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								c40f9b61a3 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use buttons instead of links for familiar, unfamiliar and delete (for all words).  
							
							 
							
							
							
						 
						
							2021-07-31 21:43:42 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								e65b443f01 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use buttons instead of links for familiar, unfamiliar and delete.  
							
							 
							
							
							
						 
						
							2021-07-31 21:41:55 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								61a848e7d4 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use alert for total number of articles.  
							
							 
							
							
							
						 
						
							2021-07-31 21:30:19 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								bef218953b 
								
							
								 
							
						 
						
							
							
								
								app/main.py: adjust badge color.  
							
							 
							
							
							
						 
						
							2021-07-31 21:22:09 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								20386033bc 
								
							
								 
							
						 
						
							
							
								
								app/main.py: green button may look better, more consistent.  
							
							 
							
							
							
						 
						
							2021-07-31 21:18:35 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								aad7f8016e 
								
							
								 
							
						 
						
							
							
								
								app/main.py: change link to button.  
							
							 
							
							
							
						 
						
							2021-07-31 21:16:38 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								22af30bc88 
								
							
								 
							
						 
						
							
							
								
								app/main.py: move alert bar above 阅读文章并回答问题 (revision).  
							
							 
							
							
							
						 
						
							2021-07-31 21:12:04 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								fbf054d174 
								
							
								 
							
						 
						
							
							
								
								app/main.py: move alert bar above 阅读文章并回答问题.  
							
							 
							
							
							
						 
						
							2021-07-31 21:10:27 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								e9c7d0fc00 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use a green alert bar.  
							
							 
							
							
							
						 
						
							2021-07-31 21:03:57 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								1936d2aec5 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use alert while showing vocabulary level.  
							
							 
							
							
							
						 
						
							2021-07-31 21:02:17 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								adfc2796da 
								
							
								 
							
						 
						
							
							
								
								app/main.py: use a different color for badge.  
							
							 
							
							
							
						 
						
							2021-07-31 20:59:08 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								29f0d02327 
								
							
								 
							
						 
						
							
							
								
								app/main.py: bootstrap elements.  
							
							 
							
							
							
						 
						
							2021-07-31 20:54:19 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								c581601bf3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of  https://github.com/lanlab-org/EnglishPal  into BugFix254-Author-ZhanJianhao  
							
							 
							
							
							
						 
						
							2021-07-30 12:18:39 +08:00  
						
					 
				
					
						
							
							
								 
								Zjh-jc
							
						 
						
							 
							
							
							
								
							
								6d8b30e631 
								
							
								 
							
						 
						
							
							
								
								fix the bug (After logging in, jump directly to the vocabulary, not to the article.)  
							
							 
							
							
							
						 
						
							2021-07-22 00:11:06 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								2584de860d 
								
							
								 
							
						 
						
							
							
								
								main.py: article count.  
							
							 
							
							
							
						 
						
							2021-07-16 18:13:07 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								e9358a627f 
								
							
								 
							
						 
						
							
							
								
								Learn english smartly.  
							
							 
							
							
							
						 
						
							2021-07-13 12:56:05 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								905e85f201 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of  https://github.com/lanlab-org/EnglishPal  
							
							 
							
							
							
						 
						
							2021-07-13 11:46:37 +08:00  
						
					 
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							 
							
							
							
								
							
								d431c0cb4b 
								
							
								 
							
						 
						
							
							
								
								update .gitignore to ignore the folder .idea  
							
							 
							
							
							
						 
						
							2021-07-13 11:19:35 +08:00  
						
					 
				
					
						
							
							
								 
								张小飞
							
						 
						
							 
							
							
							
								
							
								b53b5ed4c3 
								
							
								 
							
						 
						
							
							
								
								修改main.py,使得主页显示English Pal -(SPM-Spring2021-2599-张小飞201831990641)  
							
							 
							
							
							
						 
						
							2021-06-22 12:35:01 +08:00