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

Subscription manager and many other improvements #173

Merged
merged 28 commits into from
Jun 8, 2015

Conversation

engelgabriel
Copy link
Member

No description provided.

engelgabriel and others added 28 commits June 5, 2015 16:03
Conflicts:
	client/routes/router.coffee
* master:
  Update README.md
  Fix overflow-y mistake in wrapper
  Better Stylesheet organization + Fix for scroll in chatlist/messages
* master:
  formatting translations
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
* master:
  updated translations with Transifex
  Added translations
* master:
  removing empty files crested by lingo hub
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
* master:
  reduced constellation length
  fixed constellation pixel ratio
  fixed reversing arrow bug
  changed side-nav animation timing
  implemented delayed side-nav animation
  changed a-plus animation timing
  fixed side-nav icons alignment
  fixed flex-nav icons alignment
  changed flex-tab button ui
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.

Conflicts:
	client/stylesheets/base.less
engelgabriel added a commit that referenced this pull request Jun 8, 2015
Subscription manager and meny other improovments
@engelgabriel engelgabriel merged commit 5d01673 into master Jun 8, 2015
@engelgabriel engelgabriel deleted the subscription-manager branch June 8, 2015 15:15
@engelgabriel engelgabriel changed the title Subscription manager and meny other improovments Subscription manager and many other improvements Jun 8, 2015
Shailesh351 pushed a commit to Shailesh351/Rocket.Chat that referenced this pull request Mar 21, 2020
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.

2 participants