zhangenhuai
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests 1 Activity
552 Commits
197 Branches
4 Tags
19 MiB
Commit Graph

552 Commits (d502b3f474bc0e20ffabb6933d56db1a42882530)

Author SHA1 Message Date
mrlan d502b3f474 Merge pull request 'Bug564-JiangChao' (#152) from Bug564-JiangChao into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#152
 2024-08-26 10:29:26 +08:00
Lan Hui 66899376c3 userpaget_get.html: Resolve merge conflicts 2024-08-26 10:27:43 +08:00
mrlan 6cc7f043da Merge pull request 'Bug572-ZhongYi2' (#159) from Bug572-ZhongYi2 into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#159
 2024-08-26 10:05:45 +08:00
Lan Hui 1d80fa8886 userpaget_get.html: Resolve merge conflicts 2024-08-26 10:03:47 +08:00
mrlan dc3ef2bc9f Merge pull request 'Bug533-ZhangXuDong' (#161) from Bug533-ZhangXuDong into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#161
 2024-08-26 09:49:38 +08:00
Lan Hui 9eac40493b userpaget_get.html and mainpage_gethtml: improve display information. 2024-08-26 09:49:00 +08:00
Lan Hui fe6a28a81d userpaget_get.html: Resolve merge conflicts 2024-08-26 09:41:53 +08:00
mrlan bf8bb1a6bc Merge pull request 'Bug568-SongHaiyan' (#158) from Bug568-SongHaiyan into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#158
 2024-08-26 09:28:18 +08:00
mrlan 7a97e25b8c Merge pull request 'Bug567-YuZheChen' (#155) from Bug567-YuZheChen into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#155
 2024-08-26 09:18:24 +08:00
陈宇航 9bbd3a978d Fix bug 533 2024-07-04 15:37:37 +08:00
钟埸 18472acd3d Fix bug 572 2024-07-04 11:04:38 +08:00
钟埸 75c96a60df 解决合并冲突 2024-07-04 11:00:17 +08:00
张旭东 5657d8d5ee Fix Bug533 2024-07-04 10:44:41 +08:00
张旭东 1f718e201f init 2024-07-04 10:18:47 +08:00
宋海燕 7cf9c7cf56 fix Bug568 2024-07-04 09:54:09 +08:00
Yzccc 6633df7b70 Fix bug 567 2024-07-04 09:33:30 +08:00
Yzccc ccf22af9df Fix bug 567 2024-07-04 09:29:55 +08:00
姜潮 3383e411ec Fix bug 564 添加注释版 2024-07-03 15:19:42 +08:00
姜潮 f4488672ec Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug564-JiangChao 2024-07-03 09:46:06 +08:00
Lan Hui 00ae770195 Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Alpha-snapshot20240618 2024-07-03 07:40:38 +08:00
Lan Hui 3db629b57d Update version flag on the front page 2024-07-03 07:39:33 +08:00
姜潮 54d09469f5 修复Bug564 2024-07-02 16:19:24 +08:00
姜潮 4b06915dc4 解决合并冲突 2024-07-02 16:17:43 +08:00
梁自月 be7ae9e296 fix bug561 2024-06-27 17:06:54 +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
lixiaofeng eed852cd66 上传文件至 app/templates 2024-05-28 19:55:07 +08:00
lixiaofeng c6f8a3448d 上传文件至 app/test 2024-05-28 19:54:46 +08:00
黄慧玲 d8af2a7e54 Merge pull request 'Bug545-HuangHuiLing' (#122) from Bug545-HuangHuiLing into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#122
 2024-05-28 13:36:01 +08:00
1994836463@qq.com a0c9b82ee7 参考了一下tangxinyuan小组的写法，将选取单词的方法由模拟鼠标选取单词改为根据id获取文章，随机从文章中挑选一个单词放入生词框中，这样是一定可以选取到文章中的单词。 
然后根据span标签定位到选择的生词，双击再次选择，从而在生词框中删除该单词
 2024-05-27 14:35:56 +08:00
1994836463@qq.com 4a42c5c22c 我又将tangxinyuan小组的测试代码改回去了，我改完我的测试代码之后，只有使用未经我修改的tangxinyuan小组的测试代码才能通过。 2024-05-27 14:26:54 +08:00
1994836463@qq.com 101c359596 我将tangxinyuan小组的测试文件改了一下，只是改了一下点击按钮的方法，将点击退出按钮，使用ActionChains去点击，因为我测试的时候，用driver去点击大部分会报出'退出'的按钮被浏览器拦截的错误， 2024-05-26 11:32:39 +08:00
1994836463@qq.com 64a82bee22 测试文件也进行了修改，为了避免选择的单词出现空格的情况，增加了一个判断，若选中空格，则更换文章再次选择，这样总会选择到非空格的单词。 2024-05-26 11:27:15 +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 f3b9fd8790 change 2024-05-25 15:24:49 +08:00
1994836463@qq.com 624426b6cf change 2024-05-25 15:20:31 +08:00
1994836463@qq.com d1589f6062 time.sleep(1) 2024-05-25 15:14:31 +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
李思楠 8cbc7c9a0c 修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面 2024-05-24 22:00:08 +08:00
1994836463@qq.com 1bec0bd107 Merge remote-tracking branch 'origin/Bug545-HuangHuiLing' into Bug545-HuangHuiLing 2024-05-21 20:35:38 +08:00
1994836463@qq.com 630cb6befa delete 2024-05-21 20:34:28 +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
丁晟晔 d8e4fbbb2d Merge pull request 'Bug551-DingZeYu' (#114) from Bug551-DingZeYu into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#114
 2024-05-20 16:12:25 +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
黄慧玲 3373ba1429 Merge pull request 'Bug545-HuangHuiLing' (#120) from Bug545-HuangHuiLing into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#120
 2024-05-20 15:16:09 +08:00