Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | MM-2033 fixes img showing infinity progress | =Corey Hulen | 2015-08-27 | 2 | -0/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #503 from willstacey/patch-1 | Corey Hulen | 2015-08-27 | 1 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | Spelling error | |||||
| * | | | | Spelling error | willstacey | 2015-08-27 | 1 | -4/+4 | |
| | |/ / | |/| | | | | | | somthing -> something | |||||
* | | | | Merge pull request #502 from jasonblais/patch-1 | Corey Hulen | 2015-08-27 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Add missing period | |||||
| * | | | | Add missing period | jasonblais | 2015-08-27 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #501 from doosp/patch-1 | Corey Hulen | 2015-08-27 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Adding Periods | |||||
| * | | | | Adding Periods | doosp | 2015-08-27 | 1 | -2/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #500 from lindy65/patch-1 | Corey Hulen | 2015-08-27 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Adding missing period | |||||
| * | | | Adding missing period | lindy65 | 2015-08-27 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | 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 #495 from mattermost/minor-post-change | Christopher Speller | 2015-08-27 | 1 | -0/+5 | |
|\ \ \ | | | | | | | | | If we don't have any posts for a channel, pull page rather than pulling latest | |||||
| * | | | 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 #490 from mattermost/mm-1870 | Corey Hulen | 2015-08-27 | 23 | -1/+169 | |
|\ \ \ \ | |/ / / |/| | | | MM-1870 Creating local version of fonts retrieved from Google | |||||
| * | | | Creating local version of fonts retrieved from Google | Christopher Speller | 2015-08-27 | 23 | -1/+169 | |
| | | | | ||||||
* | | | | Merge pull request #474 from mattermost/PL-4 | Christopher Speller | 2015-08-27 | 5 | -15/+65 | |
|\ \ \ \ | | | | | | | | | | | Fixes PL-1 and PL-3 Restricting team creation | |||||
| * | | | | PL-3 fixing config files | =Corey Hulen | 2015-08-27 | 3 | -5/+7 | |
| | | | | | ||||||
| * | | | | Fixes PL-3 Restrict team creation to specific domains | =Corey Hulen | 2015-08-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fixes PL-3 Restrict team creation to specific domains | =Corey Hulen | 2015-08-25 | 4 | -22/+52 | |
| | | | | | ||||||
| * | | | | Fixes PL-1 added ability to disable team creation | =Corey Hulen | 2015-08-25 | 4 | -14/+32 | |
| | | | | | ||||||
* | | | | | Merge pull request #484 from mattermost/mm-1994 | Corey Hulen | 2015-08-27 | 3 | -31/+31 | |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1994 Improvements to import UI | |||||
| * | | | | | Improvements to import UI | Christopher Speller | 2015-08-26 | 3 | -31/+31 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #469 from mattermost/mm-1699 | Christopher Speller | 2015-08-27 | 28 | -890/+1631 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | 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 | 28 | -890/+1631 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #487 from rgarmsen2295/mm-2000 | Christopher Speller | 2015-08-27 | 2 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | MM-2000 Added links to the teams listed in the 'Find your teams' email | |||||
| * | | | | Added links to the teams listed in the 'Find your teams' email | Reed Garmsen | 2015-08-26 | 2 | -3/+3 | |
| | |/ / | |/| | | ||||||
* | | | | 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 #481 from BastienDurel/master | Joram Wilander | 2015-08-27 | 1 | -0/+2 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add Date header in mail so it will be sorted correctly | |||||
| * | | | | Use better format for date, as RFC1123 re-defined it over RFC822, and states ↵ | Bastien Durel | 2015-08-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | 'implementations SHOULD use numeric timezones instead of timezone names' | |||||
| * | | | | missing tab | Bastien Durel | 2015-08-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of github.com:mattermost/platform | Bastien Durel | 2015-08-26 | 1 | -0/+11 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | tabify | Bastien Durel | 2015-08-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | add date header in mail | Bastien Durel | 2015-08-26 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | 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 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #470 from nickago/MM-1945 | Joram Wilander | 2015-08-27 | 2 | -4/+18 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | MM-1945 Added a link to error page that returns users to the root page | |||||
| * | | | | | Added a link to error page that returns users to the root page | nickago | 2015-08-25 | 2 | -4/+18 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #478 from rgarmsen2295/mm-2007 | Christopher Speller | 2015-08-26 | 1 | -0/+11 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-2007 Clears the 'New Channel' dialogue box of errors and previous input on exit | |||||
| * | | | | Clears the 'new channel' dialogue box of errors and previous input on exit | Reed Garmsen | 2015-08-25 | 1 | -0/+11 | |
|/ / / / | ||||||
* | | | | Merge pull request #476 from rgarmsen2295/mm-1915 | Corey Hulen | 2015-08-25 | 2 | -0/+5 | |
|\ \ \ \ | |_|_|/ |/| | | | MM-1915 Added white background to non-image file previews | |||||
| * | | | Added white background to non-image files (was previously transparent | Reed Garmsen | 2015-08-25 | 2 | -0/+5 | |
|/ / / | ||||||
* | | | fixing build | =Corey Hulen | 2015-08-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #466 from mattermost/mm-1912 | Corey Hulen | 2015-08-25 | 7 | -35/+131 | |
|\ \ \ | |_|/ |/| | | 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 | 7 | -35/+131 | |
| | | | ||||||
* | | | Merge pull request #467 from mattermost/mm-2021 | Christopher Speller | 2015-08-25 | 1 | -3/+1 | |
|\ \ \ | |_|/ |/| | | Fixes mm-2021 removes hard coded port for SSL |