summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Moved 'Email verified' toast to above the sign-in prompt on the login screenReed Garmsen2015-11-061-1/+1
|
* Fixing jumping to bottom of channels when messages recieved in anouther channelChristopher Speller2015-11-061-0/+2
|
* Revert "Fixed loading forever on first page load"Christopher Speller2015-11-061-0/+5
| | | | This reverts commit d020db39cb3c694332b58f030c4441a761b16d01.
* Merge pull request #1345 from hmhealey/plt983Harrison Healey2015-11-061-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 ↵hmhealey2015-11-061-1/+1
| | | | | | | | better match the original behaviour
| * Changed markdown text regex to capture whitespace preceeding an underscorehmhealey2015-11-061-1/+1
| |
* | Merge pull request #1342 from hmhealey/plt761Joram Wilander2015-11-061-4/+4
|\ \ | | | | | | PLT-761 Removed required whitespace from before @mentions
| * | Removed required whitespace from before @mentionshmhealey2015-11-061-4/+4
| |/
* | Merge pull request #1341 from hmhealey/plt911Joram Wilander2015-11-061-1/+10
|\ \ | | | | | | PLT-911 Fixed navigating search autocomplete with the keyboard
| * | Sorted channel suggestions be type before sorting by namehmhealey2015-11-061-1/+10
| |/
* | Merge pull request #1340 from mattermost/markdown-image-fixesJoram Wilander2015-11-062-5/+8
|\ \ | | | | | | Markdown image fixes.
| * | Fixing broken markdown images taking up too much space. Fixed unnessisary ↵Christopher Speller2015-11-062-5/+8
| |/ | | | | | | expantion of markdown images not in center channel.
* | Merge pull request #1339 from mattermost/loading-forever-fixJoram Wilander2015-11-061-5/+0
|\ \ | | | | | | Fixed loading forever on first page load
| * | Fixed loading forever on first page loadChristopher Speller2015-11-061-5/+0
| | |
* | | Merge pull request #1338 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-11-063-5/+32
|\ \ \ | | | | | | | | Updating UI for search autocomplete
| * | | Updating UI for search autocompleteAsaad Mahmood2015-11-063-5/+32
| | |/ | |/|
* / | display slack attachments in RHS comment sectionFlorian Orben2015-11-062-1/+5
|/ /
* | Merge pull request #1335 from mattermost/triple-dot-fixJoram Wilander2015-11-061-1/+1
|\ \ | |/ |/| Fix user profile never updating properly
| * Fix user profile never updating properlyJoramWilander2015-11-061-1/+1
| |
* | Merge pull request #1318 from mattermost/plt-1025Christopher Speller2015-11-062-16/+44
|\ \ | | | | | | PLT-1025 Make dots in tutorial intro clickable and always at the same spot
| * | Use state for current screen in turotial introJoramWilander2015-11-051-5/+5
| | |
| * | Make dots in tutorial intro clickable and always at the same spotJoramWilander2015-11-052-16/+44
| | |
* | | Merge pull request #1328 from mattermost/PLT-1016Christopher Speller2015-11-063-9/+38
|\ \ \ | | | | | | | | PLT-1016 force logout on other browsers
| * | | Fixing issue with safari private mode=Corey Hulen2015-11-051-1/+5
| | | |
| * | | PLT-1016 force logout on other browsers=Corey Hulen2015-11-053-8/+33
| | | |
* | | | Merge pull request #1332 from mattermost/plt-560Christopher Speller2015-11-061-35/+55
|\ \ \ \ | | | | | | | | | | PLT-560 Prevent SSO users from changing their email
| * | | | Prevent SSO users from changing their emailJoramWilander2015-11-061-35/+55
| | | | |
* | | | | GIT-888 improving perf=Corey Hulen2015-11-061-0/+9
| |_|_|/ |/| | |
* | | | Merge pull request #1327 from florianorben/PLT-857-2Joram Wilander2015-11-067-1/+479
|\ \ \ \ | |/ / / |/| | | PLT-857: Support `attachments` for Incoming Webhooks
| * | | fix alter table command for postgresFlorian Orben2015-11-061-0/+1
| | | |
| * | | remove two unused assignmentsFlorian Orben2015-11-052-2/+0
| | | |
| * | | PLT-857: Support for Incoming Webhooks - Try #2Florian Orben2015-11-054-12/+74
| | | |
| * | | collapse text after 700 chars or 5 line breaksFlorian Orben2015-11-052-2/+60
| | | |
| * | | attachments frontendFlorian Orben2015-11-057-0/+359
| | | |
* | | | Merge pull request #1321 from hmhealey/plt911Joram Wilander2015-11-063-50/+125
|\ \ \ \ | | | | | | | | | | PLT-911 Search autocomplete improvements
| * | | | Moved public and private channels into separate sections in the search ↵hmhealey2015-11-053-36/+74
| | | | | | | | | | | | | | | | | | | | autocomplete
| * | | | Fixed search autocomplete click handlinghmhealey2015-11-051-1/+1
| | | | |
| * | | | Changed search autocomplete to scroll when making a selection using the keyboardhmhealey2015-11-051-13/+50
| | |_|/ | |/| |
* | | | Merge pull request #1325 from hmhealey/plt618Joram Wilander2015-11-062-52/+350
|\ \ \ \ | | | | | | | | | | PLT-618 Ignore formatting markdown lists containing only one element
| * | | | Changed markdown lexer to ignore lists containing only one itemhmhealey2015-11-051-50/+54
| | | | |
| * | | | Cleaned up Markedown Lexer for eslinthmhealey2015-11-051-62/+56
| | | | |
| * | | | Copied part of the marked lexer into markdown.jsxhmhealey2015-11-051-1/+298
| | | | |
| * | | | Moved highlighting code out of markdown.jsxhmhealey2015-11-052-51/+54
| | |_|/ | |/| |
* | | | Merge pull request #1329 from florianorben/no_panic_on_webhook_errJoram Wilander2015-11-061-0/+5
|\ \ \ \ | | | | | | | | | | don't panic if incoming webhook contains invalid json
| * | | | don't panic if incoming webhook contains invalid jsonFlorian Orben2015-11-061-0/+5
| | |_|/ | |/| |
* / | | Revert 59581c38506acf267854f33af3c1d25e876dbb69Corey Hulen2015-11-051-1/+1
|/ / /
* | | Merge pull request #1320 from mattermost/PLT-1040Harrison Healey2015-11-052-1/+1
|\ \ \ | | | | | | | | PLT-1040 changing ding
| * | | Switching to mp3=Corey Hulen2015-11-053-1/+1
| | | |
| * | | PLT-1040 changing ding=Corey Hulen2015-11-052-1/+1
| | | |
* | | | PLT-480: Use `Utils.displayUsername` for username renderings. (fixes #874)Martin Fischer2015-11-051-1/+1
| |/ / |/| |