Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(comment):duoshuo comment counts display issues and some other errors #190

Merged
merged 1 commit into from
Feb 10, 2017
Merged

fix(comment):duoshuo comment counts display issues and some other errors #190

merged 1 commit into from
Feb 10, 2017

Conversation

long2ice
Copy link
Contributor

@long2ice long2ice commented Feb 2, 2017

What kind of change does this PR introduce? (check one with "x")

  • Bug fix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Other... Please describe:

Does this PR introduce a breaking change? (check one with "x")

  • Yes
  • No

Description

  1. 使用多说评论系统时无法正确显示评论数目
  2. duoshuo.ejsParadox-post_entry.ejs 中存在的语法错误

Verification steps

No verification steps.

具体为:
1、使用多说评论系统时无法正确显示评论数目
2、duoshuo.ejs和Paradox-post_entry.ejs中存在的一点语法错误,详见文件改动
@cubesky
Copy link
Collaborator

cubesky commented Feb 2, 2017

Translate: fix bugs of duoshuo.

  1. fix a bug of duoshuo cannot display correct comment counts.
  2. fix some grammar error in duoshuo.ejs and Paradox-post_entry.ejs

@neoFelhz neoFelhz changed the title 修复使用多说评论时存在的一点小bug fix(comment):duoshuo comment counts display issues and some other errors Feb 2, 2017
@neoFelhz
Copy link
Collaborator

neoFelhz commented Feb 2, 2017

@cubesky Is it safe enough to directly push the commit into the master branch? Although there are no problem with the changed files, but I think we'd better use canary as base branch for contributions.

@pidupuis
Copy link
Collaborator

pidupuis commented Feb 2, 2017

@neoFelhz We'll have to discuss about the process. It seems better to push a fix into master (and then merge master into canary) and a feature/refactor in canary (which will be merged into master at the time of a release). If a bug exists in master, we need a fix in master, and push a commit from canary into master without merging the entire branch is not that easy...

@pidupuis
Copy link
Collaborator

pidupuis commented Feb 2, 2017

@gitmagic-bot are you dead?

@iblh iblh changed the base branch from master to canary February 10, 2017 15:56
@neoFelhz neoFelhz merged commit 2093db0 into iblh:canary Feb 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants