chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \|	Merge branch 'master' into PLT-589	Stas Vovk	2015-10-12	2	-3/+1
\| \| \|\ \ \ \ \
\| * \| \| \| \| \| \|	replaced constructions like user.roles === 'admin' by ↵	Stas Vovk	2015-10-13	2	-4/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Utils.isAdmin(user.roles) in manage members
\| * \| \| \| \| \|	changed Admin to Team Admin in admin console	Stas Vovk	2015-10-12	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into PLT-589	Stas Vovk	2015-10-12	5	-11/+9
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	changed Admin to Team Admin in Manage Team members	Stas Vovk	2015-10-12	1	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1038 from asaadmahmoodspin/ui-improvements	Joram Wilander	2015-10-13	3	-2/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multiple Ui Improvements
\| * \| \| \| \| \| \| \|	Multiple Ui Improvements	Asaad Mahmood	2015-10-13	3	-2/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #968 from hmhealey/plt322	Harrison Healey	2015-10-13	6	-137/+378
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|	PLT-322 Updated Direct Messages menu
\| * \| \| \| \| \| \| \|	Made further changes based on feedback	hmhealey	2015-10-13	2	-12/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Removed Preference.AltId	hmhealey	2015-10-13	6	-50/+34
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Cleaned up JSX errors	hmhealey	2015-10-13	2	-56/+51
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed edge cases with leaving a direct channel while viewing that channel	hmhealey	2015-10-13	4	-21/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Hid the close button when the unread badge is visible and moved it to the ↵	hmhealey	2015-10-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	right side of the sidebar
\| * \| \| \| \| \| \| \|	Renamed show_hide preference to show	hmhealey	2015-10-13	4	-7/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Made direct channels visible when receiving a message on one	hmhealey	2015-10-13	1	-0/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changed direct messages channels so users can show/hide them	hmhealey	2015-10-13	5	-164/+143
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changed direct channels in the sidebar to be displayed based on user preferences	hmhealey	2015-10-13	5	-37/+308
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1030 from mattermost/Slack-import-UI-update	Christopher Speller	2015-10-13	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Slack Import changing "Preview" label to "Beta"
\| * \| \| \| \| \| \| \| \|	Slack Import changing "Preview" label to "Beta"	it33	2015-10-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Revert "Modified markdown lexer to not break up words written in snake_case"	hmhealey	2015-10-13	2	-39/+8
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 787d2ef7bca7f411b18d1d13561d61d7e95c81a7.
* \| \| \| \| \| \| \| \|	Merge pull request #1027 from mattermost/check-https	Corey Hulen	2015-10-13	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Updating SSO help on HTTP/HTTPS
\| * \| \| \| \| \| \| \|	Update gitlab_settings.jsx	it33	2015-10-13	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1026 from asaadmahmoodspin/master	Joram Wilander	2015-10-13	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Fixing code block markdown
\| * \| \| \| \| \| \| \|	Fixing code block markdown	Asaad Mahmood	2015-10-13	1	-0/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1007 from florianorben/PLT-486	Joram Wilander	2015-10-13	14	-0/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PLT-486: Remove spell check feature from input boxes during signup flow
\| * \| \| \| \| \| \| \|	PLT-486: Remove spell check feature from input boxes during signup flow	Florian Orben	2015-10-12	14	-0/+19
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spellcheck="false" attribute to login and signup form inputs
* \| \| \| \| \| \| \|	Merge pull request #987 from hmhealey/plt521	Joram Wilander	2015-10-13	2	-8/+39
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PLT-521 Modified markdown lexer to not break up words written in snake_case
\| * \| \| \| \| \| \| \|	Modified markdown lexer to not break up words written in snake_case	hmhealey	2015-10-09	2	-8/+39
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge release branch 'release-1.1.0'	Christopher Speller	2015-10-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	PLT-596 - Update to email verification title	it33	2015-10-12	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into PLT-590	Maxim	2015-10-13	14	-71/+81
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #1022 from mattermost/release-1.1.0	Corey Hulen	2015-10-12	2	-35/+36
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Release 1.1.0rc merging to master
\| \| * \| \| \| \|	Merge branch 'release-1.1.0' into PLT-586	=Corey Hulen	2015-10-12	2	-2/+2
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	PLT-586 fixing issues with security alert	=Corey Hulen	2015-10-09	2	-35/+36
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge pull request #1018 from asaadmahmoodspin/ui-fixes	Corey Hulen	2015-10-12	5	-22/+35
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|	Other UI Improvements
\| \| * \| \| \|	Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes	Asaad Mahmood	2015-10-12	5	-11/+9
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Other UI Improvements	Asaad Mahmood	2015-10-12	5	-22/+35
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge pull request #1009 from mattermost/update-help-text	Corey Hulen	2015-10-12	1	-1/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Updating help text
\| \| * \| \| \|	Update get_link_modal.jsx	it33	2015-10-11	1	-1/+0
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \|	Removing out-of-date text saying that anyone can join a team from invite link, since there are now options to restrict sign-up based on email domain and SSO options
\| * \| \| \|	Merge pull request #989 from mattermost/typos	Corey Hulen	2015-10-12	1	-2/+1
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Fixed typos
\| \| * \| \|	Merge branch 'master' into typos	Joram Wilander	2015-10-12	2	-2/+2
\| \| \|\\| \|
\| \| * \| \|	Fixed typos	it33	2015-10-08	1	-2/+1
\| \| \| \|/ \| \| \|/\| \| \| \| \|	There was no space after "user name." before the next sentence. Also, "user name" should be "username"
\| * \| \|	Multiple UI Improvements	Asaad Mahmood	2015-10-12	5	-11/+9
\| \| \|/ \| \|/\|
* / \|	PLT-590: Change "Manage Team" to "Manage Members"	Potapov Max	2015-10-12	2	-2/+2
\|/ /
* \|	Update manage_incoming_hooks.jsx	it33	2015-10-09	1	-1/+1
\| \|
* \|	Update user_settings_integrations.jsx	it33	2015-10-09	1	-1/+1
\| \|
* \|	Update manage_incoming_hooks.jsx	it33	2015-10-09	1	-1/+1
\|/
*	Fixed html used for autolinking	hmhealey	2015-10-08	1	-1/+1
\|
*	Merge pull request #982 from hmhealey/plt547	Harrison Healey	2015-10-08	1	-24/+24
\|\ \| \| \| \|	PLT-547 Changed emoticons so that they must be surrounded by whitespace
\| *	Fixed parsing of :'( emoticon	hmhealey	2015-10-08	1	-1/+1
\| \|