summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1621 from mattermost/plt-1331Harrison Healey2015-12-071-1/+2
|\ | | | | PLT-1331 Fix possible race condition when creating new channels
| * Fix possible race condition on when creating new channelsJoramWilander2015-12-041-1/+2
| |
* | Merge pull request #1629 from mattermost/PLT-1369Christopher Speller2015-12-071-1/+2
|\ \ | | | | | | PLT-1369 send core message
| * | Fixing message=Corey Hulen2015-12-041-23/+1
| | |
| * | PLT-1369 send core message=Corey Hulen2015-12-041-1/+24
| | |
* | | Merge pull request #1616 from florianorben/PLT-1380Christopher Speller2015-12-073-3/+36
|\ \ \ | | | | | | | | PLT-1380: Post system message when user updates channel header
| * | | PLT-1380: Post system message when user updates channel headerFlorian Orben2015-12-043-3/+36
| | | |
* | | | Rename Command-Line_Tools.md to Command-Line-Tools.mdit332015-12-041-0/+0
| | | |
* | | | Merge pull request #1626 from mattermost/PLT-1355Corey Hulen2015-12-043-7/+14
|\ \ \ \ | | | | | | | | | | PLT-1355 Move link preview into pre-release feature
| * | | | PLT-1355 Move link preview into pre-release feature=Corey Hulen2015-12-043-7/+14
| | | | |
* | | | | Merge pull request #1633 from mattermost/mattermost.go-helpCorey Hulen2015-12-042-13/+95
|\ \ \ \ \ | | | | | | | | | | | | Updating mattermost.go help
| * | | | | Update Command-Line_Tools.mdit332015-12-041-1/+1
| | | | | |
| * | | | | Create Command-Line_Tools.mdit332015-12-041-0/+81
| | | | | |
| * | | | | Updating mattermost.go helpit332015-12-041-13/+14
|/ / / / /
* | | | | Merge pull request #1630 from florianorben/autocomplete-on-tabCorey Hulen2015-12-042-2/+3
|\ \ \ \ \ | | | | | | | | | | | | autocomplete component should enter suggestions on 'tab'
| * | | | | autocomplete component should enter suggestions on 'tab'Florian Orben2015-12-042-2/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #1631 from esethna/patch-38Corey Hulen2015-12-041-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Update test-links.md
| * | | | | Update test-links.mdEric Sethna2015-12-041-0/+2
| |/ / / / | | | | | | | | | | URLs can't contain angled brackets
* | | | | Merge pull request #1623 from mattermost/fixed-height-embedsCorey Hulen2015-12-046-80/+153
|\ \ \ \ \ | | |/ / / | |/| | | Fix embeds and add default fixed height
| * | | | Fix embeds and add default fixed heightJoramWilander2015-12-046-80/+153
| | |_|/ | |/| |
* | | | Merge pull request #1571 from mattermost/PLT-1310Corey Hulen2015-12-042-30/+53
|\ \ \ \ | |_|/ / |/| | | PLT-1310 moving permalink to dropdown
| * | | re-org'ing list=Corey Hulen2015-12-011-31/+31
| | | |
| * | | Fixing typo=Corey Hulen2015-12-011-1/+1
| | | |
| * | | PLT-1310 moving permalink to dropdown=Corey Hulen2015-12-012-14/+37
| | | |
* | | | Merge pull request #1613 from florianorben/PLT-1326Corey Hulen2015-12-0414-13/+93
|\ \ \ \ | | |_|/ | |/| | PLT-1326: Enable channel posts of type join or leave not trigger unread notifications
| * | | PLT-1326: Enable channel posts of type join or leave not trigger unread ↵Florian Orben2015-12-0414-13/+93
| | | | | | | | | | | | | | | | notifications
* | | | Merge pull request #1617 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-0417-32/+55
|\ \ \ \ | |_|_|/ |/| | | Multiple UI Improvements
| * | | Updating UI for suggestions listAsaad Mahmood2015-12-042-15/+21
| | | |
| * | | Multiple UI ImprovementsAsaad Mahmood2015-12-0417-39/+56
|/ / /
* | | Merge pull request #1612 from mattermost/fix-build-updateChristopher Speller2015-12-042-4/+8
|\ \ \ | | | | | | | | Fixing mattermost to refresh the page when a new version is detected
| * | | Fixing detect build=Corey Hulen2015-12-031-1/+0
| | | |
| * | | Fixing detect build=Corey Hulen2015-12-031-3/+8
| | | |
| * | | Fixing mattermost to refresh the page when a new version is detected=Corey Hulen2015-12-031-1/+1
| |/ /
* | | Merge pull request #1611 from mattermost/PLT-1301Christopher Speller2015-12-041-0/+9
|\ \ \ | | | | | | | | PLT-1310 fixing regression caused by fix for PLT-1310
| * | | PLT-1310 fixing regression caused by this bug=Corey Hulen2015-12-031-0/+9
| |/ /
* | | Merge pull request #1609 from hmhealey/gitignoreChristopher Speller2015-12-041-1/+6
|\ \ \ | | | | | | | | Updated vim files in .gitignore
| * | | Updated vim files in .gitignorehmhealey2015-12-031-1/+6
| | | |
* | | | Merge pull request #1603 from mattermost/plt-1192Christopher Speller2015-12-041-4/+15
|\ \ \ \ | | | | | | | | | | PLT-1192 Convert links in Slack attachment text to Markdown format
| * | | | Remove <> link replacementJoramWilander2015-12-041-4/+0
| | | | |
| * | | | Convert links in Slack attachment text to Markdown formatJoramWilander2015-12-031-1/+16
| | | | |
* | | | | Merge pull request #1600 from hmhealey/plt1152Joram Wilander2015-12-048-100/+53
|\ \ \ \ \ | | | | | | | | | | | | PLT-1152 Fix cross-contamination between invite member modals
| * | | | | Renamed channel_intro_mssages.jsx to channel_intro_messages.jsxhmhealey2015-12-032-1/+1
| | | | | |
| * | | | | Removed some internal state from ChannelMembersModal and ChannelInviteModalhmhealey2015-12-037-53/+23
| | | | | |
| * | | | | Switched ChannelInviteModal to use a ToggleModalButton wherever possiblehmhealey2015-12-036-47/+30
| | | | | |
* | | | | | Merge pull request #1604 from hmhealey/plt1285Joram Wilander2015-12-042-2/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-1285 Fixed IE11 tabs preventing themselves from logging out
| * | | | | | Fixed IE11 tabs preventing themselves from logging outhmhealey2015-12-032-2/+27
| |/ / / / /
* | | | | | Merge pull request #1605 from hmhealey/plt1370Joram Wilander2015-12-046-33/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-1370 Changed SuggestionBox to clear its suggestions on losing focus
| * | | | | | Changed SuggestionBox to clear its suggestions on losing focushmhealey2015-12-036-33/+19
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1614 from florianorben/reorder-display-settingsJoram Wilander2015-12-041-6/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reorder display settings; remove 'button thingy' in font options
| * | | | | | reorder display settings; remove 'button thingy' in font optionsFlorian Orben2015-12-041-6/+3
| | |_|_|/ / | |/| | | |