Commit Graph

Select branches

Hide Pull Requests

0618、

509

542

547

593

AAALF

Alpha

Alpha-snapshot20230425

Alpha-snapshot20230426

Alpha-snapshot20230427

Alpha-snapshot20230506

Alpha-snapshot20230507

Alpha-snapshot20230511

Alpha-snapshot20230519

Alpha-snapshot20230525

Alpha-snapshot20230529

Alpha-snapshot20230531

Alpha-snapshot20230601

Alpha-snapshot20230605

Alpha-snapshot20230615

Alpha-snapshot20230621

Alpha-snapshot20230621OK

Alpha-snapshot20240618

BUG543-JiWenkai

Bosh

Bug-561

Bug209-LiuChangYou

Bug257-MaJiaBin

Bug260-Mohanad

Bug344-JiangXueHong

Bug358-LiJie

Bug358-TengJiaQian

Bug391-LiuYiXiu

Bug392-LiJie

Bug392-LuoYu

Bug393-QinYanMei

Bug393-TanYanMei

Bug394-Hui

Bug394-MiaoChenShuo

Bug395-Anxiuxiu

Bug400-QiuZhonghui

Bug400-QiuZhonghui-Refactor

Bug407-JinHaoLin

Bug410-DuanJiaJie

Bug412-JiangLetian

Bug412-JiangLetian-Refactor

Bug422-XuXing

Bug428-LouJiCheng

Bug473-Buya

Bug473-LuXiaochen

Bug474-RenYinJie

Bug476-LiMengdie

Bug476-YuHuangtao

Bug476-Yuhuangtao

Bug476-ZhangWeiHao

Bug476-ZhangWeiHao-BaoYuelin

Bug476-ZhangWeiHao-YuHuangtao

Bug477-ChenJingyi

Bug478-Hui

Bug487-WuYuhan

Bug487-WuYuhan-Refactor

Bug488-TangWei

Bug490-ChenQiuwei

Bug492-XuHongJian

Bug492-XuHongJian-HuangZirui

Bug493-GongKeCheng

Bug495-LiangLiGang

Bug499-Hui

Bug499-WangZiming

Bug500-Badr

Bug501-Hui

Bug502-YuGaoXiang

Bug504-LiJia

Bug505-ZhangYiteng

Bug508-CenHaotian

Bug509-XieQiuHan

Bug509-XieQiuHan-WangZiming

Bug509-XieQiuHan-WangZiming-HuangDan

Bug511-Bosh

Bug511-Hui

Bug512-RenYu

Bug513-Mayada

Bug518-Esther

Bug518-Hui

Bug518-Mponeja

Bug521-LiYuFeng

Bug521-LiYuFeng-refactor

Bug522-HuangZirui

Bug525-Hui

Bug527-ZhouZhifang

Bug528-TangJiao

Bug529-GuHan

Bug532-HuangDan

Bug533-Yuyikai

Bug533-ZhangXuDong

Bug534-NingShushuang

Bug534-WangWeitao

Bug536-Jiangwangzhe

Bug536-QianLetao

Bug540-XiongJiaming

Bug543-Aya

Bug543-AyaOK

Bug545-HuangHuiLing

Bug547-FanWenQi-Adapted

Bug547_FanWenQi

Bug551-DingZeYu

Bug553_LinShan

Bug555-chenshiying

Bug561-LiangZiyue

Bug561-WanZiKun

Bug562-Wuyichen

Bug563-HuangHaoqi

Bug563-Hui

Bug564-JiangChao

Bug565-ChenYuhang

Bug565-Hui

Bug566-SunJiawen

Bug567-YuZheChen

Bug568-SongHaiyan

Bug569-YuTianshuai

Bug570_CaiShuHuang

Bug571-TonQi

Bug571-TongQi

Bug572-ZhongYi

Bug572-ZhongYi2

Bug573-PanBinjie

Bug574-ChenLingjie

Bug574-ChenLingjie2

Bug576-XiaBaizhi

Bug577-JiangXueQin

Bug578-ChenChen

Bug578-ChenChen2

Bug579

Bug579-LuKangyang

Bug580-Hui

Bug585-WangZixiang

BugFix254-Author-ZhanJianhao

BugFix284

BugFix293

BugFix300

BugFix347

BugFix407-JinHaoLin

BugTBD-LiSinan

ChenTianle-TypoCorrection

Deployment

Huangdan

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

Refactor-HeZhengzheng

Refactor-XunYucan

Refactor_qianjunqi

SOFTARCH2022S-ZAYID-478

SOFTARCH2023S-ZENOVIO

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

SPM2023-PR44-YuGaoxiang

SPM2023S-QianJunQi

WangXuan-Highlight-Pronounce

bug-497Gongzhengcheng

bug209-yaaqob

bug209_yaaqobv2

bug359-zhangkeli

bug492

bug555-fangchen

bug585

bug585-wangzixiang

bug585]

englishpal

fix-vuln

improvment-NiWeiCong

improvment-NiWeiCong2

improvment_GuHan

master

refactor-huangzirui

refactor-wangyu

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#7

#70

#71

#72

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

BeginningOfSpring

ColdDew

GreaterCold

GreaterCold2023

Mono Color

• d6bd24ee1c Merge branch 'Alpha' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug393-TanYanMei 倪玲丽 2023-04-24 12:01:08 +0800
• e9e2bd3d23 Remove static\js 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. #83 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
• b34f260d98 requirements.txt: use an older version of Flask to avoid deployment ERROR: No matching distribution found for Flask==2.1.0. Lan Hui 2023-03-21 11:48:09 +0800
• 70d44fcf5c Login.py: fix SyntaxWrning: 'is not' with a literal. Lan Hui 2023-03-21 11:44:05 +0800
• b80fbc936c fix: fix admin_name 吴宇涵 2023-03-20 20:19:56 +0800
• ade10e5843 feat: add admin_service blueprint 吴宇涵 2023-03-20 20:16:48 +0800
• 13d8977636 fix: set specific management displays for admin 吴宇涵 2023-03-20 20:15:58 +0800
• e2b165ada8 fix: add url 'admin' into banned url list 吴宇涵 2023-03-20 20:11:37 +0800
• df82748518 feat: create classes necessary for orm operations 吴宇涵 2023-03-20 20:09:32 +0800
• 376ef9bcbc feat: add pong orm requirement 吴宇涵 2023-03-20 20:08:14 +0800
• 90db6534ab fix: merge latest remote master branch code 吴宇涵 2023-03-20 15:08:06 +0800
• 944c931c9b 完成了对bug509的修复，以及重构项目（去掉了业务中的前端脚本） 王梓铭 2023-03-08 16:33:13 +0800
• cb0132fd31 pull master代码，并成功运行 王梓铭 2023-02-21 20:23:24 +0800
• 93390374ad 标注之前队伍的改动 王梓铭 2023-02-21 20:05:48 +0800
• 43c719b6b2 Merge pull request 'Fix bug 501 - 特殊字符&加入生词库后删除按钮失效' (#81) from Bug501-Hui into master mrlan 2023-01-31 16:45:50 +0800
• a1955341c6 Fix bug 501 - 特殊字符&加入生词库后删除按钮失效 #81 Hui Lan 2023-01-31 16:39:11 +0800
• 92a8b4a994 Lanhui-update-README2 (#80) mrlan 2023-01-30 15:44:01 +0800
• d67ccf4d71 Update README. #80 Lanhui-update-README2 Lan Hui 2023-01-30 15:41:15 +0800
• 9148d9a95c Remove .DS_Store (a Mac hidden file) Lan Hui 2023-01-30 15:16:33 +0800
• e10dbf9d67 Bug507-WuWenZhuo (#70) GreaterCold2023 王志豪 2023-01-29 12:48:52 +0800
• 968cb4ff37 Remove HEAD in README. #70 SPM2022F-CONTRIBUTORS-WuWenZhuo Hui Lan 2023-01-29 12:47:48 +0800
• 31988f710c Remove hash string in README. Hui Lan 2023-01-29 12:46:30 +0800
• 87307c6e69 Solve the problem of having too many blank lines. Hui Lan 2023-01-29 12:39:34 +0800
• 9cdc9c6f7f Bug521-LiYuFeng-Refactor (#72) 李雨峰 2023-01-29 12:01:19 +0800
• 972a1a5524 Bug490-ChenQiuwei (#63) 陈秋伟 2023-01-29 11:49:27 +0800
• 792da57b50 Remove empty line. #63 Bug490-ChenQiuwei Hui Lan 2023-01-29 11:48:13 +0800
• 1f30d6f8fb Better indentation. Hui Lan 2023-01-29 11:46:49 +0800
• 7d2266131d Make sure password and re-entered password are the same during sign-up. Hui Lan 2023-01-29 11:45:27 +0800
• 4a2770eb2f Merge branch 'Bug490-ChenQiuwei' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug490-ChenQiuwei Hui Lan 2023-01-29 11:40:40 +0800
• c52d53596f Merge pull request 'Bug489-DingRui' (#74) from SPM2022F-CONTRIBUTORS-DingRui into master mrlan 2023-01-29 11:31:41 +0800
• ca8c1bf8de Merge pull request 'Bug508-CenHaotian' (#62) from Bug508-CenHaotian into master mrlan 2023-01-29 11:19:49 +0800
• febd0fc932 Merge pull request '用简单的方法（创建 frequency 文件夹）修复Bug 499' (#64) from Bug499-Hui into master mrlan 2023-01-29 11:06:17 +0800
• 03353d49b1 Bug525-Hui (#79) mrlan 2023-01-29 10:57:58 +0800
• 773c1b34d4 set the expiry date 30 days after the date of sign-up. #79 Bug525-Hui Hui Lan 2023-01-29 10:53:58 +0800
• fae0a032c5 Show actual expiry date in expiry.html. Hui Lan 2023-01-29 10:42:23 +0800
• 1373df2a3e Merge pull request '增加单词默认勾选,并修改提示 Fix Bug 495 - Liang Li Gang' (#77) from Bug495-LiangLiGang into master mrlan 2023-01-29 10:27:22 +0800
• 43bd0bd09d update requirement.txt yugaoxiang 2023-01-01 22:05:32 +0800
• 0209548896 提交作业 englishpal yugaoxiang 2022-12-31 18:25:13 +0800