Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Merge pull request #458 from rgarmsen2295/mm-1983 | Christopher Speller | 2015-08-25 | 1 | -1/+1 |
|\ \ | |/ |/| | MM-1983 Fixed issue with timestamp incorrectly displaying single digit minutes | ||||
| * | Fixed issue with timestamp incorrectly displaying single digit minutes | Reed Garmsen | 2015-08-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #449 from rgarmsen2295/mm-1933 | Corey Hulen | 2015-08-24 | 1 | -6/+11 |
|\ \ | |/ |/| | Multiple fixes for IE10 & Edge browsers primarily due to aggressive ajax call caching on the browser | ||||
| * | Fixes issue with profile pictures not updating w/o refresh and prevents more ↵ | Reed Garmsen | 2015-08-22 | 1 | -0/+5 |
| | | | | | | | | ie10 ajax caching issues | ||||
| * | Fixed issue with logout in active sessions not working in ie10 | Reed Garmsen | 2015-08-22 | 1 | -0/+2 |
| | | |||||
| * | Added cache: false to ajax calls that caused problems with ie10 | Reed Garmsen | 2015-08-22 | 1 | -6/+4 |
| | | |||||
* | | Added fullscreen capability to youtube embed | nickago | 2015-08-21 | 1 | -1/+2 |
|/ | |||||
* | Fixing AM-PM issue | Christopher Speller | 2015-08-20 | 1 | -1/+1 |
| | |||||
* | Fixing a few refactoring errors. | Christopher Speller | 2015-08-20 | 1 | -3/+3 |
| | |||||
* | Merge pull request #394 from mattermost/mm-1410 | Joram Wilander | 2015-08-19 | 2 | -635/+687 |
|\ | | | | | MM-1410 Initial implementaiton of import from Slack | ||||
| * | Requiring team admin to import and fixing a few style issues | Christopher Speller | 2015-08-19 | 1 | -2/+1 |
| | | |||||
| * | Cosmetic refactoring for ESLint | Christopher Speller | 2015-08-19 | 2 | -642/+670 |
| | | |||||
| * | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 2 | -0/+25 |
| | | |||||
* | | Added a message deleted indicator when a post is deleted to let the user ↵ | JoramWilander | 2015-08-19 | 1 | -2/+3 |
|/ | | | | know what's happening. | ||||
* | Merge pull request #383 from rgarmsen2295/mm-1584b | Corey Hulen | 2015-08-18 | 2 | -1/+31 |
|\ | | | | | MM-1584 Private message channels no longer do a page refresh on creation/first use | ||||
| * | Added feature to the 'More...' PM channel list and fixed small cosmetic issues | Reed Garmsen | 2015-08-18 | 2 | -3/+16 |
| | | |||||
| * | Private message channels no longer refresh on creation/first use | Reed Garmsen | 2015-08-18 | 1 | -0/+17 |
| | | |||||
* | | Formatted comments' time in RHS similar to root | nickago | 2015-08-18 | 1 | -0/+4 |
|/ | |||||
* | finalize implenetation of predictive client posts so that users get ↵ | JoramWilander | 2015-08-18 | 2 | -11/+21 |
| | | | | immediate feedback after posting | ||||
* | adds predictive posting on the client | JoramWilander | 2015-08-18 | 1 | -0/+2 |
| | |||||
* | Merge pull request #391 from asaadmahmoodspin/master | Christopher Speller | 2015-08-18 | 1 | -0/+14 |
|\ | | | | | Multiple UI changes | ||||
| * | Multiple UI changes | Asaad Mahmood | 2015-08-18 | 1 | -0/+14 |
| | | |||||
* | | Merge pull request #381 from mattermost/mm-1705 | Christopher Speller | 2015-08-18 | 3 | -4/+15 |
|\ \ | | | | | | | MM-1705 add google as an oauth single-sign-on service | ||||
| * | | merge async_client getMe changes | JoramWilander | 2015-08-14 | 1 | -6/+6 |
| | | | |||||
| * | | added google sign-in functionality to the client, with minor model modifications | JoramWilander | 2015-08-14 | 3 | -10/+21 |
| | | |