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

169 Коммитов

Автор SHA1 Сообщение Дата
Jason Blais
01ee2fc121 Update text for restricting integration management to admins (#3962)
Update text for restricting integration management to admins
2016-09-06 12:41:12 -03:00
Jason Blais
a44a5aadf1 Change "Native Apps" to "Mattermost Apps" for consistency (#3957)
Change "Native Apps" to "Mattermost Apps" for consistency
2016-09-06 09:45:53 -03:00
enahum
37068bfdc0 PLT-3880 Dynamic Password Min Length help text (#3949) 2016-09-06 08:21:45 -04:00
enahum
4bd5935bd8 PLT-4041 Make SAML FirstName and LastName optional (#3951) 2016-09-06 08:19:58 -04:00
Girish Ramakrishnan
6c085594e4 mail: allow PLAIN auth over non-tls connections (#3900)
This allows mattermost to use a non-tls connection with a SMTP server that
supports PLAIN auth (but not LOGIN). The go library explicitly allows PLAIN
auth over non-tls connections - https://golang.org/src/net/smtp/auth.go#L55

Fixes #2929
2016-09-02 14:33:26 -04:00
Eric Sethna
717e8197ff Label and help text change to icon and username override (#3932)
* Update custom_integrations_settings.jsx

* Update en.json

* Update custom_integrations_settings.jsx
2016-09-02 11:29:06 -04:00
Christopher Speller
5d7f239962 Adding LDAP test connection button. Reordering LDAP settings. (#3912) 2016-09-01 17:05:20 -04:00
Christopher Speller
276e0189b1 Making LDAP FirstName and LastName fields optional. (#3919) 2016-09-01 10:03:55 -04:00
Ryan Wang
dfaccff44b Sorted teams by alphabetical order under System Console > Teams (#3868) 2016-08-25 10:45:24 -04:00
Myeonghyeon-Lee
23815a696c fix for team.display_name instead of team.name (#3827) 2016-08-24 11:05:39 -04:00
paranbaram
ffff24e625 Change en.json : PLT-3371 (#3825)
* Change en.json : PLT-3371

* Change jsx files for UI text

* Change jsx files for UI text
2016-08-22 14:16:38 -04:00
Jason Blais
dba2deabb0 Fix typo in admin.service.siteURLDescription (#3818)
* Fix typo in admin.service.siteURLDescription

* Update configuration_settings.jsx
2016-08-17 11:16:53 -04:00
Harrison Healey
8203fd16ce PLT-3647 Email Batching (#3718)
* PLT-3647 Added config settings for email batching

* PLT-3647 Refactored generation of email notification

* PLT-3647 Added serverside code for email batching

* PLT-3647 Updated settings UI to enable email batching

* PLT-3647 Removed debug code

* PLT-3647 Fixed 0-padding of minutes in batched notification

* PLT-3647 Updated clientside UI for when email batching is disabled

* Go fmt

* PLT-3647 Changed email batching to be disabled by default

* Updated batched email message

* Added email batching toggle to system console

* Changed Email Notifications > Immediate setting to a 30 second batch interval

* Go fmt

* Fixed link to Mattermost icon in batched email notification

* Updated users to use 30 second email batching by default

* Fully disabled email batching when clustering is enabled

* Fixed email batching setting in the system console

* Fixed casing of 'Send Email notifications' -> 'Send email notifications'

* Updating UI Improvements for email batching (#3736)

* Updated text for notification settings and SiteURL.

* Prevented enabling email batching when SiteURL isn't set in the system console

* Re-added a couple debug messages

* Added warning text when clustering is enabled
2016-08-16 14:41:47 -04:00
enahum
b972d2adba PLT-3844 Fix Not redirected out of system console after demoting self from System Admin (#3797) 2016-08-15 09:20:38 -04:00
enahum
225ea35895 PLT-3793 Re-order languages in Account Settings (#3756) 2016-08-12 07:51:00 -04:00
Elias Nahum
c6d5448c75 Merge branch 'release-3.3' RC5 2016-08-11 13:46:24 -05:00
Eric Sethna
a6bb9b87f7 Clarify help text for available lanuages in localization_settings.jsx (#3776)
* Update localization_settings.jsx

* Update en.json

* Update localization_settings.jsx

* Update en.json
2016-08-11 13:35:31 -05:00
Joram Wilander
2073547018 Update licensing switches for Office365 and Google SSO through OAuth2 (#3786) 2016-08-11 13:35:08 -05:00
David Lu
bd106bb401 fixed password reset salt broken (#3778) 2016-08-10 14:20:52 -05:00
Joram Wilander
3ef26de2ac Marked Office 365 SSO through OAuth2 as beta (#3781) 2016-08-10 14:20:18 -05:00
David Lu
e4b0680a79 Fixed reset password error (#3769) 2016-08-09 16:00:51 -05:00
Harrison Healey
0afa28de09 Changed autodetection of SiteURL (#3764)
* Changed autoconfiguration of SiteURL to be done on every request

* Added SiteURL to system console
2016-08-09 08:53:22 -05:00
enahum
c49a7f3524 PLT-3847 Fix bad merge in the System Console help text (for Office 365) (#3762) 2016-08-08 14:30:50 -05:00
Harrison Healey
d2aa2a7396 PLT-3802 Moved compliance section of system console back to the bottom of the sidebar (#3751) 2016-08-08 08:57:17 -05:00
Corey Hulen
605f2a289b Adding beta label to HA (#3744) 2016-08-04 15:42:16 -05:00
enahum
b04d2c2f39 PLT-3767 Promote localizations on System Console and Account Settings (#3734) 2016-08-04 13:32:57 -05:00
Corey Hulen
59d971dc75 PLT-2899 adding clustering of app servers (#3682)
* PLT-2899 adding clustering of app servers

* PLT-2899 base framework

* PLT-2899 HA backend

* PLT-2899 Fixing config file

* PLT-2899 adding config syncing

* PLT-2899 set System console to readonly when clustering enabled.

* PLT-2899 Fixing publish API

* PLT-2899 fixing strings
2016-08-04 13:25:37 -04:00
Jason Blais
ac90f5b389 Update text for OAuth 2.0 and Google SSO (#3740)
* Update help text for OAuth

* Update oauth_settings.jsx

* Update en.json
2016-08-04 13:20:01 -04:00
Joram Wilander
9b50b50283 Hardcode preset OAuth2 endpoints when saving the config from the System Console (#3722) 2016-08-03 18:32:06 -05:00
Jason Blais
224575e099 Update help text for Google/Office 365 OAuth (#3725)
* Update help text for Google/Office 365 OAuth

* Update en.json

* Change " to ' in .jsx

* Fix errors caused by "
2016-08-03 18:30:11 -05:00
Christopher Speller
937a4e3087 Fixing typo in LDAP system console (#3727) 2016-08-03 18:29:34 -05:00
Harrison Healey
7b211f93a0 PLT-3419 Moving auditing and logs to the top of the system console sidebar (#3732) 2016-08-03 18:27:59 -05:00
enahum
5bc3cea6fe PLT-3484 OAuth2 Service Provider (#3632)
* PLT-3484 OAuth2 Service Provider

* PM text review for OAuth 2.0 Service Provider

* PLT-3484 OAuth2 Service Provider UI tweaks (#3668)

* Tweaks to help text

* Pushing OAuth improvements (#3680)

* Re-arrange System Console for OAuth 2.0 Provider
2016-08-03 13:19:27 -04:00
enahum
e67bbcb0ae PLT-3740 Terms of Service link updates (#3707) 2016-08-02 16:06:51 -04:00
David Lu
2c23a4fe49 Added custom branding to login description (#3710) 2016-08-02 08:34:34 -04:00
Corey Hulen
42e74b509d PLT-3691 tweaking sytem console text (#3712) 2016-08-02 08:12:52 -04:00
Jason Blais
bc511dc186 Update help text for compliance settings (#3705)
* Update help text for compliance settings

* Update en.json
2016-08-01 11:21:50 -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
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
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
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
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
David Lu
26b588c3f7 Added HTML formatting to Storage Settings (#3648) 2016-07-20 13:04:49 -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
Harrison Healey
902261e67f Fix doc links in System Console > Webhooks and Commands (#3631) 2016-07-19 08:41:00 -08:00
Christopher Speller
1641370fbe Moving javascript driver back to platform (#3613) 2016-07-19 10:16:44 -04:00
David Lu
4ecd79f9e6 Added default to max users per team (#3602) 2016-07-18 11:13:30 -04:00
Harrison Healey
f7b3731b2b Merge branch 'release-3.2' into 'master' 2016-07-15 12:26:32 -04:00
Christopher Speller
b5c5744bc7 Updating ESLint (#3597) 2016-07-15 07:49:57 -04:00