Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Updating tutorial tip | Asaad Mahmood | 2015-11-09 | 3 | -4/+8 | |
| | | | ||||||
* | | | Merge pull request #1366 from mattermost/jump-to-new | Christopher Speller | 2015-11-09 | 2 | -1/+14 | |
|\ \ \ | |/ / |/| | | Jumps up to new messages indicator when new messages present | |||||
| * | | Jumps up to new messages indicator when new messages present | Christopher Speller | 2015-11-09 | 2 | -1/+14 | |
| |/ | ||||||
* / | Add new line break | JoramWilander | 2015-11-09 | 1 | -0/+1 | |
|/ | ||||||
* | Fixing jumping to bottom of channels when messages recieved in anouther channel | Christopher Speller | 2015-11-06 | 1 | -0/+2 | |
| | ||||||
* | Revert "Fixed loading forever on first page load" | Christopher Speller | 2015-11-06 | 1 | -0/+5 | |
| | | | | This reverts commit d020db39cb3c694332b58f030c4441a761b16d01. | |||||
* | Merge pull request #1345 from hmhealey/plt983 | Harrison Healey | 2015-11-06 | 1 | -1/+1 | |
|\ | | | | | PLT-983 Fix _emphasizing_ markdown text when it's not the start of the post | |||||
| * | Changed markdown text regex to not capture the final underscore on a word to ↵ | hmhealey | 2015-11-06 | 1 | -1/+1 | |
| | | | | | | | | better match the original behaviour | |||||
| * | Changed markdown text regex to capture whitespace preceeding an underscore | hmhealey | 2015-11-06 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1342 from hmhealey/plt761 | Joram Wilander | 2015-11-06 | 1 | -4/+4 | |
|\ \ | | | | | | | PLT-761 Removed required whitespace from before @mentions | |||||
| * | | Removed required whitespace from before @mentions | hmhealey | 2015-11-06 | 1 | -4/+4 | |
| |/ | ||||||
* | | Merge pull request #1341 from hmhealey/plt911 | Joram Wilander | 2015-11-06 | 1 | -1/+10 | |
|\ \ | | | | | | | PLT-911 Fixed navigating search autocomplete with the keyboard | |||||
| * | | Sorted channel suggestions be type before sorting by name | hmhealey | 2015-11-06 | 1 | -1/+10 | |
| |/ | ||||||
* | | Merge pull request #1340 from mattermost/markdown-image-fixes | Joram Wilander | 2015-11-06 | 1 | -1/+1 | |
|\ \ | | | | | | | Markdown image fixes. | |||||
| * | | Fixing broken markdown images taking up too much space. Fixed unnessisary ↵ | Christopher Speller | 2015-11-06 | 1 | -1/+1 | |
| |/ | | | | | | | expantion of markdown images not in center channel. | |||||
* | | Merge pull request #1339 from mattermost/loading-forever-fix | Joram Wilander | 2015-11-06 | 1 | -5/+0 | |
|\ \ | | | | | | | Fixed loading forever on first page load | |||||
| * | | Fixed loading forever on first page load | Christopher Speller | 2015-11-06 | 1 | -5/+0 | |
| | | | ||||||
* | | | Merge pull request #1338 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-11-06 | 2 | -4/+5 | |
|\ \ \ | | | | | | | | | Updating UI for search autocomplete | |||||
| * | | | Updating UI for search autocomplete | Asaad Mahmood | 2015-11-06 | 2 | -4/+5 | |
| | |/ | |/| | ||||||
* / | | display slack attachments in RHS comment section | Florian Orben | 2015-11-06 | 1 | -0/+4 | |
|/ / | ||||||
* | | 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 | 1 | -15/+39 | |
|\ \ | | | | | | | 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 | 1 | -15/+39 | |
| | | | ||||||
* | | | Merge pull request #1328 from mattermost/PLT-1016 | Christopher Speller | 2015-11-06 | 2 | -9/+29 | |
|\ \ \ | | | | | | | | | 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 | 2 | -8/+24 | |
| | | | | ||||||
* | | | | 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 | 5 | -0/+390 | |
|\ \ \ \ | |/ / / |/| | | | PLT-857: Support `attachments` for Incoming Webhooks | |||||
| * | | | 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 | 2 | -11/+60 | |
| | | | | ||||||
| * | | | collapse text after 700 chars or 5 line breaks | Florian Orben | 2015-11-05 | 1 | -2/+57 | |
| | | | | ||||||
| * | | | attachments frontend | Florian Orben | 2015-11-05 | 6 | -0/+288 | |
| | | | | ||||||
* | | | | 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 | |
| | |_|/ | |/| | | ||||||
* | | | | Revert 59581c38506acf267854f33af3c1d25e876dbb69 | Corey Hulen | 2015-11-05 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #1320 from mattermost/PLT-1040 | Harrison Healey | 2015-11-05 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | PLT-1040 changing ding | |||||
| * | | | Switching to mp3 | =Corey Hulen | 2015-11-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | PLT-1040 changing ding | =Corey Hulen | 2015-11-05 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | PLT-480: Use `Utils.displayUsername` for username renderings. (fixes #874) | Martin Fischer | 2015-11-05 | 1 | -1/+1 | |
| |/ / |/| | |