summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #1417 from florianorben/PLT-1141Christopher Speller2015-11-131-0/+1
|\ \ \ | | | | | | | | PLT-1141: Page previews can overflow their boundaries
| * | | PLT-1141: Page previews can overflow their boundariesFlorian Orben2015-11-121-0/+1
| | | |
* | | | Fixing bad mergeChristopher Speller2015-11-121-1/+1
| | | |
* | | | Merge branch 'release-1.2'Christopher Speller2015-11-128-22/+48
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Adding safari 8 to list of unsupported browsers.Christopher Speller2015-11-121-2/+2
| | |
| * | Make import/export theme input box editableJoramWilander2015-11-121-1/+0
| | |
| * | Remove unneed roleJoramWilander2015-11-111-2/+0
| | |
| * | Remove unneed argumentJoramWilander2015-11-111-1/+1
| | |
| * | Fix channel invite button on channel intro message and fix empty channel ↵JoramWilander2015-11-114-18/+23
| | | | | | | | | | | | invite modal.
| * | Added text to the edit channel purpose menu option on mobilehmhealey2015-11-101-1/+3
| | |
| * | Updated post components to re-render after first receiving user profileshmhealey2015-11-091-1/+22
| | |
* | | Merge pull request #1412 from mattermost/plt-1089Corey Hulen2015-11-122-1/+5
|\ \ \ | | | | | | | | PLT-1089 Fix profile not loading in RHS on refresh
| * | | Fix profile loading in RHS on refreshJoramWilander2015-11-122-1/+5
| | |/ | |/|
* | | Merge pull request #1409 from mattermost/plt-961Corey Hulen2015-11-1228-47/+138
|\ \ \ | | | | | | | | PLT-961 Rename areStatesEqual to areObjectsEqual and make it more comprehensive and accurate.
| * | | Rename areStatesEqual to areObjectsEqual and make it more comprehensive and ↵JoramWilander2015-11-1228-47/+138
| |/ / | | | | | | | | | accurate.
* | | Merge pull request #1407 from mattermost/plt-1041Corey Hulen2015-11-121-3/+5
|\ \ \ | | | | | | | | PLT-1041 Fix multiple pending/errored posts
| * | | Fix multiple pending/errored postsJoramWilander2015-11-121-3/+5
| |/ /
* | | Merge pull request #1411 from hmhealey/plt876Christopher Speller2015-11-121-0/+2
|\ \ \ | | | | | | | | PLT-876 Sorted channel list before rendering them in the sidebar
| * | | Sorted channel list before rendering them in the sidebarhmhealey2015-11-121-0/+2
| |/ /
* | | Merge pull request #1410 from hmhealey/plt906Christopher Speller2015-11-122-3/+7
|\ \ \ | | | | | | | | PLT-906 Added ChannelExtra.MemberCount field
| * | | Added ChannelExtra.MemberCount field to reflect the actual member count when ↵hmhealey2015-11-122-3/+7
| |/ / | | | | | | | | | we truncate the list of members to 20
* | | Merge pull request #1408 from hmhealey/plt922Christopher Speller2015-11-121-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 ↵hmhealey2015-11-121-15/+29
| |/ / | | | | | | | | | currently being sent
* | | Updating profile image and textbox resizingAsaad Mahmood2015-11-122-3/+6
| | |
* | | Fixing preview stuff for the RHSAsaad Mahmood2015-11-122-5/+15
| | |
* | | UI Improvements for centre channel due to previewAsaad Mahmood2015-11-125-24/+33
|/ /
* | Merge pull request #1352 from florianorben/PLT-1049Joram Wilander2015-11-115-20/+479
|\ \ | | | | | | PLT-1049: Vine URLs should not generate preview links
| * | move provider.json to components folder; fix indentation; add json files to ↵Florian Orben2015-11-104-325/+326
| | | | | | | | | | | | eslintignore
| * | PLT-1049: Vine URLs should not generate preview linksFlorian Orben2015-11-104-20/+478
| | |
* | | Merge pull request #1389 from florianorben/preview-markdownChristopher Speller2015-11-113-6/+54
|\ \ \ | |/ / |/| | Preview markdown post
| * | add button to preview your current postFlorian Orben2015-11-103-6/+54
| | |
* | | fix indentation to use tabsFlorian Orben2015-11-102-80/+80
| | |
* | | Add latex supportFlorian Orben2015-11-1086-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/eslintbabelChristopher Speller2015-11-102-1/+3
|\ \ | | | | | | Switched eslint to use babel-eslint parser
| * | Switched eslint to use babel-eslint parserhmhealey2015-11-092-1/+3
| | |
* | | Merge pull request #1377 from jdhoek/bug/spellingJoram Wilander2015-11-102-9/+9
|\ \ \ | | | | | | | | Spelling: replace 'Ex' with 'E.g.' in placeholders
| * | | Spelling: replace 'Ex' with 'E.g.' in placeholdersJeroen Hoek2015-11-102-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 screensJoramWilander2015-11-092-1/+18
|/ / /
* | | Merge pull request #1350 from rgarmsen2295/plt-597Christopher Speller2015-11-091-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 screenReed Garmsen2015-11-061-1/+1
| |/
* | Merge pull request #1367 from asaadmahmoodspin/ui-improvementsChristopher Speller2015-11-096-6/+14
|\ \ | | | | | | Updating tutorial tip and adding div tags to webhook labels.
| * | Updating variable tipColorAsaad Mahmood2015-11-091-1/+1
| | |
| * | Updating tutorial tipAsaad Mahmood2015-11-096-6/+14
| | |
* | | Merge pull request #1366 from mattermost/jump-to-newChristopher Speller2015-11-092-1/+14
|\ \ \ | |/ / |/| | Jumps up to new messages indicator when new messages present
| * | Jumps up to new messages indicator when new messages presentChristopher Speller2015-11-092-1/+14
| |/
* / Add new line breakJoramWilander2015-11-091-0/+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