summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / / | |/| | |
* | | | | Merge pull request #1337 from florianorben/attachments_rhsJoram Wilander2015-11-062-1/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | display slack attachments in RHS comment sectionFlorian Orben2015-11-062-1/+5
| | |_|/ | |/| |
* | | | Merge pull request #1336 from mattermost/lfbrock-patch-1Christopher Speller2015-11-061-4/+24
|\ \ \ \ | |_|/ / |/| | |
| * | | Update CHANGELOG.mdlfbrock2015-11-061-4/+24
| |/ /
* | | Merge pull request #1326 from mattermost/it33-patch-2Joram Wilander2015-11-061-5/+24
|\ \ \ | |/ / |/| |
| * | Fixed ESLint errorit332015-11-061-1/+1
| * | Adding doc linksit332015-11-051-5/+24
* | | 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 #1334 from mattermost/plt-121Joram Wilander2015-11-064-7/+171
|\ \ \
| * | | Fixing searching for quotationsChristopher Speller2015-11-064-7/+171
* | | | 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-064-37/+66
|\ \ \ \ \ \
| * | | | | | Prevent SSO users from changing their emailJoramWilander2015-11-064-37/+66
* | | | | | | Merge pull request #1333 from mattermost/GIT-888Christopher Speller2015-11-061-0/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | GIT-888 improving perf=Corey Hulen2015-11-061-0/+9
|/ / / / / /
* | | | | | Merge pull request #1331 from Tsynapse/patch-2Joram Wilander2015-11-061-1/+1
|\ \ \ \ \ \
| * | | | | | Update to proxy_passJason2015-11-061-1/+1
* | | | | | | Merge pull request #1327 from florianorben/PLT-857-2Joram Wilander2015-11-0613-31/+585
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | remove max column size from 'props'Florian Orben2015-11-061-1/+1
| * | | | | | fix alter table command for postgresFlorian Orben2015-11-062-1/+8
| * | | | | | fix logging statement not to post nonsenseFlorian Orben2015-11-061-2/+2
| * | | | | | remove two unused assignmentsFlorian Orben2015-11-052-2/+0
| * | | | | | postgres needs another query to get table information...Florian Orben2015-11-052-17/+8
| * | | | | | PLT-857: Support for Incoming Webhooks - Try #2Florian Orben2015-11-0510-41/+182
| * | | | | | 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
|\ \ \ \ \ \ \