Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1335 from mattermost/triple-dot-fix | Joram Wilander | 2015-11-06 | 1 | -1/+1 |
|\ | | | | | Fix user profile never updating properly | ||||
| * | Fix user profile never updating properly | JoramWilander | 2015-11-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1318 from mattermost/plt-1025 | Christopher Speller | 2015-11-06 | 2 | -16/+44 |
|\ \ | | | | | | | PLT-1025 Make dots in tutorial intro clickable and always at the same spot | ||||
| * | | Use state for current screen in turotial intro | JoramWilander | 2015-11-05 | 1 | -5/+5 |
| | | | |||||
| * | | Make dots in tutorial intro clickable and always at the same spot | JoramWilander | 2015-11-05 | 2 | -16/+44 |
| | | | |||||
* | | | Merge pull request #1328 from mattermost/PLT-1016 | Christopher Speller | 2015-11-06 | 3 | -9/+38 |
|\ \ \ | | | | | | | | | PLT-1016 force logout on other browsers | ||||
| * | | | Fixing issue with safari private mode | =Corey Hulen | 2015-11-05 | 1 | -1/+5 |
| | | | | |||||
| * | | | PLT-1016 force logout on other browsers | =Corey Hulen | 2015-11-05 | 3 | -8/+33 |
| | | | | |||||
* | | | | Merge pull request #1332 from mattermost/plt-560 | Christopher Speller | 2015-11-06 | 1 | -35/+55 |
|\ \ \ \ | | | | | | | | | | | PLT-560 Prevent SSO users from changing their email | ||||
| * | | | | Prevent SSO users from changing their email | JoramWilander | 2015-11-06 | 1 | -35/+55 |
| | | | | | |||||
* | | | | | GIT-888 improving perf | =Corey Hulen | 2015-11-06 | 1 | -0/+9 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #1327 from florianorben/PLT-857-2 | Joram Wilander | 2015-11-06 | 7 | -1/+479 |
|\ \ \ \ | |/ / / |/| | | | PLT-857: Support `attachments` for Incoming Webhooks | ||||
| * | | | fix alter table command for postgres | Florian Orben | 2015-11-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | remove two unused assignments | Florian Orben | 2015-11-05 | 2 | -2/+0 |
| | | | | |||||
| * | | | PLT-857: Support for Incoming Webhooks - Try #2 | Florian Orben | 2015-11-05 | 4 | -12/+74 |
| | | | | |||||
| * | | | collapse text after 700 chars or 5 line breaks | Florian Orben | 2015-11-05 | 2 | -2/+60 |
| | | | | |||||
| * | | | attachments frontend | Florian Orben | 2015-11-05 | 7 | -0/+359 |
| | | | | |||||
* | | | | Merge pull request #1321 from hmhealey/plt911 | Joram Wilander | 2015-11-06 | 3 | -50/+125 |
|\ \ \ \ | | | | | | | | | | | PLT-911 Search autocomplete improvements | ||||
| * | | | | Moved public and private channels into separate sections in the search ↵ | hmhealey | 2015-11-05 | 3 | -36/+74 |
| | | | | | | | | | | | | | | | | | | | | autocomplete | ||||
| * | | | | Fixed search autocomplete click handling | hmhealey | 2015-11-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Changed search autocomplete to scroll when making a selection using the keyboard | hmhealey | 2015-11-05 | 1 | -13/+50 |
| | |_|/ | |/| | | |||||
* | | | | 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 |
| | |_|/ | |/| | | |||||
* / | | | 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 |
| | | | | |||||
* | | | | PLT-480: Use `Utils.displayUsername` for username renderings. (fixes #874) | Martin Fischer | 2015-11-05 | 1 | -1/+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 |
| | | | |||||
* | | | 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 |
| |/ |/| | |||||
* | | Fix abd user reference in head.html | JoramWilander | 2015-11-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1308 from asaadmahmoodspin/plt-960 | Christopher Speller | 2015-11-05 | 13 | -112/+108 |
|\ \ | | | | | | | Plt 960 - Moving code themes into custom themes | ||||
| * | | Updating UI for access history and access log modals | Asaad Mahmood | 2015-11-05 | 3 | -7/+3 |
| | | |