Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | 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 |
| | | | | |||||
* | | | | 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 | ||||
* | | 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 |
| | | |||||
* | | Deferred to marked.js's html sanitization when markdown is enabled | hmhealey | 2015-09-19 | 1 | -2/+12 |
| | | |||||
* | | Changed markdown link parsing to automatically add an explicit protocol to urls | hmhealey | 2015-09-19 | 2 | -1/+16 |
| | | |||||
* | | Prevented our url autolinking from breaking markdown links | hmhealey | 2015-09-19 | 1 | -6/+34 |
| | | |||||
* | | Added marked library to text_formatting.jsx | hmhealey | 2015-09-19 | 3 | -3/+13 |
| | | |||||
* | | Removed underscores surrounding formatting tokens since they won't work with ↵ | hmhealey | 2015-09-19 | 1 | -8/+8 |
| | | | | | | | | markdown | ||||
* | | Removed unnecessary conversion of newlines to html line breaks | hmhealey | 2015-09-19 | 1 | -6/+4 |
|/ | |||||
* | merging | =Corey Hulen | 2015-09-18 | 3 | -6/+14 |
|\ | |||||
| * | Merge pull request #699 from mattermost/PLT-92 | Joram Wilander | 2015-09-18 | 2 | -5/+13 |
| |\ | | | | | | | PLT-92 Adding server side versioning to the binary | ||||
| | * | moving to security tab | =Corey Hulen | 2015-09-17 | 2 | -12/+11 |
| | | | |||||
| | * | Making changes to versioning | =Corey Hulen | 2015-09-17 | 1 | -5/+4 |
| | | | |||||
| | * | Merge branch 'master' into PLT-92 | =Corey Hulen | 2015-09-17 | 888 | -36/+116 |
| | |\ | |||||
| | * | | Adding version to UI | =Corey Hulen | 2015-09-16 | 1 | -0/+13 |
| | | | | |||||
| | * | | PLT-92 Adding server side versioning to the binary | =Corey Hulen | 2015-09-16 | 1 | -5/+2 |
| | | | | |||||
| * | | | Fixed incorrect check if a url starts with an explicit protocol | hmhealey | 2015-09-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Moving logout item | =Corey Hulen | 2015-09-17 | 1 | -6/+6 |
| | | | | |||||
* | | | | PLT-11 adding config for logs to UI | =Corey Hulen | 2015-09-17 | 17 | -293/+208 |
| | | | | |||||
* | | | | PLT-11 Adding ability to save config file | =Corey Hulen | 2015-09-17 | 8 | -131/+489 |
|/ / / | |||||
* | | | Merge pull request #705 from esethna/patch-1 | Corey Hulen | 2015-09-17 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Grammar change to New Channel ui text | ||||
| * | | Grammar change to New Channel ui text | esethna | 2015-09-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #701 from mattermost/PLT-40 | Joram Wilander | 2015-09-17 | 885 | -2/+42 |
|\ \ \ | |/ / |/| | | PLT-40 adding experimental support for emojis | ||||
| * | | Fixing css | =Corey Hulen | 2015-09-16 | 4 | -9/+7 |
| | | | |||||
| * | | PLT-40 adding experimental support for emojis | =Corey Hulen | 2015-09-16 | 886 | -2/+44 |
| |/ |