Граф коммитов

2471 Коммитов

Автор SHA1 Сообщение Дата
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
Jack
602bed85f2 fix conflict 2015-09-22 08:16:51 -07:00
hmhealey
a948935def Properly removed lingering references to emojify 2015-09-22 10:54:52 -04: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
87e67e825c Merge pull request #725 from mattermost/it33-patch-3
Adjust CLA request template
2015-09-22 00:43:11 -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
afcff9b301 Fixing unit tests 2015-09-21 20:38:31 -07: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
00f7fdbfc6 Correcting typo 2015-09-21 15:27:32 -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
Christopher Speller
ee5a77ec56 Merge pull request #734 from mattermost/plt-206
PLT-206 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.
2015-09-21 12:19:57 -04:00
Joram Wilander
977ab87d4a Merge pull request #736 from hmhealey/plt312
PLT-312 Added theme class to markdown links
2015-09-21 12:13:44 -04:00