| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 1 | -4/+13 | |
| | |\ | ||||||
| | * | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 3 | -1/+43 | |
| | | | | ||||||
| * | | | Merge pull request #682 from mattermost/nc-patch | Joram Wilander | 2015-09-15 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Fixing cutoff team name in new channel modal. | |||||
| | * | | | Fixing cutoff team name in new channel modal | Christopher Speller | 2015-09-15 | 1 | -1/+1 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #676 from hmhealey/mm1900b | Joram Wilander | 2015-09-15 | 2 | -199/+268 | |
| |\ \ \ | |/ / |/| | | MM-1900 Removed textToJsx | |||||
| | * | | Renamed text formatting tokens so that there should be significantly less ↵ | hmhealey | 2015-09-14 | 1 | -11/+11 | |
| | | | | | | | | | | | | | chance of having conflicting tokens | |||||
| | * | | Removed textToJsx! | hmhealey | 2015-09-14 | 1 | -199/+0 | |
| | | | | ||||||
| | * | | Cleaned up TextFormatting and added a default click handler for hashtags and ↵ | hmhealey | 2015-09-14 | 1 | -47/+74 | |
| | | | | | | | | | | | | | @mentions | |||||
| | * | | Added highlighting of search terms to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+41 | |
| | | | | ||||||
| | * | | Added autolinking of hashtags to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+48 | |
| | | | | ||||||
| | * | | Added autolinking of urls to the new text formatting | hmhealey | 2015-09-14 | 1 | -4/+35 | |
| | | | | ||||||
| | * | | Added highlighting when the current user is mentioned to the new text formatting | hmhealey | 2015-09-14 | 1 | -17/+69 | |
| | | | | ||||||
| | * | | Added handling for @mentions to the new text formatting | hmhealey | 2015-09-14 | 1 | -9/+54 | |
| | | | | ||||||
| | * | | Added skeleton for new text formatting code which will replace textToJsx | hmhealey | 2015-09-14 | 1 | -0/+36 | |
| | |/ | ||||||
| * | | Merge pull request #678 from mattermost/mm-1589 | Corey Hulen | 2015-09-14 | 1 | -0/+11 | |
| |\ \ | | | | | | | PLT-171 MM-1589 New add channel modal using react-bootstrap. | |||||
| | * | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 1 | -0/+11 | |
| | |/ | ||||||
| * | | replace lowerName with name | Michael Leer | 2015-09-14 | 1 | -3/+1 | |
| | | | ||||||
| * | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -2/+2 | |
| |/ | | | | | Removed lowercase from the error wording. Removed additional toLowerCase within validator. | |||||
| * | Merge pull request #623 from mattermost/plt-35 | Christopher Speller | 2015-09-09 | 1 | -0/+1 | |
| |\ | | | | | PLT-35 Add post list container to hold mounted post lists for faster rendering/channel switching. | |||||
| | * | Add post list container to hold mounted post lists for faster ↵ | JoramWilander | 2015-09-08 | 1 | -0/+1 | |
| | | | | | | | | | rendering/channel switching. | |||||
| * | | Merge pull request #602 from mattermost/mm-1409 | Joram Wilander | 2015-09-08 | 1 | -0/+13 | |
| |\ \ | |/ |/| | MM-1409 Adding ability to export data from mattermost | |||||
| | * | Adding ability to export data from mattermost | Christopher Speller | 2015-09-04 | 1 | -0/+13 | |
| | | | ||||||
| * | | Fixed @mentions containing uppercase characters | hmhealey | 2015-09-04 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #590 from nickago/MM-1932 | Corey Hulen | 2015-09-03 | 1 | -0/+1 | |
| |\ | | | | | MM-1932 Added emoji wrapper with cross platform available gliffs | |||||
| | * | Added emoji wrapper with cross platform available gliffs | nickago | 2015-09-03 | 1 | -0/+1 | |
| | | | ||||||
| * | | MM-1852 Fixed hashtag regex so that it only looks for hashtags starting with a # | hmhealey | 2015-09-03 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #566 from nickago/hotfix | Corey Hulen | 2015-09-02 | 1 | -1/+1 | |
| |\ | | | | | fixed bug in function binding causing search to slip to end word of post | |||||
| | * | fixed bug in function binding causing trimWord to slip to end word of post | nickago | 2015-09-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | Moving config.js to /web/react/utils/ Including in every file needed | Christopher Speller | 2015-09-02 | 2 | -0/+49 | |
| |/ | ||||||
| * | Cosmetic refactoring for ESLint | Christopher Speller | 2015-09-02 | 4 | -575/+681 | |
| | | ||||||
| * | Merge pull request #492 from nickago/MM-1796 | Christopher Speller | 2015-08-31 | 1 | -1/+32 | |
| |\ | | | | | MM-1796 Added parsing of the 't=' parameter on youtube videos | |||||
| | * | Added parsing of the 't=' parameter on youtube videos | nickago | 2015-08-27 | 1 | -1/+32 | |
| | | | ||||||
| * | | Merge pull request #477 from nickago/MM-1794 | Christopher Speller | 2015-08-31 | 1 | -2/+5 | |
| |\ \ | | | | | | | MM-1794 Reformatted Youtube video display | |||||
| | * | | Reformatted Youtube video display | nickago | 2015-08-25 | 1 | -2/+5 | |
| | | | | ||||||
| * | | | Merge pull request #475 from nickago/MM-1773 | Christopher Speller | 2015-08-31 | 1 | -3/+15 | |
| |\ \ \ | | | | | | | | | MM-1773a Add wildcard searching for postgresql | |||||
| | * | | | Added wildcard highlighting and removed redundant whitespace parsing | nickago | 2015-08-27 | 1 | -3/+15 | |
| | | | | | ||||||
| * | | | | Removed warning message when at the max character limit | Reed Garmsen | 2015-08-28 | 1 | -37/+0 | |
| | | | | | ||||||
| * | | | | Remove Google as a SSO service. | JoramWilander | 2015-08-28 | 1 | -1/+0 | |
| | | | | | ||||||
| * | | | | Merge pull request #496 from mattermost/mm-2015 | Christopher Speller | 2015-08-28 | 2 | -0/+16 | |
| |\ \ \ \ | | | | | | | | | | | MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up. | |||||
| | * | | | | Added the ability to create a team with SSO services and added the ability ↵ | JoramWilander | 2015-08-28 | 2 | -0/+16 | |
| | | | | | | | | | | | | | | | | | | | | | to turn off email sign up. | |||||
| * | | | | | removed vestigial perfect Scrollbar command | nickago | 2015-08-27 | 1 | -1/+0 | |
| |/ / / / | ||||||
| * / / / | If we don't have any posts for a channel, pull page rather than pulling latest. | JoramWilander | 2015-08-27 | 1 | -0/+5 | |
| |/ / / | ||||||
| * | | | Merge pull request #469 from mattermost/mm-1699 | Christopher Speller | 2015-08-27 | 3 | -8/+66 | |
| |\ \ \ | | | | | | | | | MM-1699 Refactored post handling/updating on both the client and server | |||||
| | * | | | Refactored post handling/updating on both the client and server. | JoramWilander | 2015-08-27 | 3 | -8/+66 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #472 from rgarmsen2295/mm-1853 | Christopher Speller | 2015-08-27 | 2 | -0/+53 | |
| |\ \ \ | |/ / |/| | | MM-1853 Prevents users from typing more than 4000 characters into any any post/comment | |||||
| | * | | Moved duplicate code into functions and added better handling of large paste ↵ | Reed Garmsen | 2015-08-26 | 1 | -0/+24 | |
| | | | | | | | | | | | | | text dumps | |||||
| | * | | Fixed issue with carriage returns being counted improperly in non-ie ↵ | Reed Garmsen | 2015-08-25 | 1 | -0/+28 | |
| | | | | | | | | | | | | | browsers and updated error messages to be appropriate to what is being typed (message vs. post vs. edit) | |||||
| | * | | Prevents users from typing more than 4000 characters into any 'textbox' ↵ | Reed Garmsen | 2015-08-25 | 1 | -0/+1 | |
| | |/ | | | | | | | (posts, comments, and post/comment edits). Also adds new error message for when users hit exactly 4000 characters so they know the limit. | |||||
| * | | Merge pull request #466 from mattermost/mm-1912 | Corey Hulen | 2015-08-25 | 2 | -17/+14 | |
| |\ \ | |/ |/| | Fixes mm-1912 move get file info into its own web service call | |||||
| | * | Fixes mm-1912 move get file info into its own web service call | =Corey Hulen | 2015-08-24 | 2 | -17/+14 | |
| | | | ||||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |