955 Коммитов

Автор	SHA1	Сообщение	Дата
=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
JoramWilander	e79e66c0a4	Fix theme images 404ing.	2015-09-23 15:29:39 -04:00
Harrison Healey	bff0956ba5	Merge pull request #761 from mattermost/plt-356 ... PLT-356 Fix post not rendering properly in some cases.	2015-09-23 15:04:45 -04:00
Harrison Healey	15f15de8ca	Merge pull request #759 from mattermost/plt-242-3 ... PLT-242 Implement custom UI theme colors.	2015-09-23 15:04:22 -04:00
JoramWilander	845229d983	Fix post not rendering properly in some cases.	2015-09-23 12:25:01 -04:00
Chengwei Yang	f7a32fa38a	PLT-126: Change 'Private Messages' to 'Direct Messages' ... Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>	2015-09-23 22:43:14 +08:00
JoramWilander	e4a15076f4	Implement UI theme colors.	2015-09-23 10:12:40 -04:00
Joram Wilander	7eef5be359	Merge pull request #740 from asaadmahmoodspin/ui-improvements ... UI Modifications for multiple tickets	2015-09-23 08:41:17 -04:00
Joram Wilander	f2c0db000c	Merge pull request #756 from rgarmsen2295/plt-165 ... PLT-165 Prevents users from signing up via a public link using a non-valid email address	2015-09-23 08:40:11 -04:00
Joram Wilander	e637927a0b	Merge pull request #757 from chengweiv5/PLT-168 ... PLT-168: check email used to reset password strictly	2015-09-23 08:39:31 -04:00
Christopher Speller	d3c09f209b	Merge pull request #755 from rgarmsen2295/plt-164 ... PLT-164 Post drafts containing only files are now recognized properly	2015-09-23 08:30:42 -04:00
Christopher Speller	bdd0cfd227	Merge pull request #751 from hmhealey/plt344 ... PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting	2015-09-23 08:27:12 -04:00
Christopher Speller	fc104242f4	Merge pull request #748 from hmhealey/plt233 ... PLT-233 Removed click handler from RHS [...] menu	2015-09-23 08:22:41 -04:00
Christopher Speller	772a4337c6	Merge pull request #739 from rgarmsen2295/plt-39 ... PLT-39 Clicking "Resend email" on the verification page now confirms email was sent	2015-09-23 08:19:45 -04:00
Chengwei Yang	284b3bb64c	PLT-168: check email used to reset password strictly ... Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>	2015-09-23 17:53:51 +08:00
Reed Garmsen	3ab7d3e24d	Adds a check for email validity client-side when joining a team using a public link	2015-09-22 16:38:46 -07:00
Reed Garmsen	2270a2bb45	Functionalized draft checking	2015-09-22 16:07:07 -07:00
Reed Garmsen	bb557b30d7	Post drafts are now displayed when they contain only files and no text	2015-09-22 15:37:37 -07:00
Reed Garmsen	f1700e765b	Small change to remove react warning	2015-09-22 14:25:26 -07:00
=Corey Hulen	9e04909c0a	Adding new EnableIncomingWebhooks property to service settings in the admin console.	2015-09-22 13:28:03 -07:00
=Corey Hulen	6e60768abe	Fixing merge conflict	2015-09-22 13:18:42 -07:00
Joram Wilander	ac7918c554	Merge pull request #715 from mattermost/plt-27 ... PLT-27 Implement incoming webhooks.	2015-09-22 15:47:57 -04:00
=Corey Hulen	e22e7b8b7b	Fixing bug in generating key length	2015-09-22 12:31:01 -07:00
=Corey Hulen	fc71869a96	Merge branch 'master' into PLT-11-email	2015-09-22 12:24:39 -07:00
=Corey Hulen	88e5a71e8c	Adding service settings to admin console	2015-09-22 12:12:50 -07:00
hmhealey	ffe34aa154	Restored changes which remove emojify and switch to our own version	2015-09-22 13:53:43 -04:00
hmhealey	09e8874b8e	Removed click handler from RHS [...] menu	2015-09-22 13:27:10 -04:00
Christopher Speller	e7d408585a	Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed emojify"	2015-09-22 13:21:58 -04:00
Asaad Mahmood	302372cfa0	Removing click event for channel description popover	2015-09-22 21:01:55 +05:00
Harrison Healey	f439c82d7c	Merge pull request #737 from hmhealey/plt289 ... PLT-289 Added parsing for named emojis to TextFormatting and removed emojify	2015-09-22 09:32:25 -04:00
hmhealey	251d33ad23	Added parsing for named emojis to TextFormatting and removed dependency on emojify	2015-09-22 09:22:49 -04:00
=Corey Hulen	08a3acbb44	Adding team settings to admin console	2015-09-22 01:15:41 -07:00
Corey Hulen	df2d668d59	Merge pull request #730 from mattermost/shorten-description-help-text ... Shorten description help text	2015-09-22 00:42:44 -07:00
=Corey Hulen	f05a2c03d5	Adding SQL settings to admin console	2015-09-22 00:00:19 -07:00
Asaad Mahmood	38cc148574	UI Modifications for multiple tickets	2015-09-22 11:21:28 +05:00
=Corey Hulen	e78c79b832	Adding rate limiter settings to the admin console	2015-09-21 19:01:52 -07:00
=Corey Hulen	cae5dbd245	Adding privacy to admin console	2015-09-21 18:23:10 -07:00
=Corey Hulen	f8e2a43d09	Fixing eslint errors	2015-09-21 17:52:30 -07:00
=Corey Hulen	0529a494ae	Adding image properties	2015-09-21 17:34:13 -07:00
Reed Garmsen	b4be8eb554	Minor changes to how resend status is passed	2015-09-21 17:03:08 -07:00
Reed Garmsen	dda30e407a	Added confirmation when users request another verification email; users are no longer redirected after requesting another verification email	2015-09-21 16:03:18 -07:00
=Corey Hulen	e863096358	Fixing broken signup pages	2015-09-21 15:34:09 -07:00
it33	80488dec22	Adjusting sentence	2015-09-21 15:26:44 -07:00
=Corey Hulen	9baef5a6a0	Fixing button	2015-09-21 15:17:02 -07:00
=Corey Hulen	ed9a2da83b	Adding email to admin console	2015-09-21 15:11:56 -07:00
JoramWilander	98186e5018	Implement incoming webhooks.	2015-09-21 14:22:23 -04:00
JoramWilander	3e868a6042	Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.	2015-09-21 11:30:08 -04:00
Joram Wilander	a35fa9c974	Merge pull request #732 from mattermost/plt-243 ... PLT-243 Adding new create channel modal to the more menu	2015-09-21 11:18:24 -04:00
hmhealey	d1101e3c91	Wrapped comment messages in divs like posts in the center pane	2015-09-21 10:03:47 -04:00