77 Commits

Author	SHA1	Message	Date
=Corey Hulen	8291d0285e	Fixing merge	2015-10-22 22:10:16 -07:00
=Corey Hulen	54894e90ac	Fixing merge conflict	2015-10-22 09:19:18 -07:00
=Corey Hulen	b9ce4a644d	PLT-350 allow ability to disable restricted team names	2015-10-20 17:30:24 -07:00
=Corey Hulen	1fc12dd8ba	Multi-session login	2015-10-20 14:49:42 -07:00
Harrison Healey	d139c9e825	Merge pull request #1108 from mattermost/plt-235 ... PLT-235 Implement outgoing webhooks.	2015-10-19 14:24:02 -04:00
Joram Wilander	00c06fac43	Merge pull request #1107 from asaadmahmoodspin/ui-improvements ... Updating scroll on admin console	2015-10-19 11:42:25 -04:00
Asaad Mahmood	cbbfe0112b	Updating scroll on admin console	2015-10-19 20:10:33 +05:00
JoramWilander	af6e2c29eb	Implement outgoing webhooks.	2015-10-19 09:00:30 -04:00
Stas Vovk	9fa3c996d5	change url when a user navigates between tabs [#962]	2015-10-18 18:55:04 +03:00
Christopher Speller	495673d80d	Fixing some client warnings	2015-10-16 10:50:10 -04:00
Christopher Speller	1571a9a2df	Fixing most deprication warnings	2015-10-15 15:00:28 -04:00
Asaad Mahmood	95aaa0a080	Multiple UI Improvements	2015-10-15 22:54:15 +05:00
Antti Ahti	37bb95c775	Add titles to clarify icons in system console ... The + and x icons in the team section can easily be misinterpreted as "Create team" and "Delete team". Added clarifying title text that the user can see when hovering on the icon.	2015-10-15 12:00:52 +03:00
Joram Wilander	52a87446ce	Merge pull request #1017 from stasvovk/PLT-589 ... PLT-589: changed Admin to Team Admin in Manage Team members	2015-10-13 22:53:01 -04:00
Asaad Mahmood	4cfe8ce699	Multiple Ui Improvements	2015-10-13 23:28:00 +05:00
it33	5c3a1ae57f	Update gitlab_settings.jsx	2015-10-13 05:16:04 -07:00
Stas Vovk	a1328fc8b5	Merge branch 'master' into PLT-589	2015-10-13 14:52:29 +03:00
Stas Vovk	450b56c1bd	replaced constructions like user.roles === 'admin' by Utils.isAdmin(user.roles) in manage members	2015-10-13 13:20:56 +03:00
Stas Vovk	8d8e8ec41e	changed Admin to Team Admin in admin console	2015-10-12 22:04:00 +03:00
=Corey Hulen	61f92517f3	PLT-586 fixing issues with security alert	2015-10-09 12:24:39 -07:00
Christopher Speller	b85b529373	Changing SpinPunch to Mattermost in copyright	2015-10-08 12:27:09 -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
=Corey Hulen	3d4220ce5f	PLT-435 adding ability to demote system admin	2015-10-06 09:50:27 -07:00
Asaad Mahmood	74b3338bc7	Admin console UI Improvements	2015-10-06 19:14:35 +05:00
=Corey Hulen	e26b77faf1	PLT-518 check for security bulletins	2015-10-05 17:33:45 -07:00
Joram Wilander	b591c4b32e	Merge pull request #914 from mattermost/plt-297 ... PLT-297 Add ability to override username and icon for posts from incoming webhooks.	2015-10-05 11:48:10 -04:00
JoramWilander	ef55d7f244	Update help text to mention the BOT tag for webhook posts.	2015-10-05 11:25:12 -04:00
JoramWilander	2a23d90ca6	Add config options for overriding username and icon, and add BOT indicator next to webhook posts.	2015-10-05 08:46:23 -04:00
=Corey Hulen	9d688821aa	PLT-462 Adding diagnostic info	2015-10-01 13:02:04 -07:00
Christopher Speller	be300b7e7d	Merge pull request #859 from mattermost/PLT-409 ... PLT-409 add warning to at rest salt gen	2015-10-01 07:27:32 -04:00
Christopher Speller	942702ff1a	Merge release branch 'release-1.0.0'	2015-09-29 15:34:21 -04:00
Harrison Healey	2d5b284186	Merge pull request #857 from mattermost/PLT-429 ... PLT-429, PLT-483, PLT-472 fixes to Gitlab settings page	2015-09-29 15:18:03 -04:00
=Corey Hulen	a15115d2c0	PLT-409 add warning to at rest salt gen	2015-09-29 11:45:37 -07:00
=Corey Hulen	764b4b1d82	PLT-425 changing wording	2015-09-29 11:35:39 -07:00
=Corey Hulen	80d1acab22	PLT-472 switching field ordering.	2015-09-29 11:21:27 -07:00
=Corey Hulen	0e028d04e2	PLT-429 removing scope field.	2015-09-29 11:20:16 -07:00
=Corey Hulen	b1bb2a7a54	PLT-483 adding better help text	2015-09-29 11:19:03 -07:00
=Corey Hulen	7110aa42d9	Fixing gitlab settings in admin console	2015-09-28 11:10:18 -07:00
Asaad Mahmood	0899280112	PLT-441 - Minor Ui touches to the admin console	2015-09-28 10:07:36 +05:00
=Corey Hulen	65cfe9883c	Fixing broken page	2015-09-26 17:22:04 -07:00
it33	8af7386898	Update log_settings.jsx	2015-09-25 22:38:23 -07:00
it33	5ca63153dc	Update gitlab_settings.jsx	2015-09-25 22:32:26 -07:00
it33	1b5c32f8ab	Update privacy_settings.jsx	2015-09-25 22:23:06 -07:00
it33	7e94080752	Update rate_settings.jsx	2015-09-25 22:20:16 -07:00
it33	5548bdfd36	Update rate_settings.jsx	2015-09-25 21:53:37 -07:00
it33	4f81f8826b	Update log_settings.jsx	2015-09-25 21:38:38 -07:00
it33	7a777217be	Update image_settings.jsx	2015-09-25 21:25:39 -07:00
it33	56b3df2e87	Update email_settings.jsx	2015-09-25 21:23:46 -07:00
it33	de1c87f660	Update sql_settings.jsx	2015-09-25 21:03:57 -07:00
it33	84e3c816d6	Update team_settings.jsx	2015-09-25 21:01:42 -07:00