Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #784 from mattermost/img-modal-fix | Harrison Healey | 2015-09-24 | 1 | -2/+6 |
|\ | |||||
| * | Fixing arrow keys in preview image modal | Christopher Speller | 2015-09-24 | 1 | -2/+6 |
|/ | |||||
* | Merge pull request #780 from hmhealey/plt258 | Joram Wilander | 2015-09-24 | 2 | -2/+20 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ | |||||
| * | | Converting preview image modal to use react-bootstrap. Fixes issue where moda... | Christopher Speller | 2015-09-24 | 8 | -165/+179 |
| |/ | |||||
* | | Merge pull request #778 from mattermost/plt-43 | Corey Hulen | 2015-09-24 | 2 | -1/+11 |
|\ \ | |/ |/| | |||||
| * | Fixes backspace navigating back a page. | JoramWilander | 2015-09-24 | 2 | -1/+11 |
* | | Merge pull request #777 from asaadmahmoodspin/plt-363 | Harrison Healey | 2015-09-24 | 9 | -31/+58 |
|\ \ | |/ |/| | |||||
| * | plt-363 - Adding organisation theme | Asaad Mahmood | 2015-09-24 | 9 | -31/+58 |
|/ | |||||
* | Merge pull request #771 from rgarmsen2295/plt-143 | Harrison Healey | 2015-09-24 | 5 | -4/+25 |
|\ | |||||
| * | Text cursor now focuses on the textbox after performing a drag and drop of so... | Reed Garmsen | 2015-09-23 | 2 | -6/+6 |
| * | 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 | mishimi | 2015-09-24 | 1 | -1/+1 |
* | | | Merge pull request #765 from mattermost/PLT-349 | Christopher Speller | 2015-09-24 | 24 | -171/+1279 |
|\ \ \ | |||||
| * | | | Assiging first user system_admin role | =Corey Hulen | 2015-09-23 | 4 | -0/+51 |
| * | | | Fixing state setting | =Corey Hulen | 2015-09-23 | 5 | -33/+102 |
| * | | | Fixing merge | =Corey Hulen | 2015-09-23 | 83 | -489/+1669 |
| |\ \ \ | |||||
| * | | | | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 22 | -162/+1150 |
* | | | | | Merge pull request #769 from hmhealey/plt334 | Joram Wilander | 2015-09-24 | 2 | -1/+23 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Restricted markdown output to only appear on one line when in singleline mode | hmhealey | 2015-09-23 | 2 | -1/+23 |
* | | | | | Merge pull request #766 from mattermost/postpone-oauth-and-webhooks | Corey Hulen | 2015-09-23 | 1 | -5/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Removing OAuth and webhooks changes | it33 | 2015-09-23 | 1 | -5/+0 |
* | | | | | | Merge pull request #770 from hmhealey/plt339 | Corey Hulen | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Changed Markdown links to open in a new tab | hmhealey | 2015-09-23 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #768 from mattermost/segment-fix | Corey Hulen | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fixing segment bug | =Corey Hulen | 2015-09-23 | 1 | -1/+1 |
* | | | | | | Merge pull request #767 from mattermost/segment-fix | Corey Hulen | 2015-09-23 | 1 | -1/+0 |
|\| | | | | | |_|/ / / |/| | | | | |||||
| * | | | | fixing segment bug | =Corey Hulen | 2015-09-23 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Merge pull request #762 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-09-23 | 3 | -0/+30 |
|\ \ \ \ | |||||
| * | | | | Markdown UI improvements with small description height fix | Asaad Mahmood | 2015-09-23 | 3 | -0/+30 |
* | | | | | Merge pull request #752 from mattermost/PLT-11-email | Corey Hulen | 2015-09-23 | 61 | -1127/+3196 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Changing image settings to file settings | =Corey Hulen | 2015-09-23 | 15 | -134/+134 |
| * | | | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 68 | -353/+1504 |
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
* | | | | Merge pull request #764 from mattermost/theme-image-fix | Corey Hulen | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | 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 |
|\ \ \ | |||||
| * | | | Fix post not rendering properly in some cases. | JoramWilander | 2015-09-23 | 1 | -15/+36 |
* | | | | Merge pull request #759 from mattermost/plt-242-3 | Harrison Healey | 2015-09-23 | 41 | -189/+1161 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Implement UI theme colors. | JoramWilander | 2015-09-23 | 41 | -189/+1161 |
* | | | | Merge pull request #753 from hmhealey/plt341 | Corey Hulen | 2015-09-23 | 1 | -1/+12 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Added CSS classes to markdown headings, links, and tables | hmhealey | 2015-09-23 | 1 | -1/+12 |
* | | | | Merge pull request #760 from chengweiv5/PLT-126 | Harrison Healey | 2015-09-23 | 7 | -11/+11 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | PLT-126: Change 'Private Messages' to 'Direct Messages' | Chengwei Yang | 2015-09-23 | 7 | -11/+11 |
|/ / / | |||||
* | | | Merge pull request #740 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-09-23 | 6 | -8/+16 |
|\ \ \ |