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

821 Коммитов

Автор SHA1 Сообщение Дата
Martin Bastien
3bf405c0cd Align the sidebar dropdown (#3693)
* Align the sidebar dropdown

* Change the sidebar dropdown width and realign it.

* move sidebar dropdown css fix to headers.scss
2016-08-01 11:21:05 -04:00
Asaad Mahmood
b263b0eb98 Multiple Ui improvements (#3678)
* Adding permalink back to mobile

* Improving reply flow and fixing colorpicker on mobile

* Hiding colorpicker on click only for mobile size screens
2016-08-01 11:17:27 -04:00
Harrison Healey
0b5a25a39e Fixed clientside emoji tests leaving behind a temporary file (#3691) 2016-07-31 09:49:19 -04:00
Joram Wilander
3f8dda6f5a PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660)
* EE: Add Google and Office365 SSO through OAuth2

* Add localization strings

* Text tweaks for PLT-3633

* Added sign-up button for Office 365

* Updated some error messages and a bit of licensing

* Updated sign-in method section in user settings to include Google and Office365

* Added more localization strings
2016-07-29 14:58:37 -04:00
samogot
748fdef1fb Online status in all modals (#3617)
* add wrapper to modal avatar image which show small round indicator of online/away status of member in all modals

* add offline indicator

* the color of the status indicators follow the theme
2016-07-29 14:54:42 -04:00
Eric Sethna
c084c4ae4d Policy help text (#3681)
* Update policy_settings.jsx

* Update en.json
2016-07-29 10:11:04 -04:00
Harrison Healey
56fd348123 PLT-3752 Changed email connection test to use the existing password if unchanged by client (#3685) 2016-07-29 10:09:22 -04:00
enahum
6f45bdd68b PLT-3668 Fix Dropdown for System Admins in Manage Members is empty (#3687) 2016-07-29 10:08:16 -04:00
enahum
12fe314b26 PLT-3687 Restrict the name "matterbot" from usernames (#3686) 2016-07-28 13:38:47 -04:00
enahum
6dc7ea6ab2 PLT-3553 Fix System messages show an empty box (#3689) 2016-07-28 13:38:15 -04:00
lfbrock
5a1ce3695d Update LDAP help text (#3695)
* Update ldap-settings.jsx

* Update en.json

* Update ldap_settings.jsx

* Update en.json
2016-07-28 13:37:32 -04:00
Joram Wilander
a88ff1b64d Fix console error when receiving a new message in the system console or on another team (#3688) 2016-07-28 08:41:17 -04:00
Joram Wilander
fc7ae6ba65 Initialize and close WebSocket more accurately and consistently (#3683) 2016-07-27 09:54:42 -04:00
Joram Wilander
199c55b566 Only get channels and posts on WebSocket connect if team is set (#3684) 2016-07-27 09:53:49 -04:00
Christopher Speller
528890dba0 Changing LDAP behavour so users disabled in LDAP server are disabled in Mattermost. (#3669) 2016-07-26 12:39:35 -04:00
Harrison Healey
13b7368f9d PLT-3698 Improved handling of colons around a custom emoji's name (#3676) 2016-07-26 09:27:54 -04:00
Pierre Rudloff
564dffec35 Add option to trigger outgoing webhook if first word starts with trigger word (#3611) 2016-07-26 08:04:28 -04:00
David Lu
c56b429e1d Removed Legal & Support settings from UI if empty (#3662) 2016-07-25 16:03:15 -08:00
David Lu
426b14d8a9 fixed mobile enter button (#3639) 2016-07-25 10:16:07 -04:00
David Lu
6e44d6b859 Added icons next to channels in channel switcher (#3663) 2016-07-25 10:15:48 -04:00
Harrison Healey
9b3e9243a5 PLT-3585 Added a timeout to the file upload overlay (#3656) 2016-07-22 14:30:42 -04:00
enahum
07c3f74862 daily + include nederlands (#3659) 2016-07-22 13:05:26 -04:00
Harrison Healey
b938a960a2 PLT-3683 Changed Utils.isMobileApp to return false for desktop apps (#3654) 2016-07-22 08:00:14 -08:00
Harrison Healey
6496205461 Updated custom emoji help text (#3653) 2016-07-22 10:54:03 -04:00
Harrison Healey
9c2c941449 PLT-1866/PLT-3509 Added links to download the native apps (#3651)
* PLT-1866 Added configurable links for native app downloads

* PLT-1866 Added native app download link to main menu

* PLT-3509 Added native app link to tutorial

* PLT-3509 Added native app link to welcome email

* PLT-3509 Made link to apps in welcome email conditional on being set
2016-07-22 10:53:57 -04:00
Joram Wilander
bfa04c0ab0 PLT-2408 Adds here mention for online users (#3619)
* Added @here mention that notifies online users

* Fixed existing race condition that would sometime cause clients to miss mention count changes

* Added missing localization strings

* Prevent @here from mentioning the user who posted it
2016-07-21 10:00:09 -04:00
Joram Wilander
d1de884845 Fix RHS not closing when thread is deleted by another user (#3641) 2016-07-20 17:34:25 -04:00
Joram Wilander
022cb7ffa1 If user tries to change email to current email, do nothing (#3643) 2016-07-20 17:33:23 -04:00
David Lu
9b24f4dc4c removed create account link if signup disabled (#3646) 2016-07-20 17:32:47 -04:00
David Lu
26b588c3f7 Added HTML formatting to Storage Settings (#3648) 2016-07-20 13:04:49 -08:00
Harrison Healey
b8b322c04b PLT-3482/PLT-3551/PLT-3552 Fixed some markdown list parsing (#3637)
* PLT-3552 Partially-fixed an invalid test case

* PLT-3551 Removed an invalid test case

* PLT-3482 Added a test case for multiple lists separated by text

* PLT-3482 Updated marked to fix multiple lists separated by text
2016-07-20 13:01:52 -08:00
David Lu
537d647846 PLT-3268 Made keyboard shortcuts open/close account settings and channel switcher (#3635)
* made keyboard shortcuts open/close account settings and channel switcher

* made booleans toggle
2016-07-20 13:01:31 -08:00
enahum
86d496c9b7 PLT-3629 fix uploading certificates if the files in the config do not exists (#3634) 2016-07-20 13:01:10 -08:00
David Lu
b0090214ef PLT-2712 Added view members for non-admins in channel and team (#3618)
* Added view members for non-admins in channel and team

* changed variable name
2016-07-20 13:00:22 -08:00
enahum
840b07f704 daily translations 20160719 (#3638) 2016-07-20 11:10:07 -04:00
Harrison Healey
902261e67f Fix doc links in System Console > Webhooks and Commands (#3631) 2016-07-19 08:41:00 -08:00
Asaad Mahmood
d727479125 PLT-3622 - Fixing error on sign up complete page (#3630) 2016-07-19 08:40:46 -08:00
Harrison Healey
e1de41cc81 PLT-3690 Updated marked to not break URLs on exclamation marks (#3627) 2016-07-19 08:39:44 -08:00
Asaad Mahmood
ee1d189e5c PLT-3644 - Updating link previews behaviour (#3620) 2016-07-19 08:39:27 -08:00
Pierre Rudloff
3604f925a8 Fix web app manifest (#3582) 2016-07-19 12:28:04 -04:00
enahum
6bbf8c8348 Fix client tests (#3628) 2016-07-19 11:14:15 -04:00
Christopher Speller
1641370fbe Moving javascript driver back to platform (#3613) 2016-07-19 10:16:44 -04:00
enahum
2b0fcd378c daily translations 20160718 (#3621) 2016-07-19 08:34:22 -04:00
Harrison Healey
40c47dcf0b Rendered invalid URLs as plain text when parsing markdown (#3616) 2016-07-19 08:28:29 -04:00
David Lu
5937473c5f PLT-3357 Fixed scrolling in channel switcher (#3603)
* fixed scrolling in channel switcher

* Fixed it in css
2016-07-19 08:27:37 -04:00
samogot
f31e8e09f5 PLT-914 Add mention notifications for replies on a comment thread (#3130)
* PLT-914 Add mention notifications for replies on a comment thread

* remove useless store method
fix highlighting comments posted before th user write something to thread

* refactor out isCommentMention function after rebase

* change comment bar highlighting to replay icon mention highlighting

* settings and always visible highlight

* fix unit tests for new settings

* change highlight behaviour
- if any message in comment thread generates mention - all thread is highlighted
- remove always visible highlightion

* fix bug about the textarea in the center channel not clearing

* fix default settings value notify_props.comments

* do not highlight own comments if there is no other user's messages in thread

* refactor out ReactDOM.findDOMNode

* refactor out using of UserStore from component
2016-07-19 08:27:23 -04:00
Harrison Healey
febe3a01cd Fixed use of deprecated function (#3615) 2016-07-18 11:54:42 -04:00
David Lu
4ecd79f9e6 Added default to max users per team (#3602) 2016-07-18 11:13:30 -04:00
Harrison Healey
4e16ea32e3 Fixed highighting at all mentions when enabled (#3606) 2016-07-18 11:12:38 -04:00
Harrison Healey
b353cc2cab Added a space before all entries in @mention autocomplete (#3605) 2016-07-18 11:12:01 -04:00