summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1712 from rgarmsen2295/plt-1263Harrison Healey2015-12-1412-135/+41
|\ | | | | PLT-1263 Fixed broken email unsubscribe instructions
| * Fixed broken unsubscribe instructionsReed Garmsen2015-12-1112-135/+41
| |
* | Merge pull request #1716 from rgarmsen2295/plt-1453Harrison Healey2015-12-141-7/+8
|\ \ | | | | | | PLT-1453 No longer errors upon saving the same info in Account Settings -> General
| * | 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
|\ \ | | | | | | PLT-1026 Bolds the team name when the team's statistics page is selected in the system console
| * | When a team's statistics is selected in the sys console the team name is now ↵Reed Garmsen2015-12-111-1/+1
| |/ | | | | | | also bolded
* | Merge pull request #1720 from rgarmsen2295/plt-860Harrison Healey2015-12-1416-130/+130
|\ \ | | | | | | PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+'
| * | 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
|\ \ | |/ |/| PLT-881 Adds Legal and Support Settings to the System Console
| * Added legal and support settings to sys console and implemented support for ↵Reed Garmsen2015-12-1013-51/+400
| | | | | | | | options in app
| * 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
|\ \ | | | | | | PLT-1244 Changed serverside mention parsing to support usernames containing periods
| * | 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-conf
| * | | Update nginx ssl-confmklepp2015-12-092-2/+4
| | | |
* | | | Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-1110-39/+176
|\ \ \ \ | | | | | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists
| * | | | 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 ↵hmhealey2015-12-073-13/+109
| | | | | | | | | | | | | | | | | | | | the server
| * | | | Added preference_changed web socket eventhmhealey2015-12-076-13/+40
| | | | |
* | | | | Merge pull request #1703 from rgarmsen2295/plt-583Christopher Speller2015-12-112-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 disabledReed Garmsen2015-12-102-6/+14
| | | | | |
* | | | | | Merge pull request #1702 from rgarmsen2295/plt-1047Christopher Speller2015-12-1112-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 Garmsen2015-12-1012-30/+41
| |/ / / / / | | | | | | | | | | | | | | | | | | changed remaining copyrights
* | | | | | Merge pull request #1698 from rgarmsen2295/plt-1346Christopher Speller2015-12-111-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 Garmsen2015-12-101-32/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | EnableTeamListing=false
* | | | | | | Merge pull request #1684 from hmhealey/plt1184Joram Wilander2015-12-113-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 ↵hmhealey2015-12-103-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | change is made
* | | | | | | Merge pull request #1648 from npcode/notification-email-local-timezoneChristopher Speller2015-12-102-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use local timezone for notification email
| * | | | | | Use local timezone for notification emailYi EungJun2015-12-082-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-saltsChristopher Speller2015-12-103-0/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Generate salts when empty
| * | | | | | | 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…"
| * | | | | | | 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…
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 14:31:36 +0000