mrlan
/
EnglishPal
7
3
Fork 22
Code Issues Pull Requests 45 Projects Releases Wiki Activity
650 Commits
220 Branches
4 Tags
19 MiB
Commit Graph

485 Commits (4a5fc9a7ce6c6d5c6fde6ffea813be9db70e96b5)

Author SHA1 Message Date
夏栢芝 6b3efad1dc Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug576-XiaBaizhi 2024-07-04 15:05:36 +08:00
陈晨 faf5ec14a4 Fix bug 578 2024-07-04 15:04:34 +08:00
“jxq” 70fc469f5e Fix bug 577 2024-07-04 15:03:31 +08:00
陈晨 9dab83219a Fix bug 578 2024-07-04 15:02:57 +08:00
“jxq” 7bf1a958b5 Fix bug 577 2024-07-04 15:01:22 +08:00
“jxq” 55eac68160 Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug577-JiangXueQin 2024-07-04 14:56:26 +08:00
“jxq” dc3fd67b02 解决合并冲突 2024-07-04 14:56:20 +08:00
Kikky666 02f3c4fdfa Fix bug 576-XiaBaizhi 2024-07-04 11:35:59 +08:00
陈灵婕 109a9447a7 Fix bug 574 2024-07-04 11:16:32 +08:00
陈灵婕 84e0fc51f7 解决合并冲突 2024-07-04 11:13:47 +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
Fighoh db66c8ed86 fix BUG543 2024-07-03 14:36:01 +08:00
Caroline 9215339b1e Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug570_CaiShuHuang 2024-07-03 10:11:16 +08:00
Fighoh cb576b40ed init 2024-07-03 10:03:55 +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
Caroline eb2051ca3f Fix bug 570 2024-07-03 09:45:44 +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
Caroline 8664da12de 删了几条注释 2024-07-02 16:07:26 +08:00
Caroline 2d765b5c63 随机抽取10个生词，并显示 2024-07-02 16:03:03 +08:00
梁自月 be7ae9e296 fix bug561 2024-06-27 17:06:54 +08:00
Lan Hui 2095550f33 Fix bug 547 2024-06-22 09:04:25 +08:00
Fuxinyan 1c08e80236 Fix Bug 536 2024-06-04 13:58:47 +08:00
熊佳明 d2d383f21a Fix bug 540 2024-06-03 14:03:27 +08:00
熊佳明 d83809dcc7 Fix bug 540 2024-06-03 13:49:53 +08:00
熊佳明 2785ded52b 解决冲突 2024-06-03 11:58:03 +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
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
方晨 35a6f1c828 fix 2024-05-20 21:25:51 +08:00
方晨 a42e63dc27 test bug555 2024-05-20 19:23:31 +08:00
方晨 6500eeca84 test bug 2024-05-20 19:03:33 +08:00
方晨 7d65782728 fixbug555 2024-05-20 18:31:40 +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
Lan Hui a4db1edffb Close the web browswer after finishing each test case 2024-05-20 13:28:23 +08:00
丁晟晔 49ead93bcb 更新 app/test/test_bug551_DingZeYu.py 2024-05-20 08:24:36 +08:00
丁晟晔 9afd38a09a 更新 app/test/test_bug551_DingZeYu.py 2024-05-20 08:21:02 +08:00
丁晟晔 d97743649a 更新 app/test/test_bug551_DingZeYu.py 2024-05-19 22:51:32 +08:00
丁晟晔 9f6a007426 更新 app/test/test_bug551_DingZeYu.py 2024-05-19 21:21:25 +08:00
丁晟晔 7fe3feae9a 更新 app/test/test_bug551_DingZeYu.py 2024-05-18 09:23:36 +08:00
丁晟晔 b2a53a0e40 更新 app/test/test_bug551_DingZeYu.py 2024-05-18 09:18:22 +08:00
丁晟晔 0301c39cf0 更新 app/test/test_bug551_DingZeYu.py 2024-05-18 09:14:05 +08:00
丁晟晔 5857395251 更新 app/test/test_bug551_DingZeYu.py 2024-05-18 09:08:10 +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
丁晟晔 23f0dfd8ca 更新 app/test/test_bug551_DingZeYu.py 
我这边好像没有helper文件所以我直接判断有没有这个账号，如果没有就注册一个来进行测试。这样子可以吗
 2024-05-12 13:39:14 +08:00
丁晟晔 6ee94d1610 上传文件至 app/test 2024-05-06 11:48:19 +08:00
丁晟晔 416f40222e 删除 app/test/test_bug551_DingZeYu.py 2024-05-06 11:46:39 +08:00
丁晟晔 66f5c28ead 上传文件至 app/test 2024-05-06 11:46:15 +08:00
丁晟晔 ff6286cf01 删除 app/test/test_bug551_DingZeYu.py 2024-05-06 11:42:32 +08:00
丁晟晔 1d7e61d751 上传文件至 app/test 2024-05-06 11:36:36 +08:00
丁晟晔 c9c0ef60d8 Merge branch 'Alpha-snapshot20230621' into Bug551-DingZeYu 2024-05-06 11:34:44 +08:00
唐娇 1d23062c47 Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-29 13:41:09 +08:00
林杉 b626df7c4b Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-24 18:15:04 +08:00
唐娇 184656230f Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-23 17:35:07 +08:00
林杉 bd5f8f63f5 Merge branch 'Bug553_LinShan' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-22 12:47:50 +08:00
林杉 2500fa5fc8 Fix bug553 2024-04-22 12:46:31 +08:00
AliasJeff ddcc5206d5 Merge branch 'Alpha-snapshot20230621' into Bug544-TangXinyuan 
merge latest branch
 2024-04-22 10:37:33 +08:00
林杉 6b3ad77c44 Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-22 09:11:29 +08:00
唐娇 739094e844 Fix Test File 2024-04-22 04:59:51 +08:00
唐娇 8d76133cca Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-22 04:57:36 +08:00
Lan Hui 6dbb1e2c06 No webdriver manager 2024-04-21 15:40:35 +08:00
Lan Hui 374da86174 Why not use PyPI's webdriver-manager? 2024-04-21 15:31:39 +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 8e769587cf simplify module import path 2024-04-19 08:50:41 +08:00
Lan Hui 9aa718b236 Simplify the test code, use the Edge WebDriver 2024-04-18 20:06:02 +08:00
Lan Hui 230e8e92dc Merge branch 'Bug553_LinShan' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-18 19:39:53 +08:00
林杉 4ea6d9aeed Fix Bug553 2024-04-16 08:48:55 +08:00
林杉 768c81828d Fix Bug553 2024-04-16 08:46:16 +08:00