Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1554 from florianorben/emoji_style | Christopher Speller | 2015-12-03 | 2478 | -8/+21 |
|\ | | | | | Allow to switch between default and emoji-one emoji style | ||||
| * | switch to only use emoji one smileys; remove setting to switch | Florian Orben | 2015-12-01 | 4199 | -1025/+13 |
| | | |||||
| * | Allow to switch between default and emoji-one emoji style | Florian Orben | 2015-12-01 | 4199 | -10/+1035 |
| | | |||||
* | | Merge pull request #1591 from rgarmsen2295/plt-1158 | Joram Wilander | 2015-12-03 | 1 | -0/+1 |
|\ \ | | | | | | | PLT-1158 Limit the 'Team Name' input field in Team Settings to 22 characters | ||||
| * | | Limit edit team name input field to 22 characters | Reed Garmsen | 2015-12-02 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1590 from rgarmsen2295/plt-169 | Joram Wilander | 2015-12-03 | 1 | -29/+20 |
|\ \ \ | | | | | | | | | PLT-169 Fixes issue where cancelling a change in notification settings would not be reflected in the minimized section | ||||
| * | | | Cancelling out of a notification's setting change now displays the correct ↵ | Reed Garmsen | 2015-12-02 | 1 | -29/+20 |
| |/ / | | | | | | | | | | option in the minimized setting tab | ||||
* | | | Merge pull request #1540 from hmhealey/plt1297 | Christopher Speller | 2015-12-03 | 10 | -380/+725 |
|\ \ \ | | | | | | | | | PLT-1297 Replaced SearchAutocomplete with new suggestion components | ||||
| * | | | Changed SuggestionProviders to be regular objects and not singletons | hmhealey | 2015-12-01 | 3 | -7/+5 |
| | | | | |||||
| * | | | Added -1 as an ignored magic number | hmhealey | 2015-12-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Replaced SearchAutocomplete with new suggestion components | hmhealey | 2015-12-01 | 9 | -379/+726 |
| | | | | |||||
* | | | | Merge pull request #1592 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-02 | 4 | -20/+48 |
|\ \ \ \ | | | | | | | | | | | Ui improvements for the tablet/small browser view | ||||
| * | | | | Updating UI for tablet view | Asaad Mahmood | 2015-12-02 | 2 | -6/+2 |
| | | | | | |||||
| * | | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-02 | 3 | -19/+51 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1584 from mattermost/lfbrock-patch-3 | Corey Hulen | 2015-12-02 | 1 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | Update Sign-in.md | ||||
| * | | | Update Sign-in.md | lfbrock | 2015-12-02 | 1 | -1/+5 |
|/ / / | |||||
* | | | Merge pull request #1581 from mattermost/font-fix | Christopher Speller | 2015-12-02 | 1 | -2/+4 |
|\ \ \ | | | | | | | | | Stop firefox from crashing due to fonts | ||||
| * | | | Stop firefox from crashing due to fonts | JoramWilander | 2015-12-02 | 1 | -2/+4 |
|/ / / | |||||
* | | | Merge pull request #1577 from mattermost/plt-1307 | Joram Wilander | 2015-12-02 | 4 | -60/+73 |
|\ \ \ | | | | | | | | | PLT-1307 Make proper async calls when switching channels | ||||
| * | | | Minor change | JoramWilander | 2015-12-02 | 1 | -2/+1 |
| | | | | |||||
| * | | | Remove logging | JoramWilander | 2015-12-02 | 1 | -2/+0 |
| | | | | |||||
| * | | | Add bind | JoramWilander | 2015-12-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | Make proper async calls when switching channels | JoramWilander | 2015-12-02 | 4 | -61/+76 |
| | | | | |||||
* | | | | Merge pull request #1578 from mattermost/emitter-leak | Harrison Healey | 2015-12-02 | 1 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | Fix emitter leak | ||||
| * | | | | Fix emitter leak | JoramWilander | 2015-12-02 | 1 | -2/+8 |
|/ / / / | |||||
* | | | | Merge pull request #1576 from mattermost/remove-scroll | Joram Wilander | 2015-12-02 | 1 | -3/+1 |
|\ \ \ \ | | | | | | | | | | | Remove perfectscrollbar from center channel | ||||
| * | | | | Remove perfectscrollbar from center channel | JoramWilander | 2015-12-02 | 1 | -3/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1535 from florianorben/PLT-1233 | Christopher Speller | 2015-12-02 | 62 | -2/+18819 |
|\ \ \ \ | | | | | | | | | | | PLT-1233: "Display Font" option in Account Settings > Display | ||||
| * | | | | PLT-1233: "Display Font" option in Account Settings > Display | Florian Orben | 2015-11-28 | 62 | -2/+18819 |
| | | | | | |||||
* | | | | | Merge pull request #1556 from npcode/sso-github-ent | Joram Wilander | 2015-12-02 | 2 | -1/+26 |
|\ \ \ \ \ | | | | | | | | | | | | | Make the Gitlab SSO Support compatible with Github Enterprise | ||||
| * | | | | | Note that the Github Enterprise SSO is unofficial | Yi EungJun | 2015-12-02 | 1 | -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 Enterprise | Yi EungJun | 2015-12-02 | 2 | -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-33 | Corey Hulen | 2015-12-01 | 1 | -0/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Create README.md | ||||
| * | | | | | | Create README.md | Eric Sethna | 2015-12-01 | 1 | -0/+18 |
| | |_|_|_|/ | |/| | | | | | | | | | | Instructions on how to use the test .md files. | ||||
* | | | | | | Merge pull request #1566 from esethna/patch-34 | Corey Hulen | 2015-12-01 | 1 | -0/+177 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Create test-markdown-lists.md | ||||
| * | | | | | | Create test-markdown-lists.md | Eric Sethna | 2015-12-01 | 1 | -0/+177 |
| | |_|_|_|/ | |/| | | | | | | | | | | Tests for Numbered and Bulleted Lists. | ||||
* | | | | | | Merge pull request #1567 from esethna/patch-36 | Corey Hulen | 2015-12-01 | 2 | -25/+139 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Update test-markdown.md | ||||
| * | | | | | Update test-markdown.md | Eric Sethna | 2015-12-01 | 2 | -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-1270 | Joram Wilander | 2015-12-01 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | Minor fix | ||||
| * | | | | Minor fix | JoramWilander | 2015-12-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1560 from mattermost/plt-1270 | Christopher Speller | 2015-12-01 | 1 | -5/+7 |
|\| | | | | | | | | | | | | | | PLT-1270 Fix channel creation errors | ||||
| * | | | | Fix channel creation errors | JoramWilander | 2015-12-01 | 1 | -5/+7 |
| | | | | | |||||
* | | | | | Merge pull request #1562 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-01 | 6 | -11/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Multiple UI Improvements | ||||
| * | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-01 | 6 | -11/+11 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #1559 from mattermost/plt-510 | Harrison Healey | 2015-12-01 | 5 | -73/+142 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-510 Updated OAuth2 app register modal | ||||
| * | | | | | Updated oauth2 app register modal | JoramWilander | 2015-12-01 | 5 | -73/+142 |
| | | | | | | |||||
* | | | | | | Merge pull request #1522 from tamtamchik/patch-1 | Joram Wilander | 2015-12-01 | 1 | -15/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update Setup.md | ||||
| * | | | | | | fix new lines | Yuri Tkachenko | 2015-11-30 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | easier node install for ubuntu from | Yuri Tkachenko | 2015-11-30 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/nodesource/distributions#debinstall | ||||
| * | | | | | | removed installation of Godep | Yuri Tkachenko | 2015-11-30 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #1532 need to be merged first |