Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1407 from mattermost/plt-1041 | Corey Hulen | 2015-11-12 | 1 | -3/+5 | |
|\ \ \ | | | | | | | | | PLT-1041 Fix multiple pending/errored posts | |||||
| * | | | Fix multiple pending/errored posts | JoramWilander | 2015-11-12 | 1 | -3/+5 | |
| |/ / | ||||||
* | | | Merge pull request #1411 from hmhealey/plt876 | Christopher Speller | 2015-11-12 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | PLT-876 Sorted channel list before rendering them in the sidebar | |||||
| * | | | Sorted channel list before rendering them in the sidebar | hmhealey | 2015-11-12 | 1 | -0/+2 | |
| |/ / | ||||||
* | | | Merge pull request #1410 from hmhealey/plt906 | Christopher Speller | 2015-11-12 | 2 | -3/+7 | |
|\ \ \ | | | | | | | | | PLT-906 Added ChannelExtra.MemberCount field | |||||
| * | | | Added ChannelExtra.MemberCount field to reflect the actual member count when ↵ | hmhealey | 2015-11-12 | 2 | -3/+7 | |
| |/ / | | | | | | | | | | we truncate the list of members to 20 | |||||
* | | | Merge pull request #1408 from hmhealey/plt922 | Christopher Speller | 2015-11-12 | 1 | -15/+29 | |
|\ \ \ | | | | | | | | | PLT-922 Added feedback to the Invite Members modal to indicate that emails are currently being sent | |||||
| * | | | Added feedback to the Invite Members modal to indicate that emails are ↵ | hmhealey | 2015-11-12 | 1 | -15/+29 | |
| |/ / | | | | | | | | | | currently being sent | |||||
* | | | Updating profile image and textbox resizing | Asaad Mahmood | 2015-11-12 | 2 | -3/+6 | |
| | | | ||||||
* | | | Fixing preview stuff for the RHS | Asaad Mahmood | 2015-11-12 | 2 | -5/+15 | |
| | | | ||||||
* | | | UI Improvements for centre channel due to preview | Asaad Mahmood | 2015-11-12 | 5 | -24/+33 | |
|/ / | ||||||
* | | Merge pull request #1352 from florianorben/PLT-1049 | Joram Wilander | 2015-11-11 | 5 | -20/+479 | |
|\ \ | | | | | | | PLT-1049: Vine URLs should not generate preview links | |||||
| * | | move provider.json to components folder; fix indentation; add json files to ↵ | Florian Orben | 2015-11-10 | 4 | -325/+326 | |
| | | | | | | | | | | | | eslintignore | |||||
| * | | PLT-1049: Vine URLs should not generate preview links | Florian Orben | 2015-11-10 | 4 | -20/+478 | |
| | | | ||||||
* | | | Merge pull request #1389 from florianorben/preview-markdown | Christopher Speller | 2015-11-11 | 3 | -6/+54 | |
|\ \ \ | |/ / |/| | | Preview markdown post | |||||
| * | | add button to preview your current post | Florian Orben | 2015-11-10 | 3 | -6/+54 | |
| | | | ||||||
* | | | fix indentation to use tabs | Florian Orben | 2015-11-10 | 2 | -80/+80 | |
| | | | ||||||
* | | | Add latex support | Florian Orben | 2015-11-10 | 86 | -2/+24 | |
|/ / | | | | | | | | | | | Adds latex highlighting support via https://www.npmjs.com/package/katex as requested in https://mattermost.uservoice.com/forums/306457-general/suggestions/10160757-add-latex-support | |||||
* | | Merge pull request #1365 from hmhealey/eslintbabel | Christopher Speller | 2015-11-10 | 2 | -1/+3 | |
|\ \ | | | | | | | Switched eslint to use babel-eslint parser | |||||
| * | | Switched eslint to use babel-eslint parser | hmhealey | 2015-11-09 | 2 | -1/+3 | |
| | | | ||||||
* | | | Merge pull request #1377 from jdhoek/bug/spelling | Joram Wilander | 2015-11-10 | 2 | -9/+9 | |
|\ \ \ | | | | | | | | | Spelling: replace 'Ex' with 'E.g.' in placeholders | |||||
| * | | | Spelling: replace 'Ex' with 'E.g.' in placeholders | Jeroen Hoek | 2015-11-10 | 2 | -9/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When abbreviating "For example" in English, "e.g." is used. See also: https://english.stackexchange.com/questions/16197/whats-the-difference-between-e-g-and-ex | |||||
* | | | | Add skip tutorial button to intro screens | JoramWilander | 2015-11-09 | 2 | -1/+18 | |
|/ / / | ||||||
* | | | Merge pull request #1350 from rgarmsen2295/plt-597 | Christopher Speller | 2015-11-09 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | PLT-597 Moves the 'Email verified' toast to above the sign-in prompt on the login screen | |||||
| * | | Moved 'Email verified' toast to above the sign-in prompt on the login screen | Reed Garmsen | 2015-11-06 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge pull request #1367 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2015-11-09 | 6 | -6/+14 | |
|\ \ | | | | | | | Updating tutorial tip and adding div tags to webhook labels. | |||||
| * | | Updating variable tipColor | Asaad Mahmood | 2015-11-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Updating tutorial tip | Asaad Mahmood | 2015-11-09 | 6 | -6/+14 | |
| | | | ||||||
* | | | 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 | 2 | -5/+8 | |
|\ \ | | | | | | | Markdown image fixes. | |||||
| * | | Fixing broken markdown images taking up too much space. Fixed unnessisary ↵ | Christopher Speller | 2015-11-06 | 2 | -5/+8 | |
| |/ | | | | | | | 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 | 3 | -5/+32 | |
|\ \ \ | | | | | | | | | Updating UI for search autocomplete | |||||
| * | | | Updating UI for search autocomplete | Asaad Mahmood | 2015-11-06 | 3 | -5/+32 | |
| | |/ | |/| | ||||||
* / | | display slack attachments in RHS comment section | Florian Orben | 2015-11-06 | 2 | -1/+5 | |
|/ / | ||||||
* | | 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 |