158 Commits

Author	SHA1	Message	Date
hmhealey	97b2f6ffe7	Made further changes based on feedback	2015-10-13 15:36:58 -04: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	599644fb2f	Renamed show_hide preference to show	2015-10-13 09:42:25 -04:00
hmhealey	a087403e9f	Added api to get and set preferences	2015-10-13 09:42:23 -04:00
hmhealey	da66599fa3	Added Preferences table to store user preferences	2015-10-13 09:42:23 -04:00
hmhealey	3229457de0	Added model class for user preferences object	2015-10-13 09:42:23 -04:00
=Corey Hulen	61f92517f3	PLT-586 fixing issues with security alert	2015-10-09 12:24:39 -07:00
Christopher Speller	66cc4fa08f	Adding release 1.1.0 version	2015-10-08 16:16:53 -04:00
Christopher Speller	b85b529373	Changing SpinPunch to Mattermost in copyright	2015-10-08 12:27:09 -04:00
Christopher Speller	a6629f95fe	Merge pull request #944 from mattermost/PLT-518 ... PLT-518 check for security bulletins	2015-10-08 09:59:08 -04: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	e26b77faf1	PLT-518 check for security bulletins	2015-10-05 17:33:45 -07:00
Joram Wilander	b591c4b32e	Merge pull request #914 from mattermost/plt-297 ... PLT-297 Add ability to override username and icon for posts from incoming webhooks.	2015-10-05 11:48:10 -04:00
Christopher Speller	515d709c2e	Merge pull request #915 from mattermost/plt-300 ... PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word.	2015-10-05 10:32:27 -04: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
JoramWilander	2a23d90ca6	Add config options for overriding username and icon, and add BOT indicator next to webhook posts.	2015-10-05 08:46:23 -04:00
JoramWilander	6221927351	Update allow/deny oauth page UI, and add ouath as reserved word.	2015-10-02 12:47:54 -04:00
=Corey Hulen	e0743a6a2b	Fixing break	2015-10-02 09:16:03 -07:00
=Corey Hulen	3863c3c15e	Adding offical build function	2015-10-02 09:01:50 -07:00
=Corey Hulen	b2052de746	Merge branch 'master' into PLT-462	2015-10-02 08:36:56 -07: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
=Corey Hulen	9d688821aa	PLT-462 Adding diagnostic info	2015-10-01 13:02:04 -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	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
hmhealey	284a660a47	Removed deprecated constants related to quiet mode	2015-09-30 09:59:59 -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
=Corey Hulen	8fadea44de	PLT-404 adding basic error checking to config file.	2015-09-29 14:17:16 -07:00
Christopher Speller	942702ff1a	Merge release branch 'release-1.0.0'	2015-09-29 15:34:21 -04:00
Jack	503501ab3b	rebase	2015-09-28 08:14:57 -07:00
Christopher Speller	ce74afd9ed	Fixing version unit test	2015-09-28 08:05:40 -04:00
Christopher Speller	348e931a20	Updating dockerfiles and version.go	2015-09-28 07:55:59 -04:00
=Corey Hulen	8ad9a88bda	Fixing merge	2015-09-24 12:12:27 -07:00
=Corey Hulen	57269dcaf4	Removing default theme no longer in use	2015-09-24 11:08:39 -07:00
=Corey Hulen	a374419ad5	Removing old valet crud	2015-09-24 10:52:32 -07:00
Jack	396a535f10	use github.com/disintegration/imaging	2015-09-23 15:57:49 -07:00
=Corey Hulen	7f3bfdbe0c	Fixing merge	2015-09-23 14:38:34 -07:00
=Corey Hulen	ccf2e6e4e7	Changing image settings to file settings	2015-09-23 13:47:10 -07:00
=Corey Hulen	2b5b8f95ed	Merge branch 'master' into PLT-11-email	2015-09-23 12:55:58 -07:00
=Corey Hulen	1626a6de6f	PLT-349 adding team mgt to admin console	2015-09-23 12:49:28 -07:00
JoramWilander	e4a15076f4	Implement UI theme colors.	2015-09-23 10:12:40 -04:00
=Corey Hulen	554f017327	Fixing merge conflict	2015-09-22 13:20:24 -07:00
=Corey Hulen	6e60768abe	Fixing merge conflict	2015-09-22 13:18:42 -07:00