Merge branch 'master' of github.com:RocketChat/Rocket.Chat

README.md

@@ -4,7 +4,7 @@ The Complete Open Source Chat Solution
 
 ## Demo
 
-Checkout the latest version at http://rocket.chat
+Checkout the latest version at [http://rocket.chat](http://rocket.chat)
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=49QX7TYCVZK8L)
 

client/stylesheets/rtl.less

@@ -225,7 +225,11 @@
       textarea {
           padding-left: 38px;
           padding-right: 8px;
-      }
+        }
+       >.users-typing {
+         float: right;
+       }
+     }
 
      > .formatting-tips {
        float: left;

packages/rocketchat-lib/lib/settings.coffee

@@ -4,29 +4,20 @@
 ###
 RocketChat.settings = {}
 
-###
-# Setting priorities
-###
-RocketChat.settings.priority =
-	HIGH: -1000
-	MEDIUM: 0
-	LOW: 1000
-
 ###
 # Add a setting function to a hook
 # @param {String} hook - The name of the hook
 # @param {Function} setting - The setting function
 ###
 
-RocketChat.settings.add = (hook, setting, priority) ->
-	# if setting array doesn't exist yet, initialize it
-	priority ?= RocketChat.settings.priority.MEDIUM
-	unless _.isNumber priority
-		priority = RocketChat.settings.priority.MEDIUM
-	setting.priority = priority
-	RocketChat.settings[hook] ?= []
-	RocketChat.settings[hook].push setting
+RocketChat.settings.add = (setting) ->
+	return
+
+RocketChat.settings.addGroup = (settingsGroup) ->
+	return
+
+RocketChat.settings.addPage = (settingsPage) ->
 	return
 
-RocketChat.settings.startup = (hook, setting, priority) ->
+RocketChat.settings.startup = () ->
 	return