summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #514 from mattermost/mm-2039Corey Hulen2015-08-2810-141/+0
|\
| * Remove Google as a SSO service.JoramWilander2015-08-2810-141/+0
* | Merge pull request #513 from mattermost/mm-1861Corey Hulen2015-08-282-5/+16
|\ \
| * | Fixes root images not loading when switich RHS threads.JoramWilander2015-08-282-5/+16
* | | Merge pull request #512 from mattermost/mm-1870Corey Hulen2015-08-2852-1/+190472
|\ \ \ | |_|/ |/| |
| * | Creating local version of fonts retrieved from Google with compatibilityChristopher Speller2015-08-2852-1/+190472
* | | Merge pull request #496 from mattermost/mm-2015Christopher Speller2015-08-2830-345/+883
|\ \ \ | |/ / |/| |
| * | Added the ability to create a team with SSO services and added the ability to...JoramWilander2015-08-2830-345/+883
* | | Merge pull request #511 from mattermost/MM-1698Christopher Speller2015-08-286-100/+96
|\ \ \ | |_|/ |/| |
| * | Fixing bug where the err msg gets gobbled up=Corey Hulen2015-08-271-1/+1
| * | Adding ability to upgrade postgres schema=Corey Hulen2015-08-275-99/+95
* | | Merge pull request #486 from asubset/masterJoram Wilander2015-08-283-4/+5
|\ \ \
| * | | fix GetParentPosts() queryJason Rossman2015-08-273-5/+5
| * | | Fix getParentsPosts for postgresqlJason Rossman2015-08-261-0/+1
* | | | Merge pull request #510 from rgarmsen2295/remove-rename-mobileJoram Wilander2015-08-281-7/+0
|\ \ \ \
| * | | | 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"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=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 or...JoramWilander2015-08-271-3/+5
* | | | | Merge pull request #506 from nickago/hotfixCorey Hulen2015-08-271-1/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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.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=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 errorwillstacey2015-08-271-4/+4
| | |/ / | |/| |
* | | | Merge pull request #502 from jasonblais/patch-1Corey Hulen2015-08-271-1/+1
|\ \ \ \
| * | | | Add missing periodjasonblais2015-08-271-1/+1
| |/ / /
* | | | Merge pull request #501 from doosp/patch-1Corey Hulen2015-08-271-2/+2
|\ \ \ \
| * | | | Adding Periodsdoosp2015-08-271-2/+2
| |/ / /
* | | | Merge pull request #500 from lindy65/patch-1Corey Hulen2015-08-271-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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 screenit332015-08-271-6/+4
* | | Merge pull request #491 from mattermost/mm-1998Joram Wilander2015-08-271-1/+2
|\ \ \ | |/ / |/| |
| * | 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.JoramWilander2015-08-271-0/+5
* | | | Merge pull request #490 from mattermost/mm-1870Corey Hulen2015-08-2723-1/+169
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \
| * | | | 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