Граф коммитов

1389 Коммитов

Автор SHA1 Сообщение Дата
hmhealey
ae0eb91180 Hid the close button when the unread badge is visible and moved it to the right side of the sidebar 2015-10-13 09:42:25 -04:00
hmhealey
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -04:00
hmhealey
415f959614 Made direct channels visible when receiving a message on one 2015-10-13 09:42:25 -04:00
hmhealey
ed31538893 Changed direct messages channels so users can show/hide them 2015-10-13 09:42:24 -04:00
hmhealey
7d03c24b44 Changed direct channels in the sidebar to be displayed based on user preferences 2015-10-13 09:42:24 -04:00
Joram Wilander
eb0c0fea35 Merge pull request #1007 from florianorben/PLT-486
PLT-486: Remove spell check feature from input boxes during signup flow
2015-10-13 08:46:48 -04:00
Joram Wilander
e67043f4f4 Merge pull request #987 from hmhealey/plt521
PLT-521 Modified markdown lexer to not break up words written in snake_case
2015-10-13 08:43:57 -04:00
Christopher Speller
ffdeba70ef Merge release branch 'release-1.1.0' 2015-10-13 08:39:27 -04:00
Maxim
9d3248ccec Merge branch 'master' into PLT-590 2015-10-13 10:15:44 +03:00
it33
525a48fe27 PLT-596 - Update to email verification title 2015-10-12 22:33:43 -07:00
Florian Orben
69a7363990 PLT-486: Remove spell check feature from input boxes during signup flow
Add spellcheck="false" attribute to login and signup form inputs
2015-10-12 23:24:16 +02: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
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
72b3a1d695 Other UI Improvements 2015-10-12 20:55:40 +05:00
Asaad Mahmood
fd4bfee6ea Multiple UI Improvements 2015-10-12 19:22:05 +05:00
Potapov Max
53d58fc337 PLT-590: Change "Manage Team" to "Manage Members" 2015-10-12 12:20:59 +03: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
hmhealey
787d2ef7bc Modified markdown lexer to not break up words written in snake_case 2015-10-09 16:30:57 -04: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
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