chat - chat

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \|	Merge branch 'master' into PLT-589	Stas Vovk	2015-10-13	27	-102/+491
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589	Stas Vovk	2015-10-13	6	-6/+21
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'master' into PLT-589	Stas Vovk	2015-10-12	6	-6/+21
\| \| \|\ \ \ \ \
\| * \| \| \| \| \| \|	replaced constructions like user.roles === 'admin' by Utils.isAdmin(user.role...	Stas Vovk	2015-10-13	2	-4/+4
\| \|/ / / / / /
\| * \| \| \| \| \|	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	10	-22/+20
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	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	7	-13/+40
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Multiple Ui Improvements	Asaad Mahmood	2015-10-13	7	-13/+40
* \| \| \| \| \| \| \| \|	Merge pull request #968 from hmhealey/plt322	Harrison Healey	2015-10-13	17	-148/+1260
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Made further changes based on feedback	hmhealey	2015-10-13	8	-54/+56
\| * \| \| \| \| \| \| \|	Removed Preference.AltId	hmhealey	2015-10-13	15	-166/+246
\| * \| \| \| \| \| \| \|	Made structural changes to server-side Preference code based on feedback	hmhealey	2015-10-13	9	-362/+227
\| * \| \| \| \| \| \| \|	Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transaction	hmhealey	2015-10-13	2	-8/+57
\| * \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Removed setting direct channels for a new user at creation time	hmhealey	2015-10-13	2	-50/+42
\| * \| \| \| \| \| \| \|	Moved saving multiple user preferences into a database transaction	hmhealey	2015-10-13	5	-48/+144
\| * \| \| \| \| \| \| \|	Fixed preference tests	hmhealey	2015-10-13	1	-18/+7
\| * \| \| \| \| \| \| \|	Hid the close button when the unread badge is visible and moved it to the rig...	hmhealey	2015-10-13	1	-2/+2
\| * \| \| \| \| \| \| \|	Added default direct channels for previously existing users	hmhealey	2015-10-13	2	-29/+45
\| * \| \| \| \| \| \| \|	Renamed show_hide preference to show	hmhealey	2015-10-13	9	-26/+34
\| * \| \| \| \| \| \| \|	Made direct channels visible when receiving a message on one	hmhealey	2015-10-13	1	-0/+12
\| * \| \| \| \| \| \| \|	Re-added default direct channels for new users	hmhealey	2015-10-13	1	-0/+42
\| * \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Added api to get and set preferences	hmhealey	2015-10-13	5	-0/+278
\| * \| \| \| \| \| \| \|	Added Preferences table to store user preferences	hmhealey	2015-10-13	5	-13/+325
\| * \| \| \| \| \| \| \|	Added model class for user preferences object	hmhealey	2015-10-13	2	-0/+136
* \| \| \| \| \| \| \| \|	Merge pull request #1034 from mattermost/PRs-to-master	Corey Hulen	2015-10-13	1	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Update Code-Contribution-Guidelines.md	it33	2015-10-13	1	-1/+1
\| * \| \| \| \| \| \| \| \|	Update Code-Contribution-Guidelines.md	it33	2015-10-13	1	-1/+1
\| * \| \| \| \| \| \| \| \|	Clarifying PRs should go to master	it33	2015-10-13	1	-1/+1
* \| \| \| \| \| \| \| \| \|	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"	it33	2015-10-13	1	-3/+3
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1029 from mattermost/Slack-import-help-update	Christopher Speller	2015-10-13	1	-5/+9
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Update help text for Slack Import	it33	2015-10-13	1	-5/+9
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1037 from hmhealey/revert987	Joram Wilander	2015-10-13	2	-39/+8
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Revert "Modified markdown lexer to not break up words written in snake_case"	hmhealey	2015-10-13	2	-39/+8
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1039 from mattermost/incoming-doc	Joram Wilander	2015-10-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Minor updates to incoming webhook documenatation	JoramWilander	2015-10-13	1	-1/+1
* \| \| \| \| \| \| \| \| \|	Merge pull request #1027 from mattermost/check-https	Corey Hulen	2015-10-13	3	-13/+15
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Update Configuration-Settings.md	it33	2015-10-13	1	-5/+5
\| * \| \| \| \| \| \| \| \| \|	Update gitlab_settings.jsx	it33	2015-10-13	1	-3/+3
\| * \| \| \| \| \| \| \| \| \|	Update Gitlab.md	it33	2015-10-13	1	-5/+7
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1033 from mattermost/trouble-shooting	Corey Hulen	2015-10-13	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Create Troubleshooting.md	it33	2015-10-13	1	-0/+7
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1035 from mattermost/incoming-doc	Joram Wilander	2015-10-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Minor changes to incoming webhook doc	JoramWilander	2015-10-13	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1032 from mattermost/incoming-doc	Joram Wilander	2015-10-13	1	-27/+39
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|