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

4161 Коммитов

Автор SHA1 Сообщение Дата
hmhealey
55f11ba871 Removed extra handling of markdown links when doing autolinking 2015-09-22 14:34:59 -04:00
Adrien Bourroux
ec0e11489e Merge pull request #1 from driou/driou-patch-1
Update README.md
2015-09-22 20:34:34 +02:00
Adrien Bourroux
50ccf053ac Update README.md 2015-09-22 20:32:43 +02: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
hmhealey
a2e3446e37 Added theme class to markdown links 2015-09-21 11:46:29 -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
Joram Wilander
eaaa30f6a2 Merge pull request #733 from hmhealey/plt310
PLT-310 Wrapped comment messages in divs like posts in the center pane
2015-09-21 11:17:48 -04:00
Christopher Speller
8b5cfa4594 Merge pull request #708 from hmhealey/plt173
PLT-173 Rotate images with a non-standard orientation before generating a thumbnail and preview
2015-09-21 10:47:09 -04:00
hmhealey
d1101e3c91 Wrapped comment messages in divs like posts in the center pane 2015-09-21 10:03:47 -04:00
Christopher Speller
05b4a14d1e Adding new create channel modal to the more menu 2015-09-21 09:40:45 -04:00
hmhealey
4b177a6ed5 Added constants for EXIF orientations 2015-09-21 09:17:23 -04:00
Joram Wilander
7255209b72 Merge pull request #722 from hmhealey/timestamp
Added a tooltip to post timestamps displaying the actual time the post was created
2015-09-21 08:38:27 -04:00
Joram Wilander
f399b08db3 Merge pull request #729 from mattermost/rename-handle
Renaming "Handle" to "Channel URL" or "URL"
2015-09-21 08:37:53 -04:00
Christopher Speller
4578138d57 Merge pull request #731 from asaadmahmoodspin/new-channel
Updating new channel UI
2015-09-21 08:25:41 -04:00