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

'allow reacting' should be a toggle option.otherwise, the style will display an error #6522

Merged
merged 1 commit into from Mar 29, 2017

Conversation

szluohua
Copy link
Contributor

2017-03-29 17-52-37

@rodrigok rodrigok modified the milestone: 0.55.0 Mar 29, 2017
@rodrigok rodrigok merged commit da0fe37 into RocketChat:develop Mar 29, 2017
Syirrus pushed a commit to Syirrus/Rocket.Chat that referenced this pull request Mar 31, 2017
…nto clarapy-v4

Changed over home.coffee & help.coffee to .js

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (162 commits)
  Remove coffeescript package from ui-flextab
  Remove coffeescript package from ui-sidenav
  Update PULL_REQUEST_TEMPLATE.md
  Fix Outgoing Webhooks Retrying Not Respecting Enabled Status (RocketChat#6478)
  Convert Theme Package to JS (RocketChat#6491)
  Fix typo of the safari pinned tab label (RocketChat#6487)
  fix channel merge option of user preferences (RocketChat#6493)
  converted Rocketchat logger coffee to js (RocketChat#6495)
  converted rocketchat-integrations coffee to js (RocketChat#6502)
  'allow reacting' should be a toggle option (RocketChat#6522)
  Add to HISTORY.md
  Fix backup codes remaining not showing
  Fix ESLint
  Fix ESLint
  Fix review
  Fix review
  Fix review
  fix import issue
  fix
  fix
  ...

# Conflicts:
#	packages/rocketchat-lib/server/lib/PushNotification.js
#	packages/rocketchat-ui/client/views/app/home.coffee
#	packages/rocketchat-ui/package.js
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.

None yet

2 participants