summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOG.mdit332015-11-111-9/+29
|
* Merge pull request #1399 from mattermost/plt-1104Christopher Speller2015-11-114-17/+20
|\ | | | | Fix channel invite button on channel intro message and fix empty channel invite modal.
| * 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.
* Merge pull request #1386 from hmhealey/plt1097Christopher Speller2015-11-101-1/+3
|\ | | | | PLT-1097 Added text to the edit channel purpose menu option on mobile
| * Added text to the edit channel purpose menu option on mobilehmhealey2015-11-101-1/+3
|/
* Merge pull request #1372 from hmhealey/plt1085Christopher Speller2015-11-101-1/+22
|\ | | | | PLT-1085 Updated post components to re-render when stored users change
| * Updated post components to re-render after first receiving user profileshmhealey2015-11-091-1/+22
|/
* Updating version to v1.2.0Christopher Speller2015-11-091-0/+1
|
* Updating dockerfile for release v1.2.0-rc1Christopher Speller2015-11-098-6/+35
|
* 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
| |
* | Merge pull request #1364 from mattermost/newline-hookJoram Wilander2015-11-091-0/+1
|\ \ | | | | | | Add new line break
| * | Add new line breakJoramWilander2015-11-091-0/+1
|/ /
* | Merge pull request #1362 from lindy65/patch-7Joram Wilander2015-11-091-2/+2
|\ \ | |/ |/| Update documentation-guidelines.md
| * Update documentation-guidelines.mdlindy652015-11-091-2/+2
|/ | | Corrected typos on lines 52 and 61
* Merge pull request #1361 from lindy65/patch-6Joram Wilander2015-11-091-1/+1
|\ | | | | Update release-process.md
| * Update release-process.mdlindy652015-11-091-1/+1
| | | | | | Fixed type on line 46
* | Merge pull request #1360 from lindy65/patch-5Joram Wilander2015-11-091-1/+1
|\ \ | |/ |/| Update release-process.md
| * Update release-process.mdlindy652015-11-091-1/+1
|/ | | Corrected typo on line 51
* Update Troubleshooting.mdit332015-11-081-1/+3
|
* Update Troubleshooting.mdit332015-11-081-0/+4
|
* Merge pull request #1354 from Tsynapse/patch-4it332015-11-071-1/+1
|\ | | | | Grammar Correction
| * Grammar CorrectionJason2015-11-071-1/+1
|/ | | Removed the 's' from settings @line 35
* Update Requirements.mdit332015-11-071-1/+1
|
* Merge pull request #1348 from mattermost/lfbrock-patch-2Corey Hulen2015-11-061-0/+49
|\ | | | | Update NOTICE.txt
| * Update NOTICE.txtlfbrock2015-11-061-0/+49
| |
* | Merge pull request #1347 from mattermost/plt-1062Corey Hulen2015-11-061-0/+7
|\ \ | | | | | | PLT-1062 Fix jumping when messages received in another channel.
| * | 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 #1344 from mattermost/tutorial-fixJoram Wilander2015-11-063-8/+8
|\ \ \ | |/ / |/| | Add tutorial pref for new users by default
| * | Simplified unit testJoramWilander2015-11-061-6/+0
| | |
| * | Fix unit testJoramWilander2015-11-061-2/+2
| | |
| * | Add tutorial pref for new users by defaultJoramWilander2015-11-062-0/+6
| | |
* | | 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