EnglishPal

Commit Graph

Select branches

Hide Pull Requests

509

AAALF

Alpha

Alpha-snapshot20230425

Alpha-snapshot20230426

Alpha-snapshot20230427

Alpha-snapshot20230506

Bug209-LiuChangYou

Bug257-MaJiaBin

Bug260-Mohanad

Bug344-JiangXueHong

Bug358-TengJiaQian

Bug391-LiuYiXiu

Bug392-LuoYu

Bug393-QinYanMei

Bug393-TanYanMei

Bug394-MiaoChenShuo

Bug395-Anxiuxiu

Bug400-QiuZhonghui

Bug400-QiuZhonghui-Refactor

Bug407-JinHaoLin

Bug410-DuanJiaJie

Bug412-JiangLetian

Bug412-JiangLetian-Refactor

Bug422-XuXing

Bug428-LouJiCheng

Bug473-LuXiaochen

Bug474-RenYinJie

Bug476-ZhangWeiHao

Bug477-ChenJingyi

Bug487-WuYuhan

Bug487-WuYuhan-Refactor

Bug488-TangWei

Bug490-ChenQiuwei

Bug492-XuHongJian

Bug493-GongKeCheng

Bug495-LiangLiGang

Bug499-Hui

Bug499-WangZiming

Bug501-Hui

Bug502-YuGaoXiang

Bug504-LiJia

Bug505-ZhangYiteng

Bug508-CenHaotian

Bug509-XieQiuHan

Bug509-XieQiuHan-WangZiming

Bug512-RenYu

Bug521-LiYuFeng

Bug521-LiYuFeng-refactor

Bug522-HuangZirui

Bug525-Hui

BugFix254-Author-ZhanJianhao

BugFix284

BugFix293

BugFix300

BugFix347

BugFix407-JinHaoLin

ChenTianle-TypoCorrection

Deployment

Hui-Build

Hui-EscapeUserInput

Hui-SaferSQL

IMPROVE-WangWeiLong

Improvement-Stewart

Lanhui-IncreaseChanceOfGettingDifficultArticles

Lanhui-Selenium

Lanhui-add-articles

Lanhui-build.sh

Lanhui-flash-messages

Lanhui-go-bootstrap

Lanhui-update-README

Lanhui-update-README2

SOFTARCH2022S-ZAYID-478

SPM2022F-CONTRBUTORS-TECHLEADNAME

SPM2022F-CONTRBUTORS-luofei

SPM2022F-CONTRIBUTORS-CENHAOTIAN

SPM2022F-CONTRIBUTORS-ChenQiuwei

SPM2022F-CONTRIBUTORS-DingRui

SPM2022F-CONTRIBUTORS-GONGKE

SPM2022F-CONTRIBUTORS-GONGKECHENG

SPM2022F-CONTRIBUTORS-LIJIA

SPM2022F-CONTRIBUTORS-LINJUNHONG

SPM2022F-CONTRIBUTORS-RUANYUXUAN

SPM2022F-CONTRIBUTORS-TANGWEI

SPM2022F-CONTRIBUTORS-WuWenZhuo

SPM2022F-CONTRIBUTORS-XIEQIUHAN

SPM2022F-CONTRIBUTORS-XuHongJian

SPM2022F-CONTRIBUTORS-jiaojiao

SPM2022F-CONTROIBUTORS-XUHONGJIAN

WangXuan-Highlight-Pronounce

bug209-yaaqob

bug209_yaaqobv2

bug359-zhangkeli

bug492

englishpal

improvment-NiWeiCong

master

BeginningOfSpring

ColdDew

GreaterCold

GreaterCold2023

6c2a9823af 优化了原来同学的代码格式 Bug473-LuXiaochen 谢思怡 2023-05-06 19:08:45 +0800
9b276cc454 Merge branch 'master' into improvment-NiWeiCong improvment-NiWeiCong 钱骏琪 2023-05-06 19:05:16 +0800
01ecc83768 refactor: refactor the way to check article level Bug502-YuGaoXiang 吴宇涵 2023-05-06 17:42:04 +0800
f64d06fbbf fix: fix Bug 531 and use ES6 grammar 吴宇涵 2023-05-06 17:24:51 +0800
a4cc4fd011 Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230506 Alpha-snapshot20230506 Hui Lan 2023-05-06 17:16:08 +0800
18ca48b422 Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug522-HuangZirui Bug522-HuangZirui ZhuZhihao 2023-05-05 17:21:49 +0800
a80b062b87 refactor: remove variable 'count' ZhuZhihao 2023-05-05 17:20:58 +0800
0fedf590e8 更新 'app/wordfreqCMD.py' Bug488-TangWei 汪瑜 2023-05-04 17:40:44 +0800
96dfadcde6 更新 'app/wordfreqCMD.py' 汪瑜 2023-05-04 17:39:48 +0800
7b55fc1859 first commit 杨昱晨 2023-05-04 17:18:04 +0800
ac2046ac2e first commit 杨昱晨 2023-05-04 17:02:28 +0800
8127ddcea5 Update 'app/pickle_idea2.py' bug359-zhangkeli YAKUBU ABDULAI 2023-05-02 15:14:05 +0800
f6c7928fc9 Delete 'app/pickle_idea.pyc' YAKUBU ABDULAI 2023-05-02 14:50:21 +0800
0ff73b2213 Delete 'app/Yaml.pyc' YAKUBU ABDULAI 2023-05-02 14:49:15 +0800
c3e01b20ce Delete 'app/Article.pyc' YAKUBU ABDULAI 2023-05-02 14:48:40 +0800
8a900404e7 Delete 'app/WordFreq.pyc' YAKUBU ABDULAI 2023-05-02 14:48:00 +0800
90d64ff447 Delete 'app/difficulty.pyc' YAKUBU ABDULAI 2023-05-02 14:46:25 +0800
6b64eca9e3 Delete 'app/pickle_idea2.pyc' YAKUBU ABDULAI 2023-05-02 14:39:02 +0800
303a792c76 Delete 'app/wordfreqCMD.pyc' YAKUBU ABDULAI 2023-05-02 14:38:06 +0800
b15df83df4 Delete 'app/UseSqlite.pyc' YAKUBU ABDULAI 2023-05-02 14:36:36 +0800
4fc557aff3 Delete 'app/Login.pyc' YAKUBU ABDULAI 2023-05-02 14:35:14 +0800
705aa5efcb bug修改,前面提交的first commit是重构 Bug493-GongKeCheng 田其鹭 2023-04-27 16:00:46 +0800
61f46f7d58 first commit 田其鹭 2023-04-27 15:43:11 +0800
779dafefe8 Merge branch 'Bug509-XieQiuHan-WangZiming' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427 Alpha-snapshot20230427 Hui Lan 2023-04-27 07:21:15 +0800
e118d92659 Merge branch 'Alpha-snapshot20230425' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427 Hui Lan 2023-04-27 07:20:21 +0800
9d9590328d Stop reading when user clicks the next or previous button and also selecting new text(s) Bug407-JinHaoLin Appiah Lawrence Opoku 2023-04-26 18:54:50 +0800
dabeb0d2a9 Merge branch 'Bug407-JinHaoLin' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin Appiah Lawrence Opoku 2023-04-26 18:51:51 +0800
5654fbf9bc 修改：使用新的/<username>/userpage路由 Alpha-snapshot20230425 王梓铭 2023-04-26 18:49:59 +0800
1fff921d79 完成了Bug504“标记文章标题和文章下方问题不会高亮”的修复 Bug504-LiJia your name 2023-04-25 22:32:02 +0800
d30a434b2a 修改变量名had_read_articles->visited_articles Bug509-XieQiuHan-WangZiming 王梓铭 2023-04-25 17:47:51 +0800
4dc2c9c591 Stop reading when user clicks next and previous button as well as selecting new text Appiah Lawrence Opoku 2023-04-25 15:51:39 +0800
b88bc8f36b Merge branch 'Bug509-XieQiuHan-WangZiming' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230425 Hui Lan 2023-04-25 11:40:42 +0800
6be035f282 修复当没有找到文章或者文章读完时，直接刷新页面或者session不关闭重新进入页面，导致的错误；王梓铭 2023-04-25 11:38:01 +0800
ef786795e2 Resolve merge conflict Hui Lan 2023-04-25 08:47:22 +0800
21a77ef2df Merge branch 'Alpha' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha Hui Lan 2023-04-25 08:42:18 +0800
58d7349afe Change from bug359-zhangkeli Hui Lan 2023-04-25 08:40:26 +0800
6d2191f727 Refactor: remove raw sql sentences in Article.py your name 2023-04-24 22:20:35 +0800
e9e2bd3d23 Remove static\js Bug393-TanYanMei Hui Lan 2023-04-24 11:43:43 +0800
320a99d479 Move Tan Yanmei's fillword.js to app/static/js/tanyanmei-fillword.js. Delete the strange folder static js. Hui Lan 2023-04-24 11:38:16 +0800
3eca9234a9 Merge branch 'Bug393-TanYanMei' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug393-TanYanMei Hui Lan 2023-04-24 11:32:15 +0800
e42309184d Optimized HTML tags bargin 2023-04-23 19:57:18 +0800
13caf13950 重新添加进去了原来同学的commit bargin 2023-04-23 19:36:26 +0800
fc3e27488b 给标签添加id，方便测试王梓铭 2023-04-21 05:33:26 +0800
03145b57d9 修复边界值问题（当刚开始就没有找到文章或者就根本被没有文章的时候，会出现上一篇按钮）王梓铭 2023-04-21 02:36:51 +0800
70917df47b 删除测试代码王梓铭 2023-04-20 23:15:12 +0800
8f132ed87b 添加了阅读完所有文章的提示王梓铭 2023-04-20 22:53:30 +0800
da13e5bbd5 修复Bug（没找到文章后立即上一篇会回到上上篇文章） & 标签添加id方便测试王梓铭 2023-04-20 21:28:29 +0800
84affaeb69 修改 /<username> 路由存在的问题（每次调用别的路由他都会被调用），新路由为 /<username>/userpage;同时因为修改了路由导致访问userpage_get的时候会导致静态文件路径生成错误，这里修改了\static\config.yml中的静态资源路径，修改后也都可以正常访问到的王梓铭 2023-04-20 20:30:14 +0800
89773bdcf1 Merge branch 'Bug504-LiJia' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug504-LiJia your name 2023-04-20 18:53:27 +0800
16de0a7fd9 修改变量命名：existing_articles → had_read_articles 王梓铭 2023-04-20 15:40:11 +0800
cfa0329701 Merge branch 'Alpha' of http://121.4.94.30:3000/mrlan/EnglishPal into bug359-zhangkeli Benedict Gbalawoe 2023-04-19 15:13:16 +0800
36c100b1a8 Merge branch 'bug359-zhangkeli' of http://121.4.94.30:3000/mrlan/EnglishPal into bug359-zhangkeli Benedict Gbalawoe 2023-04-19 14:54:08 +0800
ce2e1f2978 Merge branch 'DevLocal' into Bug522-HuangZirui Alpha-snapshot20230426 zzhaofisher 2023-04-18 21:52:28 +0800
11ae093fd7 Merge branch 'Alpha' into Bug522-HuangZirui zzhaofisher 2023-04-18 21:52:01 +0800
cc8ca47f8c refactor: remove sql sentences zzhaofisher 2023-04-18 21:50:54 +0800
5d20e92061 Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into DevLocal zzhaofisher 2023-04-18 21:50:18 +0800
f3d609c92b Merge Wang Ziming's work and Wu Yuhan's work. Alpha Lan Hui 2023-04-07 06:41:49 +0800
15bb925024 将记录阅读过文章的数据结果改为字典，以及修改了flag的问题王梓铭 2023-04-04 22:31:53 +0800
688ed72473 Correct grammar。 Lan Hui 2023-04-01 16:07:59 +0800
1f150fc847 refactor: use ajax to get expiry_date 吴宇涵 2023-03-31 13:39:28 +0800
7107f634c2 Merge branch 'test' into dev-fixBug509-reconstruction 王梓铭 2023-03-31 04:58:21 +0800
6f1dd13419 测试的print忘删了王梓铭 2023-03-31 04:50:41 +0800
4417cf7017 Article.py: remove debug statement. Hui Lan 2023-03-30 16:10:22 +0800
0c16a4dc6f 判断文章是否已经出现的语句写错位置了，改正下王梓铭 2023-03-29 20:53:38 +0800
5b2f5199a8 1. 取消userpage_get.html中提示删除单词信息的代码和取消user_service.userpage中render_template的flashed_messages参数。因为删除单词操作已经是异步了，而提示信息的出现是同步执行，所以就注释了代码且没有产生太大影响。 2. 修改取消user_service.deleteword中对注释flash代码的注释，根据上一步进行了重新解释。王梓铭 2023-03-27 14:28:54 +0800
0ce1c6eb6e 文章管理页面：每篇文章中保留换行，方便查看。 Lan Hui 2023-03-26 21:14:29 +0800
d4ac709385 将删除按钮移到第一行，避免因为文章的标题过长跨行导致删除按钮形状改变。 Lan Hui 2023-03-26 21:05:05 +0800
9eb5210d3f Level与Date的冒号后面加个空格，使得后面的信息更加看得清楚。 Lan Hui 2023-03-26 20:58:37 +0800
0e25737381 管理文章页面的文章列表中，每篇文章不再在内容部分重新显示标题。 Lan Hui 2023-03-26 20:56:08 +0800
b3b154a24f 简化管理文章与管理用户页面信息。 Lan Hui 2023-03-26 19:06:04 +0800
4d99405bfa 简化管理员页面信息。删除退出登录按钮，可以返回到前一页后再退出，不影响使用体验。删除'管理员您好'欢迎词，没啥意义。 Lan Hui 2023-03-26 18:59:15 +0800
8d8b9197b6 手动输入的文字最高难度等级是4 Lan Hui 2023-03-26 09:59:06 +0800
3bc61a602f 添加文章成功后，修改用户信息成功后，页面显示成功信息（flash messages）。 Lan Hui 2023-03-26 09:44:39 +0800
fb6d0b23ce admin_manage_user.html: 修改 JavaScript 函数名. Hui Lan 2023-03-25 22:21:49 +0800
c6010ccbbd admin_manage_user.html: 不再需要，所以删除. Hui Lan 2023-03-25 21:45:37 +0800
f17995a35c fix: using new pagination mod func 吴宇涵 2023-03-25 21:31:32 +0800
ce28a5bf65 feat: auto select expiry_date when select user 吴宇涵 2023-03-25 21:20:19 +0800
99aa4e0990 fix: fix article title show 吴宇涵 2023-03-25 20:41:09 +0800
a220450b03 mainpage_get.html: 首页不显示管理链接（可能会安全点）. Hui Lan 2023-03-23 22:05:36 +0800
7eb276937a admin_manage_user.html: 将默认过期时间设为365天以后. Hui Lan 2023-03-23 21:54:21 +0800
b97210a9e0 admin_manage_article.html: 更为详细的 placeholder 内容. Hui Lan 2023-03-23 21:19:20 +0800
e27985127a admin_manage_article.html: 文章最高难度等级是4. Hui Lan 2023-03-23 21:00:31 +0800
7941e5d1eb fix: fix the way to show article title 吴宇涵 2023-03-23 17:34:37 +0800
2cf65123e9 feat: admin can manage articles and users without interfering with each other 吴宇涵 2023-03-23 17:12:23 +0800
3e35679a91 refactor: refactor the model 吴宇涵 2023-03-23 17:09:25 +0800
82896de336 update .gitignore 吴宇涵 2023-03-23 16:21:02 +0800
13ccbaf25c fix: use select to choose article level 吴宇涵 2023-03-23 13:58:11 +0800
ec6a2249ae fix: fix the pagination 吴宇涵 2023-03-23 13:47:53 +0800
bdda754af6 fix: check current user is admin 吴宇涵 2023-03-23 13:40:22 +0800
52025d55bc fix: add a blankspace 吴宇涵 2023-03-23 13:35:10 +0800
5cffa1fada fix: use single quotation mark 'admin' 吴宇涵 2023-03-23 13:32:11 +0800
c9bfa08658 注释flash的使用，因为其对页面会有影响王梓铭 2023-03-21 19:19:51 +0800
6df25c58b4 查漏，业务中的两处前端标签不做修改，因为不被使用了王梓铭 2023-03-21 18:57:00 +0800
2909b4d973 admin_service.py: 管理员页面显示的用户名按照名字排序。 Hui Lan 2023-03-21 16:22:45 +0800
9075fe9eea Resolve merge conflicts. Hui Lan 2023-03-21 16:08:55 +0800
691c5b0d43 build.sh: Install requirements first. Hui Lan 2023-03-21 16:07:10 +0800
44db2218c1 fix: Use better conditional judgment methods 吴宇涵 2023-03-21 12:45:57 +0800
48de496caa fix: Remove 'Assignment Expresions' & Fix annotation words 吴宇涵 2023-03-21 12:42:59 +0800
1015704e23 fix: fix the way to check article level 吴宇涵 2023-03-21 12:29:44 +0800
cabf6702a7 fix: add one way to set article level & rename some functions and vars 吴宇涵 2023-03-20 23:37:27 +0800