summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update Sign-in.mdlfbrock2015-12-021-1/+5
|
* Merge pull request #1581 from mattermost/font-fixChristopher Speller2015-12-021-2/+4
|\ | | | | Stop firefox from crashing due to fonts
| * Stop firefox from crashing due to fontsJoramWilander2015-12-021-2/+4
|/
* Merge pull request #1577 from mattermost/plt-1307Joram Wilander2015-12-024-60/+73
|\ | | | | PLT-1307 Make proper async calls when switching channels
| * Minor changeJoramWilander2015-12-021-2/+1
| |
| * Remove loggingJoramWilander2015-12-021-2/+0
| |
| * Add bindJoramWilander2015-12-021-0/+1
| |
| * Make proper async calls when switching channelsJoramWilander2015-12-024-61/+76
| |
* | Merge pull request #1578 from mattermost/emitter-leakHarrison Healey2015-12-021-2/+8
|\ \ | | | | | | Fix emitter leak
| * | Fix emitter leakJoramWilander2015-12-021-2/+8
|/ /
* | Merge pull request #1576 from mattermost/remove-scrollJoram Wilander2015-12-021-3/+1
|\ \ | | | | | | Remove perfectscrollbar from center channel
| * | Remove perfectscrollbar from center channelJoramWilander2015-12-021-3/+1
|/ /
* | Merge pull request #1535 from florianorben/PLT-1233Christopher Speller2015-12-0262-2/+18819
|\ \ | | | | | | PLT-1233: "Display Font" option in Account Settings > Display
| * | PLT-1233: "Display Font" option in Account Settings > DisplayFlorian Orben2015-11-2862-2/+18819
| | |
* | | Merge pull request #1556 from npcode/sso-github-entJoram Wilander2015-12-022-1/+26
|\ \ \ | | | | | | | | Make the Gitlab SSO Support compatible with Github Enterprise
| * | | Note that the Github Enterprise SSO is unofficialYi EungJun2015-12-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the GitLab SSO UI is used for GitHub Enterprise SSO, it's potentially confusing. Suggested-by: it33 <iantien@gmail.com>
| * | | Make the Gitlab SSO Support compatible with Github EnterpriseYi EungJun2015-12-022-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See doc/integrations/Single-Sign-On/Github.md for the usage. Note: I thought it should work also with Github.com but it failed with "Bad token type" error.
* | | | Merge pull request #1563 from esethna/patch-33Corey Hulen2015-12-011-0/+18
|\ \ \ \ | | | | | | | | | | Create README.md
| * | | | Create README.mdEric Sethna2015-12-011-0/+18
| | | | | | | | | | | | | | | Instructions on how to use the test .md files.
* | | | | Merge pull request #1566 from esethna/patch-34Corey Hulen2015-12-011-0/+177
|\ \ \ \ \ | | | | | | | | | | | | Create test-markdown-lists.md
| * | | | | Create test-markdown-lists.mdEric Sethna2015-12-011-0/+177
| | | | | | | | | | | | | | | | | | Tests for Numbered and Bulleted Lists.
* | | | | | Merge pull request #1567 from esethna/patch-36Corey Hulen2015-12-012-25/+139
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update test-markdown.md
| * | | | | Update test-markdown.mdEric Sethna2015-12-012-25/+139
|/ / / / / | | | | | | | | | | | | | | | | | | | | 1) Add many corner cases we've hit in the past 2) Remove tables to put it in it's own .md test file 3) Remove lists as I've submitted a PR for a new .md file for those cases
* | | | | Merge pull request #1565 from mattermost/plt-1270Joram Wilander2015-12-011-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | Minor fix
| * | | | Minor fixJoramWilander2015-12-011-1/+1
| | | | |
* | | | | Merge pull request #1560 from mattermost/plt-1270Christopher Speller2015-12-011-5/+7
|\| | | | | | | | | | | | | | PLT-1270 Fix channel creation errors
| * | | | Fix channel creation errorsJoramWilander2015-12-011-5/+7
| | | | |
* | | | | Merge pull request #1562 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-016-11/+11
|\ \ \ \ \ | | | | | | | | | | | | Multiple UI Improvements
| * | | | | Multiple UI ImprovementsAsaad Mahmood2015-12-016-11/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #1559 from mattermost/plt-510Harrison Healey2015-12-015-73/+142
|\ \ \ \ \ | | | | | | | | | | | | PLT-510 Updated OAuth2 app register modal
| * | | | | Updated oauth2 app register modalJoramWilander2015-12-015-73/+142
| | | | | |
* | | | | | Merge pull request #1522 from tamtamchik/patch-1Joram Wilander2015-12-011-15/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update Setup.md
| * | | | | | fix new linesYuri Tkachenko2015-11-301-2/+2
| | | | | | |
| * | | | | | easier node install for ubuntu fromYuri Tkachenko2015-11-301-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/nodesource/distributions#debinstall
| * | | | | | removed installation of GodepYuri Tkachenko2015-11-301-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #1532 need to be merged first
| * | | | | | Merge remote-tracking branch 'mattermost/master' into patch-1Yuri Tkachenko2015-11-30402-90386/+18788
| |\ \ \ \ \ \
| * | | | | | | Update Setup.mdYuriy Tkachenko2015-11-261-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixed process for Mac OS X, makes it easier to install that way
* | | | | | | | Merge pull request #1561 from florianorben/PLT-1182Harrison Healey2015-12-011-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | PLT-1182: "Recent Mention" search brings up username as "[username]undefined
| * | | | | | | PLT-1182: "Recent Mention" search brings up username as "[username]undefined"Florian Orben2015-12-011-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #1512 from rgarmsen2295/plt-995bJoram Wilander2015-12-018-44/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-995 Applies name display preference setting in more places
| * | | | | | | Enabled name display settings in more placesReed Garmsen2015-12-018-44/+52
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1558 from mattermost/lfbrock-patch-3Corey Hulen2015-12-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update overview.md
| * | | | | | | Update overview.mdlfbrock2015-12-011-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #1555 from mattermost/PLT-902Corey Hulen2015-12-0111-62/+182
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | PLT-902 switching to push proxy server
| * | | | | | fixing other configs=Corey Hulen2015-11-302-6/+4
| | | | | | |
| * | | | | | PLT-902 switching to push proxy server=Corey Hulen2015-11-309-56/+178
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1548 from mattermost/plt-1268Christopher Speller2015-12-012-9/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-1268 Fix webhook post aggregation and pending/failed post aggregation
| * | | | | | Fix webhook post aggregation and pending/failed post aggregationJoramWilander2015-11-302-9/+40
| | | | | | |
* | | | | | | Merge pull request #1546 from mattermost/plt-1281Christopher Speller2015-12-012-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-1281 Make sure to have latest posts for the view when switching to a channel
| * | | | | | | Make sure to have latests posts for the view whhen switching to a channelJoramWilander2015-11-302-2/+4
| | | | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-03 12:31:59 +0000