372 Commits

Author	SHA1	Message	Date
Christopher Speller	cdbe6342bb	Merge release branch 'release-1.1.0'	2015-10-14 08:27:34 -04:00
hmhealey	97b2f6ffe7	Made further changes based on feedback	2015-10-13 15:36:58 -04:00
=Corey Hulen	0187e702ea	PLT-602 combining welcome and verify email	2015-10-13 09:47:31 -07:00
hmhealey	2a39e8dbfa	Removed Preference.AltId	2015-10-13 12:29:31 -04:00
hmhealey	5cecf1afcd	Made structural changes to server-side Preference code based on feedback	2015-10-13 09:42:27 -04:00
hmhealey	ed6b2cd164	Removed setting direct channels for a new user at creation time	2015-10-13 09:42:26 -04:00
hmhealey	a6cd2a7961	Moved saving multiple user preferences into a database transaction	2015-10-13 09:42:26 -04:00
hmhealey	5832232b6d	Fixed preference tests	2015-10-13 09:42:25 -04:00
hmhealey	a11421c74b	Added default direct channels for previously existing users	2015-10-13 09:42:25 -04:00
hmhealey	599644fb2f	Renamed show_hide preference to show	2015-10-13 09:42:25 -04:00
hmhealey	4678794133	Re-added default direct channels for new users	2015-10-13 09:42:24 -04:00
hmhealey	a087403e9f	Added api to get and set preferences	2015-10-13 09:42:23 -04:00
Corey Hulen	191e248b0f	Merge pull request #1022 from mattermost/release-1.1.0 ... Release 1.1.0rc merging to master	2015-10-12 14:22:05 -07:00
=Corey Hulen	9f83a72f73	Merge branch 'release-1.1.0' into PLT-586	2015-10-12 13:16:46 -07:00
hmhealey	e5a019390d	Fixed download links in Safari	2015-10-09 16:45:40 -04:00
Reed Garmsen	3a3b24e6be	Replaced change email verification email logo image with a static link	2015-10-09 13:44:20 -07:00
=Corey Hulen	61f92517f3	PLT-586 fixing issues with security alert	2015-10-09 12:24:39 -07:00
Christopher Speller	806fd77ec9	Merge pull request #981 from mattermost/plt-517 ... PLT-517 Changing SpinPunch to Mattermost in copyright	2015-10-08 12:55:11 -04:00
Corey Hulen	e36227405b	Merge pull request #978 from mattermost/plt-355 ... PLT-355 Fixing ability to dynamicly update members list.	2015-10-08 09:51:04 -07:00
Christopher Speller	b85b529373	Changing SpinPunch to Mattermost in copyright	2015-10-08 12:27:09 -04:00
Christopher Speller	7014496252	Fixing ability to dynamicly update members list.	2015-10-08 10:54:27 -04:00
Christopher Speller	7a601afc64	Merge pull request #966 from mattermost/GIT-960 ... GIT-960 show error when you cannot create a team	2015-10-08 10:00:31 -04:00
Christopher Speller	7571d21f32	Merge pull request #931 from rgarmsen2295/plt-112 ... PLT-112 Improves email change verification process	2015-10-08 09:56:00 -04:00
=Corey Hulen	80b0567257	GIT-957 fixing email templates and logos	2015-10-07 13:45:57 -07:00
=Corey Hulen	81b7f649ed	GIT-960 show error when you cannot create a team	2015-10-07 10:07:08 -07:00
JoramWilander	1421e1ec4a	Fix user_added websocket event and update websocket channel access cache on add/remove member.	2015-10-07 11:39:45 -04:00
=Corey Hulen	3b4b79d99f	Adding checkout for system admin role	2015-10-06 10:50:38 -07:00
Reed Garmsen	c84fe62ca1	Added new email to email change notification	2015-10-06 09:15:56 -07:00
JoramWilander	ab32445a68	Use http writer to automatically set content-type for file gets.	2015-10-06 09:09:52 -04:00
Reed Garmsen	f85dc7f575	Resending the verification email now sends the appropriate version of the email depending on whether it's a change or first signup	2015-10-05 14:54:15 -07:00
Reed Garmsen	817fa66ac4	Added better verification when a user changes his or her email	2015-10-05 14:29:20 -07:00
Reed Garmsen	aad9529f31	Initial cosmetic changes to the process of verifying a changed email	2015-10-05 12:45:47 -07:00
Christopher Speller	f4afabd679	Merge pull request #903 from mattermost/PLT-44 ... PLT-44 allow team switching without the need to login	2015-10-05 10:20:14 -04:00
Christopher Speller	92404d6452	Merge pull request #906 from teviot/teviot-patch-2 ... Pass-through post creation time when importing posts	2015-10-02 08:50:23 -04:00
Joram Wilander	08d390953a	Merge pull request #881 from hmhealey/plt194 ... PLT-194 Changes to ChannelMember notification settings	2015-10-02 08:45:38 -04:00
Teviot Systems	fc82f57102	Pass-through post creation time when importing posts	2015-10-02 20:16:27 +10:00
=Corey Hulen	430806301d	PLT-44 allow team switching without the need to login	2015-10-01 17:52:47 -07:00
hmhealey	c9a0030551	Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps	2015-10-01 08:31:17 -04:00
hmhealey	c16b9de8dc	Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps	2015-10-01 08:31:11 -04:00
Christopher Speller	9ce826863b	Merge pull request #866 from mattermost/PLT-345 ... PLT-345 adding client side logging	2015-10-01 07:26:54 -04:00
Christopher Speller	2d3ddfd467	Merge release branch 'release-1.0.0'	2015-09-30 15:38:15 -04:00
Christopher Speller	7d31f3a271	Fixing some locations to use the IsTeamAdmin function which properly checks for system admin permissions.	2015-09-30 14:26:37 -04:00
Christopher Speller	89b77cc72f	Fixing permissions for system admin. Fixes slack import for system admins.	2015-09-30 14:26:37 -04:00
hmhealey	9995c7ccfc	Added additional test cases and fixed existing ones for ChannelMember.MarkUnreadLevel	2015-09-30 09:59:58 -04:00
hmhealey	7c319f0524	Removed UI for quiet mode and added UI to set when a channel will be marked unread in the sidebar	2015-09-30 09:59:58 -04:00
hmhealey	4bc625e8d1	Added 'default' option to channel notification settings that just uses the user's notification level	2015-09-30 09:59:58 -04:00
hmhealey	8a5ab6a56f	Added slight delay to TestEchoCommand to account for race condition	2015-09-30 09:47:47 -04:00
Christopher Speller	73627000e7	Merge pull request #863 from mattermost/PLT-475 ... PLT-475 making sure session is properly removed	2015-09-30 07:45:42 -04:00
=Corey Hulen	0da42c5559	PLT-345 adding client side logging	2015-09-29 15:55:19 -07:00
Harrison Healey	5e9dccc464	Merge pull request #865 from mattermost/PLT-404 ... PLT-404 adding basic error checking to config file.	2015-09-29 17:33:16 -04:00