Stas Vovk
f4f4335797
Merge branch 'master' into PLT-589
2015-10-12 22:39:04 +03:00
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
535164b5b6
Merge pull request #1009 from mattermost/update-help-text
...
Updating help text
2015-10-12 11:50:42 -07:00
Corey Hulen
5ec92975ca
Merge pull request #989 from mattermost/typos
...
Fixed typos
2015-10-12 11:48:52 -07:00
Joram Wilander
4949b6837f
Merge branch 'master' into typos
2015-10-12 12:06:55 -04:00
Stas Vovk
b5a499977e
changed Admin to Team Admin in Manage Team members
2015-10-12 17:52:29 +03:00
Asaad Mahmood
fd4bfee6ea
Multiple UI Improvements
2015-10-12 19:22:05 +05:00
it33
2bfd6d9ac2
Update get_link_modal.jsx
...
Removing out-of-date text saying that anyone can join a team from invite link, since there are now options to restrict sign-up based on email domain and SSO options
2015-10-11 21:30:02 -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
it33
6aff5900f7
Fixed typos
...
There was no space after "user name." before the next sentence. Also, "user name" should be "username"
2015-10-08 22:39:16 -07: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
Christopher Speller
b85b529373
Changing SpinPunch to Mattermost in copyright
2015-10-08 12:27:09 -04:00
it33
b7897ac331
Tweaking welcome text in Town-Square
2015-10-08 08:42:45 -07:00
Christopher Speller
7014496252
Fixing ability to dynamicly update members list.
2015-10-08 10:54:27 -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
8a65601db4
Fixing resize
2015-10-07 09:13:42 -07: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
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
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
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
Asaad Mahmood
d99aea1502
Removing sidebar text hover color
2015-10-06 22:33:30 +05:00
=Corey Hulen
3d4220ce5f
PLT-435 adding ability to demote system admin
2015-10-06 09:50:27 -07:00
