EnglishPal

xieshanghai

EnglishPal

forked from mrlan/EnglishPal

Fork 0

Commit Graph

Select branches

Hide Pull Requests

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

Bosh

Bug-561

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-Buya

Bug473-LuXiaochen

Bug474-RenYinJie

Bug476-LiMengdie

Bug476-YuHuangtao

Bug476-Yuhuangtao

Bug476-ZhangWeiHao

Bug476-ZhangWeiHao-BaoYuelin

Bug476-ZhangWeiHao-YuHuangtao

Bug477-ChenJingyi

Bug487-WuYuhan

Bug487-WuYuhan-Refactor

Bug488-TangWei

Bug490-ChenQiuwei

Bug492-XuHongJian

Bug492-XuHongJian-HuangZirui

Bug493-GongKeCheng

Bug495-LiangLiGang

Bug499-Hui

Bug499-WangZiming

Bug501-Hui

Bug502-YuGaoXiang

Bug504-LiJia

Bug505-ZhangYiteng

Bug508-CenHaotian

Bug509-XieQiuHan

Bug509-XieQiuHan-WangZiming

Bug509-XieQiuHan-WangZiming-HuangDan

Bug511-Bosh

Bug512-RenYu

Bug521-LiYuFeng

Bug521-LiYuFeng-refactor

Bug522-HuangZirui

Bug525-Hui

Bug527-ZhouZhifang

Bug528-TangJiao

Bug529-GuHan

Bug532-HuangDan

Bug533-Yuyikai

Bug534-NingShushuang

Bug540-XiongJiaming

Bug545-HuangHuiLing

Bug547_FanWenQi

Bug551-DingZeYu

Bug551-XieShangHai

Bug553_LinShan

Bug561-WanZiKun

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

bug209-yaaqob

bug209_yaaqobv2

bug359-zhangkeli

bug492

bug555-fangchen

englishpal

fix-vuln

improvment-NiWeiCong

improvment-NiWeiCong2

improvment_GuHan

master

refactor-huangzirui

refactor-wangyu

BeginningOfSpring

ColdDew

GreaterCold

GreaterCold2023

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' 张伟浩 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
260f62967b 修复 Bug394 Bug394-MiaoChenShuo miaochenshuo 2022-06-05 23:36:55 +0800
40c86b2050 Bug359 修改位置pickle_idea2.py line71 keli_Chuang 2022-06-05 22:00:43 +0800
7adbbd5727 bug209 is fixed bug209-yaaqob yanbo2020 2022-06-01 19:06:05 +0800
1d3f6a47a8 bug209-yaaqob yanbo2020 2022-06-01 19:01:54 +0800
d72ab4fe3a BugFix257 Bug257-MaJiaBin majiabin 2022-06-01 16:08:55 +0800
78e5524bae userpage_post.html: update userpage_post.html. Bug395-Anxiuxiu 安秀秀 2022-05-29 15:19:07 +0800
b9cf94da74 Merge pull request 'build.sh: use a variable DEPLOYMENT_DIR to represent the code folder' (#24) from Deployment into master mrlan 2022-02-07 13:58:04 +0800
8647af3158 build.sh: use a variable DEPLOYMENT_DIR to represent the code folder Deployment Lan Hui 2022-02-07 13:56:14 +0800
2a92881581 README.md: update path BeginningOfSpring Hui Lan 2022-02-05 23:05:00 +0800
2d4c516676 README.md: new code repository folder for deployment Hui Lan 2022-02-05 23:03:43 +0800
5976f758a0 Remove pyc files. Hui Lan 2022-02-05 23:01:01 +0800
18684ada6b build.sh: deploy the new code Hui Lan 2022-02-05 22:59:45 +0800
e288b19678 Merge pull request 'ChenTianle-TypoCorrection' (#23) from ChenTianle-TypoCorrection into master GreaterCold mrlan 2022-01-27 20:18:17 +0800
f675870401 templates/mainpage_get.html: Use more appropriate word. 将'登出'按钮改为'退出' -- 陈天乐 ChenTianle-TypoCorrection Lan Hui 2022-01-27 20:15:26 +0800
8dab62df7e templates/mainpage_get.html: fix typo -- 陈天乐 Lan Hui 2022-01-27 20:12:10 +0800
c43e4c3f7c Merge pull request 'Use named style for sqlite3 execute()' (#22) from Hui-SaferSQL into master mrlan 2022-01-27 17:09:29 +0800
18dfad910b Use named style for sqlite3 execute() Hui-SaferSQL Lan Hui 2022-01-27 17:01:03 +0800
1d7939acf4 Merge pull request 'templates/signup.html: user name must not be empty. Bug reported and fixed by 丁宇超. For more details, see http://118.25.96.118/bugzilla/show_bug.cgi?id=347 and http://118.25.96.118/kanboard/?controller=BoardViewController&action=show&project_id=183' (#21) from BugFix347 into master mrlan 2022-01-27 13:04:26 +0800
788bca8873 templates/signup.html: user name must not be empty. Bug reported and fixed by 丁宇超. For more details, see http://118.25.96.118/bugzilla/show_bug.cgi?id=347 and http://118.25.96.118/kanboard/?controller=BoardViewController&action=show&project_id=183 BugFix347 Lan Hui 2022-01-27 13:02:27 +0800
922e1ee652 Merge pull request 'WangXuan-Highlight-Pronounce' (#20) from WangXuan-Highlight-Pronounce into master mrlan 2022-01-27 12:57:45 +0800
42356c222d templates/mainpage_get.html: remove superfluous () WangXuan-Highlight-Pronounce Lan Hui 2022-01-27 12:48:25 +0800
edb801b95e Show the expiry notice if the account has expired. Lan Hui 2022-01-27 12:45:09 +0800
718b98ef02 Login.py: use password instead of psd because psd may cause confusion. Lan Hui 2022-01-27 12:28:41 +0800
0c923f7db2 Login.py: simplify md5. Lan Hui 2022-01-27 12:24:20 +0800
d4c1b1fdcc Login.py: update expiry date. Lan Hui 2022-01-27 11:57:40 +0800
a94a333366 Remove redundant css files. Lan Hui 2022-01-27 11:49:41 +0800
ba2ff7dee2 Remove music player js because that is not the focus of EnglishPal. If people want to listen music, they have better options than EnglishPal. Lan Hui 2022-01-27 11:40:58 +0800
b0d80096d6 templates/userpage_get.html: change the position and order of the checkboxes. Lan Hui 2022-01-27 11:27:26 +0800
4d2dd2b68e Repalce old app folder with SoftArch王炫/english-pal-master/app/ Lan Hui 2022-01-26 21:10:09 +0800
72deae7d3a requirements.txt: include PyYAML. Lan Hui 2022-01-26 21:03:03 +0800
abd8882541 Merge pull request 'Lanhui-Selenium' (#19) from Lanhui-Selenium into master mrlan 2021-12-03 09:19:56 +0800
246ddcc62a Remove HOME_PAGE as we use URL now. Lanhui-Selenium Hui Lan 2021-12-03 09:18:34 +0800
f8a5cc2a40 test: use localhost to test Hui Lan 2021-12-03 09:16:18 +0800
3c118a53e2 add conftest.py Hui Lan 2021-12-03 09:08:45 +0800
5cc430714a Merge pull request 'README.md: correct section levels.' (#18) from Lanhui-update-README into master ColdDew mrlan 2021-10-17 15:03:30 +0800
9ffc124ac3 README.md: correct section levels. Lanhui-update-README Lan Hui 2021-10-17 15:02:54 +0800
9bba40d31b Merge pull request 'Lanhui-update-README' (#17) from Lanhui-update-README into master mrlan 2021-10-17 14:55:49 +0800
4c9b471317 README.md: better organization. Lan Hui 2021-10-17 14:54:48 +0800
84e98d8bd9 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into Lanhui-update-README Lan Hui 2021-10-17 14:32:10 +0800
a3de113751 commit build.sh Lan Hui 2021-10-17 14:31:58 +0800
7153c5aeb5 Merge pull request 'BugFix300' (#16) from BugFix300 into master mrlan 2021-09-05 20:52:31 +0800
ffc33852ae main.py: make sure the key articleID exists. BugFix300 Lan Hui 2021-09-05 20:51:28 +0800
91ca6fe33b Merge branch 'BugFix300' of http://121.4.94.30:3000/mrlan/EnglishPal into BugFix300 Lan Hui 2021-09-05 20:44:55 +0800
23288f5282 Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal Lan Hui 2021-09-05 20:44:14 +0800
02a5d4bd47 main.py: fix bug300: http://118.25.96.118/bugzilla/show_bug.cgi?id=300 Hui Lan 2021-09-05 20:42:18 +0800
ba2a48611e Merge pull request 'Lanhui-IncreaseChanceOfGettingDifficultArticles' (#15) from Lanhui-IncreaseChanceOfGettingDifficultArticles into master mrlan 2021-08-31 21:32:19 +0800
2a509f83cc Merge branch 'master' of http://121.4.94.30:3000/mrlan/EnglishPal into BugFix293 Lanhui-IncreaseChanceOfGettingDifficultArticles Hui Lan 2021-08-31 21:27:37 +0800
f8acf03acc main.py: let the user have a small chance to get a much more difficult article than his vocabulary level. Hui Lan 2021-08-31 21:25:17 +0800
6754930707 Merge pull request 'BugFix293' (#14) from BugFix293 into master mrlan 2021-08-30 08:31:56 +0800
baf333678a main.py and build.sh: shuffle the articles first before select one, relax selection range, keep the database BugFix293 Hui Lan 2021-08-30 08:18:47 +0800