Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #761 from mattermost/plt-356 | Harrison Healey | 2015-09-23 | 1 | -15/+36 |
|\ | | | | | PLT-356 Fix post not rendering properly in some cases. | ||||
| * | Fix post not rendering properly in some cases. | JoramWilander | 2015-09-23 | 1 | -15/+36 |
| | | |||||
* | | Merge pull request #759 from mattermost/plt-242-3 | Harrison Healey | 2015-09-23 | 11 | -127/+510 |
|\ \ | |/ |/| | PLT-242 Implement custom UI theme colors. | ||||
| * | Implement UI theme colors. | JoramWilander | 2015-09-23 | 11 | -127/+510 |
| | | |||||
* | | PLT-126: Change 'Private Messages' to 'Direct Messages' | Chengwei Yang | 2015-09-23 | 6 | -10/+10 |
| | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | Merge pull request #740 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-09-23 | 4 | -7/+13 |
|\ \ | | | | | | | UI Modifications for multiple tickets | ||||
| * | | Removing click event for channel description popover | Asaad Mahmood | 2015-09-22 | 1 | -1/+1 |
| | | | |||||
| * | | UI Modifications for multiple tickets | Asaad Mahmood | 2015-09-22 | 3 | -6/+12 |
| | | | |||||
* | | | Merge pull request #756 from rgarmsen2295/plt-165 | Joram Wilander | 2015-09-23 | 1 | -8/+15 |
|\ \ \ | | | | | | | | | PLT-165 Prevents users from signing up via a public link using a non-valid email address | ||||
| * | | | Adds a check for email validity client-side when joining a team using a ↵ | Reed Garmsen | 2015-09-22 | 1 | -8/+15 |
| | | | | | | | | | | | | | | | | public link | ||||
* | | | | Merge pull request #757 from chengweiv5/PLT-168 | Joram Wilander | 2015-09-23 | 1 | -3/+4 |
|\ \ \ \ | | | | | | | | | | | PLT-168: check email used to reset password strictly | ||||
| * | | | | PLT-168: check email used to reset password strictly | Chengwei Yang | 2015-09-23 | 1 | -3/+4 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | | | Merge pull request #755 from rgarmsen2295/plt-164 | Christopher Speller | 2015-09-23 | 2 | -24/+27 |
|\ \ \ \ | | | | | | | | | | | PLT-164 Post drafts containing only files are now recognized properly | ||||
| * | | | | Functionalized draft checking | Reed Garmsen | 2015-09-22 | 1 | -24/+26 |
| | | | | | |||||
| * | | | | 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 | 3 | -3/+0 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting | ||||
| * | | | Restored changes which remove emojify and switch to our own version | hmhealey | 2015-09-22 | 3 | -3/+0 |
| | | | | |||||
* | | | | 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 | 1 | -3/+11 |
|\ \ \ \ | |_|/ / |/| | | | 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 | 1 | -5/+7 |
| | | | | |||||
| * | | | Added confirmation when users request another verification email; users are ↵ | Reed Garmsen | 2015-09-21 | 1 | -1/+7 |
| | |/ | |/| | | | | | | | no longer redirected after requesting another verification email | ||||
* | | | Merge pull request #715 from mattermost/plt-27 | Joram Wilander | 2015-09-22 | 9 | -28/+315 |
|\ \ \ | |_|/ |/| | | PLT-27 Implement incoming webhooks. | ||||
| * | | Implement incoming webhooks. | JoramWilander | 2015-09-21 | 9 | -28/+315 |
| | | | |||||
* | | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵ | Christopher Speller | 2015-09-22 | 3 | -0/+3 |
| | | | | | | | | | | | | emojify" | ||||
* | | | Merge pull request #737 from hmhealey/plt289 | Harrison Healey | 2015-09-22 | 3 | -3/+0 |
|\ \ \ | | | | | | | | | 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 | 3 | -3/+0 |
| | |/ | |/| | | | | | | | 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 | ||||
* | | 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 #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 | 1 | -5/+5 |
|\ \ | | | | | | | Updating new channel UI | ||||
| * | | Updating new channel UI | Asaad Mahmood | 2015-09-21 | 1 | -5/+5 |
| |/ | |||||
* / | Added marked library to text_formatting.jsx | hmhealey | 2015-09-19 | 1 | -2/+2 |
|/ | |||||
* | merging | =Corey Hulen | 2015-09-18 | 1 | -0/+11 |
|\ | |||||
| * | Merge pull request #699 from mattermost/PLT-92 | Joram Wilander | 2015-09-18 | 1 | -0/+11 |
| |\ | | | | | | | 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 | 4 | -36/+100 |
| | |\ | |||||
| | * | | Adding version to UI | =Corey Hulen | 2015-09-16 | 1 | -0/+13 |
| | | | | |||||
* | | | | Moving logout item | =Corey Hulen | 2015-09-17 | 1 | -6/+6 |
| | | | | |||||
* | | | | PLT-11 adding config for logs to UI | =Corey Hulen | 2015-09-17 | 15 | -292/+184 |
| | | | | |||||
* | | | | PLT-11 Adding ability to save config file | =Corey Hulen | 2015-09-17 | 5 | -130/+403 |
|/ / / | |||||
* | | | Merge pull request #705 from esethna/patch-1 | Corey Hulen | 2015-09-17 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Grammar change to New Channel ui text |