chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #466 from mattermost/mm-1912	Corey Hulen	2015-08-25	2	-11/+21
\|\ \| \| \| \|	Fixes mm-1912 move get file info into its own web service call
\| *	Fixes mm-1912 move get file info into its own web service call	=Corey Hulen	2015-08-24	2	-11/+21
\| \|
* \|	Merge pull request #464 from rgarmsen2295/mm-1895	Joram Wilander	2015-08-25	4	-5/+28
\|\ \ \| \| \| \| \| \|	MM-1895 Adds email help text
\| * \|	Added email help text and added licensing info	Reed Garmsen	2015-08-24	4	-5/+28
\| \| \|
* \| \|	Merge pull request #445 from rgarmsen2295/mm-1995	Joram Wilander	2015-08-25	6	-127/+235
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1995 Moved the ability to rename a team into the team settings modal and fixed valet regression
\| * \| \|	Moved the ability to rename a team into the team settings modal; fixed ↵	Reed Garmsen	2015-08-24	6	-127/+235
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues with valet settings
* \| \| \|	Merge pull request #460 from nickago/MM-1996	Joram Wilander	2015-08-25	1	-9/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	MM-1996 exapnded form tag to include submission button
\| * \| \| \|	exapnded form tag to include submission button	nickago	2015-08-24	1	-9/+8
\| \|/ / /
* \| \| \|	Merge pull request #459 from nickago/MM-1966	Corey Hulen	2015-08-24	1	-0/+17
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	MM-1966 Re-enabled enter key submission for send invites page
\| * \| \|	Re-enabled enter key submission for send invites page	nickago	2015-08-24	1	-0/+17
\| \|/ /
* \| \|	Merge pull request #465 from rgarmsen2295/prof-img-fix	Corey Hulen	2015-08-24	1	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \|	Fixes issue with site trying to load profile pictures without having profile information
\| * \| \|	Fixed issue with site tryinng to load profile pictures without having ↵	Reed Garmsen	2015-08-24	1	-1/+6
\| \| \|/ \| \|/\| \| \| \| \| \| \|	profile information
* \| \|	Merge pull request #441 from nickago/MM-1893	Joram Wilander	2015-08-24	3	-5/+7
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1893 Upon exiting edit post modal, focus is placed on the respective text input field
\| * \| \|	Upon exiting edit post modal, foucs is placed on the respective text input field	nickago	2015-08-21	3	-5/+7
\| \| \| \|
* \| \| \|	Merge pull request #446 from rgarmsen2295/mm-1999	Joram Wilander	2015-08-24	1	-1/+6
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	MM-1999 Removes 'for' from the edit channel description title when the channel has no title
\| * \| \|	Removes 'for' from the edit channel description modal title when editing the ↵	Reed Garmsen	2015-08-24	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	description of a private message channel
* \| \| \|	Merge pull request #449 from rgarmsen2295/mm-1933	Corey Hulen	2015-08-24	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Multiple fixes for IE10 & Edge browsers primarily due to aggressive ajax call caching on the browser
\| * \| \| \|	Fixes issue with profile pictures not updating w/o refresh and prevents more ↵	Reed Garmsen	2015-08-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ie10 ajax caching issues
* \| \| \| \|	Merge pull request #457 from rgarmsen2295/mm-1833	Corey Hulen	2015-08-24	1	-2/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	MM-1833 Changes the max number of characters for a channel title/handle to 22
\| * \| \| \|	Changes the max number of characters for a channel title/handle to 22	Reed Garmsen	2015-08-24	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* / \| \|	MM-1831 - Fixing channel name and having channel name in bold for edit ↵	Asaad Mahmood	2015-08-24	2	-2/+2
\|/ / / \| \| \| \| \| \| \| \| \|	channel modal
* \| \|	Merge pull request #439 from nickago/MM-1822	Joram Wilander	2015-08-24	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1822 Added help text to profile picture screen
\| * \| \|	Added help text to profile picture screen	nickago	2015-08-21	1	-0/+4
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #440 from nickago/MM-1803	Corey Hulen	2015-08-23	2	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1803 Remove search term after the RHS is closed
\| * \| \|	remove search term after the RHS is closed	nickago	2015-08-21	2	-0/+14
\| \|/ /
* \| \|	Merge pull request #448 from mattermost/it33-patch-4	Corey Hulen	2015-08-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Changing "Features"->"Advanced" in Team Settings
\| * \| \|	Changing "Features"->"Advanced" in Team Settings	it33	2015-08-21	1	-1/+1
\| \| \|/ \| \|/\| \| \| \|	Also changing order of menu items, so Advanced (least used) is at the bottom)
* / \|	Renaming "Feature Settings"->"Advanced Features"	it33	2015-08-21	1	-2/+2
\|/ /
* \|	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