mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
-
47a359c798 Merge pull request 'Bug579-LuKangyang' (#172) from Bug579-LuKangyang into Alpha-snapshot20240618
-
fb190b0563 Resolve merge conflict
-
eb3268a139 Fix bug 579
-
220e108ee1 解决合并冲突
- Compare 4 commits »
mrlan pushed to Bug579-LuKangyang at mrlan/EnglishPal
-
fb190b0563 Resolve merge conflict
-
262604e761 Merge pull request 'BUG543-JiWenkai' (#153) from BUG543-JiWenkai into Alpha-snapshot20240618
-
61a0b39507 Resolve merge conflict
-
391e859d30 Merge pull request 'Bug574-ChenLingjie2' (#160) from Bug574-ChenLingjie2 into Alpha-snapshot20240618
-
c453317ad8 Make sure the user name is not on the black list before proceeding
- Compare 65 commits »
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
-
262604e761 Merge pull request 'BUG543-JiWenkai' (#153) from BUG543-JiWenkai into Alpha-snapshot20240618
-
61a0b39507 Resolve merge conflict
-
db66c8ed86 fix BUG543
-
cb576b40ed init
- Compare 4 commits »
mrlan pushed to BUG543-JiWenkai at mrlan/EnglishPal
-
61a0b39507 Resolve merge conflict
-
391e859d30 Merge pull request 'Bug574-ChenLingjie2' (#160) from Bug574-ChenLingjie2 into Alpha-snapshot20240618
-
c453317ad8 Make sure the user name is not on the black list before proceeding
-
f9003ece69 Remove unused import
-
146781df50 Resolve merge conflict
- Compare 61 commits »
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
-
391e859d30 Merge pull request 'Bug574-ChenLingjie2' (#160) from Bug574-ChenLingjie2 into Alpha-snapshot20240618
-
c453317ad8 Make sure the user name is not on the black list before proceeding
-
f9003ece69 Remove unused import
-
146781df50 Resolve merge conflict
-
109a9447a7 Fix bug 574
- Compare 6 commits »
mrlan pushed to Bug574-ChenLingjie2 at mrlan/EnglishPal
-
c453317ad8 Make sure the user name is not on the black list before proceeding
-
f9003ece69 Remove unused import
-
146781df50 Resolve merge conflict
-
329732038f Merge pull request 'Bug573-PanBinjie' (#169) from Bug573-PanBinjie into Alpha-snapshot20240618
-
0bfb35b978 Make translation tooltip work
- Compare 57 commits »
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
-
329732038f Merge pull request 'Bug573-PanBinjie' (#169) from Bug573-PanBinjie into Alpha-snapshot20240618
-
0bfb35b978 Make translation tooltip work
-
13a091be72 Merge branch 'Bug573-PanBinjie' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug573-PanBinjie
-
af59afc7e0 解决合并冲突
- Compare 4 commits »
mrlan pushed to Bug573-PanBinjie at mrlan/EnglishPal
-
0bfb35b978 Make translation tooltip work
-
13a091be72 Merge branch 'Bug573-PanBinjie' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug573-PanBinjie
-
30ff57909e Merge pull request 'word_operation.js: do not alert each time' (#179) from Bug570_CaiShuHuang into Alpha-snapshot20240618
-
fb1f927e83 word_operation.js: do not alert each time
-
3b6d88bd68 Merge pull request 'Bug570_CaiShuHuang' (#170) from Bug570_CaiShuHuang into Alpha-snapshot20240618
- Compare 56 commits »
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
-
30ff57909e Merge pull request 'word_operation.js: do not alert each time' (#179) from Bug570_CaiShuHuang into Alpha-snapshot20240618
-
fb1f927e83 word_operation.js: do not alert each time
- Compare 2 commits »
mrlan merged pull request mrlan/EnglishPal#179
word_operation.js: do not alert each time
mrlan created pull request mrlan/EnglishPal#179
word_operation.js: do not alert each timemrlan pushed to Bug570_CaiShuHuang at mrlan/EnglishPal
-
fb1f927e83 word_operation.js: do not alert each time
mrlan pushed to Alpha-snapshot20240618 at mrlan/EnglishPal
-
3b6d88bd68 Merge pull request 'Bug570_CaiShuHuang' (#170) from Bug570_CaiShuHuang into Alpha-snapshot20240618
-
eff0d01fa0 word_operation.js: Resolve conflict
-
3049a4314a 只是修改名字
-
d8263d17e0 Fix bug 570
-
9215339b1e Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug570_CaiShuHuang
- Compare 8 commits »
mrlan pushed to Bug570_CaiShuHuang at mrlan/EnglishPal
-
eff0d01fa0 word_operation.js: Resolve conflict
-
8f38e5fd87 Merge pull request 'Bug571-TongQi' (#166) from Bug571-TongQi into Alpha-snapshot20240618
-
b39cf2e4fa Merge pull request 'Remove wordfreqapp.db from app/static' (#178) from Bug578-ChenChen2 into Alpha-snapshot20240618
-
6f4b91fd73 Remove wordfreqapp.db from app/static
-
09beaff831 Merge pull request 'Bug578-ChenChen' (#167) from Bug578-ChenChen into Alpha-snapshot20240618
- Compare 42 commits »