it33
1779a71721
Removing OAuth and webhooks changes
...
While OAuth2 and webhooks are in the codebase, the UI was only partly finished and we foresee enough time for testing before shipping Oct 2 so we're postponing these to the Oct 16 release.
2015-09-23 13:29:50 -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
Corey Hulen
0170cfe604
Merge pull request #764 from mattermost/theme-image-fix
...
Fix theme images 404ing.
2015-09-23 12:44:13 -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
Asaad Mahmood
47aab71e6b
Markdown UI improvements with small description height fix
2015-09-23 23:37:36 +05:00
Corey Hulen
301706f255
Merge pull request #753 from hmhealey/plt341
...
PLT-341 Added CSS classes to markdown headings, links, and tables
2015-09-23 09:57:43 -07:00
JoramWilander
845229d983
Fix post not rendering properly in some cases.
2015-09-23 12:25:01 -04:00
Harrison Healey
fa312f5b47
Merge pull request #760 from chengweiv5/PLT-126
...
PLT-126: Change 'Private Messages' to 'Direct Messages'
2015-09-23 11:31:10 -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
hmhealey
018b036e5d
Added CSS classes to markdown headings, links, and tables
2015-09-23 09:37:48 -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
it33
0391e5fe96
Merge pull request #758 from sjmog/readme-fix
...
fix README typo
2015-09-23 05:23:05 -07: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
Sam Morgan
bc057f1f9d
fix README typo
2015-09-23 12:48:51 +01: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
Corey Hulen
f340d21cf4
Merge pull request #754 from mattermost/it33-patch-1
...
Removing CLA templates response
2015-09-22 17:28:25 -07: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
it33
f533d4bf30
Removing CLA templates response
...
Clutters the rest of the instructions...
2015-09-22 14:28:12 -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
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
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
55f11ba871
Removed extra handling of markdown links when doing autolinking
2015-09-22 14:34:59 -04:00
hmhealey
1afa1d37c7
Moved text formatting code to only occur inside of markdown text nodes
2015-09-22 14:30:50 -04:00
hmhealey
d025da5da9
Changed hashtag regex to only accept hashtags that begin with a letter
2015-09-22 14:28:43 -04:00
hmhealey
1709532ae6
Moved emoticon parsing to happen after url parsing so that we don't have smilies accidentally occuring in urls
2015-09-22 14:14:54 -04:00
Joram Wilander
a44e8f0cd9
Merge pull request #710 from jdeng/master
...
content type for getFile()
2015-09-22 14:08:32 -04:00
hmhealey
ffe34aa154
Restored changes which remove emojify and switch to our own version
2015-09-22 13:53:43 -04:00
Christopher Speller
e9a2c223f2
Merge pull request #747 from mattermost/revert-742-plt289
...
Revert "PLT-289 Properly removed lingering references to emojify"
2015-09-22 13:33:18 -04:00
Christopher Speller
6beadc0319
Revert "PLT-289 Properly removed lingering references to emojify"
2015-09-22 13:33:11 -04:00
hmhealey
09e8874b8e
Removed click handler from RHS [...] menu
2015-09-22 13:27:10 -04:00
Christopher Speller
7c0388856d
Merge pull request #746 from mattermost/revert-737-plt289
...
Revert "PLT-289 Added parsing for named emojis to TextFormatting and …
2015-09-22 13:22:04 -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
Christopher Speller
130e73ca02
Merge pull request #742 from hmhealey/plt289
...
PLT-289 Properly removed lingering references to emojify
2015-09-22 11:25:15 -04:00
