Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #514 from mattermost/mm-2039 | Corey Hulen | 2015-08-28 | 10 | -141/+0 |
|\ | | | | | MM-2039 Remove Google as a SSO service. | ||||
| * | Remove Google as a SSO service. | JoramWilander | 2015-08-28 | 10 | -141/+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 | 30 | -345/+883 |
|\ \ \ | |/ / |/| | | 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 | 30 | -345/+883 |
| | | | | | | | | | | | | to turn off email sign up. | ||||
* | | | Merge pull request #511 from mattermost/MM-1698 | Christopher Speller | 2015-08-28 | 6 | -100/+96 |
|\ \ \ | |_|/ |/| | | MM-1698 Fixes upgrade db from 0.6 for postgres | ||||
| * | | Fixing bug where the err msg gets gobbled up | =Corey Hulen | 2015-08-27 | 1 | -1/+1 |
| | | | |||||
| * | | Adding ability to upgrade postgres schema | =Corey Hulen | 2015-08-27 | 5 | -99/+95 |
| | | | |||||
* | | | Merge pull request #486 from asubset/master | Joram Wilander | 2015-08-28 | 3 | -4/+5 |
|\ \ \ | | | | | | | | | Fix getParentsPosts() query | ||||
| * | | | fix GetParentPosts() query | Jason Rossman | 2015-08-27 | 3 | -5/+5 |
| | | | | |||||
| * | | | Fix getParentsPosts for postgresql | Jason Rossman | 2015-08-26 | 1 | -0/+1 |
| | | | | |||||
* | | | | 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 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #509 from mattermost/revert-490-mm-1870 | Corey Hulen | 2015-08-27 | 23 | -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 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 | ||||
| * | | | | MM-1032 auto-login after tream creation | =Corey Hulen | 2015-08-27 | 1 | -17/+21 |
| | | | | | |||||
* | | | | | Merge pull request #507 from mattermost/post-limit | Corey Hulen | 2015-08-27 | 1 | -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 ↵ | JoramWilander | 2015-08-27 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | order. | ||||
* | | | | | Merge pull request #506 from nickago/hotfix | Corey Hulen | 2015-08-27 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | hotfix: removed vestigial perfect Scrollbar command | ||||
| * | | | | removed vestigial perfect Scrollbar command | nickago | 2015-08-27 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #505 from mattermost/post-create-time | Corey Hulen | 2015-08-27 | 1 | -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. | JoramWilander | 2015-08-27 | 1 | -3/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #499 from mattermost/MM-2033 | Joram Wilander | 2015-08-27 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | MM-2033 fixes img showing infinity progress | ||||
| * | | | | MM-2033 fixes img showing infinity progress | =Corey Hulen | 2015-08-27 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | 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 |
| | | | | |