summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge=Corey Hulen2015-09-2415-121/+111
|\
| * Merge pull request #789 from mattermost/PLT-362Harrison Healey2015-09-247-65/+35
| |\
| | * fixing issue=Corey Hulen2015-09-241-1/+0
| | * Removing default theme no longer in use=Corey Hulen2015-09-246-29/+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=Corey Hulen2015-09-241-10/+3
| * | | 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-244-39/+61
| |\ \ \ | | |/ / | |/| |
| | * | Removing config file EnableIncomingWebhooks to falseAsaad Mahmood2015-09-241-1/+1
| | * | plt-298 - Improving UI for webhooksAsaad Mahmood2015-09-245-40/+62
| * | | Merge pull request #783 from mattermost/plt-287Harrison Healey2015-09-241-1/+3
| |\ \ \
| | * | | Hiding export from UIChristopher Speller2015-09-241-1/+3
| | |/ /
| * | | Merge pull request #784 from mattermost/img-modal-fixHarrison Healey2015-09-241-2/+6
| |\ \ \ | | |/ / | |/| |
| | * | Fixing arrow keys in preview image modalChristopher Speller2015-09-241-2/+6
| |/ /
* / / Removing old valet crud=Corey Hulen2015-09-247-291/+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-248-165/+179
|\ \ \
| * | | Converting preview image modal to use react-bootstrap. Fixes issue where moda...Christopher Speller2015-09-248-165/+179
| |/ /
* | | Merge pull request #778 from mattermost/plt-43Corey Hulen2015-09-242-1/+11
|\ \ \ | |/ / |/| |
| * | Fixes backspace navigating back a page.JoramWilander2015-09-242-1/+11
* | | Merge pull request #777 from asaadmahmoodspin/plt-363Harrison Healey2015-09-249-31/+58
|\ \ \ | |/ / |/| |
| * | plt-363 - Adding organisation themeAsaad Mahmood2015-09-249-31/+58
|/ /
* | 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-2424-171/+1279
|\ \ \
| * | | Assiging first user system_admin role=Corey Hulen2015-09-234-0/+51
| * | | Fixing state setting=Corey Hulen2015-09-235-33/+102
| * | | Fixing merge=Corey Hulen2015-09-2383-489/+1669
| |\ \ \
| * | | | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-2322-162/+1150
* | | | | Merge pull request #769 from hmhealey/plt334Joram Wilander2015-09-242-1/+23
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Restricted markdown output to only appear on one line when in singleline modehmhealey2015-09-232-1/+23
* | | | | Merge pull request #766 from mattermost/postpone-oauth-and-webhooksCorey Hulen2015-09-231-5/+0
|\ \ \ \ \
| * | | | | Removing OAuth and webhooks changesit332015-09-231-5/+0
* | | | | | Merge pull request #770 from hmhealey/plt339Corey Hulen2015-09-231-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Changed Markdown links to open in a new tabhmhealey2015-09-231-1/+1
|/ / / / /
* | | | | Merge pull request #768 from mattermost/segment-fixCorey Hulen2015-09-231-1/+1
|\ \ \ \ \
| * | | | | fixing segment bug=Corey Hulen2015-09-231-1/+1
* | | | | | Merge pull request #767 from mattermost/segment-fixCorey Hulen2015-09-231-1/+0
|\| | | | | | |_|/ / / |/| | | |
| * | | | fixing segment bug=Corey Hulen2015-09-231-1/+0
|/ / / /
* | | | Merge pull request #762 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-09-233-0/+30
|\ \ \ \