IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,032 Commits 845 Branches 1,202 Tags
cdbe6342bb018e16d6eb3f04c0c6c8457805e61a
Commit Graph

1571 Commits

Author SHA1 Message Date
Christopher Speller
cdbe6342bb Merge release branch 'release-1.1.0' 2015-10-14 08:27:34 -04:00
Christopher Speller
cbefd88951 Merge pull request #993 from apaatsio/bootstrap-help-block 
Use help-block class from Bootstrap
 2015-10-14 07:39:53 -04:00
Joram Wilander
888ab49e23 Merge pull request #1042 from hmhealey/plt322-followup 
PLT-322 Fixed leave direct channel button for users with a long username
 2015-10-13 22:53:36 -04: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
Joram Wilander
a4adc9b95e Merge pull request #1038 from asaadmahmoodspin/ui-improvements 
Multiple Ui Improvements
 2015-10-13 22:52:28 -04:00
hmhealey
3f2b6bfa27 Fixed leave direct channel button for users with a long username 2015-10-13 18:31:17 -04:00
Harrison Healey
56b02f2eba Merge pull request #968 from hmhealey/plt322 
PLT-322 Updated Direct Messages menu
 2015-10-13 18:23:53 -04:00
JoramWilander
ac0f8f6bcf Fix webhook name not overriding in LHS and update webhook help text. 2015-10-13 18:01:11 -04:00
hmhealey
97b2f6ffe7 Made further changes based on feedback 2015-10-13 15:36:58 -04:00
Christopher Speller
1dfffacc31 Merge pull request #1030 from mattermost/Slack-import-UI-update 
Slack Import changing "Preview" label to "Beta"
 2015-10-13 15:23:16 -04:00
hmhealey
17d37816d4 Revert "Modified markdown lexer to not break up words written in snake_case" 
This reverts commit 787d2ef7bc.
 2015-10-13 14:36:58 -04:00
Asaad Mahmood
4cfe8ce699 Multiple Ui Improvements 2015-10-13 23:28:00 +05:00
Corey Hulen
a2979924a4 Merge pull request #1027 from mattermost/check-https 
Updating SSO help on HTTP/HTTPS
 2015-10-13 09:51:55 -07:00
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
Christopher Speller
e60fb1dfd7 Fixing user settings dialog so it desn't ask you to check your email unless you changed it 2015-10-13 11:31:57 -04:00
it33
62bbf11224 Slack Import changing "Preview" label to "Beta" 2015-10-13 08:22:22 -07:00
Joram Wilander
f641f83ff9 Merge pull request #1026 from asaadmahmoodspin/master 
Fixing code block markdown
 2015-10-13 10:11:03 -04:00
hmhealey
a2517ee991 Cleaned up JSX errors 2015-10-13 09:42:26 -04:00
hmhealey
097d236f43 Fixed edge cases with leaving a direct channel while viewing that channel 2015-10-13 09:42:26 -04:00
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
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
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
Asaad Mahmood
527e99f8d2 Fixing code block markdown 2015-10-13 14:33:37 +05: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
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
Potapov Max
53d58fc337 PLT-590: Change "Manage Team" to "Manage Members" 2015-10-12 12:20:59 +03:00