- Nov 16, 2015
-
-
Gabriel Engel authored
Fix for #1411 and #1407. Corrected ill-referenced variables
-
Gabriel Engel authored
Improving English language translations
-
- Nov 15, 2015
-
-
graywolf336 authored
Fix for #1411 and #1407. Corrected the malreferenced variables, was not able to verify #1407 as being fixed since there wasn't clear instructions on how to replicate.
-
SingLi authored
Move all builds - including demo server to develop. Please merge down to master.
-
Olivier Beddows authored
Adding initial en.i18n translations.
-
Olivier Beddows authored
-
Olivier Beddows authored
-
Olivier Beddows authored
-
Olivier Beddows authored
-
Olivier Beddows authored
-
Olivier Beddows authored
-
Olivier Beddows authored
-
Olivier Beddows authored
-
Olivier Beddows authored
Fixing spelling errors, correcting grammar and casing.
-
- Nov 14, 2015
-
-
Gabriel Engel authored
-
- Nov 13, 2015
-
-
SingLi authored
Add permission checks to bulk rest api methods
-
Gabriel Engel authored
-
Gabriel Engel authored
Update from develop
-
Marcelo Schmidt authored
Added liminality.xyz post link
-
Gabriel Engel authored
-
Gabriel Engel authored
Created and pushed by LingoHub.
-
Gabriel Engel authored
-
Marcelo Schmidt authored
Channel settings
-
Marcelo Schmidt authored
* develop: Conflicts: client/views/app/message.coffee
-
Gabriel Engel authored
Message type api
-
Marcelo Schmidt authored
Conflicts: client/views/app/message.coffee
-
Marcelo Schmidt authored
* develop: Fixed conflicts added Git Flow and HISTORY.md Deletes direct message subscription for users conversing with user being deleted. Fix Room model's removeByTypeContainingUsername. usernames field missing trailing 's' Remove the added console log Combine the first two checks into one to make it more readable Update message pinning to show up on the tab list with a few options to allow/disallow it and whether to allow anyone to pin messages Moved oembed code to a template helper. Conflicts: client/views/app/message.coffee
-
Marcelo Schmidt authored
* master: Fixed conflicts added Git Flow and HISTORY.md Remove the added console log Combine the first two checks into one to make it more readable Update message pinning to show up on the tab list with a few options to allow/disallow it and whether to allow anyone to pin messages Moved oembed code to a template helper.
-
Marcelo Schmidt authored
* 'master' of github.com:RocketChat/Rocket.Chat: added Git Flow and HISTORY.md
-
Marcelo Schmidt authored
* mitar-move-oembed-to-helper: Fixed conflicts Moved oembed code to a template helper.
-
Marcelo Schmidt authored
-
https://github.com/mitar/Rocket.ChatMarcelo Schmidt authored
Merge branch 'move-oembed-to-helper' of https://github.com/mitar/Rocket.Chat into mitar-move-oembed-to-helper # By Mitar # Via Mitar * 'move-oembed-to-helper' of https://github.com/mitar/Rocket.Chat: Moved oembed code to a template helper. # Conflicts: # client/views/app/message.coffee
-
Gabriel Engel authored
-
Marcelo Schmidt authored
-
Gabriel Engel authored
Remove direct message subscription for both users when one is deleted
-
Marcelo Schmidt authored
* message-type-api: Created RocketChat.MessageTypes class to hold message type rendering rules Removed unused 'nu' message type Send e-mail on first username set Add enrollment email
-
Marcelo Schmidt authored
-
Aaron Ogle authored
Add Pinning Functionality
-
Reid Wakida authored
Fixes #1149 where "other" user's subscription for non-deleted, direct message, was not deleted. This led to duplicate key error if a new user, with the same username as the deleted user, is created and tries to direct message the "other" user.
-
Reid Wakida authored
-