2857 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
hmhealey	c25d2d1e99	Switched :p emoticon	2015-10-08 12:43:25 -04:00
Christopher Speller	7a601afc64	Merge pull request #966 from mattermost/GIT-960 ... GIT-960 show error when you cannot create a team	2015-10-08 10:00:31 -04:00
Christopher Speller	a6629f95fe	Merge pull request #944 from mattermost/PLT-518 ... PLT-518 check for security bulletins	2015-10-08 09:59:08 -04:00
Christopher Speller	7571d21f32	Merge pull request #931 from rgarmsen2295/plt-112 ... PLT-112 Improves email change verification process	2015-10-08 09:56:00 -04:00
Harrison Healey	2ebcb3f69d	Merge pull request #970 from mattermost/GIT-957 ... GIT-957 fixing email templates and logos	2015-10-08 09:37:38 -04:00
Harrison Healey	51bf2dc185	Merge pull request #952 from tomitm/PLT-445 ... PLT-445 Create About dialog	2015-10-08 09:33:56 -04:00
Harrison Healey	21bf9db56c	Merge pull request #948 from rgarmsen2295/plt-167 ... PLT-167 Fixes issue with trying to comment on a deleted post	2015-10-08 09:30:44 -04:00
Tomi M	e7eca9a9ed	Use ReactBootstrap.Modal instead.	2015-10-07 16:33:56 -07:00
=Corey Hulen	80b0567257	GIT-957 fixing email templates and logos	2015-10-07 13:45:57 -07:00
Reed Garmsen	be8225b761	Now handles commenting on a deleted post gracefully, and checks for any areas where data may no longer exist once a post has been deleted	2015-10-07 13:00:16 -07:00
=Corey Hulen	81b7f649ed	GIT-960 show error when you cannot create a team	2015-10-07 10:07:08 -07:00
Corey Hulen	c189e2bb76	Merge pull request #951 from mattermost/PLT-500 ... PLT-500 fixing connection msg issues	2015-10-07 09:33:59 -07:00
Corey Hulen	3c859aebde	Merge pull request #961 from mattermost/plt-471 ... PLT-471 Fix user_added websocket event	2015-10-07 09:30:01 -07:00
Corey Hulen	5ac1a58063	Merge pull request #959 from mattermost/build-fix ... Moving external libraries to the install step and into a seperate bundle.	2015-10-07 09:26:16 -07:00
=Corey Hulen	fea45ad0c5	Moving to url.Values	2015-10-07 09:25:17 -07:00
=Corey Hulen	dbfc502184	Moving to url.Values	2015-10-07 09:23:26 -07:00
=Corey Hulen	8a65601db4	Fixing resize	2015-10-07 09:13:42 -07:00
=Corey Hulen	08d2a6cb31	Changing to url values	2015-10-07 08:58:56 -07:00
Joram Wilander	6a9acafe8a	Merge pull request #963 from mattermost/plt-538 ... PLT-538 Add missing -d to webhook doc.	2015-10-07 11:51:29 -04:00
JoramWilander	3b5228cc6f	Add missing -d to webhook doc.	2015-10-07 11:50:54 -04:00
=Corey Hulen	e83dd55361	Moving to updated	2015-10-07 08:48:18 -07:00
JoramWilander	1421e1ec4a	Fix user_added websocket event and update websocket channel access cache on add/remove member.	2015-10-07 11:39:45 -04:00
=Corey Hulen	c6c2a97f44	Fixing resiz	2015-10-07 08:37:56 -07:00
Christopher Speller	3bcd304a3a	Moving external libraries to the install step and into a seperate bundle	2015-10-07 10:54:28 -04:00
Joram Wilander	7d2ff7ce78	Merge pull request #958 from mattermost/plt-450 ... Add space between 'message:' and the actual root message.	2015-10-07 10:49:06 -04:00
JoramWilander	ab23c0d65c	Add space between 'messsage:' and the actual root message.	2015-10-07 10:48:32 -04:00
Harrison Healey	7daa8680c8	Merge pull request #956 from mishimi/patch-8 ... Deleting carriage return	2015-10-07 10:38:41 -04:00
Harrison Healey	4d600babe8	Merge pull request #950 from mattermost/PLT-519 ... PLT-519 toggle team creation link based on config setting	2015-10-07 09:52:12 -04:00
mishimi	da3eb0066d	Deleting carriage return	2015-10-07 06:48:32 -07:00
Christopher Speller	4263c08c55	Merge pull request #953 from asaadmahmoodspin/plt-522 ... PLT-522 - Adding option for mentionHighlightLink for themes	2015-10-07 08:43:24 -04:00
Joram Wilander	dfaef4bd72	Merge pull request #955 from mattermost/fix-api-doc ... Fix broken link to api doc.	2015-10-07 08:38:52 -04:00
JoramWilander	9007082b91	Fix broken link to api doc.	2015-10-07 08:38:25 -04:00
Christopher Speller	08496a7c14	Merge pull request #949 from mattermost/PLT-478 ... PLT-478 partial fix for local storage getting filled up. This will b…	2015-10-07 08:31:50 -04:00
Christopher Speller	cf9ce772c2	Merge pull request #947 from mattermost/PLT-435 ... PLT-435 adding ability to demote system admin	2015-10-07 08:30:57 -04:00
Christopher Speller	2cd546370f	Merge pull request #945 from mattermost/plt-433 ... PLT-433 Allow team admin to delete comments.	2015-10-07 08:28:05 -04:00
Christopher Speller	db532e7506	Merge pull request #943 from mattermost/plt-444 ... PLT-444 Parse special characters out of end of mysql search strings.	2015-10-07 08:24:45 -04:00
Joram Wilander	3ce40d6a94	Merge pull request #946 from asaadmahmoodspin/ui-improvements ... PLT-451 - Adding visual effect for logout active sessions button	2015-10-07 08:00:51 -04:00
Asaad Mahmood	698ca63d99	PLT-522 - Adding option for mentionHighlightLink for themes	2015-10-07 14:41:24 +05:00
Tomi M	5a28562354	PLT-445 Create About dialog	2015-10-06 20:31:23 -07:00
=Corey Hulen	4345dce3b8	PLT-500 fixing connection msg issues	2015-10-06 16:17:27 -07:00
=Corey Hulen	378d975eaa	PLT-519 toggle team creation link based on config setting	2015-10-06 13:44:52 -07:00
Corey Hulen	fe802fb9c4	Merge pull request #938 from mattermost/plt-111 ... PLT-111 Combining email verification confirmation screen with login screen.	2015-10-06 13:24:17 -07:00
=Corey Hulen	8de30c804f	PLT-478 partial fix for local storage getting filled up. This will be fixed for good with multi-login stuff	2015-10-06 13:20:46 -07:00
=Corey Hulen	3b4b79d99f	Adding checkout for system admin role	2015-10-06 10:50:38 -07:00
Asaad Mahmood	d99aea1502	Removing sidebar text hover color	2015-10-06 22:33:30 +05:00
Asaad Mahmood	15269c539a	Changing link colour opacity LHS	2015-10-06 22:27:05 +05:00
Asaad Mahmood	a0a32bb608	Updating link color opacity in LHS	2015-10-06 22:25:22 +05:00
=Corey Hulen	3d4220ce5f	PLT-435 adding ability to demote system admin	2015-10-06 09:50:27 -07:00
Asaad Mahmood	cdb09be6d0	Removing console.log	2015-10-06 21:43:13 +05:00
JoramWilander	8a0d0bfa25	Parse special characters out of search strings and replace with spaces.	2015-10-06 12:38:42 -04:00