Lan Hui
|
d00432cee1
|
Resolve merge conflicts
|
2024-09-01 07:27:46 +08:00 |
|
Lan Hui
|
e6c945bac7
|
fillword.js & highlight.js: fix JavaScript errors on the front page
|
2024-08-30 08:32:09 +08:00 |
|
Lan Hui
|
fb190b0563
|
Resolve merge conflict
|
2024-08-28 07:53:26 +08:00 |
|
Lan Hui
|
0bfb35b978
|
Make translation tooltip work
|
2024-08-27 11:29:09 +08:00 |
|
Lan Hui
|
13a091be72
|
Merge branch 'Bug573-PanBinjie' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug573-PanBinjie
|
2024-08-27 10:41:33 +08:00 |
|
Lan Hui
|
fb1f927e83
|
word_operation.js: do not alert each time
|
2024-08-27 08:19:22 +08:00 |
|
Lan Hui
|
eff0d01fa0
|
word_operation.js: Resolve conflict
|
2024-08-27 08:15:18 +08:00 |
 mrlan
|
8f38e5fd87
|
Merge pull request 'Bug571-TongQi' (#166) from Bug571-TongQi into Alpha-snapshot20240618
Reviewed-on: mrlan/EnglishPal#166
|
2024-08-27 08:03:04 +08:00 |
|
Lan Hui
|
6f4b91fd73
|
Remove wordfreqapp.db from app/static
|
2024-08-27 07:58:26 +08:00 |
|
Lan Hui
|
ebfe7416e6
|
userpaget_get.html: Resolve conflict
|
2024-08-27 07:43:57 +08:00 |
|
Lan Hui
|
2e203699c0
|
userpaget_get.html: Resolve merge conflicts
|
2024-08-27 07:15:22 +08:00 |
 卢康阳
|
eb3268a139
|
Fix bug 579
|
2024-07-06 16:34:54 +08:00 |
 潘彬杰
|
af59afc7e0
|
解决合并冲突
|
2024-07-05 17:54:11 +08:00 |
蔡书煌
|
3049a4314a
|
只是修改名字
|
2024-07-05 13:35:16 +08:00 |
|
Caroline
|
d8263d17e0
|
Fix bug 570
|
2024-07-04 19:50:34 +08:00 |
 宋海燕
|
794dcf399c
|
fix Bug571
|
2024-07-04 19:22:20 +08:00 |
 陈晨
|
faf5ec14a4
|
Fix bug 578
|
2024-07-04 15:04:34 +08:00 |
|
陈晨
|
9dab83219a
|
Fix bug 578
|
2024-07-04 15:02:57 +08:00 |
Kikky666
|
02f3c4fdfa
|
Fix bug 576-XiaBaizhi
|
2024-07-04 11:35:59 +08:00 |
 钟埸
|
18472acd3d
|
Fix bug 572
|
2024-07-04 11:04:38 +08:00 |
|
Caroline
|
eb2051ca3f
|
Fix bug 570
|
2024-07-03 09:45:44 +08:00 |
|
Caroline
|
8664da12de
|
删了几条注释
|
2024-07-02 16:07:26 +08:00 |
|
Caroline
|
2d765b5c63
|
随机抽取10个生词，并显示
|
2024-07-02 16:03:03 +08:00 |
|
Lan Hui
|
2095550f33
|
Fix bug 547
|
2024-06-22 09:04:25 +08:00 |
 lixiaofeng
|
e3db7c30b0
|
上传文件至 app/static/js
|
2024-05-28 19:55:38 +08:00 |
|
lixiaofeng
|
9f03cc49fa
|
上传文件至 app/static/js
|
2024-05-28 19:55:26 +08:00 |
1994836463@qq.com
|
9537024339
|
再次选择高亮单词，由于标记高亮单词的标签由<mark>改为了<span>，所以在取消单词高亮状态时将标签均改为了<span>，替换时的代码也冗余了，所以也进行了一部分删除。
|
2024-05-26 11:22:20 +08:00 |
|
1994836463@qq.com
|
85a3a9ce6a
|
这里的代码写多余了，删除了一部分
|
2024-05-26 11:19:28 +08:00 |
|
1994836463@qq.com
|
fcd2c83904
|
change
|
2024-05-25 12:03:37 +08:00 |
|
1994836463@qq.com
|
29a673cd92
|
change
|
2024-05-25 11:59:38 +08:00 |
 黄慧玲
|
5dbdf60a2c
|
Merge branch 'Alpha-snapshot20230621' into Bug545-HuangHuiLing
|
2024-05-21 20:02:08 +08:00 |
|
1994836463@qq.com
|
101506a511
|
test and fix
|
2024-05-21 20:00:32 +08:00 |
|
1994836463@qq.com
|
9b3551bbc8
|
fix
|
2024-05-20 15:30:38 +08:00 |
|
1994836463@qq.com
|
90ac789bb4
|
Merge remote-tracking branch 'origin/Bug545-HuangHuiLing' into Bug545-HuangHuiLing
# Conflicts:
# app/static/js/fillword.js
# app/static/js/highlight.js
|
2024-05-20 15:26:30 +08:00 |
|
1994836463@qq.com
|
8575a0dc33
|
fix
|
2024-05-20 15:25:34 +08:00 |
 丁晟晔
|
77ed63441b
|
更新 app/static/css/bootstrap.css
|
2024-05-14 23:26:53 +08:00 |
|
丁晟晔
|
b19eabd225
|
更新 app/static/config.yml
|
2024-05-14 23:26:11 +08:00 |
|
丁晟晔
|
b9d0ad4a15
|
上传文件至 app/static/css
|
2024-05-14 23:24:26 +08:00 |
|
丁晟晔
|
aca827a912
|
更新 app/static/css/bootstrap.css
|
2024-05-14 23:24:06 +08:00 |
|
丁晟晔
|
c9c0ef60d8
|
Merge branch 'Alpha-snapshot20230621' into Bug551-DingZeYu
|
2024-05-06 11:34:44 +08:00 |
|
丁晟晔
|
393264a6fe
|
更新 app/static/js/highlight.js
|
2024-04-19 10:51:18 +08:00 |
|
丁晟晔
|
d5c76674da
|
更新 app/static/css/bootstrap.css
|
2024-04-19 10:50:43 +08:00 |
 AliasJeff
|
b5bde9d33d
|
test: update test file, update username/password config, add pytest to requirements.txt
|
2024-04-09 22:09:50 +08:00 |
|
AliasJeff
|
83491ce28c
|
refactor: Add comments & optimize code
|
2024-04-09 21:21:19 +08:00 |
 唐欣媛
|
2966a8162f
|
Fix bug 544
|
2024-03-27 12:39:42 +08:00 |
|
Lan Hui
|
e9ac50422b
|
Make the flash message dismissible.
|
2023-08-11 19:28:53 +08:00 |
|
Lan Hui
|
f4df263d6e
|
Flash message is informative. Why not add it?
|
2023-08-11 19:14:51 +08:00 |
|
Hui Lan
|
6ea0b970a2
|
(1) Downgrade Flask version from 2.3.2 to 2.0.3 as installing the higher version reports errors. This is probably due to my outdated python version (3.6). (2) Persist SQLite database data in a docker volume. Created a docker volume called englishpal-db using command 'docker volume create englishpal-db' and associate this volume with the docker image file directory /app. So, now what happens in /app will be mirrored to englishpal-db. Where is englishpal-db located? Use command 'docker volume inspect englishpal-db' to find out.
|
2023-07-17 07:45:38 +08:00 |
|
Lan Hui
|
18c37d583a
|
admin_service.py: show article content for the newly added article after clicking the button '保存'.
|
2023-07-14 08:15:15 +08:00 |
|
Lan Hui
|
9a156ebf7e
|
Fix Bug 539
|
2023-07-08 18:23:45 +08:00 |