Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform into plt-366 | Asaad Mahmood | 2015-09-25 | 8 | -35/+55 |
|\ | |||||
| * | Merge pull request #810 from mattermost/fixing-redirect3 | Joram Wilander | 2015-09-25 | 1 | -2/+8 |
| |\ | | | | | | | Fixing 1 more case | ||||
| | * | Fixing 1 more case | =Corey Hulen | 2015-09-25 | 1 | -2/+8 |
| | | | |||||
| * | | Merge pull request #809 from mattermost/scrolling-partial-fix | Joram Wilander | 2015-09-25 | 1 | -8/+8 |
| |\ \ | | | | | | | | | Partial fix to scrolling issues. No longer jumps up from the bottom when RHS opens | ||||
| | * | | Partial fix to scrolling issues. No longer jumps up from the bottom when RHS ↵ | Christopher Speller | 2015-09-25 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | opens | ||||
| * | | | Merge pull request #807 from mattermost/plt-248 | Christopher Speller | 2015-09-25 | 1 | -0/+6 |
| |\ \ \ | | | | | | | | | | | PLT-248 Fixes RHS not scrolling to show previews when file attached. | ||||
| | * | | | Fixes RHS not scrolling to show previews when file attached. | JoramWilander | 2015-09-25 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | 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 |
| | | |_|/ | | |/| | | |||||
* | / | | | plt-366 - Adding Windows 8 theme | Asaad Mahmood | 2015-09-25 | 8 | -10/+43 |
|/ / / / | |||||
* | | | | 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 | 2 | -14/+16 |
| |\ \ \ | |||||
| * | | | | 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 | 1 | -14/+14 |
| |\ \ \ | |||||
| * | | | | 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 #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 |
| |/ | |||||
* / | 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 | ||||
* | Fixing merge | =Corey Hulen | 2015-09-24 | 10 | -113/+111 |
|\ | |||||
| * | Merge pull request #789 from mattermost/PLT-362 | Harrison Healey | 2015-09-24 | 2 | -57/+35 |
| |\ | | | | | | | PLT-362 removing themes and hiding OAuth provider option. | ||||
| | * | Removing default theme no longer in use | =Corey Hulen | 2015-09-24 | 1 | -22/+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 | ||||
| | * | | plt-298 - Improving UI for webhooks | Asaad Mahmood | 2015-09-24 | 4 | -39/+61 |
| | | | | |||||
| * | | | 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 |
| | |/ / | |||||
| * / / | Fixing arrow keys in preview image modal | Christopher Speller | 2015-09-24 | 1 | -2/+6 |
| |/ / | |||||
* / / | Removing old valet crud | =Corey Hulen | 2015-09-24 | 4 | -225/+5 |
|/ / | |||||
* | | Merge pull request #780 from hmhealey/plt258 | Joram Wilander | 2015-09-24 | 2 | -2/+20 |
|\ \ | | | | | | | PLT-258 Added help text to notification settings to say which browsers support them | ||||
| * | | Added help text to notification settings to say which browsers support them | hmhealey | 2015-09-24 | 2 | -2/+20 |
| | | | |||||
* | | | Merge pull request #781 from hmhealey/plt332 | Joram Wilander | 2015-09-24 | 3 | -9/+3 |
|\ \ \ | | | | | | | | | PLT-332 Improved date tooltips | ||||
| * | | | Changed format of date tooltips | hmhealey | 2015-09-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Removed timestamp tooltips from posts in the RHS | hmhealey | 2015-09-24 | 2 | -8/+2 |
| |/ / | |||||
* | | | Merge pull request #779 from mattermost/plt-294 | Corey Hulen | 2015-09-24 | 8 | -165/+179 |
|\ \ \ | | | | | | | | | PLT-294 Converting preview image modal to use react-bootstrap. |