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

d3a796428d account_service.py: module re is no longer necessary. Hui Lan 2022-11-03 22:21:34 +0800
702205940c Login.py: must convert warn to string before comparing to OK Lan Hui 2022-11-03 22:06:24 +0800
f0b5adc5e4 Login.py: fix function name Lan Hui 2022-11-03 22:02:32 +0800
3cfec31c3f Login.py: add missing colon Hui Lan 2022-11-03 22:00:47 +0800
286e884dd8 Refactor Wu Yuhan's code Hui Lan 2022-11-03 21:59:12 +0800
bfd87c51f6 Merge pull request 'Bug487-WuYuhan' (#56) from Bug487-WuYuhan into master mrlan 2022-11-03 21:28:55 +0800
ab01b8e19b Hui-Build (#55) mrlan 2022-11-01 21:43:01 +0800
65d78d5250 build.sh: automatically restart docker container after Ubuntu reboot Hui-Build Hui Lan 2022-11-01 21:35:22 +0800
a1e20e4149 build.sh: change deployment path Hui Lan 2022-11-01 21:33:56 +0800
59d95d8e9f account_service.py: 导入re库使用正则匹配过滤了注册时用户名的非法字符 Bug487-WuYuhan 吴宇涵 2022-10-21 11:07:20 +0800
5844eab6d5 account_service.py: 添加注册时用户名的非法字符过滤吴宇涵 2022-10-21 10:44:39 +0800
02ffcd3b59 Merge pull request 'Bug412-JiangLetian-Refactor' (#54) from Bug412-JiangLetian-Refactor into master mrlan 2022-08-05 16:18:06 +0800
ecc354bc0d Refactor: use better function Bug412-JiangLetian-Refactor Lan Hui 2022-08-02 12:33:41 +0800
1d8671c5c7 Refactor: use better function name Lan Hui 2022-08-02 12:30:27 +0800
8cb34e56ba Refactor: remove duplicate code block Lan Hui 2022-08-02 12:26:18 +0800
b5dacb9ad2 Improve comments Lan Hui 2022-08-02 11:52:40 +0800
47e745e774 Use better variable name (use articleContent instead of txt, and use camelCase) Lan Hui 2022-08-02 11:45:21 +0800
1dfe370983 Use better variable names Lan Hui 2022-08-02 11:39:35 +0800
9927515b11 Merge pull request 'Bug412-JiangLetian' (#39) from Bug412-JiangLetian into master mrlan 2022-08-02 11:03:39 +0800
c15746bbb2 Resolve conflicts Bug412-JiangLetian Lan Hui 2022-08-02 11:00:33 +0800
b745da4c90 Merge pull request 'IMPROVE-WangWeiLong' (#35) from IMPROVE-WangWeiLong into master mrlan 2022-07-31 09:11:53 +0800
7663dfb8f4 Merge pull request 'Hui-EscapeUserInput' (#53) from Hui-EscapeUserInput into master mrlan 2022-07-29 16:20:01 +0800
0098fa8746 Prevent attribute injection Hui-EscapeUserInput Lan Hui 2022-07-29 15:26:19 +0800
828cef406c Escape user input first Lan Hui 2022-07-29 15:22:42 +0800
2c1bc98833 Bug422-XuXing (#46) 徐幸 2022-07-21 23:13:33 +0800
4fb1cad745 Use a better variable name (fix session variable name error). Bug422-XuXing Lan Hui 2022-07-21 22:28:22 +0800
2a553e0f8f Use a better variable name. Lan Hui 2022-07-21 22:17:50 +0800
4513a80bdd Remove unused code. Lan Hui 2022-07-21 22:15:07 +0800
e73c66edd3 Re-arrange button positions (put Next Article before Previous Article). Lan Hui 2022-07-21 22:12:35 +0800
69835c7f8d Merge branch 'Bug422-XuXing' into Bug422-XuXing Lan Hui 2022-07-21 22:05:48 +0800
9a89510f4e Merge pull request 'Improvement-Stewart' (#49) from Improvement-Stewart into master mrlan 2022-07-20 17:31:01 +0800
e9eb604a22 Improve spacing and indentation. Improvement-Stewart Lan Hui 2022-07-20 17:10:03 +0800
9beb1ad1d2 Make up the enclosing >. Lan Hui 2022-07-20 17:09:04 +0800
8998d6e4af Improve spacing. Lan Hui 2022-07-20 17:08:07 +0800
8747f35fd8 Make up the enclosing >. Lan Hui 2022-07-20 17:07:09 +0800
fdb432031f Better indentation. Lan Hui 2022-07-20 17:06:11 +0800
1401870591 Use Chinese UI language. Lan Hui 2022-07-20 17:04:34 +0800
1ca90bb2a9 Remove superfluous 'jjj'. Lan Hui 2022-07-20 17:00:13 +0800
ea19658212 Merge branch 'Improvement-Stewart' Lan Hui 2022-07-20 16:57:31 +0800
028e2f9d56 Merge pull request '[Refactor]: Remove loop.index0, as it is hard to understand.' (#52) from Bug400-QiuZhonghui-Refactor into master mrlan 2022-07-18 19:58:01 +0800
50a1093781 Remove loop.index0, as it is hard to understand. Bug400-QiuZhonghui-Refactor Lan Hui 2022-07-18 19:51:23 +0800
c21659ba7e Bug477 重构 and 增加功能 (#48) 陈靖毅 2022-07-18 16:00:08 +0800
13b39cf85c Use better variable names. Bug477-ChenJingyi Lan Hui 2022-07-18 15:57:23 +0800
b0f1e707b1 Merge branch 'Bug477-ChenJingyi' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug477-ChenJingyi Lan Hui 2022-07-18 15:51:55 +0800
9d420acd8b [REFACTOR] user_service.py: Added id to user name, word and frequency for click to execute AJAX request in JS (#30) 邱忠辉 2022-07-18 13:29:04 +0800
84468cf28a Use GET instead of get for HTTP request. Bug400-QiuZhonghui Lan Hui 2022-07-18 12:17:17 +0800
e9675ec8ee Improve function name. Lan Hui 2022-07-18 12:14:31 +0800
3f6dc2b1f4 Improve readability. Lan Hui 2022-07-18 12:12:46 +0800
304f720779 Use a better variable name. Lan Hui 2022-07-18 12:03:39 +0800
c264400794 User modern let to declare a variable. Lan Hui 2022-07-18 12:02:15 +0800
6306fdbbfc Remove unused lines Lan Hui 2022-07-18 12:00:06 +0800
35205d2066 更新 'app/wordfreqCMD.py' Bug474-RenYinJie 任殷杰 2022-06-20 13:13:26 +0800
ce2af6665d 更新 'app/wordfreqCMD.py' 任殷杰 2022-06-20 13:12:27 +0800
3ca66d147c 更新 'app/wordfreqCMD.py' 任殷杰 2022-06-20 13:07:27 +0800
fa44bc9126 add more comments and sql file Blueotter 2022-06-18 22:16:18 +0800
d7b40ee699 add wordCMD.py Blueotter 2022-06-18 16:17:08 +0800
cb224fe3ab 更新 'app/difficulty.py' Bug344-JiangXueHong 姜雪虹 2022-06-15 12:04:43 +0800
71cc627aad 更新 'app/templates/userpage_get.html' 徐幸 2022-06-15 11:42:46 +0800
e241c47744 Merge branch 'master' into Bug428-LouJiCheng Bug428-LouJiCheng 楼吉诚 2022-06-14 22:11:24 +0800
9d5175d0a6 WIP:[REFACTOR]:main.py,create_clozeTest.py:重构 stfujnkk 2022-06-14 22:01:44 +0800
0117470ab5 WIP:[BugFix]:main.py:跳转错误 stfujnkk 2022-06-14 21:53:20 +0800
de1d191e5a

add slider of speech-rate 陈靖毅 2022-06-14 19:19:02 +0800
3d24690ccf

refactor fillword.js and highlight.js 陈靖毅 2022-06-14 16:24:05 +0800
22775f9797 上传文件至 'app' 徐幸 2022-06-14 15:58:21 +0800
9e36644215 增加返回上一篇按钮徐幸 2022-06-14 15:56:12 +0800
8441d4ed51 force strong password SOFTARCH2022S-ZAYID-478 SayidCali jamac 2022-06-14 09:20:24 +0300
6823c10043 improved stewy 2022-06-14 13:25:42 +0800
3b6e749346 我们把highlight.js里面的内容进行了一定的修改 Bug392-LuoYu 540497900 2022-06-14 13:19:56 +0800
ee44372848 improved stewy 2022-06-14 12:37:28 +0800
041cbd97fc 更新 'app/static/js/highlight.js' 蒋乐天 2022-06-13 21:32:49 +0800
bd997d1c66 更新 'app/difficulty.py' Bug476-ZhangWeiHao 张伟浩 2022-06-13 20:39:59 +0800
83a11244ac 更新 'app/wordfreqCMD.py' Bug358-TengJiaQian 滕佳倩 2022-06-13 19:40:18 +0800
f553c37af2 改进评级用户level yzj642 2022-06-13 19:35:07 +0800
72e23f4e13 对fillword.js进行了重构 AAAzsf 2022-06-13 16:33:03 +0800
d52e60bdd2 fixbug410 Bug410-DuanJiaJie 段佳杰 2022-06-13 16:28:27 +0800
5a62204864 BugFix407: fillword.js 在划新词后，会直接开始读新词（之前是会读完之前划的词后才开始读新词） AAAzsf 2022-06-13 15:56:58 +0800
8450335628 Merge branch 'master' into Bug209-LiuChangYou Bug209-LiuChangYou 刘长优 2022-06-13 11:55:28 +0800
3ccaad00f2 [BUGFIX] Article.py: modified get_today_article to fix bug 209 Umky 2022-06-13 11:44:57 +0800
b53e7031e5 Bug412-JiangLetian lin 2022-06-13 11:40:20 +0800
e48008550a Merge branch 'Bug394-MiaoChenShuo' into master 缪宸硕 2022-06-12 21:50:36 +0800
3d6a61c113 [IMPORVE] userpage_get.html: 修改了用户操作生词时的响应方式 Umky 2022-06-12 21:45:43 +0800
8924166975 上传文件至 'static\js' 覃艳美 2022-06-12 21:23:34 +0800
fde3be4c23 更新 'app/Article.py' Bug393-QinYanMei 李凯 2022-06-11 23:21:17 +0800
4817557099 更新 'app/Article.py' IMPROVE-WangWeiLong 李凯 2022-06-11 23:20:41 +0800
5d5f4cf8f2 更新 'app/Article.py' 李凯 2022-06-11 23:13:08 +0800
e40ebac452 更新 'app/static/css/bootstrap.css' 李凯 2022-06-11 23:08:29 +0800
d0dfa605a9 更新 'app/wordfreqCMD.py' 滕佳倩 2022-06-11 09:56:54 +0800
46ddf063cf [REFACTOR] 将Artical.py文件中的前端代码分离出来 Bug391-LiuYiXiu LM 2022-06-10 21:18:16 +0800
dafe1717eb [IMPROVE] userpage_get.html:bug391修改文章所在div层（灰色区域）左右的边距，使鼠标划词时，鼠标松开的终点始终可以落在灰色边框内，从而使边界词汇均能划入 LM 2022-06-10 20:33:30 +0800
241708af9c [IMPROVE]:main.py:完型填空请求和计分接口 stfujnkk 2022-06-10 19:24:58 +0800
4870772f1f [IMPROVE]:clozeTest.html,userpage_get.html:完型填空页面 stfujnkk 2022-06-10 19:23:14 +0800
f214838cdd [IMPROVE]:create_clozeTest.py:生成完型填空 stfujnkk 2022-06-10 19:20:18 +0800
3e554c61c9 [BugFix]:requirements.txt:修复Flask1版本不兼容 stfujnkk 2022-06-10 19:13:47 +0800
1e6c4c6da0 [IMPROVE]:.gitignore:忽略python字节码缓存 stfujnkk 2022-06-10 19:06:23 +0800
a35a21074a add test_word_operation.py in test folder PeterQiu 2022-06-10 10:19:28 +0800
f488aa51a3 Fix Bug260 Bug260-Mohanad ileaderx 2022-06-09 22:56:57 +0300
670e5a2083 [REFACTOR] user_service.py: Added id to user name, word and frequency for click to execute AJAX request in JS PeterQiu 2022-06-08 10:50:21 +0800
3654776aec BugFix358 + Improve + Refactor Stela 2022-06-06 19:42:26 +0800
2a570af421 i added select all function bug209_yaaqobv2 yanbo2020 2022-06-06 17:11:29 +0800
e8b7b2e4dc 修复了bug407：划词朗读时，会结束之前的朗读，直接重新开始新的划词朗读。 BugFix407-JinHaoLin AAAzsf 2022-06-06 15:54:22 +0800