summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Fixes youtube videos causing random scrolling.JoramWilander2015-09-251-1/+0
|
* Fixing merge=Corey Hulen2015-09-2410-113/+111
|\
| * Merge pull request #789 from mattermost/PLT-362Harrison Healey2015-09-242-57/+35
| |\ | | | | | | PLT-362 removing themes and hiding OAuth provider option.
| | * Removing default theme no longer in use=Corey Hulen2015-09-241-22/+0
| | |
| | * Disabling OAuth provider for 0.8=Corey Hulen2015-09-241-35/+35
| | |
| * | Merge pull request #785 from mattermost/PLT-203Joram Wilander2015-09-241-10/+3
| |\ \ | | | | | | | | Partial fix for PLT-203
| | * | Partial fix for PLT-203=Corey Hulen2015-09-241-10/+3
| | | |
| * | | Merge pull request #788 from hmhealey/plt379Christopher Speller2015-09-241-4/+3
| |\ \ \ | | |_|/ | |/| | PLT-379 Removed smilies that start with a semicolon
| | * | Removed smilies that start with a semicolonhmhealey2015-09-241-4/+3
| | | |
| * | | Merge pull request #782 from asaadmahmoodspin/plt-298Joram Wilander2015-09-244-39/+61
| |\ \ \ | | |/ / | |/| | plt-298 - Improving UI for webhooks
| | * | plt-298 - Improving UI for webhooksAsaad Mahmood2015-09-244-39/+61
| | | |
| * | | Merge pull request #783 from mattermost/plt-287Harrison Healey2015-09-241-1/+3
| |\ \ \ | | | | | | | | | | PLT-287 Hiding export from UI
| | * | | Hiding export from UIChristopher Speller2015-09-241-1/+3
| | |/ /
| * / / Fixing arrow keys in preview image modalChristopher Speller2015-09-241-2/+6
| |/ /
* / / Removing old valet crud=Corey Hulen2015-09-244-225/+5
|/ /
* | Merge pull request #780 from hmhealey/plt258Joram Wilander2015-09-242-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 themhmhealey2015-09-242-2/+20
| | |
* | | Merge pull request #781 from hmhealey/plt332Joram Wilander2015-09-243-9/+3
|\ \ \ | | | | | | | | PLT-332 Improved date tooltips
| * | | Changed format of date tooltipshmhealey2015-09-241-1/+1
| | | |
| * | | Removed timestamp tooltips from posts in the RHShmhealey2015-09-242-8/+2
| |/ /
* | | Merge pull request #779 from mattermost/plt-294Corey Hulen2015-09-248-165/+179
|\ \ \ | | | | | | | | PLT-294 Converting preview image modal to use react-bootstrap.
| * | | Converting preview image modal to use react-bootstrap. Fixes issue where ↵Christopher Speller2015-09-248-165/+179
| |/ / | | | | | | | | | modal would appear behind background on iOS
* | | Merge pull request #778 from mattermost/plt-43Corey Hulen2015-09-242-1/+11
|\ \ \ | |/ / |/| | PLT-43 Fixes backspace navigating back a page.
| * | Fixes backspace navigating back a page.JoramWilander2015-09-242-1/+11
| | |
* | | plt-363 - Adding organisation themeAsaad Mahmood2015-09-249-31/+58
|/ /
* | Merge pull request #771 from rgarmsen2295/plt-143Harrison Healey2015-09-245-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 Garmsen2015-09-232-6/+6
| | | | | | | | | | | | some text
| * | Added support to drag and drop text into the main textbox or RHS textboxReed Garmsen2015-09-233-1/+16
| | |
| * | Small fix for react key warningReed Garmsen2015-09-232-3/+9
| | |
* | | Merge pull request #776 from mishimi/patch-5Harrison Healey2015-09-241-1/+1
|\ \ \ | | | | | | | | PLT-388 Added warning that @mentions from Slack are not imported
| * | | PLT-388mishimi2015-09-241-1/+1
| | |/ | |/| | | | Warning users that @mentions from Slack are currently not supported after import
* | | Merge pull request #765 from mattermost/PLT-349Christopher Speller2015-09-2411-138/+999
|\ \ \ | | | | | | | | PLT-349 adding team mgt to admin console
| * | | Fixing state setting=Corey Hulen2015-09-234-31/+100
| | | |
| * | | Fixing merge=Corey Hulen2015-09-2367-373/+1568
| |\ \ \
| * | | | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-2311-131/+923
| | | | |
* | | | | Merge pull request #769 from hmhealey/plt334Joram Wilander2015-09-242-1/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | 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 modehmhealey2015-09-232-1/+23
| | | | |
* | | | | Changed Markdown links to open in a new tabhmhealey2015-09-231-1/+1
| |_|/ / |/| | |
* | | | fixing segment bug=Corey Hulen2015-09-231-1/+1
| | | |
* | | | fixing segment bug=Corey Hulen2015-09-231-1/+0
|/ / /
* | | Merge pull request #762 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-09-233-0/+30
|\ \ \ | | | | | | | | Markdown UI improvements with small description height fix
| * | | Markdown UI improvements with small description height fixAsaad Mahmood2015-09-233-0/+30
| | | |
* | | | Changing image settings to file settings=Corey Hulen2015-09-234-42/+42
| | | |
* | | | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-2362-329/+1495
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fix theme images 404ing.JoramWilander2015-09-231-1/+1
| | |
| * | Merge pull request #761 from mattermost/plt-356Harrison Healey2015-09-231-15/+36
| |\ \ | | | | | | | | PLT-356 Fix post not rendering properly in some cases.
| | * | Fix post not rendering properly in some cases.JoramWilander2015-09-231-15/+36
| | | |
| * | | Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-2338-186/+1154
| |\ \ \ | | |_|/ | |/| | PLT-242 Implement custom UI theme colors.
| | * | Implement UI theme colors.JoramWilander2015-09-2338-186/+1154
| | | |
| * | | Merge pull request #753 from hmhealey/plt341Corey Hulen2015-09-231-1/+12
| |\ \ \ | | |_|/ | |/| | PLT-341 Added CSS classes to markdown headings, links, and tables