summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
|\ \
| * | Removed required whitespace from before @mentionshmhealey2015-11-061-4/+4
| |/
* | Merge pull request #1341 from hmhealey/plt911Joram Wilander2015-11-061-1/+10
|\ \
| * | 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
|\ \
| * | Fixing broken markdown images taking up too much space. Fixed unnessisary exp...Christopher Speller2015-11-062-5/+8
| |/
* | Merge pull request #1339 from mattermost/loading-forever-fixJoram Wilander2015-11-061-5/+0
|\ \
| * | 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 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 properlyJoramWilander2015-11-061-1/+1
* | Merge pull request #1318 from mattermost/plt-1025Christopher Speller2015-11-062-16/+44
|\ \
| * | 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
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \
| * | | | Moved public and private channels into separate sections in the search autoco...hmhealey2015-11-053-36/+74
| * | | | 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
|\ \ \ \
| * | | | Changed markdown lexer to ignore lists containing only one itemhmhealey2015-11-051-50/+54