Allow removing of license without turning off enterprise features (#2690)

This commit is contained in:
Joram Wilander
2016-04-13 14:32:00 -04:00
committed by Corey Hulen
parent a9bd9843d4
commit 4d8b635503
5 changed files with 2 additions and 10 deletions

View File

@@ -131,7 +131,6 @@ class LicenseSettings extends React.Component {
licenseKey = (
<div className='col-sm-8'>
<button
disabled={this.props.config.LdapSettings.Enable}
className='btn btn-danger'
onClick={this.handleRemove}
id='remove-button'
@@ -145,10 +144,7 @@ class LicenseSettings extends React.Component {
<br/>
<br/>
<p className='help-text'>
<FormattedHTMLMessage
id='admin.licence.keyMigration'
defaultMessage='If youre migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href="http://mattermost.com" target="_blank">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.'
/>
{'If you migrate servers you may need to remove your license key to install it elsewhere. You can remove the key here, which will revert functionality to that of Team Edition.'}
</p>
</div>
);

View File

@@ -287,7 +287,6 @@
"admin.ldap.userFilterTitle": "User Filter:",
"admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"",
"admin.ldap.usernameAttrTitle": "Username Attribute:",
"admin.licence.keyMigration": "If youre migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.",
"admin.license.choose": "Choose File",
"admin.license.chooseFile": "Choose File",
"admin.license.edition": "Edition: ",

View File

@@ -287,7 +287,6 @@
"admin.ldap.userFilterTitle": "Filtro de Usuario:",
"admin.ldap.usernameAttrEx": "Ej \"sAMAccountName\"",
"admin.ldap.usernameAttrTitle": "Atributo Usuario:",
"admin.licence.keyMigration": "Si estás migrando servidores es posible que necesites remover tu licencia de este servidor para poder instalarlo en un servidor nuevo. Para empezar, <a href=\"http://mattermost.com\" target=\"_blank\">deshabilita todas las características de la Edición Enterprise de este servidor</a>. Esta operación habilitará la opción para remover la licencia y degradar este servidor de la Edición Enterprise a la Edición Team.",
"admin.license.choose": "Seleccionar Archivo",
"admin.license.chooseFile": "Escoger Archivo",
"admin.license.edition": "Edición: ",

View File

@@ -242,7 +242,6 @@
"admin.ldap.uernameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"nom d'utilisateur\" dans Mattermost. Utilisez de préférence le même champ que l'attribut \"identifiant d'utilisateur\".",
"admin.ldap.usernameAttrEx": "Exemple : \"sAMAccountName\"",
"admin.ldap.usernameAttrTitle": "Attribut \"nom d'utilisateur\" :",
"admin.licence.keyMigration": "If youre migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.",
"admin.license.chooseFile": "Parcourir",
"admin.license.keyRemove": "Remove Enterprise License and Downgrade Server",
"admin.license.noFile": "Aucun fichier chargé",

View File

@@ -287,7 +287,6 @@
"admin.ldap.userFilterTitle": "Filtro de Usuário:",
"admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"",
"admin.ldap.usernameAttrTitle": "Atributo do Usuário:",
"admin.licence.keyMigration": "Se você estiver migrando seu servidor você pode precisar remover sua chave da licença deste servidor a pedido para instala-la em um novo servidor. Para iniciar, <a href=\"http://mattermost.com\" target=\"_blank\">desativar todos os recursos Enterprise Edition deste servidor</a>. Isto irá habilitar para remover a chave da licença e fazer downgrade deste servidor Enterprise Edition para Team Edition.",
"admin.license.choose": "Escolha o Arquivo",
"admin.license.chooseFile": "Escolha um Arquivo",
"admin.license.edition": "Edição: ",
@@ -1421,4 +1420,4 @@
"web.footer.terms": "Termos",
"web.header.back": "Voltar",
"web.root.singup_info": "Toda comunicação em um só lugar, pesquisável e acessível em qualquer lugar"
}
}