chat - chat

	Commit message (Expand)	Author	Age	Files	Lines
*	fixing merge conflicts	=Corey Hulen	2015-07-21	149	-2589/+2303
\|\
\| *	Merge pull request #200 from mattermost/mm-1356	Corey Hulen	2015-07-21	86	-1216/+893
\| \|\
\| \| *	Changing the way we mattermost handles URLs. team.domain.com becomes domain.c...	Christopher Speller	2015-07-20	86	-1216/+893
\| * \|	Merge pull request #210 from hmhealey/makefile	Corey Hulen	2015-07-21	1	-2/+8
\| \|\ \
\| \| * \|	Changed Makefile to restart existing mysql/redis containers if they've been s...	hmhealey	2015-07-20	1	-2/+8
\| \| \|/
\| * \|	Merge pull request #217 from mattermost/quick-manage-fix	Joram Wilander	2015-07-21	1	-0/+1
\| \|\ \
\| \| * \|	quick fix to get manage team modal working again	JoramWilander	2015-07-21	1	-0/+1
\| \|/ /
\| * \|	Merge pull request #216 from asaadmahmoodspin/mm-1631	Joram Wilander	2015-07-21	3	-4/+13
\| \|\ \
\| \| * \|	mm-1631 - Fixing image previewer bug	Asaad Mahmood	2015-07-21	3	-4/+13
\| \|/ /
\| * \|	Merge pull request #211 from rgarmsen2295/mm-1186	Christopher Speller	2015-07-20	3	-2/+13
\| \|\ \
\| \| * \|	Added channel name to RHS comment threads; minor css changes to compensate fo...	Reed Garmsen	2015-07-19	3	-2/+13
\| * \| \|	Merge pull request #207 from hmhealey/mm825	Joram Wilander	2015-07-20	1	-1/+2
\| \|\ \ \
\| \| * \| \|	Fixed the labels on the mention list for users without their first/last name ...	hmhealey	2015-07-18	1	-1/+2
\| \| \|/ /
\| * \| \|	Merge pull request #204 from nickago/MM-1519	Joram Wilander	2015-07-20	1	-1/+2
\| \|\ \ \
\| \| * \| \|	Even on error, submission stop, updated to relect that	nickago	2015-07-17	1	-1/+2
\| * \| \| \|	Merge pull request #209 from mattermost/mm-831	Joram Wilander	2015-07-20	3	-10/+25
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| \| * \| \|	fixes mm-831 post timestamps now update	JoramWilander	2015-07-20	3	-10/+25
\| \|/ / /
\| * \| \|	Merge pull request #208 from nickago/MM-1079	Joram Wilander	2015-07-20	1	-3/+1
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Removed remenant of non-hover system	nickago	2015-07-18	1	-3/+1
\| * \| \|	Fixes javascript console errors	=Corey Hulen	2015-07-17	2	-4/+5
\| * \| \|	Merge pull request #185 from mattermost/mm-1348	Corey Hulen	2015-07-17	14	-216/+35
\| \|\ \ \
\| \| * \| \|	fixes mm-1348 removing dependency on redis	=Corey Hulen	2015-07-14	14	-216/+35
\| * \| \| \|	Merge pull request #192 from nickago/MM-1079	Corey Hulen	2015-07-17	3	-6/+8
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Changed javascript to CSS method	nickago	2015-07-17	3	-6/+8
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge pull request #177 from hmhealey/mm825	Corey Hulen	2015-07-17	31	-230/+395
\| \|\ \ \
\| \| * \| \|	Use a user's full name as their display name if a nickname hasn't been specified	hmhealey	2015-07-17	3	-2/+64
\| \| * \| \|	Unify all locations where we determine a user's display named based off of th...	hmhealey	2015-07-17	6	-11/+33
\| \| * \| \|	Add tests to check if a User's first/last name are valid	hmhealey	2015-07-17	1	-0/+17
\| \| * \| \|	Allow Users to be notified using @all, @channel, and their first name when ot...	hmhealey	2015-07-17	2	-13/+11
\| \| * \| \|	Use User.FirstName for notifications instead of trying to determine it from U...	hmhealey	2015-07-17	3	-32/+11
\| \| * \| \|	Use User.FirstName instead of trying to infer a user's first name from their ...	hmhealey	2015-07-17	3	-10/+5
\| \| * \| \|	Sanitize FirstName and LastName fields of an object instead of the nickname w...	hmhealey	2015-07-17	2	-4/+2
\| \| * \| \|	Fix migration code so that LastName is populated correctly for users who only...	hmhealey	2015-07-17	2	-17/+26
\| \| * \| \|	Add interface to edit a user's nickname directly	hmhealey	2015-07-17	1	-1/+54
\| \| * \| \|	Added FirstName and LastName fields to User object and attempt to populate th...	hmhealey	2015-07-17	2	-2/+24
\| \| * \| \|	Renamed all clientside references from full_name to nickname	hmhealey	2015-07-17	8	-21/+21
\| \| * \| \|	Renamed FullName column in database to Nickname. Renamed all serverside refer...	hmhealey	2015-07-17	22	-155/+165
\| * \| \| \|	Merge pull request #202 from mattermost/readme-update-mm-1356	it33	2015-07-17	1	-18/+2
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Fixing grammar	Christopher Speller	2015-07-17	1	-1/+1
\| \| * \| \|	Modifications to readme for mm-1356	Christopher Speller	2015-07-17	1	-18/+2
\| * \| \| \|	Merge pull request #203 from nickago/MM-1601	Christopher Speller	2015-07-17	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	Fixed typo	nickago	2015-07-17	1	-1/+1
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge pull request #199 from asaadmahmoodspin/master	Joram Wilander	2015-07-17	5	-13/+20
\| \|\ \ \ \
\| \| * \| \| \|	Improving search header for mobile layouts and other UI changes	Asaad Mahmood	2015-07-17	5	-13/+20
\| * \| \| \| \|	Merge pull request #184 from nickago/MM-1278	Joram Wilander	2015-07-17	4	-7/+31
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| \| * \| \| \|	removed testing material	nickago	2015-07-16	1	-1/+0
\| \| * \| \| \|	removed testing material	nickago	2015-07-16	1	-4/+0
\| \| * \| \| \|	Check your credentials from session	nickago	2015-07-16	2	-1/+6
\| \| * \| \| \|	reworked logic to stem from post	nickago	2015-07-16	2	-6/+6
\| \| * \| \| \|	Moved admin checking into seperate function	nickago	2015-07-16	2	-13/+17