Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #808 from mattermost/fixing-redirect2 | Corey Hulen | 2015-09-25 | 4 | -4/+6 |
|\ | | | | | fixing more redirect places | ||||
| * | fixing more redirect places | =Corey Hulen | 2015-09-25 | 4 | -4/+6 |
| | | |||||
* | | Merge pull request #805 from mattermost/plt-250 | Joram Wilander | 2015-09-25 | 1 | -21/+27 |
|\ \ | | | | | | | PLT-250 Fix post list not resizing properly for file previews. | ||||
| * | | Fix post list not resizing properlu for file previews. | JoramWilander | 2015-09-25 | 1 | -21/+27 |
| | | | |||||
* | | | Merge pull request #806 from mattermost/fixing-redirect | Harrison Healey | 2015-09-25 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | redirect to team after login | ||||
| * | | | redirect to team after login | =Corey Hulen | 2015-09-25 | 2 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #794 from mattermost/PLT-157 | Christopher Speller | 2015-09-25 | 6 | -83/+107 |
|\ \ \ | | | | | | | | | PLT-157 Fixing blue bar and renders warning when mis-configured. | ||||
| * | | | Fixing typo | =Corey Hulen | 2015-09-25 | 1 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into PLT-157 | =Corey Hulen | 2015-09-25 | 8 | -38/+70 |
| |\ \ \ | |||||
| * | | | | Fixing eslint | =Corey Hulen | 2015-09-24 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Fixing blue bar and renders warning when mis-configured. | =Corey Hulen | 2015-09-24 | 6 | -82/+107 |
| | | | | | |||||
* | | | | | Merge pull request #797 from asaadmahmoodspin/bug-fixes | Christopher Speller | 2015-09-25 | 7 | -24/+56 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Bug fixes and UI improvements for multiple tickets | ||||
| * | | | | Using react tooltip for timestamp in center channel instead of normal bootstrap | Asaad Mahmood | 2015-09-25 | 4 | -9/+13 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into bug-fixes | Asaad Mahmood | 2015-09-25 | 3 | -17/+57 |
| |\ \ \ \ | |||||
| * | | | | | Adding margin bot to videos | Asaad Mahmood | 2015-09-25 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Improving uploader name and video type for videos | Asaad Mahmood | 2015-09-25 | 1 | -4/+2 |
| | | | | | | |||||
| * | | | | | Bug fixes and UI improvements for multiple tickets | Asaad Mahmood | 2015-09-25 | 10 | -20/+49 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #803 from mattermost/plt-405 | Corey Hulen | 2015-09-25 | 1 | -1/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-405 Fixes youtube videos causing random scrolling. | ||||
| * | | | | | Fixes youtube videos causing random scrolling. | JoramWilander | 2015-09-25 | 1 | -1/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #802 from mattermost/plt-291 | Corey Hulen | 2015-09-25 | 2 | -11/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-291 Fixing 404 page props | ||||
| * | | | | Fixing 404 page props | Christopher Speller | 2015-09-24 | 2 | -11/+6 |
| | | | | | |||||
* | | | | | Merge pull request #793 from hmhealey/plt367 | Joram Wilander | 2015-09-25 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-367 Added a json response to the uploadProfileImage api call | ||||
| * | | | | | Added a json response to the uploadProfileImage api call | hmhealey | 2015-09-24 | 1 | -0/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #799 from mattermost/plt-31-2 | Harrison Healey | 2015-09-25 | 4 | -21/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-31 Added welcome email back in. | ||||
| * | | | | | Added welcome email back in. | JoramWilander | 2015-09-25 | 4 | -21/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #801 from mattermost/plt-376 | Harrison Healey | 2015-09-25 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | PLT-376 Fix account settings being scrolled to bottom when opened. | ||||
| * | | | | | Fix acconut settings being scrolled to bottom when opened. | JoramWilander | 2015-09-25 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #800 from mishimi/patch-7 | Christopher Speller | 2015-09-25 | 1 | -14/+14 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | PLT 381 In Theme Color settings, change the "Button Color" to "Button… | ||||
| * | | | | | PLT 381 In Theme Color settings, change the "Button Color" to "Button Text" | mishimi | 2015-09-25 | 1 | -14/+14 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Also made the following changes 1. Capitalize all words 2. Remove the word "color" if it comes after "text" Ex. Sidebar text color --> Sidebar Text | ||||
* | | | | | Merge pull request #795 from chengweiv5/fix-typo | Joram Wilander | 2015-09-25 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix a typo and trailing space: adminsiter -> administer | ||||
| * | | | | Fix a typo and trailing space: adminsiter -> administer | Chengwei Yang | 2015-09-25 | 1 | -2/+2 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | | | Merge pull request #792 from esethna/patch-2 | Christopher Speller | 2015-09-25 | 1 | -1/+41 |
|\ \ \ \ | |/ / / |/| | | | Update NOTICE.txt to include emoji license info V2 | ||||
| * | | | Update NOTICE.txt to include emoji license info V3 | esethna | 2015-09-24 | 1 | -3/+6 |
| | | | | | | | | | | | | Tweaked the license info as per chat with Ian | ||||
| * | | | Update NOTICE.txt to include emoji license info V2 | esethna | 2015-09-24 | 1 | -0/+37 |
|/ / / | | | | | | | Added to the bottom of the file | ||||
* | | | Merge pull request #787 from mattermost/PLT-30 | Corey Hulen | 2015-09-24 | 7 | -291/+5 |
|\ \ \ | | | | | | | | | PLT-30 Removing old valet crud | ||||
| * \ \ | Fixing merge | =Corey Hulen | 2015-09-24 | 15 | -121/+111 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #789 from mattermost/PLT-362 | Harrison Healey | 2015-09-24 | 7 | -65/+35 |
|\ \ \ \ | | | | | | | | | | | PLT-362 removing themes and hiding OAuth provider option. | ||||
| * | | | | fixing issue | =Corey Hulen | 2015-09-24 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Removing default theme no longer in use | =Corey Hulen | 2015-09-24 | 6 | -29/+0 |
| | | | | | |||||
| * | | | | Disabling OAuth provider for 0.8 | =Corey Hulen | 2015-09-24 | 1 | -35/+35 |
| | | | | | |||||
* | | | | | Merge pull request #785 from mattermost/PLT-203 | Joram Wilander | 2015-09-24 | 1 | -10/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Partial fix for PLT-203 | ||||
| * | | | | | Partial fix for PLT-203 | =Corey Hulen | 2015-09-24 | 1 | -10/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #788 from hmhealey/plt379 | Christopher Speller | 2015-09-24 | 1 | -4/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | PLT-379 Removed smilies that start with a semicolon | ||||
| * | | | | | Removed smilies that start with a semicolon | hmhealey | 2015-09-24 | 1 | -4/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #782 from asaadmahmoodspin/plt-298 | Joram Wilander | 2015-09-24 | 4 | -39/+61 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | plt-298 - Improving UI for webhooks | ||||
| * | | | | | Removing config file EnableIncomingWebhooks to false | Asaad Mahmood | 2015-09-24 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | plt-298 - Improving UI for webhooks | Asaad Mahmood | 2015-09-24 | 5 | -40/+62 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #783 from mattermost/plt-287 | Harrison Healey | 2015-09-24 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-287 Hiding export from UI | ||||
| * | | | | | Hiding export from UI | Christopher Speller | 2015-09-24 | 1 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #784 from mattermost/img-modal-fix | Harrison Healey | 2015-09-24 | 1 | -2/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fixing arrow keys in preview image modal |