Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #535 from nickago/MM-2067 | Corey Hulen | 2015-09-02 | 28 | -995/+1496 | |
|\ \ | | | | | | | MM-2067 Cosmetic Refactoring | |||||
| * | | Cosmetic Refactoring | nickago | 2015-09-02 | 28 | -995/+1496 | |
| |/ | ||||||
* | | 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 | 5 | -4/+7 | |
|\| | ||||||
| * | Also updating the position of the bottom unread indicator | Asaad Mahmood | 2015-09-01 | 2 | -2/+1 | |
| | | ||||||
| * | MM-2046 - Updating momentum scroll on IOS | Asaad Mahmood | 2015-09-01 | 1 | -0/+1 | |
| | | ||||||
| * | 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 | |
| |/ | ||||||
* | | Removing complexity rule. Removing check of camel case from property names | Christopher Speller | 2015-08-31 | 1 | -2/+2 | |
| | | ||||||
* | | 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 #494 from rgarmsen2295/mm-1628 | Christopher Speller | 2015-08-31 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | MM-1628 The navbar is no longer completely obscured by the status bar in full screen safari on iOS | |||||
| * | | | | When viewing the site on iOS from the home screen, the top of the screen is ↵ | Reed Garmsen | 2015-08-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | no longer obscured by the phone's status bar | |||||
* | | | | | Merge pull request #493 from asaadmahmoodspin/master | Christopher Speller | 2015-08-31 | 2 | -6/+16 | |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 2 | -6/+18 | |
| | |/ / / | |/| | | | ||||||
* | | | | | 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 | 4 | -1/+23 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1899 Enabled and added help text for settings items | |||||
| * | | | | | | Enabled and added help text for settings items | Asaad Mahmood | 2015-08-27 | 4 | -1/+23 | |
| | | | | | | | ||||||
* | | | | | | | 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 | 6 | -58/+0 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | MM-2039 Remove Google as a SSO service. | |||||
| * | | | | | | | | Remove Google as a SSO service. | JoramWilander | 2015-08-28 | 6 | -58/+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 #512 from mattermost/mm-1870 | Corey Hulen | 2015-08-28 | 52 | -1/+190472 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | MM-1870 Creating local version of fonts retrieved from Google with compatibility with all browsers. | |||||
| * | | | | | | | | | Creating local version of fonts retrieved from Google with compatibility | Christopher Speller | 2015-08-28 | 52 | -1/+190472 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | with all browsers. | |||||
* | | | | | | | | | Merge pull request #496 from mattermost/mm-2015 | Christopher Speller | 2015-08-28 | 16 | -253/+534 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | 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 | 16 | -253/+534 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Revert "MM-1870 Creating local version of fonts retrieved from Google" | Corey Hulen | 2015-08-27 | 23 | -169/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #504 from mattermost/MM-1032 | Corey Hulen | 2015-08-27 | 1 | -17/+21 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | MM-1032 auto-login after tream creation |