86 Commits

Include renames

Author	SHA1	Message	Date
Joram Wilander	288ad55f80	Revert "MM-1494 Change image resizing for preview and thumbnail to use Lanczos interpolation"	2015-07-16 05:05:26 -04:00
=Corey Hulen	e017babc5d	fixing merge	2015-07-15 10:22:05 -08:00
hmhealey	7ff57181b9	Changed image resizing for both the preview and thumbnail to use Lanczos interpolation instead of simple nearest neighbour	2015-07-14 11:48:53 -04:00
Reed Garmsen	f406beca8b	If a message has no text but has an attached image or file the desktop notification now says uploaded an image or uploaded a file respectively (if both, defaults to image)	2015-07-13 13:16:45 -07:00
nickago	aff43f43f8	removed testing state	2015-07-13 09:27:30 -07:00
nickago	7d6d9c297f	Added User update function	2015-07-13 08:58:52 -07:00
=Corey Hulen	252d0f3924	Fixes mm-1415 adding email bypass flag	2015-07-12 23:36:52 -08:00
nickago	44000b58d9	Server now notifies users they have been added to a new channel	2015-07-09 12:05:04 -07:00
Christopher Speller	3ad2098926	Merge pull request #149 from rgarmsen2295/mm-1260 ... MM-1260 Member Invites can no longer be sent to emails already used to signup	2015-07-08 20:24:39 -04:00
Joram Wilander	3012a7f532	Merge pull request #136 from mattermost/code-review ... team code review	2015-07-08 09:07:47 -04:00
Corey Hulen	f6e8b4f310	Merge pull request #143 from rgarmsen2295/mm-1416 ... MM-1416 Changed error message when adding a previously deleted channel to be better suited	2015-07-07 23:12:08 -08:00
Reed Garmsen	65dc307e68	Small tweaks and cleanup	2015-07-07 18:12:53 -07:00
Reed Garmsen	ddeb3ec738	Added a server side check to see if members who are trying to be invited have already been invited by checking the email. Client handles it as if it was an email error.	2015-07-07 17:57:25 -07:00
Christopher Speller	4e856c29b2	Merge pull request #138 from hmhealey/mm756 ... MM-756 Don't mark channels as unread after user joined/left messages	2015-07-07 13:36:05 -04:00
hmhealey	23e527978e	Add a post type for user joined/left messages and don't flag a channel as unread when one of those is automatically posted	2015-07-07 11:00:29 -04:00
Reed Garmsen	f839b63496	Added new error message when trying to add a channel that was previously deleted as well as a corresponding unit test	2015-07-06 17:57:36 -07:00
hmhealey	122a67c3b4	Explicitly cast to an int64 when selecting a random profile picture colour to prevent overflow on 32-bit installations of Go	2015-07-06 18:08:52 -04:00
=Corey Hulen	e3ab0a4e3d	team code review	2015-07-06 11:20:40 -08:00
=Corey Hulen	34fb817a4a	Fixing unit tests	2015-07-06 00:50:42 -08:00
=Corey Hulen	cbadc26386	adding debugging	2015-07-06 00:00:34 -08:00
=Corey Hulen	9be9cf8d9d	adding debugging	2015-07-05 23:52:07 -08:00
=Corey Hulen	fcbb3d5561	adding debugging	2015-07-05 23:51:07 -08:00
=Corey Hulen	e01aea7825	fixing unit tests	2015-07-05 09:52:23 -08:00
=Corey Hulen	60f5350402	Fixing unit test	2015-07-05 09:27:00 -08:00
=Corey Hulen	5582a05909	Fixing unit test	2015-07-05 09:22:32 -08:00
=Corey Hulen	ed178457cd	fixing unit tests	2015-07-05 09:13:06 -08:00
=Corey Hulen	ec2af296b2	fixing race condition in unit tests	2015-07-05 09:06:56 -08:00
Asaad Mahmood	e46561339f	MM-1426 - Updating UI	2015-07-17 21:04:33 +05:00
nickago	27eeabafe0	Facelifted "direct message" to "private message"	2015-07-01 09:48:39 -07:00
Joram Wilander	a00b4e00ad	Merge pull request #106 from mattermost/mm-1119 ... fixes mm-1119 adds @all and @channel mention capabilites	2015-06-30 11:58:22 -04:00
Corey Hulen	74081b7fdc	Merge pull request #100 from asaadmahmoodspin/master ... MM-1268 - Updating button in email template	2015-06-29 21:16:25 -08:00
Corey Hulen	4d2ca8881b	Merge pull request #98 from mattermost/mm-1199 ... fixes mm-1199 adds off-topic as a default channel	2015-06-29 21:16:07 -08:00
Asaad Mahmood	1e0161e4c6	MM-1268 - Updating button in email template	2015-06-30 01:07:23 +05:00
JoramWilander	7b7e73fb92	added team-wide and channel-wide mentions	2015-06-29 14:37:59 -04:00
Reed Garmsen	6cfccf63d5	Changed invite email to reflect the sender's status in the team (e.g. admin v.s. plain member)	2015-06-29 09:42:12 -07:00
JoramWilander	ba998db099	update unit tests for default channels	2015-06-29 11:14:12 -04:00
JoramWilander	d00f90d10c	new users now join off-topic defaultly	2015-06-29 10:24:45 -04:00
JoramWilander	cebb4bef84	move default channel creation to seperate func and add off-topic	2015-06-29 09:07:13 -04:00
JoramWilander	c3ebd3e6be	updated channel unit test	2015-06-29 07:45:12 -04:00
Corey Hulen	5ff8b54920	Merge pull request #59 from haikoschol/master ... Fix typo in function name	2015-06-27 06:07:47 -04:00
Corey Hulen	5e6fb9c181	Merge pull request #48 from rgarmsen2295/mm-1364 ... MM-1364	2015-06-25 11:42:45 -04:00
Corey Hulen	049a41f9be	Merge pull request #27 from mattermost/mm-1240 ... fixes mm-1240 adds ability to turn valet feature on	2015-06-25 11:20:19 -04:00
Haiko Schol	dea39c7b64	Fix typo in function name	2015-06-24 14:21:27 +02:00
Corey Hulen	b4ae75b944	Merge pull request #50 from mattermost/mm-1320 ... HELIUM fixes mm-1320 removes freetype libs and only use solid color for gene…	2015-06-22 11:42:54 -08:00
JoramWilander	2877d69143	use proper dimensions for generated profile image	2015-06-22 15:17:47 -04:00
JoramWilander	012ff506ec	fixes mm-1320 removes freetype libs and only use solid color for generated profile pics	2015-06-22 15:11:20 -04:00
Reed Garmsen	c397adacbe	Fixed bmp image previewing/uploading by adding new go image library	2015-06-22 10:20:20 -07:00
Christopher Speller	6207f2b7e8	Changing test images	2015-06-22 08:37:20 -04:00
Corey Hulen	7de9ed0aa3	Merge pull request #40 from mattermost/image-fix ... HELIUM profile image now generates on each call if S3 is not configured	2015-06-19 10:41:56 -08:00
Corey Hulen	77ab1633af	Merge pull request #40 from mattermost/image-fix ... HELIUM profile image now generates on each call if S3 is not configured	2015-06-19 10:41:56 -08:00