summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #820 from mattermost/it33-patch-2Corey Hulen2015-09-260-0/+0
|\
| * Changed "30 person team" to "30-person team"it332015-09-081-1/+1
* | Merge pull request #821 from mattermost/it33-patch-3Corey Hulen2015-09-261-1/+1
|\ \
| * | Renaming "Windows 10 Dark" to "Windows Dark"it332015-09-251-1/+1
* | | Merge pull request #819 from mattermost/it33-patch-1Corey Hulen2015-09-269-41/+40
|\ \ \ | |/ / |/| |
| * | Update log_settings.jsxit332015-09-251-3/+3
| * | Update gitlab_settings.jsxit332015-09-251-8/+8
| * | Update privacy_settings.jsxit332015-09-251-2/+2
| * | Update rate_settings.jsxit332015-09-251-5/+5
| * | Update rate_settings.jsxit332015-09-251-3/+3
| * | Update log_settings.jsxit332015-09-251-7/+7
| * | Update image_settings.jsxit332015-09-251-1/+1
| * | 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 #817 from mattermost/lfbrock-patch-1Corey Hulen2015-09-251-0/+152
|\ \ \
| * | | Create markdown.mdlfbrock2015-09-251-0/+152
* | | | Merge pull request #815 from mattermost/it33-patch-3Corey Hulen2015-09-251-0/+31
|\ \ \ \
| * | | | Update NOTICE.txtit332015-09-251-0/+31
| |/ / /
* | | | Merge pull request #813 from asaadmahmoodspin/plt-366Corey Hulen2015-09-258-10/+43
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/mattermost/platform into plt-366Asaad Mahmood2015-09-259-36/+62
| |\ \ \ \
| * | | | | plt-366 - Adding Windows 8 themeAsaad Mahmood2015-09-258-10/+43
* | | | | | Merge pull request #812 from hmhealey/plt256Corey Hulen2015-09-255-7/+38
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Added headers to getFile requests from Microsoft browsers to trigger a downloadhmhealey2015-09-251-0/+14
| * | | | | Updated mssola/user_agent libraryhmhealey2015-09-254-7/+24
* | | | | | Merge pull request #811 from mattermost/plt-45Corey Hulen2015-09-252-4/+18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Force videos to be set dimensions.JoramWilander2015-09-252-4/+18
* | | | | | Merge pull request #810 from mattermost/fixing-redirect3Joram Wilander2015-09-252-3/+15
|\ \ \ \ \ \
| * | | | | | Fixing 1 more case=Corey Hulen2015-09-252-3/+15
| |/ / / / /
* | | | | | Merge pull request #809 from mattermost/scrolling-partial-fixJoram Wilander2015-09-251-8/+8
|\ \ \ \ \ \
| * | | | | | Partial fix to scrolling issues. No longer jumps up from the bottom when RHS ...Christopher Speller2015-09-251-8/+8
* | | | | | | Merge pull request #807 from mattermost/plt-248Christopher Speller2015-09-251-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Fixes RHS not scrolling to show previews when file attached.JoramWilander2015-09-251-0/+6
* | | | | | | | Merge pull request #808 from mattermost/fixing-redirect2Corey Hulen2015-09-254-4/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fixing more redirect places=Corey Hulen2015-09-254-4/+6
* | | | | | | | Merge pull request #805 from mattermost/plt-250Joram Wilander2015-09-251-21/+27
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix post list not resizing properlu for file previews.JoramWilander2015-09-251-21/+27
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #806 from mattermost/fixing-redirectHarrison Healey2015-09-252-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | redirect to team after login=Corey Hulen2015-09-252-2/+2
| | |/ / / / | |/| | | |
* | | | | | 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