4499 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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
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
Christopher Speller	d9766cf691	Merge pull request #1657 from mattermost/plt-1410 ... PLT-1410 Fix email error not showing up on team signup page	2015-12-09 09:20:40 -05:00
hmhealey	c7e84696f5	Removed space bar from autocompletes	2015-12-09 09:14:46 -05:00
=Corey Hulen	20e3c568d1	fixing typo	2015-12-09 06:13:25 -08:00
JoramWilander	984dc19f30	Delay center scroll when sidebar opens to be after animation	2015-12-09 08:53:53 -05:00
it33	0b960e4a0b	Update Sign-in.md	2015-12-09 04:15:04 -08:00
it33	fc6ba52bca	Merge pull request #1665 from mattermost/lfbrock-patch-2 ... Update markdown tests	2015-12-09 03:58:15 -08:00
it33	5ba6af1f6c	Clarifying test process ... This test process should only be used by core team, since it references Core team site,	2015-12-09 03:56:27 -08:00
it33	b24aecfa49	Merge pull request #1668 from esethna/patch-40 ... Create test-attachments.md	2015-12-09 03:47:44 -08:00
it33	827893aa16	Releases under MIT License ... Making punctuation consistent for reference to releases under MIT License	2015-12-09 03:47:29 -08:00
Eric Sethna	beef2c7819	Create test-attachments.md	2015-12-08 15:48:05 -08:00
hmhealey	3a04aee87b	Updated browser requirements in documentation	2015-12-08 17:33:23 -05:00
lfbrock	91724014b8	Create test-syntax-highlighting.md	2015-12-08 17:32:46 -05:00
=Corey Hulen	f790bcdbc7	Updating the push message	2015-12-08 14:10:52 -08:00
=Corey Hulen	d2db4b1621	Fixing defaults	2015-12-08 14:06:52 -08:00