EnglishPal

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

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

englishpal

fix-vuln

improvment-NiWeiCong

improvment-NiWeiCong2

improvment_GuHan

master

refactor-huangzirui

refactor-wangyu

#1

#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

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#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

ce58f14406 Merge pull request 'Fix bug 580' (#188) from Bug580-Hui into Alpha-snapshot20240618 Alpha-snapshot20240618 mrlan 2024-09-08 12:19:02 +0800
05dc0ecbb7 Fix bug 580 #188 Bug580-Hui Lan Hui 2024-09-08 12:18:07 +0800
8859827eac Merge pull request 'Fix bug 565' (#187) from Bug565-Hui into Alpha-snapshot20240618 mrlan 2024-09-07 09:04:35 +0800
b6a36b1d1a Fix bug 565 #187 Bug565-Hui Lan Hui 2024-09-07 09:03:59 +0800
12752341db Merge pull request 'Fix bug 394' (#185) from Bug394-Hui into Alpha-snapshot20240618 #186 mrlan 2024-09-06 08:55:35 +0800
3abebdfb21 Fix bug 394 #185 Bug394-Hui Lan Hui 2024-09-06 08:54:11 +0800
92331ca7a0 Merge pull request 'Fix bug 478' (#184) from Bug478-Hui into Alpha-snapshot20240618 mrlan 2024-09-05 10:12:21 +0800
1166d3499f Fix bug 478 #184 Bug478-Hui Lan Hui 2024-09-05 10:11:20 +0800
fe1d4c29ff Merge pull request 'Fix Bug 501. The key fix is the first line in funciton wordTemplate() from word_operation.js, i.e., using double quotes instead of single quotes.' (#183) from Bug501-Hui into Alpha-snapshot20240618 mrlan 2024-09-04 15:17:23 +0800
aaf2db8657 Fix Bug 501. The key fix is the first line in funciton wordTemplate() from word_operation.js, i.e., using double quotes instead of single quotes. #183 Bug501-Hui Lan Hui 2024-09-04 15:15:03 +0800
e478217343 Merge pull request 'main.py: fix Bug 511' (#182) from Bug511-Hui into Alpha-snapshot20240618 mrlan 2024-09-04 10:22:56 +0800
4f95935037 main.py: fix Bug 511 #182 Bug511-Hui Lan Hui 2024-09-04 10:21:55 +0800
370a215d08 Merge pull request 'pickle_idea.py: Make funciton unfamiliar() more robust' (#181) from Bug518-Hui into Alpha-snapshot20240618 mrlan 2024-09-03 11:43:10 +0800
de81f5966d pickle_idea.py: Make funciton unfamiliar() more robust #181 Bug518-Hui Lan Hui 2024-09-03 11:42:14 +0800
38206271c6 Ignore words with length less than or equal to 2 Lan Hui 2024-09-02 15:24:19 +0800
172727f95f Merge pull request 'Fix Bug 563' (#180) from Bug563-Hui into Alpha-snapshot20240618 mrlan 2024-09-02 15:18:12 +0800
46d1793397 Fix Bug 563 #180 Bug563-Hui Lan Hui 2024-09-02 15:16:11 +0800
74186df292 Merge pull request 'DONE: bug555-fangchen' (#123) from bug555-fangchen into Alpha-snapshot20240618 mrlan 2024-09-01 07:39:04 +0800
db652d3bf2 conftest.py: remove the extra blank line in the file #123 bug555-fangchen Lan Hui 2024-09-01 07:38:49 +0800
b43174ffba Resolve merge conflicts Lan Hui 2024-09-01 07:35:50 +0800
74f47b786e Merge pull request 'Fix bug 547' (#146) from Bug547-FanWenQi-Adapted into Alpha-snapshot20240618 mrlan 2024-09-01 07:28:15 +0800
d00432cee1 Resolve merge conflicts #146 Bug547-FanWenQi-Adapted Lan Hui 2024-09-01 07:27:46 +0800
19ea14b38c Merge pull request '提供更便利的获取用户单词表的方法，以json数据格式返回' (#93) from SPM2023S-QianJunQi into Alpha-snapshot20240618 mrlan 2024-08-31 07:39:00 +0800
621ac24991 Give the blueprint a better name: apiService #93 SPM2023S-QianJunQi Lan Hui 2024-08-31 07:38:30 +0800
ceb5f14ee9 Simplify wordCMD.py and rename it to api_service.py Lan Hui 2024-08-31 07:35:50 +0800
8f31b030ea Resolve merge conflicts Lan Hui 2024-08-31 06:59:46 +0800
909119b587 Merge pull request 'DONE: Bug536-Jiangwangzhe' (#138) from Bug536-Jiangwangzhe into Alpha-snapshot20240618 mrlan 2024-08-30 08:32:48 +0800
e6c945bac7 fillword.js & highlight.js: fix JavaScript errors on the front page #138 Bug536-Jiangwangzhe Lan Hui 2024-08-30 08:32:09 +0800
0c6616d52c Resolve merge conflicts Lan Hui 2024-08-30 08:11:03 +0800
44d9c39d4b Merge pull request 'DONE: Bug540-XiongJiaming' (#125) from Bug540-XiongJiaming into Alpha-snapshot20240618 mrlan 2024-08-29 07:53:48 +0800
b2e11aea6f 将标记文章按钮移到页面上方；标记文章时不要alert #125 Bug540-XiongJiaming Lan Hui 2024-08-29 07:52:58 +0800
2bec0642dd Resolve merge conflicts Lan Hui 2024-08-29 07:34:32 +0800
62dd580974 在加入生词簿前，去掉全角方括号【】 Lan Hui 2024-08-28 08:08:31 +0800
47a359c798 Merge pull request 'Bug579-LuKangyang' (#172) from Bug579-LuKangyang into Alpha-snapshot20240618 mrlan 2024-08-28 07:56:09 +0800
fb190b0563 Resolve merge conflict #172 Bug579-LuKangyang Lan Hui 2024-08-28 07:53:26 +0800
262604e761 Merge pull request 'BUG543-JiWenkai' (#153) from BUG543-JiWenkai into Alpha-snapshot20240618 mrlan 2024-08-28 07:50:49 +0800
61a0b39507 Resolve merge conflict #153 BUG543-JiWenkai Lan Hui 2024-08-28 07:48:50 +0800
391e859d30 Merge pull request 'Bug574-ChenLingjie2' (#160) from Bug574-ChenLingjie2 into Alpha-snapshot20240618 mrlan 2024-08-28 07:43:37 +0800
c453317ad8 Make sure the user name is not on the black list before proceeding #160 Bug574-ChenLingjie2 Lan Hui 2024-08-28 07:42:05 +0800
f9003ece69 Remove unused import Lan Hui 2024-08-28 07:23:52 +0800
146781df50 Resolve merge conflict Lan Hui 2024-08-28 07:23:30 +0800
329732038f Merge pull request 'Bug573-PanBinjie' (#169) from Bug573-PanBinjie into Alpha-snapshot20240618 mrlan 2024-08-27 11:30:23 +0800
0bfb35b978 Make translation tooltip work #169 Bug573-PanBinjie Lan Hui 2024-08-27 11:29:09 +0800
13a091be72 Merge branch 'Bug573-PanBinjie' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug573-PanBinjie Lan Hui 2024-08-27 10:41:33 +0800
30ff57909e Merge pull request 'word_operation.js: do not alert each time' (#179) from Bug570_CaiShuHuang into Alpha-snapshot20240618 mrlan 2024-08-27 08:19:54 +0800
fb1f927e83 word_operation.js: do not alert each time #179 Bug570_CaiShuHuang Lan Hui 2024-08-27 08:19:22 +0800
3b6d88bd68 Merge pull request 'Bug570_CaiShuHuang' (#170) from Bug570_CaiShuHuang into Alpha-snapshot20240618 mrlan 2024-08-27 08:18:44 +0800
eff0d01fa0 word_operation.js: Resolve conflict #170 Lan Hui 2024-08-27 08:15:18 +0800
8f38e5fd87 Merge pull request 'Bug571-TongQi' (#166) from Bug571-TongQi into Alpha-snapshot20240618 mrlan 2024-08-27 08:03:04 +0800
b39cf2e4fa Merge pull request 'Remove wordfreqapp.db from app/static' (#178) from Bug578-ChenChen2 into Alpha-snapshot20240618 mrlan 2024-08-27 07:59:02 +0800
6f4b91fd73 Remove wordfreqapp.db from app/static #178 Bug578-ChenChen2 Lan Hui 2024-08-27 07:58:26 +0800
09beaff831 Merge pull request 'Bug578-ChenChen' (#167) from Bug578-ChenChen into Alpha-snapshot20240618 mrlan 2024-08-27 07:53:20 +0800
ebfe7416e6 userpaget_get.html: Resolve conflict #167 Bug578-ChenChen Lan Hui 2024-08-27 07:43:57 +0800
98027158b5 Merge pull request 'Bug577-JiangXueQin' (#163) from Bug577-JiangXueQin into Alpha-snapshot20240618 mrlan 2024-08-27 07:39:25 +0800
92a1af4222 userpaget_get.html: Resolve conflict #163 Bug577-JiangXueQin Lan Hui 2024-08-27 07:39:04 +0800
79dff9a3b5 Merge pull request 'Bug576-XiaBaizhi' (#162) from Bug576-XiaBaizhi into Alpha-snapshot20240618 mrlan 2024-08-27 07:21:05 +0800
bd4fb6846b userpaget_get.html: Do not disable the 'Next Article' button #162 Bug576-XiaBaizhi Lan Hui 2024-08-27 07:20:20 +0800
2e203699c0 userpaget_get.html: Resolve merge conflicts Lan Hui 2024-08-27 07:15:22 +0800
d502b3f474 Merge pull request 'Bug564-JiangChao' (#152) from Bug564-JiangChao into Alpha-snapshot20240618 mrlan 2024-08-26 10:29:26 +0800
66899376c3 userpaget_get.html: Resolve merge conflicts #152 Bug564-JiangChao Lan Hui 2024-08-26 10:27:43 +0800
6cc7f043da Merge pull request 'Bug572-ZhongYi2' (#159) from Bug572-ZhongYi2 into Alpha-snapshot20240618 mrlan 2024-08-26 10:05:45 +0800
1d80fa8886 userpaget_get.html: Resolve merge conflicts #159 Bug572-ZhongYi2 Lan Hui 2024-08-26 10:03:47 +0800
dc3ef2bc9f Merge pull request 'Bug533-ZhangXuDong' (#161) from Bug533-ZhangXuDong into Alpha-snapshot20240618 mrlan 2024-08-26 09:49:38 +0800
9eac40493b userpaget_get.html and mainpage_gethtml: improve display information. #161 Bug533-ZhangXuDong Lan Hui 2024-08-26 09:49:00 +0800
fe6a28a81d userpaget_get.html: Resolve merge conflicts Lan Hui 2024-08-26 09:41:53 +0800
bf8bb1a6bc Merge pull request 'Bug568-SongHaiyan' (#158) from Bug568-SongHaiyan into Alpha-snapshot20240618 mrlan 2024-08-26 09:28:18 +0800
7a97e25b8c Merge pull request 'Bug567-YuZheChen' (#155) from Bug567-YuZheChen into Alpha-snapshot20240618 mrlan 2024-08-26 09:18:24 +0800
9afc642c41 Add test_bug#_LiJie.py #175 Bug392-LiJie mrmanforgithub 2024-07-09 20:13:13 +0800
dae8fe739c new file: app/test/test_bug#_lijie.py.py Bug358-LiJie mrmanforgithub 2024-07-09 20:05:56 +0800
de392ddc5a 加入注册验证码机制，防止被机器人恶意批量注册。修改源代码的 account_service.py 文件，并加入验证码机制。 #173 Bug534-WangWeitao 王伟涛 2024-07-07 17:54:44 +0800
eb3268a139 Fix bug 579 卢康阳 2024-07-06 16:34:54 +0800
220e108ee1 解决合并冲突卢康阳 2024-07-06 16:33:43 +0800
af59afc7e0 解决合并冲突潘彬杰 2024-07-05 17:54:11 +0800
3049a4314a 只是修改名字蔡书煌 2024-07-05 13:35:16 +0800
4e8ef0a44c 更新 app/static/js/highlight.js #177 Bug569-YuTianshuai 于天帅 2024-07-05 12:18:06 +0800
a17759416a Fix bug 563 #168 Bug563-HuangHaoqi peilinwu 2024-07-04 21:41:51 +0800
d8263d17e0 Fix bug 570 Caroline 2024-07-04 19:50:34 +0800
794dcf399c fix Bug571 #166 Bug571-TongQi 宋海燕 2024-07-04 19:22:20 +0800
56c8dc24c6 Fix bug 563 peilinwu 2024-07-04 15:37:40 +0800
9bbd3a978d Fix bug 533 陈宇航 2024-07-04 15:37:37 +0800
6b3efad1dc Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug576-XiaBaizhi 夏栢芝 2024-07-04 15:05:36 +0800
faf5ec14a4 Fix bug 578 陈晨 2024-07-04 15:04:34 +0800
70fc469f5e Fix bug 577 “jxq” 2024-07-04 15:03:31 +0800
9dab83219a Fix bug 578 陈晨 2024-07-04 15:02:57 +0800
7bf1a958b5 Fix bug 577 “jxq” 2024-07-04 15:01:22 +0800
55eac68160 Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug577-JiangXueQin “jxq” 2024-07-04 14:56:26 +0800
dc3fd67b02 解决合并冲突 “jxq” 2024-07-04 14:56:20 +0800
02f3c4fdfa Fix bug 576-XiaBaizhi Kikky666 2024-07-04 11:35:59 +0800
109a9447a7 Fix bug 574 陈灵婕 2024-07-04 11:16:32 +0800
84e0fc51f7 解决合并冲突陈灵婕 2024-07-04 11:13:47 +0800
18472acd3d Fix bug 572 钟埸 2024-07-04 11:04:38 +0800
75c96a60df 解决合并冲突钟埸 2024-07-04 11:00:17 +0800
5657d8d5ee Fix Bug533 张旭东 2024-07-04 10:44:41 +0800
94fba598ea Fix bug 572 Bug572-ZhongYi 钟埸 2024-07-04 10:42:34 +0800
41e1921520 Fix bug 572 钟埸 2024-07-04 10:40:35 +0800
de5ffccd85 Fix bug 566 #171 Bug566-SunJiawen SUNJIAWEN 2024-07-04 10:19:52 +0800
1f718e201f init 张旭东 2024-07-04 10:18:47 +0800
b38bcd5165 Fix bug 571 #165 #164 WangJiaLu 2024-07-04 10:10:31 +0800
87d034306b Fix bug 574 #156 Bug574-ChenLingjie 陈灵婕 2024-07-04 10:09:27 +0800
8e8de286e0 Fix bug 566 SUNJIAWEN 2024-07-04 10:06:44 +0800