chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #1199 from hmhealey/plt600	Corey Hulen	2015-10-28	3	-5/+39
\|\ \| \| \| \|	PLT-600 Renamed channel description to channel header and added channel purpose field
\| *	Added Channel.Purpose on the server	hmhealey	2015-10-27	3	-0/+34
\| \|
\| *	Renamed Channel.Description to Channel.Header on the server	hmhealey	2015-10-27	2	-5/+5
\| \|
* \|	Merge branch 'master' into PLT-25	=Corey Hulen	2015-10-26	6	-45/+124
\|\\|
\| *	Merge pull request #1194 from mattermost/webhook-request	Corey Hulen	2015-10-26	1	-0/+18
\| \|\ \| \| \| \| \| \|	Parse incoming webhook requests into model instead of string map
\| \| *	Remove unused iconemoji field	JoramWilander	2015-10-26	1	-1/+0
\| \| \|
\| \| *	Parse incoming webhook requsets into model instead of string map	JoramWilander	2015-10-26	1	-0/+19
\| \| \|
\| * \|	Merge pull request #1164 from hmhealey/plt778	Corey Hulen	2015-10-26	4	-44/+104
\| \|\ \ \| \| \|/ \| \|/\|	PLT-778 Changed post searching to allow searching by multiple users/channels
\| \| *	Moved logic for searching for posts by multiple users/channels into the sql ↵	hmhealey	2015-10-26	1	-39/+28
\| \| \| \| \| \| \| \| \| \| \| \|	query
\| \| *	Changed post searching to allow searching by multiple users/channels	hmhealey	2015-10-23	4	-42/+113
\| \| \|
\| * \|	Mattermost can not send message start with slash	Florian Orben	2015-10-25	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	resolves #827
* \| \|	Merge branch 'master' into PLT-25	=Corey Hulen	2015-10-23	2	-14/+15
\|\\| \|
\| * \|	Fixing merge conflict	=Corey Hulen	2015-10-22	3	-10/+16
\| \|\\|
\| * \|	Merge branch 'master' into PLT-44	=Corey Hulen	2015-10-20	5	-11/+211
\| \|\ \
\| * \| \|	Multi-session login	=Corey Hulen	2015-10-20	1	-12/+13
\| \| \| \|
\| * \| \|	Adding multi-session cookie	=Corey Hulen	2015-10-20	2	-14/+14
\| \| \| \|
* \| \| \|	Adding analytics tab	=Corey Hulen	2015-10-22	3	-0/+101
\| \|_\|/ \|/\| \|
* \| \|	Fixing unit tests	=Corey Hulen	2015-10-20	1	-4/+4
\| \| \|
* \| \|	Fixing unit test	=Corey Hulen	2015-10-20	1	-4/+4
\| \| \|
* \| \|	PLT-350 allow ability to disable restricted team names	=Corey Hulen	2015-10-20	2	-2/+8
\| \|/ \|/\|
* \|	Merge branch 'release-1.1.0'	Christopher Speller	2015-10-20	1	-8/+8
\|\ \
\| * \|	Allowing salts longer than 32 chars	=Corey Hulen	2015-10-19	1	-8/+8
\| \| \|
* \| \|	Merge pull request #1116 from sharms/master	Joram Wilander	2015-10-20	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Fixed missing colon
\| * \| \|	Fixed missing colon	Steven Harms	2015-10-19	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #1113 from hmhealey/plt716	Joram Wilander	2015-10-20	3	-2/+202
\|\ \ \ \| \|/ / \|/\| \|	PLT-716/717 Added from:, in:, and channel: search filters
\| * \|	Added from:, in:, and channel: search modifiers	hmhealey	2015-10-19	3	-2/+202
\| \| \|
* \| \|	Merge pull request #1108 from mattermost/plt-235	Harrison Healey	2015-10-19	6	-0/+269
\|\ \ \ \| \| \| \| \| \| \| \|	PLT-235 Implement outgoing webhooks.
\| * \| \|	Refactor to hit database less often.	JoramWilander	2015-10-19	1	-0/+14
\| \| \| \|
\| * \| \|	Remove temporary test code.	JoramWilander	2015-10-19	1	-4/+0
\| \| \| \|
\| * \| \|	Add api unit tests for outgoing webhooks.	JoramWilander	2015-10-19	1	-0/+36
\| \| \| \|
\| * \| \|	Add model test for outgoing webhooks.	JoramWilander	2015-10-19	2	-0/+97
\| \| \| \|
\| * \| \|	Implement outgoing webhooks.	JoramWilander	2015-10-19	4	-0/+126
\| \| \| \|
* \| \| \|	Merge pull request #1072 from mattermost/plt-554	Corey Hulen	2015-10-19	1	-8/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \|	PLT-554 Small refactor of websocket code on client and server
\| * \| \|	Small refactor of websocket code on client and server	JoramWilander	2015-10-16	1	-8/+8
\| \|/ /
* \| \|	Merge pull request #1085 from mattermost/plt-633	Harrison Healey	2015-10-16	1	-0/+5
\|\ \ \ \| \|/ / \|/\| \|	PLT-633 Add default username and icon to incoming webhooks.
\| * \|	Add default username and icon to incoming webhooks.	JoramWilander	2015-10-16	1	-0/+5
\| \| \|
* \| \|	Merge pull request #1079 from hmhealey/initprefs	Christopher Speller	2015-10-16	1	-0/+9
\|\ \ \ \| \|/ / \|/\| \|	Added an initial call to get all user preferences on page load
\| * \|	Added an initial call to get all user preferences on page load	hmhealey	2015-10-15	1	-0/+9
\| \| \|
* \| \|	Merge pull request #1049 from apaatsio/full-teams-data	Joram Wilander	2015-10-16	2	-1/+7
\|\ \ \ \| \|/ / \|/\| \|	Use display name instead of name in team switcher menu
\| * \|	Sanitize team data	Antti Ahti	2015-10-14	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	We don't want to expose sensitive data that might pose a security risk.
\| * \|	Use team display name in team switcher menu	Antti Ahti	2015-10-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu
* \| \|	Marking when user ran the unit tests	=Corey Hulen	2015-10-15	1	-0/+6
\|/ /
* \|	Made further changes based on feedback	hmhealey	2015-10-13	2	-21/+5
\| \|
* \|	Removed Preference.AltId	hmhealey	2015-10-13	4	-29/+31
\| \|
* \|	Made structural changes to server-side Preference code based on feedback	hmhealey	2015-10-13	3	-25/+36
\| \|
* \|	Renamed show_hide preference to show	hmhealey	2015-10-13	2	-3/+3
\| \|
* \|	Added api to get and set preferences	hmhealey	2015-10-13	2	-0/+38
\| \|
* \|	Added Preferences table to store user preferences	hmhealey	2015-10-13	1	-2/+4
\| \|
* \|	Added model class for user preferences object	hmhealey	2015-10-13	2	-0/+136
\|/
*	PLT-586 fixing issues with security alert	=Corey Hulen	2015-10-09	1	-3/+10
\|