Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Fixed EditChannelHeaderModal's contents not always being updated when a ↵ | hmhealey | 2015-12-10 | 3 | -20/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change is made | |||||
* | | | | | | | | | Merge pull request #1648 from npcode/notification-email-local-timezone | Christopher Speller | 2015-12-10 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Use local timezone for notification email | |||||
| * | | | | | | | | Use local timezone for notification email | Yi EungJun | 2015-12-08 | 2 | -3/+3 | |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local timezone is better default than UTC because it is common that all users of a mattermost server live near the server. | |||||
* | | | | | | | | Merge pull request #1688 from mattermost/fix-salts | Christopher Speller | 2015-12-10 | 3 | -0/+38 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Generate salts when empty | |||||
| * | | | | | | | | Fixing unit test | =Corey Hulen | 2015-12-09 | 1 | -3/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Generate salts when empty | =Corey Hulen | 2015-12-09 | 3 | -0/+41 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #1694 from mattermost/revert-1625-ephemeral_messages | Christopher Speller | 2015-12-10 | 5 | -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 Speller | 2015-12-10 | 5 | -103/+48 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | mess…" | |||||
* | | | | | | | | Merge pull request #1680 from mattermost/lfbrock-patch-1 | it33 | 2015-12-09 | 1 | -59/+82 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update release-process.md | |||||
| * | | | | | | | | Update release-process.md | lfbrock | 2015-12-09 | 1 | -59/+82 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1625 from florianorben/ephemeral_messages | Christopher Speller | 2015-12-09 | 5 | -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 Orben | 2015-12-09 | 5 | -48/+103 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | this new method | |||||
* | | | | | | / | Removing old 1.3 DB upgrade code | Christopher Speller | 2015-12-09 | 1 | -2/+0 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Fixing travis github deploy | Christopher Speller | 2015-12-09 | 1 | -0/+2 | |
| | | | | | | | ||||||
* | | | | | | | Updating version to 1.3.0 | Christopher Speller | 2015-12-09 | 1 | -0/+1 | |
| | | | | | | | ||||||
* | | | | | | | Updating dockerfile for release v1.3.0-rc1 | Christopher Speller | 2015-12-09 | 8 | -7/+32 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #1679 from mattermost/lfbrock-patch-1 | Christopher Speller | 2015-12-09 | 2 | -4/+5 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update config settings documentation | |||||
| * | | | | | | Update CHANGELOG.md | lfbrock | 2015-12-09 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | Update CHANGELOG.md | lfbrock | 2015-12-09 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Update config settings documentation | lfbrock | 2015-12-09 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #1678 from mattermost/plt-1402 | Corey Hulen | 2015-12-09 | 4 | -8/+15 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | PLT-1402 Fix OEmbeds when switching channel, vine/soundcloud heights, and yout… | |||||
| * | | | | | Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embeds | JoramWilander | 2015-12-09 | 4 | -8/+15 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #1675 from mattermost/replica-fix | Christopher Speller | 2015-12-09 | 2 | -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 replica | JoramWilander | 2015-12-09 | 2 | -3/+18 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #1673 from mishimi/patch-14 | Corey Hulen | 2015-12-09 | 1 | -1/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update Search.md | |||||
| * | | | | | | Update Search.md | mishimi | 2015-12-09 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Added help for the jump link | |||||
* | | | | | | | Merge pull request #1658 from mattermost/plt-1371 | Corey Hulen | 2015-12-09 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-1371 Update incoming hook documentation to more clearly state the... | |||||
| * | | | | | | | Update incoming hook documentation to more clearly state the direct message ↵ | JoramWilander | 2015-12-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality | |||||
* | | | | | | | | Merge pull request #1674 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-12-09 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Ui improvements | |||||
| * | | | | | | | Improving pencil icon for manage members | Asaad Mahmood | 2015-12-09 | 1 | -1/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Removing clearfix from modal body | Asaad Mahmood | 2015-12-09 | 1 | -1/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1672 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-09 | 146 | -324/+47799 | |
|\| | | | | | | | |_|/ / / / / |/| | | | | | | Multiple UI Improvements | |||||
| * | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-09 | 146 | -324/+47799 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #1670 from mattermost/plt-1407 | Corey Hulen | 2015-12-09 | 1 | -2/+9 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | PLT-1407 Delay center scroll when sidebar opens to be after animation | |||||
| * | | | | | Delay center scroll when sidebar opens to be after animation | JoramWilander | 2015-12-09 | 1 | -2/+9 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #1671 from hmhealey/plt1430 | Christopher Speller | 2015-12-09 | 3 | -16/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-1430 Removed space bar from autocompletes | |||||
| * | | | | | | Removed space bar from autocompletes | hmhealey | 2015-12-09 | 3 | -16/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1663 from mattermost/PLT-1418 | Joram Wilander | 2015-12-09 | 3 | -1/+53 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-1418 Adding old style replying in RHS | |||||
| * \ \ \ \ \ \ | Fixing merge | =Corey Hulen | 2015-12-08 | 18 | -41/+91 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | PLT-1418 Adding old style replying in RHS | =Corey Hulen | 2015-12-08 | 3 | -2/+54 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1667 from mattermost/fix-push | Joram Wilander | 2015-12-09 | 5 | -9/+13 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixing push notifications | |||||
| * | | | | | | | | | fixing typo | =Corey Hulen | 2015-12-09 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Updating the push message | =Corey Hulen | 2015-12-08 | 1 | -1/+5 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fixing defaults | =Corey Hulen | 2015-12-08 | 4 | -8/+8 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1666 from hmhealey/plt1427 | Christopher Speller | 2015-12-09 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | PLT-1427 Updated browser requirements in documentation | |||||
| * | | | | | | | | | Updated browser requirements in documentation | hmhealey | 2015-12-08 | 1 | -3/+3 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1657 from mattermost/plt-1410 | Christopher Speller | 2015-12-09 | 1 | -6/+13 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | PLT-1410 Fix email error not showing up on team signup page | |||||
| * | | | | | | | | Fix email error not showing up on team signup page | JoramWilander | 2015-12-08 | 1 | -6/+13 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Update Sign-in.md | it33 | 2015-12-09 | 1 | -5/+9 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1665 from mattermost/lfbrock-patch-2 | it33 | 2015-12-09 | 3 | -7/+357 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update markdown tests |