chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	Code simplification and rebasing	Reed Garmsen	2015-07-16	2	-32/+6
\| \| \| \| \|
\| * \| \| \|	Added missing semi-colons	Reed Garmsen	2015-07-16	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Minor changes to scroll 'feel' and logic flow	Reed Garmsen	2015-07-16	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Few minor bug fixes	Reed Garmsen	2015-07-16	1	-33/+17
\| \| \| \| \|
\| * \| \| \|	Fixes not selecting an element that hasn't been scrolled to	Reed Garmsen	2015-07-16	2	-47/+27
\| \| \| \| \|
\| * \| \| \|	Getting scrolling working with the arrow keys	Reed Garmsen	2015-07-16	2	-16/+43
\| \| \| \| \|
\| * \| \| \|	Minor changes and tweaks trying to get scrolling to work	Reed Garmsen	2015-07-16	1	-11/+20
\| \| \| \| \|
\| * \| \| \|	Better handling of previous highlight when you backspace (therefore ↵	Reed Garmsen	2015-07-16	1	-12/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	re-enlarging the number of mentions)
\| * \| \| \|	Minor changes towards getting interior scrolling working with arrow keys	Reed Garmsen	2015-07-16	1	-4/+5
\| \| \| \| \|
\| * \| \| \|	When moving from a mention lower in the list to one higher in the list by ↵	Reed Garmsen	2015-07-16	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	typing more, now properly highlights
\| * \| \| \|	Improved selection logic when using both the mouse and arrow keys	Reed Garmsen	2015-07-16	2	-3/+23
\| \| \| \| \|
\| * \| \| \|	Highlighting now occurs as you arrow key thru mention list. However some ↵	Reed Garmsen	2015-07-16	2	-53/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	small bugs remain.
\| * \| \| \|	Have arrow key selection working, but visually does not highlight correct ↵	Reed Garmsen	2015-07-16	3	-20/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mention. Also if user continues to type things might get weird.
\| * \| \| \|	Changed model of handling key down and focus change	Reed Garmsen	2015-07-16	2	-17/+40
\| \| \| \| \|
\| * \| \| \|	Changed parts of framework	Reed Garmsen	2015-07-16	1	-6/+8
\| \| \| \| \|
\| * \| \| \|	Added comma	Reed Garmsen	2015-07-16	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Added framework for handling up and down arrow key presses to move between ↵	Reed Garmsen	2015-07-16	1	-1/+17
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	different @mention choices
* / \| \|	Clarifying license in README.md	it33	2015-07-16	1	-4/+1
\|/ / /
* \| \|	Merge pull request #175 from ralder/fix-dispatchError	Joram Wilander	2015-07-16	7	-132/+103
\|\ \ \ \| \| \| \| \| \| \| \|	[webui] fix incorrect call for AsyncClient.dispatchError
\| * \| \|	fix incorrect call for AsyncClient.dispatchError	ralder	2015-07-13	7	-132/+103
\| \| \| \|
* \| \| \|	Merge pull request #195 from mattermost/revert-181-mm1494	Joram Wilander	2015-07-16	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Revert "MM-1494 Change image resizing for preview and thumbnail to us…
\| * \| \| \|	Revert "MM-1494 Change image resizing for preview and thumbnail to use ↵	Joram Wilander	2015-07-16	1	-3/+3
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Lanczos interpolation"
* \| \| \|	Merge pull request #171 from mattermost/mm-1415	Corey Hulen	2015-07-15	7	-28/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fixes mm-1415 adding email bypass flag
\| * \ \ \	fixing merge	=Corey Hulen	2015-07-15	40	-493/+417
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #191 from asaadmahmoodspin/master	Corey Hulen	2015-07-15	2	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Minor UI changes
\| * \| \| \| \|	Minor UI changes	Asaad Mahmood	2015-07-15	2	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #181 from hmhealey/mm1494	Corey Hulen	2015-07-15	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1494 Change image resizing for preview and thumbnail to use Lanczos interpolation
\| * \| \| \| \| \|	Changed image resizing for both the preview and thumbnail to use Lanczos ↵	hmhealey	2015-07-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	interpolation instead of simple nearest neighbour
* \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #153 from nickago/MM-1460	Corey Hulen	2015-07-15	2	-2/+15
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	MM-1460 Updated database schema for emoji compatibility
\| * \| \| \| \| \| \|	Updated database schema for full utf8 compatibility	nickago	2015-07-09	2	-2/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #189 from nickago/MM-1591	Christopher Speller	2015-07-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	MM-1591 Fixed typo, returned password flow to standard model
\| * \| \| \| \| \| \|	Fixed typo, returned password flow to standard model	nickago	2015-07-15	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #182 from mattermost/revert-174-MM-831-3	Joram Wilander	2015-07-14	2	-31/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Revert "MM-831 Time change ping riding on the status interupt for tim…
\| * \| \| \| \| \|	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	2	-1/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+31
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-139/+108
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[webui] fix loading animation for ie
\| * \| \| \| \| \| \|	[webui] fix loading animation for ie	ralder	2015-07-11	8	-139/+108
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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.