summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1694 from mattermost/revert-1625-ephemeral_messagesChristopher Speller2015-12-105-103/+48
|\ | | | | Revert "add helper method to add ephemeral messages; also switch 'delete mess…"
| * Revert "add helper method to add ephemeral messages; also switch 'delete ↵Christopher Speller2015-12-105-103/+48
|/ | | | mess…"
* Merge pull request #1680 from mattermost/lfbrock-patch-1it332015-12-091-59/+82
|\ | | | | Update release-process.md
| * Update release-process.mdlfbrock2015-12-091-59/+82
| |
* | Merge pull request #1625 from florianorben/ephemeral_messagesChristopher Speller2015-12-095-48/+103
|\ \ | | | | | | add helper method to add ephemeral messages; also switch 'delete mess…
| * | add helper method to add ephemeral messages; also switch 'delete message' to ↵Florian Orben2015-12-095-48/+103
|/ / | | | | | | this new method
* | Removing old 1.3 DB upgrade codeChristopher Speller2015-12-091-2/+0
| |
* | Fixing travis github deployChristopher Speller2015-12-091-0/+2
| |
* | Updating version to 1.3.0Christopher Speller2015-12-091-0/+1
| |
* | Updating dockerfile for release v1.3.0-rc1Christopher Speller2015-12-098-7/+32
|/
* Merge pull request #1679 from mattermost/lfbrock-patch-1Christopher Speller2015-12-092-4/+5
|\ | | | | Update config settings documentation
| * Update CHANGELOG.mdlfbrock2015-12-091-0/+1
| |
| * Update CHANGELOG.mdlfbrock2015-12-091-2/+2
| |
| * Update config settings documentationlfbrock2015-12-091-2/+2
|/
* Merge pull request #1678 from mattermost/plt-1402Corey Hulen2015-12-094-8/+15
|\ | | | | PLT-1402 Fix OEmbeds when switching channel, vine/soundcloud heights, and yout…
| * Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embedsJoramWilander2015-12-094-8/+15
| |
* | Merge pull request #1675 from mattermost/replica-fixChristopher Speller2015-12-092-3/+18
|\ \ | | | | | | PLT-1413 Split db channel get into two functions using master and replica
| * | Split db channel get into two functions using master and replicaJoramWilander2015-12-092-3/+18
| | |
* | | Merge pull request #1673 from mishimi/patch-14Corey Hulen2015-12-091-1/+2
|\ \ \ | | | | | | | | Update Search.md
| * | | Update Search.mdmishimi2015-12-091-1/+2
| | | | | | | | | | | | Added help for the jump link
* | | | Merge pull request #1658 from mattermost/plt-1371Corey Hulen2015-12-091-2/+2
|\ \ \ \ | | | | | | | | | | PLT-1371 Update incoming hook documentation to more clearly state the...
| * | | | Update incoming hook documentation to more clearly state the direct message ↵JoramWilander2015-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | functionality
* | | | | Merge pull request #1674 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-12-092-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | Ui improvements
| * | | | Improving pencil icon for manage membersAsaad Mahmood2015-12-091-1/+3
| | | | |
| * | | | Removing clearfix from modal bodyAsaad Mahmood2015-12-091-1/+0
| | | | |
* | | | | Merge pull request #1672 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-09146-324/+47799
|\| | | | | |_|/ / |/| | | Multiple UI Improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2015-12-09146-324/+47799
| | |/ | |/|
* | | Merge pull request #1670 from mattermost/plt-1407Corey Hulen2015-12-091-2/+9
|\ \ \ | |/ / |/| | PLT-1407 Delay center scroll when sidebar opens to be after animation
| * | Delay center scroll when sidebar opens to be after animationJoramWilander2015-12-091-2/+9
| | |
* | | Merge pull request #1671 from hmhealey/plt1430Christopher Speller2015-12-093-16/+2
|\ \ \ | | | | | | | | PLT-1430 Removed space bar from autocompletes
| * | | Removed space bar from autocompleteshmhealey2015-12-093-16/+2
| | | |
* | | | Merge pull request #1663 from mattermost/PLT-1418Joram Wilander2015-12-093-1/+53
|\ \ \ \ | | | | | | | | | | PLT-1418 Adding old style replying in RHS
| * \ \ \ Fixing merge=Corey Hulen2015-12-0818-41/+91
| |\ \ \ \
| * | | | | PLT-1418 Adding old style replying in RHS=Corey Hulen2015-12-083-2/+54
| | | | | |
* | | | | | Merge pull request #1667 from mattermost/fix-pushJoram Wilander2015-12-095-9/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixing push notifications
| * | | | | | fixing typo=Corey Hulen2015-12-091-1/+1
| | | | | | |
| * | | | | | Updating the push message=Corey Hulen2015-12-081-1/+5
| | | | | | |
| * | | | | | Fixing defaults=Corey Hulen2015-12-084-8/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1666 from hmhealey/plt1427Christopher Speller2015-12-091-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-1427 Updated browser requirements in documentation
| * | | | | | Updated browser requirements in documentationhmhealey2015-12-081-3/+3
| |/ / / / /
* | | | | | Merge pull request #1657 from mattermost/plt-1410Christopher Speller2015-12-091-6/+13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | PLT-1410 Fix email error not showing up on team signup page
| * | | | | Fix email error not showing up on team signup pageJoramWilander2015-12-081-6/+13
| | |_|_|/ | |/| | |
* | | | | Update Sign-in.mdit332015-12-091-5/+9
| | | | |
* | | | | Merge pull request #1665 from mattermost/lfbrock-patch-2it332015-12-093-7/+357
|\ \ \ \ \ | | | | | | | | | | | | Update markdown tests
| * | | | | Create test-syntax-highlighting.mdlfbrock2015-12-081-0/+231
| | | | | |
| * | | | | Create test-tables.mdlfbrock2015-12-081-0/+80
| | | | | |
| * | | | | Update markdown testslfbrock2015-12-081-7/+46
| | | | | |
* | | | | | Clarifying test processit332015-12-091-1/+1
| | | | | | | | | | | | | | | | | | This test process should only be used by core team, since it references Core team site,
* | | | | | Merge pull request #1668 from esethna/patch-40it332015-12-091-0/+144
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create test-attachments.md
| * | | | | | Create test-attachments.mdEric Sethna2015-12-081-0/+144
| | |_|/ / / | |/| | | |