lixiaofeng
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity

Commit Graph

  • 64b9c51fab Define a fixture that restarts flask app for each test run Lan Hui 2024-04-10 14:44:23 +0800
  • 0fd1592036 rename unit test file AliasJeff 2024-04-10 08:55:57 +0800
  • 46233ead1e Merge branch 'Alpha-snapshot20230621' into Bug544-TangXinyuan AliasJeff 2024-04-09 22:17:54 +0800
  • b5bde9d33d test: update test file, update username/password config, add pytest to requirements.txt AliasJeff 2024-04-09 22:09:50 +0800
  • 83491ce28c refactor: Add comments & optimize code Bug-561 AliasJeff 2024-04-09 21:21:19 +0800
  • 77a3adb546 Define fixture 'restore_sqlite_database' that will be automatically used to restore the database before starting each test Lan Hui 2024-04-09 20:06:30 +0800
  • 4f91659713 How to run pytest Lan Hui 2024-04-09 16:13:05 +0800
  • 083cbfd040 Ignore app/test/assets Lan Hui 2024-04-09 16:01:44 +0800
  • 0dc253bc19 Ignore pytest_report.html Lan Hui 2024-04-09 15:58:47 +0800
  • a4608db424 Correct code comments Lan Hui 2024-04-09 13:21:44 +0800
  • 0a63c5354a Make test_add_word.py work again Lan Hui 2024-04-09 12:11:30 +0800
  • b7fe68c54d test_bug553 林杉 2024-04-08 16:37:15 +0800
  • 85a3faaa9f Fix bug 528 唐娇 2024-04-06 00:18:44 +0800
  • 2966a8162f Fix bug 544 唐欣媛 2024-03-27 12:39:42 +0800
  • b8f2919959 Fix bug 553 林杉 2024-03-25 10:15:11 +0800
  • f164465903 Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 林杉 2024-03-25 10:14:32 +0800
  • 292972c0ce Fix bug 528 唐娇 2024-03-19 14:59:36 +0800
  • 04c4064c68 Fix bug 553 林杉 2024-03-18 13:21:46 +0800
  • 7d5b1c0ed4 Fix ImportError: cannot import name 'url_quote' Bug511-Bosh Hui Lan 2024-02-22 16:27:31 +0800
  • d9e28e3a2b Tweak button size so it looks better on tablets. Lan Hui 2023-08-13 21:08:13 +0800
  • 41d1d9619d Stress test code contributed by students Lan Hui 2023-08-13 16:14:43 +0800
  • 30b54f8023 Tweak button style Lan Hui 2023-08-12 17:59:49 +0800
  • 1e3ac7a379 Use larger buttons Lan Hui 2023-08-12 17:42:25 +0800
  • 8dd6a2a343 Use an arrow for Next Article or Previsou Article Lan Hui 2023-08-12 17:36:49 +0800
  • d2f30daab1 Use PonyORM instead of class RecordQuery from UseSqlite.py. Incorporated changes from Pull Request 91 contributed by He Zhengzheng. Lan Hui 2023-08-12 15:29:12 +0800
  • ed1d0fd714 Show only one place after the decimal point. Lan Hui 2023-08-11 21:02:22 +0800
  • f3aa407c56 Use small letters for In and Up. Lan Hui 2023-08-11 19:32:34 +0800
  • e9ac50422b Make the flash message dismissible. Lan Hui 2023-08-11 19:28:53 +0800
  • f4df263d6e Flash message is informative. Why not add it? Lan Hui 2023-08-11 19:14:51 +0800
  • dff560cc73 Indent code using web-mode. Lan Hui 2023-08-11 18:39:36 +0800
  • c110de0393 Better spacing. Lan Hui 2023-08-11 18:38:35 +0800
  • aaabd3e3bb Enlarge button size so it is more table-friendly. Lan Hui 2023-08-11 18:34:48 +0800
  • 9da1a1cae6 Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621 Lan Hui 2023-08-11 18:29:54 +0800
  • 9b1d60748d Increase button size so that it is easier to use on tablets . Hui Lan 2023-08-11 18:29:35 +0800
  • 83bbd8f600 Improve the speed of loading the next article further after incorporating Chen Qiuwei et al.'s suggestions. Lan Hui 2023-08-11 15:48:53 +0800
  • 1b211f107d Speed up loading next article Lan Hui 2023-08-11 11:59:48 +0800
  • 10c291bed2 Highlight user difficulty level too. Lan Hui 2023-08-10 19:12:30 +0800
  • 6d15b65e3c Make highlighting text difficulty level work. Lan Hui 2023-08-10 19:09:15 +0800
  • e4f870c995 Create folder app/db with a README file. Lan Hui 2023-08-10 15:25:42 +0800
  • 06f896a33a Update .gitignore Lan Hui 2023-08-10 15:22:30 +0800
  • 25c2e0aca8 README.md: update the path to wordfreqapp.db. Hui Lan 2023-08-10 14:24:00 +0800
  • dca76969eb 解决程序源文件更新了，但是 docker container 中的程序源文件没有更新的问题 Hui Lan 2023-08-10 14:19:37 +0800
  • 00ae957b27 Try to figure out how to rebuild the image after updating the source code. Hui Lan 2023-08-10 10:47:57 +0800
  • a397c756cf Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621 Hui Lan 2023-08-10 10:05:29 +0800
  • 14ab63c85c 文章段落正确分段（在 lead class 中添加 white-space: pre-wrap;） Lan Hui 2023-08-10 10:03:02 +0800
  • b8c3d9bda7 No cache while building docker image Hui Lan 2023-07-17 17:46:55 +0800
  • 43419ab4b6 Enlarge text difficult level for one second (make it work using vanilla JavaScript) Lan Hui 2023-07-17 16:28:08 +0800
  • 78d9a66e88 After loading the next article, show its difficulty level in a larger size for one second. Hui Lan 2023-07-17 16:13:56 +0800
  • 79bdec2a7d Dockerfile: update docker image version. Hui Lan 2023-07-17 10:38:17 +0800
  • fb80e952b9 Simplify the docker run options Hui Lan 2023-07-17 10:25:07 +0800
  • 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. Hui Lan 2023-07-17 07:45:38 +0800
  • 20051e1a93 article.py: correct data format Lan Hui 2023-07-14 09:17:11 +0800
  • 5711f0e826 Update flask version in requirements.txt, use escape from markupsafe package. Lan Hui 2023-07-14 09:11:02 +0800
  • cc92e5e29a admin_service.py: non-programmers probably do not know int. So, use integer instead. Lan Hui 2023-07-14 08:32:20 +0800
  • cd562a745c admin_service.py: do not need to have seperate lines for a statement. Lan Hui 2023-07-14 08:30:58 +0800
  • c284893097 admin_service.py: correct typo parmas. Lan Hui 2023-07-14 08:27:33 +0800
  • 87fd594636 admin_service.py: refactor view function article(). Lan Hui 2023-07-14 08:26:37 +0800
  • 18c37d583a admin_service.py: show article content for the newly added article after clicking the button '保存'. Lan Hui 2023-07-14 08:15:15 +0800
  • 472c0c115f Fix Bug 541 Lan Hui 2023-07-09 20:26:32 +0800
  • 9a156ebf7e Fix Bug 539 Lan Hui 2023-07-08 18:23:45 +0800
  • 807d74741b 修复 Bug 493。不要转义（escape）表单提交的内容。否则类 WordFreq 不能正确工作，比如转义会把单引号变成 '，这不利于 WordFreq 类处理。 Hui Lan 2023-07-07 16:13:48 +0800
  • 287d496ae9 Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621 Hui Lan 2023-07-01 15:17:34 +0800
  • 582f399f73 Bug537 and Bug538 张艺腾 2023-06-21 16:48:45 +0800
  • c37ee98b77 Merge branch 'fix-vuln' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230619b Hui Lan 2023-06-19 21:50:48 +0800
  • f40a388277 Fix: Move wordfreqapp.db to new location fix-vuln 徐宣 2023-06-19 14:48:35 +0800
  • 4e1e19d71d 为系统添加一个全局变量记录数据库的单词及其等级，使得数据库单词等级只需在登录时进行一次评级，大致能将点击下一篇的时间缩减为原来的10^-15次以下，感谢章翊、赵煜涵、唐伟、宋江涛同学的建议，没有他们我懒得改的 Bug476-Yuhuangtao 俞黄焘 2023-06-18 21:43:00 +0800
  • 2277473afe Fix: Add import for 'abort' function 徐宣 2023-06-18 19:49:33 +0800
  • f01c334827 Fix: no-random secret key generation and XSS vulnerability 徐宣 2023-06-18 19:44:19 +0800
  • 3361e4ba79 添加测试convert_test_type_to_difficulty_level和get_difficulty_level_for_user函数运行所需时间的几行代码 俞黄焘 2023-06-18 13:21:49 +0800
  • 4d2535a6e8 Merge branch 'Alpha-snapshot20230605' into Bug527-ZhouZhifang Bug527-ZhouZhifang Alpha-snapshot20230615 Laugh 2023-06-15 15:59:29 +0800
  • bb2d0363e4 Feat: update fontsize and margin of some elements Laugh 2023-06-15 15:54:46 +0800
  • 8890e4250a added api_bp.py and change in main.py Bug473-Buya shakil 2023-06-15 07:03:06 +0800
  • 144c750cfd Merge branch 'master' into Bug534-NingShushuang Bug534-NingShushuang 周彦丰 2023-06-11 01:47:33 +0800
  • b923d805e3 小改了一下，可以正常去除单词前后多余的连字符 improvment_GuHan 顾涵 2023-06-08 15:26:49 +0800
  • e19d1ae51b pylint:fixed 2 remove redundant comments Bug393-TanYanMei 倪玲丽 2023-06-05 21:27:20 +0800
  • bb85237939 在signup.html中删除了jquery-3.1.1.js，使用了项目中原有的/static/js/jquery.js 周彦丰 2023-06-05 16:02:17 +0800
  • 1ce6dcf41b synced with Alpha-snapshot20230525 improvment-NiWeiCong2 HAMED SALMA MOHAMED HUSSEIN 2023-06-05 11:28:51 +0800
  • 3ad9ab7351 Merge branch 'Alpha-snapshot20230525' of http://121.4.94.30:3000/mrlan/EnglishPal into improvment-NiWeiCong2 HAMED SALMA MOHAMED HUSSEIN 2023-06-05 11:20:30 +0800
  • 616d35a92f 增加了部分优化代码的注释 refactor-huangzirui 黄子睿 2023-06-05 08:37:31 +0800
  • 708a6a2821 Merge pull request 'WIP：Bug529-GuHan' (#88) from Bug529-GuHan into master Bosh 顾涵 2023-06-04 12:39:34 +0800
  • 0ed7657747 Merge remote-tracking branch 'origin/SPM2023S-QianJunQi' into SPM2023S-QianJunQi SPM2023S-QianJunQi poincareS 2023-06-04 10:42:40 +0800
  • 2fb3003808 fix: 2023.6.1 1. 删去了wordCMD.py中： from flask import ....,Blueprint,.... 改为： from flask import * 2. 修改了代码的格式，包括：等号两边的空格、加号两边的空格 3. 更新了访问用户单词的token验证 3.1 使用Authorization的字段值（Bearer xxx)验证token 3.2 取消了路由访问用户单词的功能，只能在终端命令行中输入: "curl -H "Authorization: Bearer 密钥" http://127.0.0.1:5000/show/用户名/"获取单词 poincareS 2023-06-04 10:41:24 +0800
  • 782783040a pylint:fixed 1 倪玲丽 2023-06-04 01:50:13 +0800
  • 9a95842b7c delete tanyanmei-fillword.js 倪玲丽 2023-06-04 00:39:18 +0800
  • 3e0b8a0235 refactor:pylint 倪玲丽 2023-06-04 00:35:43 +0800
  • 05a31a3a48 添加了PIL的依赖 周彦丰 2023-06-03 14:35:53 +0800
  • 9816596cf8 删除 'app/static/js/tanyanmei-fillword.js' Alpha-snapshot20230605 黄子睿 2023-06-02 21:34:27 +0800
  • 682247bff1 refactor partial function and code writing specifications 黄子睿 2023-06-02 21:33:21 +0800
  • 66772b2f8b 修改了部分代码的书写规划，如注释，空格等 refactor-wangyu 汪瑜 2023-06-01 20:51:58 +0800
  • 4241cc3a6d Refactoring parameter names and partial function names to make them more reasonable 杨昱晨 2023-06-01 19:13:39 +0800
  • ffd2d516fa Refactoring parameter names and partial function names to make them more reasonable 杨昱晨 2023-06-01 19:08:31 +0800
  • f741f84b4d commit 杨昱晨 2023-06-01 19:02:28 +0800
  • d136c93df6 通过正则表达式保留英文字符和'特殊字符 顾涵 2023-06-01 16:16:53 +0800
  • b22c654f0f Merge branch 'Bug529-GuHan' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230601 Alpha-snapshot20230601 Hui Lan 2023-06-01 07:40:27 +0800
  • d402bb45cb 刷新屏幕，点击上下篇，加入生词库，停止阅读(更改) Alpha-snapshot20230531 倪玲丽 2023-05-31 18:37:05 +0800
  • cdf6180901 刷新屏幕，点击上下篇，加入生词库，停止阅读 倪玲丽 2023-05-30 18:48:37 +0800
  • 38837c9c2f 合并最新的Alpha-snapshot20230529 倪玲丽 2023-05-30 18:45:23 +0800
  • 688a198768 已经与Alpha-snapshot20230525 分支同步，重新提交 Bug529-GuHan 顾涵 2023-05-28 16:31:12 +0800
  • a0ddf4bdad 上传文件至 'app/static/js' Bug492-XuHongJian-HuangZirui Alpha-snapshot20230529 黄子睿 2023-05-27 17:33:37 +0800
  • ea16ea6673 Pylint部分： 1. 补充module docstring，即文档顶部的简要说明 （我做的说明很简陋，只是为了通过pylint的检查而为之） 2. 优化了if-else-return，即删除了不必要的elif或else 3. 拆分了所有在同一行的模块引用（不同模块的引用需要放在不同行，以便理解和阅读） 4. 删除了部分没有被使用的引用（有的引用在文件A中被使用了，但import却写在了文件B，且文件B没有使用这些引用，而文件A引用了文件B，导致文件B的所有引用也被A引用，这似乎并不合理） 5. 修改了引用的顺序（os、random等系统引用应放在自定义模块引用的上方） 6. 修改了过长的代码，注释除外（每行限制在100个字符以内） 7. 优化了条件判断的判断符号： is和is not 用于判断两个变量是否指向同一个位置 == 和 !=用于比较两个变量 8. 为每个py文件添加了"last new line"，删除了多余的尾部空行 Refactor_qianjunqi 钱骏琪 2023-05-26 22:18:11 +0800