Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1325 from hmhealey/plt618 | Joram Wilander | 2015-11-06 | 2 | -52/+350 |
|\ | | | | | PLT-618 Ignore formatting markdown lists containing only one element | ||||
| * | Changed markdown lexer to ignore lists containing only one item | hmhealey | 2015-11-05 | 1 | -50/+54 |
| | | |||||
| * | Cleaned up Markedown Lexer for eslint | hmhealey | 2015-11-05 | 1 | -62/+56 |
| | | |||||
| * | Copied part of the marked lexer into markdown.jsx | hmhealey | 2015-11-05 | 1 | -1/+298 |
| | | |||||
| * | Moved highlighting code out of markdown.jsx | hmhealey | 2015-11-05 | 2 | -51/+54 |
| | | |||||
* | | Merge pull request #1329 from florianorben/no_panic_on_webhook_err | Joram Wilander | 2015-11-06 | 1 | -0/+5 |
|\ \ | | | | | | | don't panic if incoming webhook contains invalid json | ||||
| * | | don't panic if incoming webhook contains invalid json | Florian Orben | 2015-11-06 | 1 | -0/+5 |
| | | | |||||
* | | | Rename tests-emoticons.md to test-emoticons.md | it33 | 2015-11-05 | 1 | -0/+0 |
| | | | |||||
* | | | Create tests-emoticons.md | it33 | 2015-11-05 | 1 | -0/+930 |
| | | | |||||
* | | | Merge pull request #1330 from mattermost/revert-1324-PLT-480 | Corey Hulen | 2015-11-05 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Revert 59581c38506acf267854f33af3c1d25e876dbb69 | ||||
| * | | Revert 59581c38506acf267854f33af3c1d25e876dbb69 | Corey Hulen | 2015-11-05 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1320 from mattermost/PLT-1040 | Harrison Healey | 2015-11-05 | 2 | -1/+1 |
|\ \ | | | | | | | PLT-1040 changing ding | ||||
| * | | Switching to mp3 | =Corey Hulen | 2015-11-05 | 3 | -1/+1 |
| | | | |||||
| * | | PLT-1040 changing ding | =Corey Hulen | 2015-11-05 | 2 | -1/+1 |
| | | | |||||
* | | | Update Release-Numbering.md | it33 | 2015-11-05 | 1 | -1/+7 |
| | | | |||||
* | | | Merge pull request #1324 from gabel/PLT-480 | Joram Wilander | 2015-11-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | PLT-480 Use `Utils.displayUsername` for username renderings | ||||
| * | | | PLT-480: Use `Utils.displayUsername` for username renderings. (fixes #874) | Martin Fischer | 2015-11-05 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1302 from mattermost/it33-patch-1 | Corey Hulen | 2015-11-05 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Noting random build failures | ||||
| * | | Update CONTRIBUTING.md | it33 | 2015-11-05 | 1 | -1/+2 |
| | | | |||||
| * | | Update CONTRIBUTING.md | it33 | 2015-11-04 | 1 | -1/+1 |
| | | | |||||
| * | | Noting random build failures | it33 | 2015-11-04 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1319 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-05 | 3 | -21/+29 |
|\ \ \ | |_|/ |/| | | UI Improvements for Slack and post dropdown | ||||
| * | | UI Improvements for Slack and post dropdown | Asaad Mahmood | 2015-11-05 | 3 | -21/+29 |
| | | | |||||
* | | | Merge pull request #1317 from hmhealey/scroll | Corey Hulen | 2015-11-05 | 2 | -4/+7 |
|\ \ \ | | | | | | | | | Re-added changes made in ac052fb9 to perfect scrollbar | ||||
| * | | | Re-added changes made in ac052fb9 to perfect scrollbar | hmhealey | 2015-11-05 | 2 | -4/+7 |
| | | | | |||||
* | | | | Merge pull request #1315 from mattermost/plt-996 | Corey Hulen | 2015-11-05 | 4 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | PLT-996 Prevent tutorial showing up a second before post list loads | ||||
| * | | | | Update tutorial to not show by default | JoramWilander | 2015-11-05 | 4 | -6/+6 |
| | | | | | |||||
* | | | | | Merge pull request #1314 from mattermost/plt-829 | Corey Hulen | 2015-11-05 | 1 | -1/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-829 Only allow one ding every 3s | ||||
| * | | | | Only allow one ding every 3s | JoramWilander | 2015-11-05 | 1 | -1/+5 |
| |/ / / | |||||
* | | | | Merge pull request #1316 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-11-05 | 7 | -96/+134 |
|\ \ \ \ | |_|/ / |/| | | | Modal improvements for members | ||||
| * | | | Modal improvements for members | Asaad Mahmood | 2015-11-05 | 7 | -96/+134 |
| | | | | |||||
* | | | | Merge pull request #1313 from mattermost/plt-992 | Joram Wilander | 2015-11-05 | 8 | -11/+14 |
|\ \ \ \ | |_|/ / |/| | | | PLT-992 / PLT-984 Fixed center channel height magic. Fixes tutorial. | ||||
| * | | | Fixed center channel height magic. Fixes tutorial | Christopher Speller | 2015-11-05 | 8 | -11/+14 |
| | | | | |||||
* | | | | Merge pull request #1310 from mattermost/plt-697 | Christopher Speller | 2015-11-05 | 3 | -7/+12 |
|\ \ \ \ | | | | | | | | | | | PLT-697 Don't send welcome emails for users signing up from an email invite and update email content | ||||
| * | | | | Update email css | JoramWilander | 2015-11-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Don't send welcome emails for users signing up from an email invite, update ↵ | JoramWilander | 2015-11-05 | 3 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | email content | ||||
* | | | | | Merge pull request #1311 from mattermost/plt-981 | Christopher Speller | 2015-11-05 | 2 | -1/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-981 Only show * in tab title when a channel is marked unread | ||||
| * | | | | Add constant form 'mention' | JoramWilander | 2015-11-05 | 2 | -1/+5 |
| | | | | | |||||
| * | | | | Only show * in tab title when a channel is marked unread | JoramWilander | 2015-11-05 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #1301 from mishimi/patch-9 | Corey Hulen | 2015-11-05 | 1 | -5/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Added documentation on search modifiers and two character search limi… | ||||
| * | | | | | Update Search.md | mishimi | 2015-11-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update Search.md | mishimi | 2015-11-04 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Update Search.md | mishimi | 2015-11-04 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Update Search.md | mishimi | 2015-11-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Made updates more concise | mishimi | 2015-11-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Added documentation on search modifiers and two character search limitations | mishimi | 2015-11-04 | 1 | -2/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1312 from hmhealey/plt592 | Joram Wilander | 2015-11-05 | 6 | -12/+18 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-592 Correctly measure the length of unicode strings | ||||
| * | | | | Fixed string length checks for fields that can contain unicode characters | hmhealey | 2015-11-05 | 6 | -12/+18 |
|/ / / / | |||||
* | | | | Merge pull request #1309 from mattermost/analytics-fix | Harrison Healey | 2015-11-05 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix user reference in head.html | ||||
| * | | | Fix abd user reference in head.html | JoramWilander | 2015-11-05 | 1 | -1/+1 |
|/ / / |