summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | FIxing scroll for more direct channelsAsaad Mahmood2015-12-102-14/+19
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1712 from rgarmsen2295/plt-1263Harrison Healey2015-12-1412-135/+41
|\ \ \ \ \
| * | | | | Fixed broken unsubscribe instructionsReed Garmsen2015-12-1112-135/+41
| | |_|/ / | |/| | |
* | | | | Merge pull request #1716 from rgarmsen2295/plt-1453Harrison Healey2015-12-141-7/+8
|\ \ \ \ \
| * | | | | No longer errors upon saving the same info in Account Settings -> GeneralReed Garmsen2015-12-111-7/+8
| |/ / / /
* | | | | Merge pull request #1717 from rgarmsen2295/plt-1026Harrison Healey2015-12-141-1/+1
|\ \ \ \ \
| * | | | | When a team's statistics is selected in the sys console the team name is now ...Reed Garmsen2015-12-111-1/+1
| |/ / / /
* | | | | Merge pull request #1720 from rgarmsen2295/plt-860Harrison Healey2015-12-1416-130/+130
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed issue with emails containing a '+'Reed Garmsen2015-12-131-1/+1
| * | | | Fixing issues caused by changing test emailsReed Garmsen2015-12-132-2/+2
| * | | | Updated emails in unit tests to include '+'Reed Garmsen2015-12-1314-128/+128
| |/ / /
* | | | Merge pull request #1588 from rgarmsen2295/plt-881Joram Wilander2015-12-1213-45/+402
|\ \ \ \ | |/ / / |/| | |
| * | | Added legal and support settings to sys console and implemented support for o...Reed Garmsen2015-12-1013-51/+400
| * | | Added legal and support items to config fileReed Garmsen2015-12-011-0/+8
* | | | Create accepting-pull-request.mdit332015-12-111-0/+28
* | | | Merge pull request #1677 from hmhealey/plt1244Corey Hulen2015-12-111-18/+35
|\ \ \ \
| * | | | Changed serverside mention parsing to support usernames containing periodshmhealey2015-12-091-18/+35
* | | | | Merge pull request #1676 from kh0r/masterCorey Hulen2015-12-112-2/+4
|\ \ \ \ \
| * | | | | Update nginx ssl-confmklepp2015-12-092-2/+4
* | | | | | Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-1110-39/+176
|\ \ \ \ \ \
| * | | | | | Changed Sidebar direct channel list to be driven by preferenceshmhealey2015-12-082-17/+31
| * | | | | | Moved logic for making direct channels visible to both members on post to the...hmhealey2015-12-073-13/+109
| * | | | | | Added preference_changed web socket eventhmhealey2015-12-076-13/+40
* | | | | | | Merge pull request #1703 from rgarmsen2295/plt-583Christopher Speller2015-12-112-6/+14
|\ \ \ \ \ \ \
| * | | | | | | Disables the ability to send email invites when user creation is disabledReed Garmsen2015-12-102-6/+14
* | | | | | | | Merge pull request #1702 from rgarmsen2295/plt-1047Christopher Speller2015-12-1112-30/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue with Team Settings modal saving items instead of cancelling; chan...Reed Garmsen2015-12-1012-30/+41
| |/ / / / / / /
* | | | | | | | Merge pull request #1698 from rgarmsen2295/plt-1346Christopher Speller2015-12-111-32/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Disabling ability to enable team listing on a system where EnableTeamListing=...Reed Garmsen2015-12-101-32/+52
* | | | | | | | | Merge pull request #1684 from hmhealey/plt1184Joram Wilander2015-12-113-20/+43
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed EditChannelHeaderModal's contents not always being updated when a chang...hmhealey2015-12-103-20/+43
* | | | | | | | | Merge pull request #1648 from npcode/notification-email-local-timezoneChristopher Speller2015-12-102-3/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use local timezone for notification emailYi EungJun2015-12-082-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #1688 from mattermost/fix-saltsChristopher Speller2015-12-103-0/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing unit test=Corey Hulen2015-12-091-3/+0
| * | | | | | | | Generate salts when empty=Corey Hulen2015-12-093-0/+41
| | |/ / / / / / | |/| | | | | |
* | | | | | | | 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...Christopher Speller2015-12-105-103/+48
|/ / / / / / / /
* | | | | | | | Merge pull request #1680 from mattermost/lfbrock-patch-1it332015-12-091-59/+82
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 message' to ...Florian Orben2015-12-095-48/+103
|/ / / / / / / /
* | | | | | | / 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 CHANGELOG.mdlfbrock2015-12-091-0/+1
| * | | | | | Update CHANGELOG.mdlfbrock2015-12-091-2/+2
| * | | | | | Update config settings documentationlfbrock2015-12-091-2/+2
|/ / / / / /