Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #493 from asaadmahmoodspin/master | Christopher Speller | 2015-08-31 | 1 | -3/+3 |
|\ | | | | | MM-1899 - Updating UI for commands in input box | ||||
| * | Removing console.log from command_list | Asaad Mahmood | 2015-08-27 | 1 | -2/+0 |
| | | |||||
| * | MM-1899 - Updating UI for commands in input box | Asaad Mahmood | 2015-08-27 | 1 | -3/+5 |
| | | |||||
* | | 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 #485 from nickago/MM-1899 | Christopher Speller | 2015-08-31 | 3 | -1/+18 |
|\ \ \ | | | | | | | | | MM-1899 Enabled and added help text for settings items | ||||
| * | | | Enabled and added help text for settings items | Asaad Mahmood | 2015-08-27 | 3 | -1/+18 |
| | | | | |||||
* | | | | Merge pull request #480 from nickago/MM-1704 | Christopher Speller | 2015-08-31 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | MM-1704 Open new teams in new tab | ||||
| * | | | | Open new teams in new tab | nickago | 2015-08-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | 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 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Revert "MM-2046 - Updating postHolder scroll" | Christopher Speller | 2015-08-31 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #521 from rgarmsen2295/mm-2044 | Corey Hulen | 2015-08-30 | 1 | -1/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-2044 Removes ability to auto-scroll to new messages in ie10/11 to fix rendering issue | ||||
| * | | | | | | Removes ability to auto-scroll to new messages in ie10/11 to fix rendering issue | Reed Garmsen | 2015-08-30 | 1 | -1/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #519 from rgarmsen2295/fix-slow-type | Corey Hulen | 2015-08-30 | 4 | -51/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [Performance Fix] Removes warning message when at the max character limit | ||||
| * | | | | | | | Removed warning message when at the max character limit | Reed Garmsen | 2015-08-28 | 4 | -51/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #518 from asaadmahmoodspin/MM-2046 | Corey Hulen | 2015-08-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | MM-2046 - Updating postHolder scroll | ||||
| * | | | | | | | MM-2046 - Updating postHolder scroll | Asaad Mahmood | 2015-08-28 | 1 | -0/+1 |
| |/ / / / / / | |||||
* / / / / / / | First post list on page load will show loading screen until latest posts are ↵ | JoramWilander | 2015-08-28 | 1 | -2/+24 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | grabbed from the server. | ||||
* | | | | | | Merge pull request #514 from mattermost/mm-2039 | Corey Hulen | 2015-08-28 | 5 | -52/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-2039 Remove Google as a SSO service. | ||||
| * | | | | | | Remove Google as a SSO service. | JoramWilander | 2015-08-28 | 5 | -52/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #513 from mattermost/mm-1861 | Corey Hulen | 2015-08-28 | 2 | -5/+16 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | MM-1861 Fixes root images not loading when switching RHS threads. | ||||
| * | | | | | | Fixes root images not loading when switich RHS threads. | JoramWilander | 2015-08-28 | 2 | -5/+16 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #496 from mattermost/mm-2015 | Christopher Speller | 2015-08-28 | 11 | -206/+458 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | 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 | 11 | -206/+458 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to turn off email sign up. | ||||
* | | | | | | | Merge pull request #510 from rgarmsen2295/remove-rename-mobile | Joram Wilander | 2015-08-28 | 1 | -7/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removes old rename team option from mobile sidebar | ||||
| * | | | | | | | Removes rename team option from mobile sidebar | Reed Garmsen | 2015-08-27 | 1 | -7/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #504 from mattermost/MM-1032 | Corey Hulen | 2015-08-27 | 1 | -17/+21 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | MM-1032 auto-login after tream creation | ||||
| * | | | | | | | MM-1032 auto-login after tream creation | =Corey Hulen | 2015-08-27 | 1 | -17/+21 |
| | | | | | | | | |||||
* | | | | | | | | removed vestigial perfect Scrollbar command | nickago | 2015-08-27 | 1 | -1/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #498 from mattermost/it33-patch-1 | Christopher Speller | 2015-08-27 | 1 | -6/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Updating help text for Slack Import screen | ||||
| * | | | | | | Updating help text for Slack Import screen | it33 | 2015-08-27 | 1 | -6/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #491 from mattermost/mm-1998 | Joram Wilander | 2015-08-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | MM-1998 Temporary PM channels now use username instead of display name | ||||
| * | | | | | | Temporary PM channels now use username instead of display name | Christopher Speller | 2015-08-27 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | 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 #484 from mattermost/mm-1994 | Corey Hulen | 2015-08-27 | 2 | -17/+17 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | MM-1994 Improvements to import UI | ||||
| * | | | | | Improvements to import UI | Christopher Speller | 2015-08-26 | 2 | -17/+17 |
| | | | | | | |||||
* | | | | | | Merge pull request #469 from mattermost/mm-1699 | Christopher Speller | 2015-08-27 | 17 | -864/+1348 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | 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 | 17 | -864/+1348 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #472 from rgarmsen2295/mm-1853 | Christopher Speller | 2015-08-27 | 6 | -8/+72 |
|\ \ \ \ \ | |/ / / / |/| | | | | 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 | 4 | -31/+34 |
| | | | | | | | | | | | | | | | | | | | | text dumps | ||||
| * | | | | Fixed issue with carriage returns being counted improperly in non-ie ↵ | Reed Garmsen | 2015-08-25 | 4 | -8/+43 |
| | | | | | | | | | | | | | | | | | | | | 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 | 5 | -6/+32 |
| | | | | | | | | | | | | | | | | | | | | (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 #471 from nickago/MM-1803 | Christopher Speller | 2015-08-27 | 1 | -0/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-1803 Added clearing of search bar on close of comment section of RHS | ||||
| * | | | | Added clearing of search bar on close of comment section of RHS | nickago | 2015-08-25 | 1 | -0/+7 |
| | |/ / | |/| | | |||||
* | | | | Clears the 'new channel' dialogue box of errors and previous input on exit | Reed Garmsen | 2015-08-25 | 1 | -0/+11 |
| |_|/ |/| | | |||||
* | | | Added white background to non-image files (was previously transparent | Reed Garmsen | 2015-08-25 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #466 from mattermost/mm-1912 | Corey Hulen | 2015-08-25 | 4 | -28/+35 |
|\ \ \ | |_|/ |/| | | Fixes mm-1912 move get file info into its own web service call |