Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed issue with emails containing a '+' | Reed Garmsen | 2015-12-13 | 1 | -1/+1 |
| | |||||
* | Fixing issues caused by changing test emails | Reed Garmsen | 2015-12-13 | 2 | -2/+2 |
| | |||||
* | Updated emails in unit tests to include '+' | Reed Garmsen | 2015-12-13 | 14 | -128/+128 |
| | |||||
* | Create accepting-pull-request.md | it33 | 2015-12-11 | 1 | -0/+28 |
| | |||||
* | Merge pull request #1677 from hmhealey/plt1244 | Corey Hulen | 2015-12-11 | 1 | -18/+35 |
|\ | | | | | PLT-1244 Changed serverside mention parsing to support usernames containing periods | ||||
| * | Changed serverside mention parsing to support usernames containing periods | hmhealey | 2015-12-09 | 1 | -18/+35 |
| | | |||||
* | | Merge pull request #1676 from kh0r/master | Corey Hulen | 2015-12-11 | 2 | -2/+4 |
|\ \ | | | | | | | Update nginx ssl-conf | ||||
| * | | Update nginx ssl-conf | mklepp | 2015-12-09 | 2 | -2/+4 |
| | | | |||||
* | | | Merge pull request #1652 from hmhealey/plt1319 | Corey Hulen | 2015-12-11 | 10 | -39/+176 |
|\ \ \ | | | | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists | ||||
| * | | | Changed Sidebar direct channel list to be driven by preferences | hmhealey | 2015-12-08 | 2 | -17/+31 |
| | | | | |||||
| * | | | Moved logic for making direct channels visible to both members on post to ↵ | hmhealey | 2015-12-07 | 3 | -13/+109 |
| | | | | | | | | | | | | | | | | the server | ||||
| * | | | Added preference_changed web socket event | hmhealey | 2015-12-07 | 6 | -13/+40 |
| | | | | |||||
* | | | | Merge pull request #1703 from rgarmsen2295/plt-583 | Christopher Speller | 2015-12-11 | 2 | -6/+14 |
|\ \ \ \ | | | | | | | | | | | PLT-583 Disables the ability to send email invites when user creation is disabled | ||||
| * | | | | Disables the ability to send email invites when user creation is disabled | Reed Garmsen | 2015-12-10 | 2 | -6/+14 |
| | | | | | |||||
* | | | | | Merge pull request #1702 from rgarmsen2295/plt-1047 | Christopher Speller | 2015-12-11 | 12 | -30/+41 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1047 Fixed issue with Team Settings modal visually saving items instead of cancelling | ||||
| * | | | | | Fixed issue with Team Settings modal saving items instead of cancelling; ↵ | Reed Garmsen | 2015-12-10 | 12 | -30/+41 |
| |/ / / / | | | | | | | | | | | | | | | | changed remaining copyrights | ||||
* | | | | | Merge pull request #1698 from rgarmsen2295/plt-1346 | Christopher Speller | 2015-12-11 | 1 | -32/+52 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1346 Hides the ability to enable team listing on a team where it's been disabled in the system console | ||||
| * | | | | | Disabling ability to enable team listing on a system where ↵ | Reed Garmsen | 2015-12-10 | 1 | -32/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | EnableTeamListing=false | ||||
* | | | | | | Merge pull request #1684 from hmhealey/plt1184 | Joram Wilander | 2015-12-11 | 3 | -20/+43 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | PLT-1184 Fixed EditChannelHeaderModal's contents not being updated when a change is made | ||||
| * | | | | | 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 |
| | | | | | | |