summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixes RHS not scrolling to show previews when file attached.JoramWilander2015-09-251-0/+6
* Merge pull request #794 from mattermost/PLT-157Christopher Speller2015-09-256-83/+107
|\
| * Fixing typo=Corey Hulen2015-09-251-6/+6
| * Merge branch 'master' into PLT-157=Corey Hulen2015-09-258-38/+70
| |\
| * | Fixing eslint=Corey Hulen2015-09-241-1/+0
| * | Fixing blue bar and renders warning when mis-configured.=Corey Hulen2015-09-246-82/+107
* | | Merge pull request #797 from asaadmahmoodspin/bug-fixesChristopher Speller2015-09-257-24/+56
|\ \ \
| * | | Using react tooltip for timestamp in center channel instead of normal bootstrapAsaad Mahmood2015-09-254-9/+13
| * | | Merge branch 'master' of https://github.com/mattermost/platform into bug-fixesAsaad Mahmood2015-09-253-17/+57
| |\ \ \
| * | | | Adding margin bot to videosAsaad Mahmood2015-09-251-0/+1
| * | | | Improving uploader name and video type for videosAsaad Mahmood2015-09-251-4/+2
| * | | | Bug fixes and UI improvements for multiple ticketsAsaad Mahmood2015-09-2510-20/+49
| | |/ / | |/| |
* | | | Merge pull request #803 from mattermost/plt-405Corey Hulen2015-09-251-1/+0
|\ \ \ \
| * | | | Fixes youtube videos causing random scrolling.JoramWilander2015-09-251-1/+0
* | | | | Merge pull request #802 from mattermost/plt-291Corey Hulen2015-09-252-11/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixing 404 page propsChristopher Speller2015-09-242-11/+6
* | | | | Merge pull request #793 from hmhealey/plt367Joram Wilander2015-09-251-0/+3
|\ \ \ \ \
| * | | | | Added a json response to the uploadProfileImage api callhmhealey2015-09-241-0/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #799 from mattermost/plt-31-2Harrison Healey2015-09-254-21/+8
|\ \ \ \ \
| * | | | | Added welcome email back in.JoramWilander2015-09-254-21/+8
* | | | | | 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
* | | | | | Merge pull request #800 from mishimi/patch-7Christopher Speller2015-09-251-14/+14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | PLT 381 In Theme Color settings, change the "Button Color" to "Button Text"mishimi2015-09-251-14/+14
| |/ / / /
* | | | | Merge pull request #795 from chengweiv5/fix-typoJoram Wilander2015-09-251-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix a typo and trailing space: adminsiter -> administerChengwei Yang2015-09-251-2/+2
| | |/ / | |/| |
* | | | Merge pull request #792 from esethna/patch-2Christopher Speller2015-09-251-1/+41
|\ \ \ \ | |/ / / |/| | |
| * | | Update NOTICE.txt to include emoji license info V3esethna2015-09-241-3/+6
| * | | Update NOTICE.txt to include emoji license info V2esethna2015-09-241-0/+37
|/ / /
* | | Merge pull request #787 from mattermost/PLT-30Corey Hulen2015-09-247-291/+5
|\ \ \
| * \ \ 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
|\ \ \