chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added last updated for pictures	nickago	2015-07-16	1	-2/+7
\|
*	Merge pull request #175 from ralder/fix-dispatchError	Joram Wilander	2015-07-16	4	-123/+92
\|\ \| \| \| \|	[webui] fix incorrect call for AsyncClient.dispatchError
\| *	fix incorrect call for AsyncClient.dispatchError	ralder	2015-07-13	4	-123/+92
\| \|
* \|	fixing merge	=Corey Hulen	2015-07-15	27	-434/+324
\|\ \
\| * \	Merge pull request #176 from nickago/MM-1400	Corey Hulen	2015-07-15	1	-2/+13
\| \|\ \ \| \| \| \| \| \| \| \|	MM-1400 Add processing for message-less image posts w/ pluralization
\| \| * \|	Fixed minor typo	nickago	2015-07-14	1	-1/+1
\| \| \| \|
\| \| * \|	Add processing for messageless image posts w/ pluralization	nickago	2015-07-13	1	-2/+13
\| \| \| \|
\| * \| \|	Fixed typo, returned password flow to standard model	nickago	2015-07-15	1	-1/+1
\| \| \| \|
\| * \| \|	Revert "MM-831 Time change ping riding on the status interupt for timestamp ↵	Joram Wilander	2015-07-14	2	-31/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update"
\| * \| \|	Merge pull request #174 from nickago/MM-831-3	Joram Wilander	2015-07-14	2	-3/+31
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	MM-831 Time change ping riding on the status interupt for timestamp update
\| \| * \| \|	Added semicolons	nickago	2015-07-14	2	-2/+2
\| \| \| \| \|
\| \| * \| \|	Fixed 'this' typo and added semicolon	nickago	2015-07-13	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Added timestamp updates to right side and cleaned code	nickago	2015-07-13	3	-14/+28
\| \| \| \| \|
\| \| * \| \|	merge conflicts	nickago	2015-07-13	2	-2/+16
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	should fix scrolling on forceupdate	JoramWilander	2015-07-13	2	-2/+13
\| \| \| \| \|
\| * \| \| \|	Merge pull request #167 from rgarmsen2295/mm-629	Joram Wilander	2015-07-14	1	-1/+17
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	MM-629 Empty messages with files attached now include text in the desktop notification describing the contents
\| \| * \| \| \|	If a message has no text but has an attached image or file the desktop ↵	Reed Garmsen	2015-07-13	1	-1/+17
\| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	notification now says uploaded an image or uploaded a file respectively (if both, defaults to image)
\| * \| \| \|	Merge pull request #168 from ralder/fix-loading-screen-for-ie	Joram Wilander	2015-07-14	6	-97/+99
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	[webui] fix loading animation for ie
\| \| * \| \| \|	[webui] fix loading animation for ie	ralder	2015-07-11	6	-97/+99
\| \| \| \| \| \|
\| * \| \| \| \|	mm-1302 - Adding profile pick in LHS Header	Asaad Mahmood	2015-07-14	1	-4/+6
\| \| \| \| \| \|
\| * \| \| \| \|	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.
\| * \| \| \|	Merge pull request #158 from nickago/MM-975	Christopher Speller	2015-07-13	8	-10/+19
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	MM-975 Added timestamps to pictures to stop caching
\| \| * \| \| \|	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 timestamps to pictures to stop caching	nickago	2015-07-13	4	-4/+7
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	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	1	-11/+18
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	[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	1	-11/+18
\| \| \| \|
* \| \| \|	Fixes mm-1415 adding email bypass flag	=Corey Hulen	2015-07-12	1	-17/+16
\|/ / /
* \| /	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	4	-6/+50
\|\ \ \| \| \| \| \| \|	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	3	-10/+34
\| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \|
\| * \|	Better logic for checking if channel has loaded	Reed Garmsen	2015-07-10	2	-2/+7
\| \| \|
\| * \|	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