summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1623 from mattermost/fixed-height-embedsCorey Hulen2015-12-046-80/+153
|\
| * Fix embeds and add default fixed heightJoramWilander2015-12-046-80/+153
* | Merge pull request #1571 from mattermost/PLT-1310Corey Hulen2015-12-042-30/+53
|\ \
| * | 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 notif...Florian Orben2015-12-0414-13/+93
* | | | Merge pull request #1617 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-0417-32/+55
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 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 this bug=Corey Hulen2015-12-031-0/+9
| |/ /
* | | Merge pull request #1609 from hmhealey/gitignoreChristopher Speller2015-12-041-1/+6
|\ \ \
| * | | Updated vim files in .gitignorehmhealey2015-12-031-1/+6
* | | | Merge pull request #1603 from mattermost/plt-1192Christopher Speller2015-12-041-4/+15
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | Fixed IE11 tabs preventing themselves from logging outhmhealey2015-12-032-2/+27
| |/ / / / /
* | | | | | Merge pull request #1605 from hmhealey/plt1370Joram Wilander2015-12-046-33/+19
|\ \ \ \ \ \
| * | | | | | 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 optionsFlorian Orben2015-12-041-6/+3
| | |_|_|/ / | |/| | | |
* | | | | | Escaped charactersit332015-12-031-5/+5
* | | | | | Install guidesit332015-12-031-1/+1
* | | | | | Updating GitHub issues processit332015-12-031-1/+1
* | | | | | MIT Licenseit332015-12-031-23/+11
|/ / / / /
* | | | | Merge pull request #1610 from esethna/patch-37Corey Hulen2015-12-031-1/+16
|\ \ \ \ \
| * | | | | Update test-markdown-lists.mdEric Sethna2015-12-031-1/+16
* | | | | | Merge pull request #1593 from npcode/sso-githubCorey Hulen2015-12-032-0/+24
|\ \ \ \ \ \
| * | | | | | Add unofficial guide for GitHub SSOYi EungJun2015-12-032-0/+24
* | | | | | | Merge pull request #1608 from hmhealey/safarifontsCorey Hulen2015-12-031-9/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Changed font changing code to use jquery to fix Safari weirdnesshmhealey2015-12-031-9/+13
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1606 from mattermost/lfbrock-patch-3it332015-12-031-4/+11
|\ \ \ \ \ \
| * | | | | | Update CONTRIBUTING.mdlfbrock2015-12-031-4/+11
* | | | | | | Update Troubleshooting.mdit332015-12-031-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1602 from mattermost/fix-build-numberJoram Wilander2015-12-031-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixing issue where build number isn't set causing caching issues=Corey Hulen2015-12-031-1/+1
* | | | | | Merge pull request #1598 from mattermost/plt-1079Harrison Healey2015-12-032-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add limit to Props size in Post tableJoramWilander2015-12-032-1/+5
* | | | | | Merge pull request #1599 from asaadmahmoodspin/ui-improvementsChristopher Speller2015-12-033-9/+37
|\ \ \ \ \ \