summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #510 from rgarmsen2295/remove-rename-mobileJoram Wilander2015-08-281-7/+0
|\ | | | | Removes old rename team option from mobile sidebar
| * Removes rename team option from mobile sidebarReed Garmsen2015-08-271-7/+0
| |
* | Merge pull request #509 from mattermost/revert-490-mm-1870Corey Hulen2015-08-2723-169/+1
|\ \ | | | | | | Revert "MM-1870 Creating local version of fonts retrieved from Google"
| * | Revert "MM-1870 Creating local version of fonts retrieved from Google"Corey Hulen2015-08-2723-169/+1
|/ /
* | Merge pull request #504 from mattermost/MM-1032Corey Hulen2015-08-271-17/+21
|\ \ | | | | | | MM-1032 auto-login after tream creation
| * | MM-1032 auto-login after tream creation=Corey Hulen2015-08-271-17/+21
| | |
* | | Merge pull request #507 from mattermost/post-limitCorey Hulen2015-08-271-3/+5
|\ \ \ | |_|/ |/| | Change GetPostsSince limit to 1000 and only add updated posts to post list order
| * | Change GetPostsSince limit to 1000 and only add updated posts to post list ↵JoramWilander2015-08-271-3/+5
| | | | | | | | | | | | order.
* | | Merge pull request #506 from nickago/hotfixCorey Hulen2015-08-271-1/+0
|\ \ \ | |/ / |/| | hotfix: removed vestigial perfect Scrollbar command
| * | removed vestigial perfect Scrollbar commandnickago2015-08-271-1/+0
| | |
* | | Merge pull request #505 from mattermost/post-create-timeCorey Hulen2015-08-271-3/+1
|\ \ \ | |/ / |/| | Force fresh timestamp for CreateAt field of Posts before saving to DB.
| * | Force fresh timestamp for CreateAt field of Posts before saving to DB.JoramWilander2015-08-271-3/+1
| | |
* | | Merge pull request #499 from mattermost/MM-2033Joram Wilander2015-08-271-0/+1
|\ \ \ | | | | | | | | MM-2033 fixes img showing infinity progress
| * | | MM-2033 fixes img showing infinity progress=Corey Hulen2015-08-271-1/+0
| | | |
| * | | MM-2033 fixes img showing infinity progress=Corey Hulen2015-08-272-0/+2
| |/ /
* | | Merge pull request #503 from willstacey/patch-1Corey Hulen2015-08-271-4/+4
|\ \ \ | | | | | | | | Spelling error
| * | | Spelling errorwillstacey2015-08-271-4/+4
| | |/ | |/| | | | somthing -> something
* | | Merge pull request #502 from jasonblais/patch-1Corey Hulen2015-08-271-1/+1
|\ \ \ | | | | | | | | Add missing period
| * | | Add missing periodjasonblais2015-08-271-1/+1
| |/ /
* | | Merge pull request #501 from doosp/patch-1Corey Hulen2015-08-271-2/+2
|\ \ \ | | | | | | | | Adding Periods
| * | | Adding Periodsdoosp2015-08-271-2/+2
| |/ /
* | | Merge pull request #500 from lindy65/patch-1Corey Hulen2015-08-271-1/+1
|\ \ \ | |/ / |/| | Adding missing period
| * | Adding missing periodlindy652015-08-271-1/+1
|/ /
* | Merge pull request #498 from mattermost/it33-patch-1Christopher Speller2015-08-271-6/+4
|\ \ | |/ |/| Updating help text for Slack Import screen
| * Updating help text for Slack Import screenit332015-08-271-6/+4
| |
* | Merge pull request #491 from mattermost/mm-1998Joram Wilander2015-08-271-1/+2
|\ \ | |/ |/| MM-1998 Temporary PM channels now use username instead of display name
| * Temporary PM channels now use username instead of display nameChristopher Speller2015-08-271-1/+2
| |
* | Merge pull request #495 from mattermost/minor-post-changeChristopher Speller2015-08-271-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.JoramWilander2015-08-271-0/+5
| | |
* | | Merge pull request #490 from mattermost/mm-1870Corey Hulen2015-08-2723-1/+169
|\ \ \ | |/ / |/| | MM-1870 Creating local version of fonts retrieved from Google
| * | Creating local version of fonts retrieved from GoogleChristopher Speller2015-08-2723-1/+169
| | |
* | | Merge pull request #474 from mattermost/PL-4Christopher Speller2015-08-275-15/+65
|\ \ \ | | | | | | | | Fixes PL-1 and PL-3 Restricting team creation
| * | | PL-3 fixing config files=Corey Hulen2015-08-273-5/+7
| | | |
| * | | Fixes PL-3 Restrict team creation to specific domains=Corey Hulen2015-08-251-1/+1
| | | |
| * | | Fixes PL-3 Restrict team creation to specific domains=Corey Hulen2015-08-254-22/+52
| | | |
| * | | Fixes PL-1 added ability to disable team creation=Corey Hulen2015-08-254-14/+32
| | | |
* | | | Merge pull request #484 from mattermost/mm-1994Corey Hulen2015-08-273-31/+31
|\ \ \ \ | | | | | | | | | | MM-1994 Improvements to import UI
| * | | | Improvements to import UIChristopher Speller2015-08-263-31/+31
| | | | |
* | | | | Merge pull request #469 from mattermost/mm-1699Christopher Speller2015-08-2728-890/+1631
|\ \ \ \ \ | |_|_|_|/ |/| | | | MM-1699 Refactored post handling/updating on both the client and server
| * | | | Refactored post handling/updating on both the client and server.JoramWilander2015-08-2728-890/+1631
| | |_|/ | |/| |
* | | | Merge pull request #487 from rgarmsen2295/mm-2000Christopher Speller2015-08-272-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' emailReed Garmsen2015-08-262-3/+3
| | |/ / | |/| |
* | | | Merge pull request #472 from rgarmsen2295/mm-1853Christopher Speller2015-08-276-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 Garmsen2015-08-264-31/+34
| | | | | | | | | | | | | | | | | | | | text dumps
| * | | | Fixed issue with carriage returns being counted improperly in non-ie ↵Reed Garmsen2015-08-254-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 Garmsen2015-08-255-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/masterJoram Wilander2015-08-271-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 Durel2015-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | 'implementations SHOULD use numeric timezones instead of timezone names'
| * | | | missing tabBastien Durel2015-08-261-1/+1
| | | | |
| * | | | Merge branch 'master' of github.com:mattermost/platformBastien Durel2015-08-261-0/+11
| |\ \ \ \ | | | |/ / | | |/| |