2917 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Stas Vovk	8d8e8ec41e	changed Admin to Team Admin in admin console	2015-10-12 22:04:00 +03:00
Stas Vovk	bafb341015	Merge remote-tracking branch 'upstream/master' into PLT-589	2015-10-12 21:54:51 +03:00
Corey Hulen	246d934e5e	Merge pull request #1016 from asaadmahmoodspin/ui-improvements ... Multiple UI Improvements	2015-10-12 11:29:46 -07:00
Corey Hulen	2d4d25051e	Merge pull request #1000 from hmhealey/plt604 ... PLT-604 Fixed download links in Safari	2015-10-12 11:29:05 -07:00
Stas Vovk	b5a499977e	changed Admin to Team Admin in Manage Team members	2015-10-12 17:52:29 +03:00
asaadmahmoodspin	0c5835e350	Merge branch 'master' into ui-improvements	2015-10-12 19:41:04 +05:00
it33	f55416d9f4	Update Code-Contribution-Guidelines.md	2015-10-12 07:37:40 -07:00
Asaad Mahmood	fd4bfee6ea	Multiple UI Improvements	2015-10-12 19:22:05 +05:00
it33	f7e624d582	Merge pull request #1008 from mattermost/release-1.1.0 ... Fixing help text in webhooks	2015-10-11 20:52:22 -07:00
it33	1da8ae36fa	Merge pull request #1001 from mattermost/missed-pr ... Missed PR - Help text update to webhooks	2015-10-11 15:56:15 -07:00
it33	808238f7c6	Update CHANGELOG.md	2015-10-11 15:50:19 -07:00
it33	7cd26c82ea	Merge pull request #998 from mattermost/lfbrock-patch-1 ... Fixing incorrect markdown	2015-10-11 15:48:36 -07:00
it33	c33f9edf11	Merge pull request #1002 from mattermost/beta-label ... Adding beta label to Slack Import	2015-10-10 16:32:34 -07:00
it33	ffa0900d53	Merge pull request #1003 from mattermost/heading-alignment ... Aligning heading with text	2015-10-10 16:32:21 -07:00
it33	30c4795be5	Merge pull request #1004 from mattermost/bug-fix ... bugfix should be two words	2015-10-10 16:22:25 -07:00
it33	ed8b1aa00c	bugfix should be two words	2015-10-10 16:11:47 -07:00
it33	85716be6d6	Aligning heading with text	2015-10-10 16:10:14 -07:00
it33	ce55eb06bd	Adding beta label to Slack Import	2015-10-10 15:55:12 -07:00
it33	ea3713561b	Update manage_incoming_hooks.jsx	2015-10-09 18:39:34 -07:00
it33	b0d5b6a2e2	Update user_settings_integrations.jsx	2015-10-09 18:28:57 -07:00
it33	acde3ebf98	Update manage_incoming_hooks.jsx	2015-10-09 18:27:55 -07:00
hmhealey	e5a019390d	Fixed download links in Safari	2015-10-09 16:45:40 -04:00
lfbrock	3e7132cb72	Fixing incorrect markdown	2015-10-09 15:56:00 -04:00
Christopher Speller	a0febe2f31	Merge branch 'release-1.1.0'	2015-10-09 11:54:14 -04:00
it33	b67bb7e6fe	Update README.md	2015-10-09 08:53:06 -07:00
it33	05ed5b0899	Update README.md	2015-10-08 23:07:20 -07:00
it33	fd375a8ee7	Update Slack-Import.md	2015-10-08 23:05:48 -07:00
it33	db1724fa9f	Update README.md	2015-10-08 23:05:22 -07:00
it33	7906a9067f	Rename doc/usage/Slack-Import.md to doc/help/Slack-Import.md	2015-10-08 23:05:05 -07:00
it33	9c5ce4620e	Update README.md	2015-10-08 22:31:45 -07:00
it33	ae23c20113	Update Incoming-Webhooks.md	2015-10-08 22:13:27 -07:00
it33	76a7cfc826	Merge pull request #973 from mattermost/new-webhook-docs ... Update and rename Incoming.md to Incoming-Webhooks.md	2015-10-08 22:01:54 -07:00
it33	d091839f9a	Update README.md	2015-10-08 21:41:02 -07:00
it33	d706f3f686	Create README.md	2015-10-08 21:39:15 -07:00
it33	c11c43170b	Create Manage-Team.md	2015-10-08 21:27:41 -07:00
Christopher Speller	12cd7c03d6	Fixing broken travis release build	2015-10-08 16:46:45 -04:00
Christopher Speller	66cc4fa08f	Adding release 1.1.0 version	2015-10-08 16:16:53 -04:00
Christopher Speller	c0e4b1e797	Creating dockerfiles for release 1.1.0	2015-10-08 16:16:53 -04:00
Corey Hulen	5d4c0e3189	Merge pull request #984 from hmhealey/linkfix ... Fixed html used for autolinking	2015-10-08 13:11:09 -07:00
hmhealey	3c489518e6	Fixed html used for autolinking	2015-10-08 15:59:21 -04:00
Harrison Healey	9a177d7aa8	Merge pull request #983 from mattermost/fix-db-upgrade ... Fixing db upgrade for 1.1	2015-10-08 15:31:34 -04:00
Corey Hulen	20c766aed5	Merge pull request #977 from mattermost/lfbrock-patch-1 ... Updated to include v1.1.0	2015-10-08 11:36:20 -07:00
lfbrock	a4178c183e	Update CHANGELOG.md	2015-10-08 14:24:01 -04:00
=Corey Hulen	b7a4b1a418	Fixing db upgrade for 1.1	2015-10-08 10:59:38 -07:00
it33	9049321a9d	Renaming SpinPunch, Inc. to Mattermost, Inc.	2015-10-08 10:30:31 -07:00
Harrison Healey	7dde0211c5	Merge pull request #982 from hmhealey/plt547 ... PLT-547 Changed emoticons so that they must be surrounded by whitespace	2015-10-08 13:19:39 -04:00
Christopher Speller	806fd77ec9	Merge pull request #981 from mattermost/plt-517 ... PLT-517 Changing SpinPunch to Mattermost in copyright	2015-10-08 12:55:11 -04:00
Corey Hulen	e36227405b	Merge pull request #978 from mattermost/plt-355 ... PLT-355 Fixing ability to dynamicly update members list.	2015-10-08 09:51:04 -07:00
Corey Hulen	26252ccebf	Merge pull request #971 from mattermost/PLT-567 ... PLT-567 auto join open channels	2015-10-08 09:49:29 -07:00
hmhealey	fa8a1ca098	Fixed parsing of :'( emoticon	2015-10-08 12:43:25 -04:00