Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into SPM2022F-CONTRIBUTORS-jiaojiao

README.md

@@ -180,5 +180,5 @@ Demo video link: https://b23.tv/QuB77m
 
 Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=215
 
-
+### 娇娇
 *Last modified on 2021-10-17*

v

@@ -0,0 +1,241 @@
+commit 671df67723abfe723fa51400f705e71d7e9332e5 (HEAD -> SPM2022F-CONTRIBUTORS-JIAOJIAO, origin/master, origin/HEAD, master)
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Thu Nov 10 19:03:59 2022 +0800
+
+    Bug487-WuYuhan-Refactor (#58)
+    
+    将所有用于用户名验证的逻辑放入到 `UserName` 类中。
+    
+    Hui
+    
+    Co-authored-by: Lan Hui <1348141770@qq.com>
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/58
+    Co-authored-by: mrlan <mrlan@noreply.121.4.94.30>
+    Co-committed-by: mrlan <mrlan@noreply.121.4.94.30>
+
+commit f909201615500b8df1d296cae72964b06980cd6f
+Merge: bfd87c5 29ffada
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Tue Nov 8 19:53:09 2022 +0800
+
+    Merge pull request 'Bug487-WuYuhan-Refactor' (#57) from Bug487-WuYuhan-Refactor into master
+    
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/57
+
+commit 29ffada7eb442c19406fa2cc6f8dd1eb6dff2466
+Author: Hui Lan <lanhui@zjnu.edu.cn>
+Date:   Thu Nov 3 22:28:25 2022 +0800
+
+    Login.py: improve comments.
+
+commit d3a796428d9eac9ebe2f35329540dff34d7fb06b
+Author: Hui Lan <lanhui@zjnu.edu.cn>
+Date:   Thu Nov 3 22:21:34 2022 +0800
+
+    account_service.py: module re is no longer necessary.
+
+commit 702205940cc8962f23b304c55b13ccbb8a0d6639
+Author: Lan Hui <1348141770@qq.com>
+Date:   Thu Nov 3 22:06:24 2022 +0800
+
+    Login.py: must convert warn to string before comparing to OK
+
+commit f0b5adc5e4fc25298042a02efc63f61aa9830ded
+Author: Lan Hui <1348141770@qq.com>
+Date:   Thu Nov 3 22:02:32 2022 +0800
+
+    Login.py: fix function name
+
+commit 3cfec31c3fe739d679c2af3d1e1bbaf3e5826896
+Author: Hui Lan <lanhui@zjnu.edu.cn>
+Date:   Thu Nov 3 22:00:47 2022 +0800
+
+    Login.py: add missing colon
+
+commit 286e884dd8a08fe3bb14cd9f656c2da1f70af2b5
+Author: Hui Lan <lanhui@zjnu.edu.cn>
+Date:   Thu Nov 3 21:59:12 2022 +0800
+
+    Refactor Wu Yuhan's code
+
+commit bfd87c51f6755c600f5656fd4bcfb4babf708ab9
+Merge: ab01b8e 59d95d8
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Thu Nov 3 21:28:55 2022 +0800
+
+    Merge pull request 'Bug487-WuYuhan' (#56) from Bug487-WuYuhan into master
+    
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/56
+
+commit ab01b8e19be89dd7d8a29c3ead4368c48c9f0481
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Tue Nov 1 21:43:01 2022 +0800
+
+    Hui-Build (#55)
+    
+    Make English Pal docker run automatically each time after Ubuntu reboot.
+    
+    Hui
+    
+    Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/55
+    Co-authored-by: mrlan <mrlan@noreply.121.4.94.30>
+    Co-committed-by: mrlan <mrlan@noreply.121.4.94.30>
+
+commit 59d95d8e9fbd7ea48f43e4296cd8223c992d77d3 (origin/Bug487-WuYuhan)
+Author: wuyuhan <woodwhale@qq.com>
+Date:   Fri Oct 21 11:07:20 2022 +0800
+
+    account_service.py: 导入re库使用正则匹配过滤了注册时用户名的非法字符
+
+commit 5844eab6d5d15a05f825e3cfd9c5e5905b0b8a8f
+Author: woodwhale <woodwhale@qq.com>
+Date:   Fri Oct 21 10:44:39 2022 +0800
+
+    account_service.py: 添加注册时用户名的非法字符过滤
+
+commit 02ffcd3b592b7a12e21ee5e016175150d24a4cb8
+Merge: 9927515 ecc354b
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Fri Aug 5 16:18:06 2022 +0800
+
+    Merge pull request 'Bug412-JiangLetian-Refactor' (#54) from Bug412-JiangLetian-Refactor into master
+    
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/54
+
+commit ecc354bc0dc4e0b1fb0fc3845da8f54c34bd7ed7 (origin/Bug412-JiangLetian-Refactor)
+Author: Lan Hui <1348141770@qq.com>
+Date:   Tue Aug 2 12:33:41 2022 +0800
+
+    Refactor: use better function
+
+commit 1d8671c5c78768c29dab349670cbcbbb88f5fda5
+Author: Lan Hui <1348141770@qq.com>
+Date:   Tue Aug 2 12:30:27 2022 +0800
+
+    Refactor: use better function name
+
+commit 8cb34e56ba752bab2a18d1f33a3beb2ee5e74363
+Author: Lan Hui <1348141770@qq.com>
+Date:   Tue Aug 2 12:26:18 2022 +0800
+
+    Refactor: remove duplicate code block
+
+commit b5dacb9ad21a932c80d891d208184606dcc8ec7b
+Author: Lan Hui <1348141770@qq.com>
+Date:   Tue Aug 2 11:52:40 2022 +0800
+
+    Improve comments
+
+commit 47e745e7742658c10c4b201b92719e690fd35b27
+Author: Lan Hui <1348141770@qq.com>
+Date:   Tue Aug 2 11:45:21 2022 +0800
+
+    Use better variable name (use articleContent instead of txt, and use camelCase)
+
+commit 1dfe370983a7a8112b278f5bfce5fd5587104c49
+Author: Lan Hui <1348141770@qq.com>
+Date:   Tue Aug 2 11:39:35 2022 +0800
+
+    Use better variable names
+
+commit 9927515b1139de5f2c0c42a6b28f9a3efa4897c1
+Merge: b745da4 c15746b
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Tue Aug 2 11:03:39 2022 +0800
+
+    Merge pull request 'Bug412-JiangLetian' (#39) from Bug412-JiangLetian into master
+    
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/39
+
+commit c15746bbb2c663bcdb585ac541c6c270e25a8019 (origin/Bug412-JiangLetian)
+Merge: b745da4 041cbd9
+Author: Lan Hui <1348141770@qq.com>
+Date:   Tue Aug 2 11:00:33 2022 +0800
+
+    Resolve conflicts
+
+commit b745da4c908a600a734dec08ba5373ae838cdace
+Merge: 7663dfb 4817557
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Sun Jul 31 09:11:53 2022 +0800
+
+    Merge pull request 'IMPROVE-WangWeiLong' (#35) from IMPROVE-WangWeiLong into master
+    
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/35
+
+commit 7663dfb8f48eece671a89ae8c252571b91028042
+Merge: 2c1bc98 0098fa8
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Fri Jul 29 16:20:01 2022 +0800
+
+    Merge pull request 'Hui-EscapeUserInput' (#53) from Hui-EscapeUserInput into master
+    
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/53
+
+commit 0098fa87469f918f2c4a84f5ef49031e8e63c4f0 (origin/Hui-EscapeUserInput)
+Author: Lan Hui <1348141770@qq.com>
+Date:   Fri Jul 29 15:26:19 2022 +0800
+
+    Prevent attribute injection
+
+commit 828cef406ccc4996925359650312d3dc41625100
+Author: Lan Hui <1348141770@qq.com>
+Date:   Fri Jul 29 15:22:42 2022 +0800
+
+    Escape user input first
+
+commit 2c1bc98833e2427aab810e23248a9476e85bc030
+Author: 徐幸 <2567198082@qq.com>
+Date:   Thu Jul 21 23:13:33 2022 +0800
+
+    Bug422-XuXing (#46)
+    
+    增加了返回上一篇的按钮及相关功能的实现，当点击下一篇文章跳转至下一篇时，页面中会增加一个返回上一篇按钮，点击返回上一篇按钮后可以回到上一篇。
+    
+    Co-authored-by: Lan Hui <1348141770@qq.com>
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/46
+    Co-authored-by: 徐幸 <2567198082@qq.com>
+    Co-committed-by: 徐幸 <2567198082@qq.com>
+
+commit 9a89510f4effb9388bff2b831bd2482a16a5016f
+Merge: 028e2f9 e9eb604
+Author: mrlan <mrlan@noreply.121.4.94.30>
+Date:   Wed Jul 20 17:31:01 2022 +0800
+
+    Merge pull request 'Improvement-Stewart' (#49) from Improvement-Stewart into master
+    
+    Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/49
+
+commit e9eb604a2255d563b61b56ed7f45f439255e8935 (origin/Improvement-Stewart)
+Author: Lan Hui <1348141770@qq.com>
+Date:   Wed Jul 20 17:10:03 2022 +0800
+
+    Improve spacing and indentation.
+
+commit 9beb1ad1d2fb5df12dffff1f6f990fd12cf891a7
+Author: Lan Hui <1348141770@qq.com>
+Date:   Wed Jul 20 17:09:04 2022 +0800
+
+    Make up the enclosing >.
+
+commit 8998d6e4afedd85da68a6d74cbf9213251331486
+Author: Lan Hui <1348141770@qq.com>
+Date:   Wed Jul 20 17:08:07 2022 +0800
+
+    Improve spacing.
+
+commit 8747f35fd8f1dd40400c44ed9ed955e5c1cce6ae
+Author: Lan Hui <1348141770@qq.com>
+Date:   Wed Jul 20 17:07:09 2022 +0800
+
+    Make up the enclosing >.
+
+commit fdb432031f74ab2955d1ee4bb9089a70d2e5f7fd
+Author: Lan Hui <1348141770@qq.com>
+Date:   Wed Jul 20 17:06:11 2022 +0800
+
+    Better indentation.
+
+commit 1401870591b479731f54e41eb4815466e4a109c3
+Author: Lan Hui <1348141770@qq.com>