IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,516 Commits 845 Branches 1,202 Tags
e7eb86c8c31e7d0cfd7f18efdefc4ac50171e8a0
Commit Graph

4516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Reed Garmsen
e7eb86c8c3 Updated emails in unit tests to include '+' 2015-12-13 14:21:23 -08:00
it33
ce03fbc6d8 Create accepting-pull-request.md 2015-12-11 07:35:53 -08:00
Corey Hulen
9dc8108e2d Merge pull request #1677 from hmhealey/plt1244 
PLT-1244 Changed serverside mention parsing to support usernames containing periods
 2015-12-11 06:42:48 -08:00
Corey Hulen
e0dd903b80 Merge pull request #1676 from kh0r/master 
Update nginx ssl-conf
 2015-12-11 06:42:17 -08:00
Corey Hulen
412b45431a Merge pull request #1652 from hmhealey/plt1319 
PLT-1319 Fixed direct channels not being visible when no actual channel exists
 2015-12-11 06:40:37 -08:00
Christopher Speller
607a8151de Merge pull request #1703 from rgarmsen2295/plt-583 
PLT-583 Disables the ability to send email invites when user creation is disabled
 2015-12-11 08:47:46 -05:00
Christopher Speller
d327461017 Merge pull request #1702 from rgarmsen2295/plt-1047 
PLT-1047 Fixed issue with Team Settings modal visually saving items instead of cancelling
 2015-12-11 08:44:47 -05:00
Christopher Speller
4d08e77798 Merge pull request #1698 from rgarmsen2295/plt-1346 
PLT-1346 Hides the ability to enable team listing on a team where it's been disabled in the system console
 2015-12-11 08:43:00 -05:00
Joram Wilander
505445d9d9 Merge pull request #1684 from hmhealey/plt1184 
PLT-1184 Fixed EditChannelHeaderModal's contents not being updated when a change is made
 2015-12-11 08:37:13 -05:00
Reed Garmsen
9c79f02ca4 Disables the ability to send email invites when user creation is disabled 2015-12-10 16:47:09 -08:00
Reed Garmsen
470797cca6 Fixed issue with Team Settings modal saving items instead of cancelling; changed remaining copyrights 2015-12-10 14:33:21 -08:00
Reed Garmsen
612a9b4fd6 Disabling ability to enable team listing on a system where EnableTeamListing=false 2015-12-10 11:18:24 -08:00
Christopher Speller
149ac6f3ce Merge pull request #1648 from npcode/notification-email-local-timezone 
Use local timezone for notification email
 2015-12-10 13:44:11 -05:00
hmhealey
88f29d8b6d Fixed EditChannelHeaderModal's contents not always being updated when a change is made 2015-12-10 10:01:01 -05:00
Christopher Speller
aef1686606 Merge pull request #1688 from mattermost/fix-salts 
Generate salts when empty
 2015-12-10 08:54:12 -05:00
Christopher Speller
415276fa6a Merge pull request #1694 from mattermost/revert-1625-ephemeral_messages 
Revert "add helper method to add ephemeral messages; also switch 'delete mess…"
 2015-12-10 08:40:21 -05:00
Christopher Speller
e80129a0e9 Revert "add helper method to add ephemeral messages; also switch 'delete mess…" 2015-12-10 08:32:30 -05:00
=Corey Hulen
7299fd6a4c Fixing unit test 2015-12-09 20:59:15 -08:00
it33
47c3ff91a3 Merge pull request #1680 from mattermost/lfbrock-patch-1 
Update release-process.md
 2015-12-09 20:54:52 -08:00
Christopher Speller
468d8ed053 Merge pull request #1625 from florianorben/ephemeral_messages 
add helper method to add ephemeral messages; also switch 'delete mess…
 2015-12-09 19:16:50 -05:00
=Corey Hulen
9fbe16c17b Generate salts when empty 2015-12-09 15:42:48 -08:00
hmhealey
83b46880f3 Changed serverside mention parsing to support usernames containing periods 2015-12-09 16:38:55 -05:00
Florian Orben
99d79eee56 add helper method to add ephemeral messages; also switch 'delete message' to this new method 2015-12-09 22:29:54 +01:00
Christopher Speller
985dc06e5f Removing old 1.3 DB upgrade code 2015-12-09 15:55:44 -05:00
Christopher Speller
66f90428e9 Fixing travis github deploy 2015-12-09 15:06:38 -05:00
Christopher Speller
0f563509a5 Updating version to 1.3.0 2015-12-09 14:51:33 -05:00
Christopher Speller
92d0dad18b Updating dockerfile for release v1.3.0-rc1 2015-12-09 14:50:12 -05:00
lfbrock
62b9be7ac4 Update release-process.md 2015-12-09 14:23:27 -05:00
Christopher Speller
2396cfafc1 Merge pull request #1679 from mattermost/lfbrock-patch-1 
Update config settings documentation
 2015-12-09 13:57:06 -05:00
lfbrock
8c06096fa5 Update CHANGELOG.md 2015-12-09 13:09:27 -05:00
lfbrock
88d1543088 Update CHANGELOG.md 2015-12-09 13:02:42 -05:00
lfbrock
25ee77be8c Update config settings documentation 2015-12-09 13:00:04 -05:00
Corey Hulen
d81496ffcf Merge pull request #1678 from mattermost/plt-1402 
PLT-1402 Fix OEmbeds when switching channel, vine/soundcloud heights, and yout…
 2015-12-09 09:52:13 -08:00
JoramWilander
699230bb3f Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embeds 2015-12-09 12:24:34 -05:00
Christopher Speller
84aa572f67 Merge pull request #1675 from mattermost/replica-fix 
PLT-1413 Split db channel get into two functions using master and replica
 2015-12-09 11:22:13 -05:00
Corey Hulen
2ca37ec2fc Merge pull request #1673 from mishimi/patch-14 
Update Search.md
 2015-12-09 08:20:17 -08:00
Corey Hulen
f712f4aaee Merge pull request #1658 from mattermost/plt-1371 
PLT-1371 Update incoming hook documentation to more clearly state the...
 2015-12-09 08:19:51 -08:00
Joram Wilander
519ec06e2d Merge pull request #1674 from asaadmahmoodspin/ui-improvements 
Ui improvements
 2015-12-09 11:16:42 -05:00
mklepp
aa507095a4 Update nginx ssl-conf 2015-12-09 17:04:25 +01:00
JoramWilander
8e8b001609 Split db channel get into two functions using master and replica 2015-12-09 10:48:35 -05:00
Asaad Mahmood
ea5bde6c82 Improving pencil icon for manage members 2015-12-09 20:46:00 +05:00
Asaad Mahmood
a5ec7fbe02 Removing clearfix from modal body 2015-12-09 20:43:28 +05:00
Corey Hulen
7f1b0cbd1f Merge pull request #1672 from asaadmahmoodspin/ui-improvements 
Multiple UI Improvements
 2015-12-09 07:38:27 -08:00
mishimi
fabaf83091 Update Search.md 
Added help for the jump link
 2015-12-09 07:37:10 -08:00
Corey Hulen
f3683f487e Merge pull request #1670 from mattermost/plt-1407 
PLT-1407 Delay center scroll when sidebar opens to be after animation
 2015-12-09 07:37:05 -08:00
Asaad Mahmood
8cd5b4293a Multiple UI Improvements 2015-12-09 20:23:13 +05:00
Christopher Speller
b612c61ac1 Merge pull request #1671 from hmhealey/plt1430 
PLT-1430 Removed space bar from autocompletes
 2015-12-09 09:41:23 -05:00
Joram Wilander
3daa830ab1 Merge pull request #1663 from mattermost/PLT-1418 
PLT-1418 Adding old style replying in RHS
 2015-12-09 09:35:28 -05:00
Joram Wilander
34cf264a08 Merge pull request #1667 from mattermost/fix-push 
Fixing push notifications
 2015-12-09 09:34:15 -05:00
Christopher Speller
7ead817199 Merge pull request #1666 from hmhealey/plt1427 
PLT-1427 Updated browser requirements in documentation
 2015-12-09 09:25:40 -05:00