summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Update email_settings.jsxit332015-09-251-10/+9
* Update sql_settings.jsxit332015-09-251-1/+1
* Update team_settings.jsxit332015-09-251-3/+3
* Update service_settings.jsxit332015-09-251-2/+2
* Minor wording changeit332015-09-251-1/+1
* Typo fixit332015-09-251-1/+1
* Fix capitalization typeit332015-09-251-1/+1
* Merge pull request #801 from mattermost/plt-376Harrison Healey2015-09-251-0/+2
|\
| * Fix acconut settings being scrolled to bottom when opened.JoramWilander2015-09-251-0/+2
* | PLT 381 In Theme Color settings, change the "Button Color" to "Button Text"mishimi2015-09-251-14/+14
|/
* Fixing merge=Corey Hulen2015-09-246-98/+78
|\
| * Merge pull request #789 from mattermost/PLT-362Harrison Healey2015-09-242-57/+35
| |\
| | * 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 #788 from hmhealey/plt379Christopher Speller2015-09-241-4/+3
| |\ \ | | |/ | |/|
| | * Removed smilies that start with a semicolonhmhealey2015-09-241-4/+3
| * | Merge pull request #782 from asaadmahmoodspin/plt-298Joram Wilander2015-09-241-34/+31
| |\ \ | | |/ | |/|
| | * plt-298 - Improving UI for webhooksAsaad Mahmood2015-09-241-34/+31
| * | Merge pull request #783 from mattermost/plt-287Harrison Healey2015-09-241-1/+3
| |\ \
| | * | 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
|\
| * 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
|\ \
| * | 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-247-159/+168
|\ \
| * | Converting preview image modal to use react-bootstrap. Fixes issue where moda...Christopher Speller2015-09-247-159/+168
| |/
* | Merge pull request #778 from mattermost/plt-43Corey Hulen2015-09-242-1/+11
|\ \ | |/ |/|
| * Fixes backspace navigating back a page.JoramWilander2015-09-242-1/+11
* | plt-363 - Adding organisation themeAsaad Mahmood2015-09-242-21/+27
|/
* Merge pull request #771 from rgarmsen2295/plt-143Harrison Healey2015-09-245-4/+25
|\
| * Text cursor now focuses on the textbox after performing a drag and drop of so...Reed Garmsen2015-09-232-6/+6
| * 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-388mishimi2015-09-241-1/+1
* | | Merge pull request #765 from mattermost/PLT-349Christopher Speller2015-09-2410-137/+992
|\ \ \
| * | | Fixing state setting=Corey Hulen2015-09-234-31/+100
| * | | Fixing merge=Corey Hulen2015-09-2341-352/+1204
| |\ \ \
| * | | | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-2310-130/+916
* | | | | Merge pull request #769 from hmhealey/plt334Joram Wilander2015-09-241-0/+16
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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
|/ / /
* | | Changing image settings to file settings=Corey Hulen2015-09-234-42/+42
* | | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-2337-310/+1162
|\ \ \ | |/ / |/| / | |/
| * Fix theme images 404ing.JoramWilander2015-09-231-1/+1
| * Merge pull request #761 from mattermost/plt-356Harrison Healey2015-09-231-15/+36
| |\
| | * Fix post not rendering properly in some cases.JoramWilander2015-09-231-15/+36