chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #115 from nickago/MM-1425	Corey Hulen	2015-07-01	6	-9/+9
\|\ \| \| \| \|	MM-1425 Facelifted "direct message" to "private message"
\| *	Facelifted "direct message" to "private message"	nickago	2015-07-01	6	-9/+9
\| \|
* \|	Merge pull request #114 from asaadmahmoodspin/master	Corey Hulen	2015-07-01	12	-5/+21
\|\ \ \| \| \| \| \| \|	Fixing css issues in IE, adding doctype to html files
\| * \|	Improving targeting for row content	Asaad Mahmood	2015-07-01	1	-5/+5
\| \| \|
\| * \|	Just arranging the css more properly	Asaad Mahmood	2015-07-01	1	-1/+4
\| \| \|
\| * \|	Fixing height for content	Asaad Mahmood	2015-07-01	2	-3/+5
\| \| \|
\| * \|	Fixing css issues in IE, adding doctype to html files	Asaad Mahmood	2015-07-01	11	-0/+11
\| \|/
* \|	Merge pull request #92 from nickago/MM-1151	Corey Hulen	2015-07-01	4	-14/+27
\|\ \ \| \| \| \| \| \|	MM-1151 clickable search results
\| * \|	Finally fixed the git weirdness	nickago	2015-07-01	4	-14/+27
\| \|/
* \|	Merge pull request #90 from ralder/patch-1	Corey Hulen	2015-07-01	1	-1/+1
\|\ \ \| \|/ \|/\|	fix pr #82 bug mention list inside modal
\| *	fix pr #82 mention list inside modal	ralder	2015-06-29	1	-1/+1
\| \|
* \|	Merge pull request #62 from jedisct1/authenticated-encryption	Corey Hulen	2015-06-30	1	-6/+32
\|\ \ \| \| \| \| \| \|	SQL store: use authenticated encryption
\| * \|	SQL store: use authenticated encryption	Frank Denis	2015-06-24	1	-6/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Data were encrypted using AES-CFB, with a properly randomized IV, but without any authenticators. This allows the data to be tampered with, without being noticed by the application. This diff slightly changes the encryption/decryption functions in sql_store.go to add a HMAC-SHA256 authenticator to encrypted messages. Two keys are derived from AtRestEncryptKey: the first half of SHA512(AtRestEncryptKey) for the block cipher and the second half for the MAC. This can be changed to a KDF if needed. The decryption function also checks that base64 decoding actually worked, and that the ciphertext is long enough to include the IV and the MAC. Unfortunately, it breaks backward compatibility. But if such a change has to be made, it has to be made early.
* \| \|	Merge pull request #110 from nickago/MM-1430	Corey Hulen	2015-06-30	3	-3/+19
\|\ \ \ \| \| \| \| \| \| \| \|	MM-1430 Added the ability to have hashtags with dashes in them
\| * \| \|	Added the ability to have hashtags with dashes in them	nickago	2015-06-30	3	-3/+19
\| \| \| \|
* \| \| \|	Merge pull request #102 from nickago/MM-1328	Corey Hulen	2015-06-30	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	MM-1328 Now limits domain to just alphanumeric
\| * \| \| \|	Aligned front end and back end domain requirements	nickago	2015-06-30	1	-1/+3
\| \|/ / /
* \| \| \|	Merge pull request #111 from rgarmsen2295/mm-1305	Joram Wilander	2015-06-30	1	-8/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \|	MM-1305 The word "constructor" will no longer be highlighted
\| * \| \|	Removed unnecessary loop copying	Reed Garmsen	2015-06-30	1	-5/+1
\| \| \| \|
\| * \| \|	Changed keyword logic to use arrays rather than maps to remove highlighting ↵	Reed Garmsen	2015-06-30	1	-5/+5
\|/ / / \| \| \| \| \| \| \| \| \|	of js object properties like constructor and __proto__
* \| \|	Merge pull request #109 from nickago/MM-1289	Christopher Speller	2015-06-30	1	-3/+10
\|\ \ \ \| \| \| \| \| \| \| \|	Mm 1289 Now sorts extra channel members lexigraphically
\| * \| \|	Added extra precaution to avoid null error	nickago	2015-06-30	1	-7/+9
\| \| \| \|
\| * \| \|	MM-1289 Now sorts users in lexigraphical order in extra members popover	nickago	2015-06-30	1	-1/+6
\| \| \| \|
* \| \| \|	Merge pull request #108 from rgarmsen2295/mm-1309	Christopher Speller	2015-06-30	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	MM-1309 Fixed grammmatical issue in error message
\| * \| \| \|	Fixed grammmatical issue in error message	Reed Garmsen	2015-06-30	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #106 from mattermost/mm-1119	Joram Wilander	2015-06-30	10	-18/+99
\|\ \ \ \ \| \|/ / / \|/\| \| \|	fixes mm-1119 adds @all and @channel mention capabilites
\| * \| \|	added mentioned username to default mention keys	JoramWilander	2015-06-30	1	-1/+1
\| \| \| \|
\| * \| \|	@all and @channel now highlight like other mentions	JoramWilander	2015-06-30	2	-2/+8
\| \| \| \|
\| * \| \|	add default icon for non-user autocompletes	JoramWilander	2015-06-30	2	-2/+13
\| \| \| \|
\| * \| \|	@all and @channel now auto-complete	JoramWilander	2015-06-29	4	-3/+17
\| \| \| \|
\| * \| \|	added team-wide and channel-wide mentions	JoramWilander	2015-06-29	3	-11/+61
\| \| \| \|
* \| \| \|	Merge pull request #107 from mattermost/revert-91-MM-1289	Christopher Speller	2015-06-30	1	-6/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Revert "MM-1289 Sorted the channel members popover lexigraphically"
\| * \| \| \|	Revert "MM-1289 Sorted the channel members popover lexigraphically"	Christopher Speller	2015-06-30	1	-6/+1
\|/ / / /
* \| \| \|	Merge pull request #101 from rgarmsen2295/mm-983	Christopher Speller	2015-06-30	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	MM-983 Fixed file preview removal in IE10
\| * \| \| \|	Changed file preview removal from using dataset which is unsupported in ie10 ↵	Reed Garmsen	2015-06-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to using the getAttribute method which is backwards and forwards compatible
* \| \| \| \|	Merge pull request #91 from nickago/MM-1289	Christopher Speller	2015-06-30	1	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	MM-1289 Sorted the channel members popover lexigraphically
\| * \| \| \| \|	Added semicolons	nickago	2015-06-29	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Sorted the channel members popover lexigraphically	nickago	2015-06-29	1	-1/+6
\| \|/ / / /
* \| \| \| \|	Merge pull request #103 from nickago/MM-1293	Joram Wilander	2015-06-30	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	MM-1293 Updated file display key to avoid child flattening
\| * \| \| \| \|	Changed the style of key-assignment to allow for more assured variance	nickago	2015-06-29	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Updated file display key to avoid child flattening	nickago	2015-06-29	1	-1/+2
\| \|/ / / /
* \| \| \| \|	Merge pull request #100 from asaadmahmoodspin/master	Corey Hulen	2015-06-29	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	MM-1268 - Updating button in email template
\| * \| \| \| \|	MM-1268 - Updating button in email template	Asaad Mahmood	2015-06-30	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of https://github.com/mattermost/platform	Asaad Mahmood	2015-06-30	3	-2/+12
\| \|\\| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of https://github.com/mattermost/platform	Asaad Mahmood	2015-06-29	18	-126/+247
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'master' of https://github.com/mattermost/platform	Asaad Mahmood	2015-06-28	2	-2/+2
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge pull request #98 from mattermost/mm-1199	Corey Hulen	2015-06-29	11	-33/+102
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	fixes mm-1199 adds off-topic as a default channel
\| * \| \| \| \| \|	update unit tests for default channels	JoramWilander	2015-06-29	3	-3/+26
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add intro text specific to off-topic channel	JoramWilander	2015-06-29	2	-1/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	new users now join off-topic defaultly	JoramWilander	2015-06-29	4	-16/+43
\| \| \| \| \| \| \|