mrlan pushed to Bug547-FanWenQi-Adapted at mrlan/EnglishPal
- d00432cee1 Resolve merge conflicts
- 19ea14b38c Merge pull request '提供更便利的获取用户单词表的方法,以json数据格式返回' (#93) from SPM2023S-QianJunQi into Alpha-snapshot20240618
- 621ac24991 Give the blueprint a better name: apiService
- ceb5f14ee9 Simplify wordCMD.py and rename it to api_service.py
- 8f31b030ea Resolve merge conflicts
- Compare 96 commits »
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
- 19ea14b38c Merge pull request '提供更便利的获取用户单词表的方法,以json数据格式返回' (#93) from SPM2023S-QianJunQi into Alpha-snapshot20240618
- 621ac24991 Give the blueprint a better name: apiService
- ceb5f14ee9 Simplify wordCMD.py and rename it to api_service.py
- 8f31b030ea Resolve merge conflicts
- 0ed7657747 Merge remote-tracking branch 'origin/SPM2023S-QianJunQi' into SPM2023S-QianJunQi
- Compare 8 commits »
mrlan merged pull request mrlan/EnglishPal#93
提供更便利的获取用户单词表的方法,以json数据格式返回
mrlan pushed to SPM2023S-QianJunQi at mrlan/EnglishPal
- 621ac24991 Give the blueprint a better name: apiService
mrlan pushed to SPM2023S-QianJunQi at mrlan/EnglishPal
- ceb5f14ee9 Simplify wordCMD.py and rename it to api_service.py
- 8f31b030ea Resolve merge conflicts
- 909119b587 Merge pull request 'DONE: Bug536-Jiangwangzhe' (#138) from Bug536-Jiangwangzhe into Alpha-snapshot20240618
- e6c945bac7 fillword.js & highlight.js: fix JavaScript errors on the front page
- 0c6616d52c Resolve merge conflicts
- Compare 352 commits »
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
- 909119b587 Merge pull request 'DONE: Bug536-Jiangwangzhe' (#138) from Bug536-Jiangwangzhe into Alpha-snapshot20240618
- e6c945bac7 fillword.js & highlight.js: fix JavaScript errors on the front page
- 0c6616d52c Resolve merge conflicts
- 1c08e80236 Fix Bug 536
- Compare 4 commits »
mrlan pushed to Bug536-Jiangwangzhe at mrlan/EnglishPal
- e6c945bac7 fillword.js & highlight.js: fix JavaScript errors on the front page
- 0c6616d52c Resolve merge conflicts
- 44d9c39d4b Merge pull request 'DONE: Bug540-XiongJiaming' (#125) from Bug540-XiongJiaming into Alpha-snapshot20240618
- b2e11aea6f 将标记文章按钮移到页面上方;标记文章时不要alert
- 2bec0642dd Resolve merge conflicts
- Compare 240 commits »
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
- 44d9c39d4b Merge pull request 'DONE: Bug540-XiongJiaming' (#125) from Bug540-XiongJiaming into Alpha-snapshot20240618
- b2e11aea6f 将标记文章按钮移到页面上方;标记文章时不要alert
- 2bec0642dd Resolve merge conflicts
- d2d383f21a Fix bug 540
- d83809dcc7 Fix bug 540
- Compare 6 commits »
mrlan pushed to Bug540-XiongJiaming at mrlan/EnglishPal
- b2e11aea6f 将标记文章按钮移到页面上方;标记文章时不要alert
- 2bec0642dd Resolve merge conflicts
- 62dd580974 在加入生词簿前,去掉全角方括号【】
- 47a359c798 Merge pull request 'Bug579-LuKangyang' (#172) from Bug579-LuKangyang into Alpha-snapshot20240618
- fb190b0563 Resolve merge conflict
- Compare 78 commits »
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
- 62dd580974 在加入生词簿前,去掉全角方括号【】