Stas Vovk
a1328fc8b5
Merge branch 'master' into PLT-589
2015-10-13 14:52:29 +03:00
Stas Vovk
822881e51a
Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589
2015-10-13 13:27:34 +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
Corey Hulen
191e248b0f
Merge pull request #1022 from mattermost/release-1.1.0
...
Release 1.1.0rc merging to master
2015-10-12 14:22:05 -07:00
Corey Hulen
246c7414bd
Merge pull request #1018 from asaadmahmoodspin/ui-fixes
...
Other UI Improvements
2015-10-12 13:18:47 -07:00
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
Asaad Mahmood
893a72141b
Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes
2015-10-12 23:36:24 +05:00
=Corey Hulen
3c42ae312d
Merge branch 'release-1.1.0' into PLT-586
2015-10-12 10:55:43 -07:00
Joram Wilander
4949b6837f
Merge branch 'master' into typos
2015-10-12 12:06:55 -04:00
Asaad Mahmood
7bb8f5d1ef
Removing padding from post comment cell in RHS
2015-10-12 20:59:03 +05:00
Asaad Mahmood
72b3a1d695
Other UI Improvements
2015-10-12 20:55:40 +05: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
=Corey Hulen
61f92517f3
PLT-586 fixing issues with security alert
2015-10-09 12:24:39 -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
12cd7c03d6
Fixing broken travis release build
2015-10-08 16:46:45 -04:00
hmhealey
3c489518e6
Fixed html used for autolinking
2015-10-08 15:59:21 -04: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
hmhealey
5bcba280c6
Changed emoticons so that they much be surrounded by whitespace
2015-10-08 12:43:25 -04:00
hmhealey
c25d2d1e99
Switched :p emoticon
2015-10-08 12:43:25 -04:00
=Corey Hulen
e640bf7b6c
Fixing issue with lastIndexOf
2015-10-08 09:34:49 -07:00
Christopher Speller
b85b529373
Changing SpinPunch to Mattermost in copyright
2015-10-08 12:27:09 -04:00
=Corey Hulen
d412144f88
Adding removing blank target for browser links
2015-10-08 09:14:13 -07: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
=Corey Hulen
f548e0ffb9
PLT-567 auto join open channels
2015-10-07 17:13:55 -07: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
