Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes RHS not scrolling to show previews when file attached. | JoramWilander | 2015-09-25 | 1 | -0/+6 |
| | |||||
* | 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 | 2 | -6/+13 |
|\ \ \ | | | | | | | | | 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 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into bug-fixes | Asaad Mahmood | 2015-09-25 | 1 | -14/+14 |
| |\ \ \ | |||||
| * | | | | Bug fixes and UI improvements for multiple tickets | Asaad Mahmood | 2015-09-25 | 4 | -2/+6 |
| | |/ / | |/| | | |||||
* | | | | 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 | 6 | -98/+78 |
|\ | |||||
| * | 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 #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 | 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 | 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 | 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 | ||||
* | | Merge pull request #778 from mattermost/plt-43 | Corey Hulen | 2015-09-24 | 2 | -1/+11 |
|\ \ | |/ |/| | PLT-43 Fixes backspace navigating back a page. | ||||
| * | Fixes backspace navigating back a page. | JoramWilander | 2015-09-24 | 2 | -1/+11 |
| | | |||||
* | | plt-363 - Adding organisation theme | Asaad Mahmood | 2015-09-24 | 2 | -21/+27 |
|/ | |||||
* | 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 | ||||
* | | | Merge pull request #765 from mattermost/PLT-349 | Christopher Speller | 2015-09-24 | 10 | -137/+992 |
|\ \ \ | | | | | | | | | PLT-349 adding team mgt to admin console | ||||
| * | | | Fixing state setting | =Corey Hulen | 2015-09-23 | 4 | -31/+100 |
| | | | | |||||
| * | | | Fixing merge | =Corey Hulen | 2015-09-23 | 41 | -352/+1204 |
| |\ \ \ | |||||
| * | | | | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 10 | -130/+916 |
| | | | | | |||||
* | | | | | Merge pull request #769 from hmhealey/plt334 | Joram Wilander | 2015-09-24 | 1 | -0/+16 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-334 Restricted markdown output to only appear on one line when in singleline mode | ||||
| * | | | | Restricted markdown output to only appear on one line when in singleline mode | hmhealey | 2015-09-23 | 1 | -0/+16 |
| | |/ / | |/| | | |||||
* / | | | Changed Markdown links to open in a new tab | hmhealey | 2015-09-23 | 1 | -1/+1 |
|/ / / |