chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge pull request #178 from asaadmahmoodspin/master	Joram Wilander	2015-07-14	2	-7/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mm-1302 - Adding profile pick in LHS Header
\| * \| \| \| \| \| \|	mm-1302 - Adding profile pick in LHS Header	Asaad Mahmood	2015-07-14	2	-9/+28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'MM-1302' of https://github.com/nickago/platform into mm-1302	Asaad Mahmood	2015-07-14	1	-0/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
* / \| \| \| \| \|	Updating README_DEV.md with corrected forum links	it33	2015-07-13	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #158 from nickago/MM-975	Christopher Speller	2015-07-13	11	-10/+41
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-975 Added timestamps to pictures to stop caching
\| * \| \| \| \| \|	removed testing state	nickago	2015-07-13	1	-2/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added update function to image update and fixed corner cases	nickago	2015-07-13	6	-7/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added async get to channel swap	nickago	2015-07-13	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added User update function	nickago	2015-07-13	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added timestamps to pictures to stop caching	nickago	2015-07-13	6	-4/+27
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #166 from rgarmsen2295/mm-1526	Corey Hulen	2015-07-13	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1526 Desktop notifications no longer render carriage returns
\| * \| \| \| \| \|	Changed parser for desktop notifications to replace returns with a single space.	Reed Garmsen	2015-07-10	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Changes to notifcation carriage return parsing	Reed Garmsen	2015-07-10	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #163 from ralder/fix-and-refactor-browser-store	Christopher Speller	2015-07-13	11	-310/+150
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	[webui] second bugfix for pr #150 and refactor BrowserStore
\| * \| \| \| \|	fix BrowserStore bug in actionOnItemsWithPrefix and refactor BrowserStore	ralder	2015-07-10	11	-310/+150
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #164 from ralder/fix-mentions-list-height-in-right-sidebar	Joram Wilander	2015-07-13	2	-15/+23
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	[webui] fix incorrect height for mentions list for reply and edit textbox
\| * \| \| \|	[webui] fix incorrect height for mentions list for reply textbox	ralder	2015-07-10	2	-15/+23
\| \| \| \| \|
\| \| \| \| *	Fixes mm-1415 adding email bypass flag	=Corey Hulen	2015-07-12	7	-28/+29
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #165 from mattermost/revert-154-MM-831	Joram Wilander	2015-07-10	2	-11/+0
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Revert "MM-831 Post timestamp now updates in real time"
\| * \| \|	Revert "MM-831 Post timestamp now updates in real time"	Joram Wilander	2015-07-10	2	-11/+0
\|/ / /
* \| \|	Merge pull request #159 from rgarmsen2295/mm-1269b	Corey Hulen	2015-07-10	5	-6/+54
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1269b Added yellow tinge to post and comment textbox when connection is disrupted
\| * \| \|	Removed extraneous setState	Reed Garmsen	2015-07-10	1	-2/+1
\| \| \| \|
\| * \| \|	Changed spacing model of connection flag & removed unnecessary duplication ↵	Reed Garmsen	2015-07-10	1	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of logic
\| * \| \|	Moved check for existing timer interrupt outside of if-else block for sanity	Reed Garmsen	2015-07-09	1	-4/+5
\| \| \| \|
\| * \| \|	Removed newline	Reed Garmsen	2015-07-09	1	-1/+0
\| \| \| \|
\| * \| \|	Changed method again this time to a timer based system so that when inet ↵	Reed Garmsen	2015-07-09	1	-16/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	does come back the yellow tinge goes away automatically not on user input
\| * \| \|	Added performance comment	Reed Garmsen	2015-07-09	1	-0/+2
\| \| \| \|
\| * \| \|	Use the AsyncClient call 'updateLastViewedAt' as a way of checking for inet ↵	Reed Garmsen	2015-07-09	2	-10/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	connectivity immediately after clearning yellow bar after user has typed 5 characters
\| * \| \|	Added errorchange listener to textbox that detects if inet is not connected. ↵	Reed Garmsen	2015-07-09	4	-10/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Still do not have reliable way of checking if inet has reconnected
\| * \| \|	Notes to myself	Reed Garmsen	2015-07-09	1	-1/+6
\| \| \| \|
* \| \| \|	Merge pull request #157 from rgarmsen2295/mm-1265	Corey Hulen	2015-07-10	4	-10/+11
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels
\| * \| \|	Final change to code affected by change to loading more channels logic	Reed Garmsen	2015-07-10	1	-1/+1
\| \| \| \|
\| * \| \|	Removed test code	Reed Garmsen	2015-07-10	1	-2/+0
\| \| \| \|
\| * \| \|	Better logic for checking if channel has loaded	Reed Garmsen	2015-07-10	3	-2/+9
\| \| \| \|
\| * \| \|	Removed extraneous console.log functions	Reed Garmsen	2015-07-09	1	-5/+0
\| \| \| \|
\| * \| \|	Leave result of _getMoreChannels unitialized if it does not yet exist in ↵	Reed Garmsen	2015-07-09	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	browser storage to know when list of more channels is loading vs when its empty
\| * \| \|	The options to change member roles are now links so that they have the ↵	Reed Garmsen	2015-07-09	1	-4/+4
\| \|/ / \| \| \| \| \| \| \| \| \|	'click' mouse hand when hovered over
* \| \|	Merge pull request #162 from asaadmahmoodspin/master	Joram Wilander	2015-07-10	3	-8/+13
\|\ \ \ \| \| \| \| \| \| \| \|	UI Improvements for RHS
\| * \| \|	UI Improvements for RHS	Asaad Mahmood	2015-07-10	3	-8/+13
\|/ / /
* \| \|	Merge pull request #156 from asaadmahmoodspin/master	Joram Wilander	2015-07-10	9	-41/+72
\|\ \ \ \| \| \| \| \| \| \| \|	Improving mentions list and other UI improvements
\| * \| \|	MM-1304 - Quick fix for error on welcome sign up page	Asaad Mahmood	2015-07-10	2	-4/+6
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/mattermost/platform	Asaad Mahmood	2015-07-10	10	-8/+60
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #154 from nickago/MM-831	Joram Wilander	2015-07-10	2	-0/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	MM-831 Post timestamp now updates in real time
\| * \| \| \|	Added comments for the force update functions	nickago	2015-07-09	2	-0/+2
\| \| \| \| \|
\| * \| \| \|	Placed event listeners on higher level components to avoid app dispatcher vomit	nickago	2015-07-09	3	-9/+9
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of https://github.com/mattermost/platform into MM-831	nickago	2015-07-09	9	-94/+138
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \|	merge
\| * \| \| \|	Time change ping riding on the status interupt for timestamp update	nickago	2015-07-09	1	-0/+9
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #160 from ralder/fix-pr-150-MM-895	Christopher Speller	2015-07-10	3	-8/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[webui] fix bugs for pr #150 MM-895
\| * \| \| \|	fix bugs for pr #150 MM-895	ralder	2015-07-10	3	-8/+14
\| \| \| \| \|
* \| \| \| \|	Merge pull request #152 from faebser/manifest-for-mobile	Christopher Speller	2015-07-10	2	-0/+26
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Manifest for mobile