chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added cache: false to ajax calls that caused problems with ie10	Reed Garmsen	2015-08-22	1	-6/+4
\|
*	Merge pull request #427 from asaadmahmoodspin/mm-1696	Harrison Healey	2015-08-21	2	-9/+27
\|\ \| \| \| \|	MM-1696 - Improvements for Slack Import
\| *	Updating setting_upload	Asaad Mahmood	2015-08-21	1	-12/+0
\| \|
\| *	Merge branch 'master' of https://github.com/mattermost/platform into mm-1696	Asaad Mahmood	2015-08-21	5	-42/+99
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx
\| * \|	MM-1696 - Improvements for Slack Import	Asaad Mahmood	2015-08-21	2	-9/+27
\| \| \|
* \| \|	Merge pull request #420 from asaadmahmoodspin/ui-changes	Joram Wilander	2015-08-21	8	-23/+52
\|\ \ \ \| \|_\|/ \|/\| \|	Multiple UI Improvements
\| * \|	Solving conflicts and also fixing css for MM-1752	Asaad Mahmood	2015-08-21	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' of https://github.com/mattermost/platform into ui-changes	Asaad Mahmood	2015-08-21	4	-204/+508
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: web/react/components/channel_notifications.jsx
\| * \|	Updating intro text for channels	Asaad Mahmood	2015-08-21	1	-2/+2
\| \| \|
\| * \|	Removing getDOMNode from view_image	Asaad Mahmood	2015-08-21	1	-2/+2
\| \| \|
\| * \|	Multiple UI Improvements	Asaad Mahmood	2015-08-21	8	-23/+52
\| \| \|
* \| \|	Merge pull request #431 from nickago/MM-1797	Christopher Speller	2015-08-21	1	-8/+2
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1797 Removed state holding functionality when switching to access history or session view
\| * \| \|	Removed state holding functionality when switching to access history or ↵	nickago	2015-08-20	1	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	session view
* \| \| \|	Merge pull request #432 from nickago/MM-1804	Joram Wilander	2015-08-21	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	MM-1804 Updated navbar to more accurately mirror desktop preformance
\| * \| \| \|	Updated navbar to more accurately mirror desktop preformance	nickago	2015-08-20	1	-0/+3
\| \|/ / /
* \| \| \|	Merge pull request #437 from mattermost/it33-patch-4	Christopher Speller	2015-08-21	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Adjusting "Find Your Team" instructions
\| * \| \| \|	Adjusting "Find Your Team" instructions	it33	2015-08-21	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #435 from mattermost/it33-patch-2	Christopher Speller	2015-08-21	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fixing typo "Summery" -> "Summary"
\| * \| \| \|	Fixing typo "Summery" -> "Summary"	it33	2015-08-20	1	-2/+2
\| \|/ / /
* \| \| \|	Merge pull request #434 from mattermost/it33-patch-1	Christopher Speller	2015-08-21	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fixing typo "SelectFile" -> "Select File"
\| * \| \| \|	Fixing typo "SelectFile" -> "Select File"	it33	2015-08-20	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #425 from rgarmsen2295/mm-1901	Joram Wilander	2015-08-21	1	-32/+80
\|\ \ \ \ \| \|/ / / \|/\| \| \|	MM-1901 When a user joins a channel that channel is now automatically opened for them
\| * \| \|	Fixed issue with channel name in url and added loading icon to replace ↵	Reed Garmsen	2015-08-20	1	-10/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'Join' button for slow connections
\| * \| \|	Cosmetic reformatting of more_channels.jsx	Reed Garmsen	2015-08-20	1	-29/+62
\| \| \| \|
\| * \| \|	Users are now placed in the channel after joining it from the 'More...' ↵	Reed Garmsen	2015-08-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	channel menu
* \| \| \|	Merge pull request #433 from nickago/MM-1840	Corey Hulen	2015-08-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	MM-1840 Changed title of the edit channel modal
\| * \| \| \|	changed title of edit_channel modal	nickago	2015-08-20	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #423 from nickago/MM-1888	Corey Hulen	2015-08-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	MM-1888 Added blank href to make tab recognize and jump to it
\| * \| \| \|	Added blank href to make tab recognize and jump to it	nickago	2015-08-20	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #410 from rgarmsen2295/mm-1821b	Corey Hulen	2015-08-20	2	-202/+506
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	MM-1821 Replaces the on/off buttons with simple radio buttons
\| * \| \|	Reformats the user_settings_notifications.jsx file	Reed Garmsen	2015-08-20	1	-98/+308
\| \| \| \|
\| * \| \|	Cosmetic reformatting of the channel_notifications.jsx file	Reed Garmsen	2015-08-20	1	-104/+198
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #424 from mattermost/mm-1987	Joram Wilander	2015-08-20	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1987 Fixing posts not being able to upload
\| * \| \|	Fixing posts not being able to upload	Christopher Speller	2015-08-20	1	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #422 from mattermost/ampm-fix	Joram Wilander	2015-08-20	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fixing AM-PM issue
\| * \| \|	Fixing AM-PM issue	Christopher Speller	2015-08-20	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #418 from mattermost/mm-1811	Corey Hulen	2015-08-20	1	-29/+87
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1811 Skipping invite members step when email is disabled.
\| * \| \|	Skipping invite members step when email is disabled. Cosmetic refactoring ↵	Christopher Speller	2015-08-20	1	-29/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	included.
* \| \| \|	Merge pull request #421 from nickago/hotfix	Corey Hulen	2015-08-20	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	HOTFIX: Fixed this/self typo
\| * \| \|	Fixed this/self typo	nickago	2015-08-20	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #404 from nickago/MM-1886	Joram Wilander	2015-08-20	1	-78/+100
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Mm 1886 Add loading screen to channel invite modal
\| * \| \|	Made state getter member function and fixed scu edge case	nickago	2015-08-20	1	-39/+35
\| \| \| \|
\| * \| \|	Re-added state update on show	nickago	2015-08-19	1	-0/+1
\| \| \| \|
\| * \| \|	Cosmetic refactoring	nickago	2015-08-19	1	-56/+67
\| \| \| \|
\| * \| \|	Added loading screen to add more members modal	nickago	2015-08-19	1	-20/+34
\| \| \| \|
* \| \| \|	Revert "Multiple UI Improvements"	Joram Wilander	2015-08-20	8	-31/+14
\| \| \| \|
* \| \| \|	Merge pull request #416 from asaadmahmoodspin/ui-changes	Harrison Healey	2015-08-20	8	-14/+31
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Multiple UI Improvements
\| * \| \|	Multiple UI Improvements	Asaad Mahmood	2015-08-20	8	-14/+31
\| \| \|/ \| \|/\|
* \| \|	Fixed mixed case typo	nickago	2015-08-20	1	-1/+1
\| \| \|
* \| \|	Merge pull request #414 from mattermost/update-etag-version	Christopher Speller	2015-08-20	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Update etag version for the addition of CreatorId field to channels