summaryrefslogtreecommitdiffstats
path: root/web/react/utils
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #813 from asaadmahmoodspin/plt-366Corey Hulen2015-09-252-5/+38
|\ | | | | PLT-366 - Adding Windows 10 dark theme.
| * Merge branch 'master' of https://github.com/mattermost/platform into plt-366Asaad Mahmood2015-09-251-1/+2
| |\
| * | plt-366 - Adding Windows 8 themeAsaad Mahmood2015-09-252-5/+38
| | |
* | | Merge pull request #811 from mattermost/plt-45Corey Hulen2015-09-251-0/+4
|\ \ \ | |_|/ |/| | PLT-45 Force videos to be set dimensions.
| * | Force videos to be set dimensions.JoramWilander2015-09-251-0/+4
| |/
* | Merge pull request #808 from mattermost/fixing-redirect2Corey Hulen2015-09-251-1/+2
|\ \ | |/ |/| fixing more redirect places
| * fixing more redirect places=Corey Hulen2015-09-251-1/+2
| |
* | Merge pull request #794 from mattermost/PLT-157Christopher Speller2015-09-251-1/+1
|\ \ | | | | | | PLT-157 Fixing blue bar and renders warning when mis-configured.
| * \ Merge branch 'master' into PLT-157=Corey Hulen2015-09-251-14/+14
| |\ \
| * | | Fixing blue bar and renders warning when mis-configured.=Corey Hulen2015-09-241-1/+1
| | | |
* | | | Merge pull request #797 from asaadmahmoodspin/bug-fixesChristopher Speller2015-09-251-1/+2
|\ \ \ \ | |_|_|/ |/| | | Bug fixes and UI improvements for multiple tickets
| * | | Merge branch 'master' of https://github.com/mattermost/platform into bug-fixesAsaad Mahmood2015-09-251-14/+14
| |\ \ \ | | | |/ | | |/|
| * | | Bug fixes and UI improvements for multiple ticketsAsaad Mahmood2015-09-251-1/+2
| | |/ | |/|
* | | Merge pull request #803 from mattermost/plt-405Corey Hulen2015-09-251-1/+0
|\ \ \ | |_|/ |/| | PLT-405 Fixes youtube videos causing random scrolling.
| * | Fixes youtube videos causing random scrolling.JoramWilander2015-09-251-1/+0
| |/
* / PLT 381 In Theme Color settings, change the "Button Color" to "Button Text"mishimi2015-09-251-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 Hulen2015-09-241-4/+3
|\
| * Removed smilies that start with a semicolonhmhealey2015-09-241-4/+3
| |
* | Removing old valet crud=Corey Hulen2015-09-241-17/+0
|/
* plt-363 - Adding organisation themeAsaad Mahmood2015-09-242-21/+27
|
* Merge pull request #765 from mattermost/PLT-349Christopher Speller2015-09-243-1/+56
|\ | | | | PLT-349 adding team mgt to admin console
| * Fixing merge=Corey Hulen2015-09-235-97/+499
| |\
| * | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-233-2/+57
| | |
* | | Merge pull request #769 from hmhealey/plt334Joram Wilander2015-09-241-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 modehmhealey2015-09-231-0/+16
| | |/ | |/|
* / | Changed Markdown links to open in a new tabhmhealey2015-09-231-1/+1
|/ /
* | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-235-97/+499
|\ \ | |/ |/|
| * Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-232-45/+282
| |\ | | | | | | PLT-242 Implement custom UI theme colors.
| | * Implement UI theme colors.JoramWilander2015-09-232-45/+282
| | |
| * | Added CSS classes to markdown headings, links, and tableshmhealey2015-09-231-1/+12
| | |
| * | Merge pull request #740 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-09-231-1/+2
| |\ \ | | | | | | | | UI Modifications for multiple tickets
| | * | UI Modifications for multiple ticketsAsaad Mahmood2015-09-221-1/+2
| | | |
| * | | Merge pull request #751 from hmhealey/plt344Christopher Speller2015-09-233-50/+203
| |\ \ \ | | |_|/ | |/| | PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting
| | * | Removed extra handling of markdown links when doing autolinkinghmhealey2015-09-221-31/+5
| | | |
| | * | Moved text formatting code to only occur inside of markdown text nodeshmhealey2015-09-222-19/+33
| | | |
| | * | Changed hashtag regex to only accept hashtags that begin with a letterhmhealey2015-09-221-1/+1
| | | |
| | * | Moved emoticon parsing to happen after url parsing so that we don't have ↵hmhealey2015-09-221-4/+4
| | | | | | | | | | | | | | | | smilies accidentally occuring in urls
| | * | Restored changes which remove emojify and switch to our own versionhmhealey2015-09-222-0/+165
| | | |
* | | | Fixing merge conflict=Corey Hulen2015-09-221-55/+98
|\| | |
| * | | Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-221-55/+98
| |\ \ \ | | |/ / | |/| | PLT-27 Implement incoming webhooks.
| | * | Implement incoming webhooks.JoramWilander2015-09-211-55/+98
| | | |
| * | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵Christopher Speller2015-09-222-165/+0
| | | | | | | | | | | | | | | | emojify"
| * | | Added parsing for named emojis to TextFormatting and removed dependency on ↵hmhealey2015-09-222-0/+165
| | |/ | |/| | | | | | | emojify
* | | Adding service settings to admin console=Corey Hulen2015-09-221-2/+0
| | |
* | | Adding email to admin console=Corey Hulen2015-09-211-0/+15
|/ /
* | Added theme class to markdown linkshmhealey2015-09-211-1/+7
| |
* | Cleaned up markdown formatting code and removed debug statementshmhealey2015-09-192-7/+9
| |
* | Deferred to marked.js's html sanitization when markdown is enabledhmhealey2015-09-191-2/+12
| |
* | Changed markdown link parsing to automatically add an explicit protocol to urlshmhealey2015-09-192-1/+16
| |
* | Prevented our url autolinking from breaking markdown linkshmhealey2015-09-191-6/+34
| |