Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #535 from nickago/MM-2067 | Corey Hulen | 2015-09-02 | 12 | -476/+794 | |
|\ \ | | | | | | | MM-2067 Cosmetic Refactoring | |||||
| * | | Cosmetic Refactoring | nickago | 2015-09-02 | 12 | -476/+794 | |
| |/ | ||||||
* | | Merge branch 'release-0.7.0' | Christopher Speller | 2015-09-02 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | Fix bad user being set on team creation causing Manage Team modal to not work. | JoramWilander | 2015-09-01 | 1 | -1/+1 | |
| | | ||||||
* | | Merging release branch 'release-0.7.0' | Christopher Speller | 2015-09-01 | 3 | -3/+5 | |
|\| | ||||||
| * | Also updating the position of the bottom unread indicator | Asaad Mahmood | 2015-09-01 | 1 | -1/+0 | |
| | | ||||||
| * | Merge pull request #528 from mattermost/MM-2056 | Christopher Speller | 2015-09-01 | 1 | -1/+2 | |
| |\ | | | | | | | HOTFIX MM-2056 fixes problem with creating team | |||||
| | * | MM-2056 fixes problem with creating team | =Corey Hulen | 2015-08-31 | 1 | -1/+2 | |
| | | | ||||||
| * | | Fix missing forgot password link. | JoramWilander | 2015-08-31 | 1 | -1/+3 | |
| |/ | ||||||
* | | Merge pull request #508 from rgarmsen2295/reformat_user_general | Christopher Speller | 2015-08-31 | 2 | -79/+175 | |
|\ \ | | | | | | | [Cosmetic Reformatting] UserSettingsGeneralTab (and a few minor changes to PostInfo) | |||||
| * | | Reformats the user_settings_general.jsx file; also adds missing keys to ↵ | Reed Garmsen | 2015-08-27 | 2 | -79/+175 | |
| | | | | | | | | | | | | children in an array | |||||
* | | | Merge pull request #497 from nickago/MM-1842 | Christopher Speller | 2015-08-31 | 1 | -0/+8 | |
|\ \ \ | | | | | | | | | MM-1842 Added invite link to off-topic channel | |||||
| * | | | Added invite link to off-topic channel | nickago | 2015-08-27 | 1 | -0/+8 | |
| | | | | ||||||
* | | | | 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 #485 from nickago/MM-1899 | Christopher Speller | 2015-08-31 | 2 | -1/+17 | |
|\ \ \ \ | | | | | | | | | | | MM-1899 Enabled and added help text for settings items | |||||
| * | | | | Enabled and added help text for settings items | Asaad Mahmood | 2015-08-27 | 2 | -1/+17 | |
| | | | | | ||||||
* | | | | | 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 | |
| | | | | | ||||||
* | | | | | 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 | 3 | -14/+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 | 3 | -14/+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 | 4 | -51/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | MM-2039 Remove Google as a SSO service. | |||||
| * | | | | | Remove Google as a SSO service. | JoramWilander | 2015-08-28 | 4 | -51/+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 | 7 | -193/+438 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | 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 | 7 | -193/+438 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | |_|_|_|/ | |/| | | | | ||||||
* / | | | | | MM-1032 auto-login after tream creation | =Corey Hulen | 2015-08-27 | 1 | -17/+21 | |
|/ / / / / | ||||||
* | | | | | 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 | |
| | | | | ||||||
* | | | | 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 | 13 | -839/+1174 | |
|\ \ \ \ | |_|/ / |/| | | | 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 | 13 | -839/+1174 | |
| | | | | ||||||
* | | | | Merge pull request #472 from rgarmsen2295/mm-1853 | Christopher Speller | 2015-08-27 | 4 | -8/+19 | |
|\ \ \ \ | |/ / / |/| | | | 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 | 3 | -31/+10 | |
| | | | | | | | | | | | | | | | | text dumps | |||||
| * | | | Fixed issue with carriage returns being counted improperly in non-ie ↵ | Reed Garmsen | 2015-08-25 | 3 | -8/+15 | |
| | | | | | | | | | | | | | | | | 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 | 4 | -6/+31 | |
| | | | | | | | | | | | | | | | | (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 |