summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* 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 invi...JoramWilander2015-11-114-18/+23
| * 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
|\ \
| * | Fix profile loading in RHS on refreshJoramWilander2015-11-122-1/+5
* | | Merge pull request #1409 from mattermost/plt-961Corey Hulen2015-11-1228-47/+138
|\ \ \
| * | | Rename areStatesEqual to areObjectsEqual and make it more comprehensive and a...JoramWilander2015-11-1228-47/+138
| |/ /
* | | Merge pull request #1407 from mattermost/plt-1041Corey Hulen2015-11-121-3/+5
|\ \ \
| * | | Fix multiple pending/errored postsJoramWilander2015-11-121-3/+5
| |/ /
* | | Merge pull request #1411 from hmhealey/plt876Christopher Speller2015-11-121-0/+2
|\ \ \
| * | | 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
|\ \ \
| * | | Added ChannelExtra.MemberCount field to reflect the actual member count when ...hmhealey2015-11-122-3/+7
| |/ /
* | | Merge pull request #1408 from hmhealey/plt922Christopher Speller2015-11-121-15/+29
|\ \ \
| * | | Added feedback to the Invite Members modal to indicate that emails are curren...hmhealey2015-11-121-15/+29
| |/ /
* | | 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
|\ \
| * | move provider.json to components folder; fix indentation; add json files to e...Florian Orben2015-11-104-325/+326
| * | 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
|\ \ \ | |/ / |/| |
| * | 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
|/ /
* | Merge pull request #1365 from hmhealey/eslintbabelChristopher Speller2015-11-102-1/+3
|\ \
| * | 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 placeholdersJeroen Hoek2015-11-102-9/+9
* | | | Add skip tutorial button to intro screensJoramWilander2015-11-092-1/+18
|/ / /
* | | Merge pull request #1350 from rgarmsen2295/plt-597Christopher Speller2015-11-091-1/+1
|\ \ \ | |_|/ |/| |
| * | 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 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 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
* Merge pull request #1345 from hmhealey/plt983Harrison Healey2015-11-061-1/+1
|\
| * Changed markdown text regex to not capture the final underscore on a word to ...hmhealey2015-11-061-1/+1
| * 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
|\ \