| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | Post drafts are now displayed when they contain only files and no text | Reed Garmsen | 2015-09-22 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | | * | | | | Small change to remove react warning | Reed Garmsen | 2015-09-22 | 1 | -0/+1 | |
| | | |/ / / | ||||||
| | * | | | | Merge pull request #751 from hmhealey/plt344 | Christopher Speller | 2015-09-23 | 8 | -62/+203 | |
| | |\ \ \ \ | | |_|_|/ | |/| | | | PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting | |||||
| | | * | | | Removed extra handling of markdown links when doing autolinking | hmhealey | 2015-09-22 | 1 | -31/+5 | |
| | | | | | | ||||||
| | | * | | | Moved text formatting code to only occur inside of markdown text nodes | hmhealey | 2015-09-22 | 2 | -19/+33 | |
| | | | | | | ||||||
| | | * | | | Changed hashtag regex to only accept hashtags that begin with a letter | hmhealey | 2015-09-22 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Moved emoticon parsing to happen after url parsing so that we don't have ↵ | hmhealey | 2015-09-22 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | smilies accidentally occuring in urls | |||||
| | | * | | | Restored changes which remove emojify and switch to our own version | hmhealey | 2015-09-22 | 7 | -12/+165 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #748 from hmhealey/plt233 | Christopher Speller | 2015-09-23 | 1 | -8/+1 | |
| | |\ \ \ \ | | | | | | | | | | | | | PLT-233 Removed click handler from RHS [...] menu | |||||
| | | * | | | | Removed click handler from RHS [...] menu | hmhealey | 2015-09-22 | 1 | -8/+1 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #739 from rgarmsen2295/plt-39 | Christopher Speller | 2015-09-23 | 3 | -4/+17 | |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | PLT-39 Clicking "Resend email" on the verification page now confirms email was sent | |||||
| | | * | | | | Minor changes to how resend status is passed | Reed Garmsen | 2015-09-21 | 3 | -7/+11 | |
| | | | | | | | ||||||
| | | * | | | | Added confirmation when users request another verification email; users are ↵ | Reed Garmsen | 2015-09-21 | 2 | -2/+11 | |
| | | | |_|/ | | |/| | | | | | | | | | | | | no longer redirected after requesting another verification email | |||||
| * | | | | | Adding new EnableIncomingWebhooks property to service settings in the admin ↵ | =Corey Hulen | 2015-09-22 | 1 | -0/+34 | |
| | | | | | | | | | | | | | | | | | | | | | console. | |||||
| * | | | | | Fixing merge conflict | =Corey Hulen | 2015-09-22 | 13 | -84/+544 | |
| |\| | | | | ||||||
| | * | | | | Merge pull request #715 from mattermost/plt-27 | Joram Wilander | 2015-09-22 | 13 | -84/+544 | |
| | |\ \ \ \ | | |_|_|/ | |/| | | | PLT-27 Implement incoming webhooks. | |||||
| | | * | | | Implement incoming webhooks. | JoramWilander | 2015-09-21 | 13 | -84/+544 | |
| | | | | | | ||||||
| * | | | | | Fixing bug in generating key length | =Corey Hulen | 2015-09-22 | 3 | -8/+8 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-22 | 1 | -1/+1 | |
| |\| | | | | ||||||
| | * | | | | Revert "PLT-289 Properly removed lingering references to emojify" | Christopher Speller | 2015-09-22 | 1 | -0/+5 | |
| | | |_|/ | |/| | | ||||||
| | * | | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵ | Christopher Speller | 2015-09-22 | 6 | -165/+7 | |
| | | | | | | | | | | | | | | | | | emojify" | |||||
| | * | | | Merge pull request #742 from hmhealey/plt289 | Christopher Speller | 2015-09-22 | 1 | -5/+0 | |
| | |\ \ \ | | | | | | | | | | | PLT-289 Properly removed lingering references to emojify | |||||
| | | * | | | Properly removed lingering references to emojify | hmhealey | 2015-09-22 | 1 | -5/+0 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #737 from hmhealey/plt289 | Harrison Healey | 2015-09-22 | 6 | -7/+165 | |
| | |\| | | | | | | | | | | | | | PLT-289 Added parsing for named emojis to TextFormatting and removed emojify | |||||
| | | * | | | Added parsing for named emojis to TextFormatting and removed dependency on ↵ | hmhealey | 2015-09-22 | 6 | -7/+165 | |
| | | | |/ | | |/| | | | | | | | | | emojify | |||||
| | * | | | Merge pull request #730 from mattermost/shorten-description-help-text | Corey Hulen | 2015-09-22 | 1 | -1/+1 | |
| | |\ \ \ | | |/ / | |/| | | Shorten description help text | |||||
| | | * | | Adjusting sentence | it33 | 2015-09-21 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Shorten description help text | it33 | 2015-09-20 | 1 | -1/+1 | |
| | | |/ | | | | | | | Currently it word wraps, this prevents word-wrapping | |||||
| * | | | Adding service settings to admin console | =Corey Hulen | 2015-09-22 | 15 | -58/+443 | |
| | | | | ||||||
| * | | | Adding team settings to admin console | =Corey Hulen | 2015-09-22 | 6 | -3/+307 | |
| | | | | ||||||
| * | | | Adding SQL settings to admin console | =Corey Hulen | 2015-09-22 | 5 | -8/+592 | |
| | | | | ||||||
| * | | | Adding rate limiter settings to the admin console | =Corey Hulen | 2015-09-21 | 3 | -0/+284 | |
| | | | | ||||||
| * | | | Adding privacy to admin console | =Corey Hulen | 2015-09-21 | 3 | -0/+175 | |
| | | | | ||||||
| * | | | Fixing eslint errors | =Corey Hulen | 2015-09-21 | 2 | -4/+2 | |
| | | | | ||||||
| * | | | Adding image properties | =Corey Hulen | 2015-09-21 | 3 | -0/+429 | |
| | | | | ||||||
| * | | | Fixing broken signup pages | =Corey Hulen | 2015-09-21 | 9 | -14/+24 | |
| | | | | ||||||
| * | | | Fixing button | =Corey Hulen | 2015-09-21 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Adding email to admin console | =Corey Hulen | 2015-09-21 | 14 | -265/+431 | |
| |/ / | ||||||
| * | | Merge pull request #734 from mattermost/plt-206 | Christopher Speller | 2015-09-21 | 4 | -3/+7 | |
| |\ \ | | | | | | | PLT-206 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. | |||||
| | * | | Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. | JoramWilander | 2015-09-21 | 4 | -3/+7 | |
| | | | | ||||||
| * | | | Merge pull request #736 from hmhealey/plt312 | Joram Wilander | 2015-09-21 | 1 | -1/+7 | |
| |\ \ \ | |/ / |/| | | PLT-312 Added theme class to markdown links | |||||
| | * | | Added theme class to markdown links | hmhealey | 2015-09-21 | 1 | -1/+7 | |
| | | | | ||||||
| * | | | Merge pull request #732 from mattermost/plt-243 | Joram Wilander | 2015-09-21 | 1 | -8/+13 | |
| |\ \ \ | | | | | | | | | PLT-243 Adding new create channel modal to the more menu | |||||
| | * | | | Adding new create channel modal to the more menu | Christopher Speller | 2015-09-21 | 1 | -8/+13 | |
| | |/ / | ||||||
| * / / | Wrapped comment messages in divs like posts in the center pane | hmhealey | 2015-09-21 | 2 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #722 from hmhealey/timestamp | Joram Wilander | 2015-09-21 | 3 | -3/+16 | |
| |\ \ | | | | | | | Added a tooltip to post timestamps displaying the actual time the post was created | |||||
| | * | | Added a tooltip to post timestamps displaying the actual time the post was ↵ | hmhealey | 2015-09-19 | 3 | -3/+16 | |
| | |/ | | | | | | | created | |||||
| * | | Merge pull request #731 from asaadmahmoodspin/new-channel | Christopher Speller | 2015-09-21 | 2 | -6/+10 | |
| |\ \ | | | | | | | Updating new channel UI | |||||
| | * | | Updating new channel UI | Asaad Mahmood | 2015-09-21 | 2 | -6/+10 | |
| | |/ | ||||||
| * | | Cleaned up markdown formatting code and removed debug statements | hmhealey | 2015-09-19 | 2 | -7/+9 | |
| | | | ||||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |