Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #811 from mattermost/plt-45 | Corey Hulen | 2015-09-25 | 1 | -4/+14 |
|\ | | | | | PLT-45 Force videos to be set dimensions. | ||||
| * | Force videos to be set dimensions. | JoramWilander | 2015-09-25 | 1 | -4/+14 |
| | | |||||
* | | 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 | 3 | -3/+4 |
|\ \ \ \ | |_|_|/ |/| | | | fixing more redirect places | ||||
| * | | | fixing more redirect places | =Corey Hulen | 2015-09-25 | 3 | -3/+4 |
| | | | | |||||
* | | | | 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 | 2 | -69/+69 |
|\ \ \ | | | | | | | | | 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 | 1 | -0/+2 |
| |\| | | |||||
| * | | | Fixing eslint | =Corey Hulen | 2015-09-24 | 1 | -1/+0 |
| | | | | |||||
| * | | | Fixing blue bar and renders warning when mis-configured. | =Corey Hulen | 2015-09-24 | 2 | -68/+69 |
| | |/ | |/| | |||||
* | | | Merge pull request #797 from asaadmahmoodspin/bug-fixes | Christopher Speller | 2015-09-25 | 1 | -5/+11 |
|\ \ \ | |_|/ |/| | | 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 | 3 | -9/+12 |
| | | | |||||
| * | | Bug fixes and UI improvements for multiple tickets | Asaad Mahmood | 2015-09-25 | 3 | -1/+4 |
| |/ | |||||
* / | Fix acconut settings being scrolled to bottom when opened. | JoramWilander | 2015-09-25 | 1 | -0/+2 |
|/ | |||||
* | Fixing merge | =Corey Hulen | 2015-09-24 | 5 | -94/+75 |
|\ | |||||
| * | 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 #782 from asaadmahmoodspin/plt-298 | Joram Wilander | 2015-09-24 | 1 | -34/+31 |
| |\ | | | | | | | plt-298 - Improving UI for webhooks | ||||
| | * | plt-298 - Improving UI for webhooks | Asaad Mahmood | 2015-09-24 | 1 | -34/+31 |
| | | | |||||
| * | | 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 | 3 | -208/+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 | 7 | -159/+168 |
|\ \ | | | | | | | PLT-294 Converting preview image modal to use react-bootstrap. | ||||
| * | | Converting preview image modal to use react-bootstrap. Fixes issue where ↵ | Christopher Speller | 2015-09-24 | 7 | -159/+168 |
| |/ | | | | | | | modal would appear behind background on iOS | ||||
* / | Fixes backspace navigating back a page. | JoramWilander | 2015-09-24 | 2 | -1/+11 |
|/ | |||||
* | Merge pull request #771 from rgarmsen2295/plt-143 | Harrison Healey | 2015-09-24 | 5 | -4/+25 |
|\ | | | | | PLT-143 Support for text drag and drop | ||||
| * | Text cursor now focuses on the textbox after performing a drag and drop of ↵ | Reed Garmsen | 2015-09-23 | 2 | -6/+6 |
| | | | | | | | | some text | ||||
| * | Added support to drag and drop text into the main textbox or RHS textbox | Reed Garmsen | 2015-09-23 | 3 | -1/+16 |
| | | |||||
| * | Small fix for react key warning | Reed Garmsen | 2015-09-23 | 2 | -3/+9 |
| | | |||||
* | | Merge pull request #776 from mishimi/patch-5 | Harrison Healey | 2015-09-24 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-388 Added warning that @mentions from Slack are not imported | ||||
| * | | PLT-388 | mishimi | 2015-09-24 | 1 | -1/+1 |
| | | | | | | | | | Warning users that @mentions from Slack are currently not supported after import | ||||
* | | | Fixing state setting | =Corey Hulen | 2015-09-23 | 4 | -31/+100 |
| | | | |||||
* | | | Fixing merge | =Corey Hulen | 2015-09-23 | 32 | -250/+669 |
|\| | | |||||
| * | | Changing image settings to file settings | =Corey Hulen | 2015-09-23 | 4 | -42/+42 |
| | | | |||||
| * | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 28 | -208/+627 |
| |\| | |||||
| | * | Fix theme images 404ing. | JoramWilander | 2015-09-23 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #761 from mattermost/plt-356 | Harrison Healey | 2015-09-23 | 1 | -15/+36 |
| | |\ | | | | | | | | | PLT-356 Fix post not rendering properly in some cases. |