Skip to content

Commit

Permalink
* [FIX] Fixed issue on copy password to clipboard on Chrome browser. …
Browse files Browse the repository at this point in the history
…Related #140. Thanks to @basil-twisleton

* [FIX] Fixed English translation. Related #140.Thanks to @basil-twisleton
* [FIX] Fixed displaying required field when it is a select tag. Related #140.Thanks to @basil-twisleton
* [FIX] Fixed issue when adding an user from LDAP when no group/profile is set (disabled by default). Fixes #157
* [MOD] Modified behavior when adding a new customer from account page. Related #140.Thanks to @basil-twisleton
* [MOD] Updated German translation. Thanks to @wagnst
  • Loading branch information
nuxsmin committed Oct 25, 2015
1 parent 9451281 commit 50ea4e0
Show file tree
Hide file tree
Showing 32 changed files with 1,230 additions and 929 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
=== ** v1.2.0.08 ===

* [FIX] Fixed issue on copy password to clipboard on Chrome browser. Related #140. Thanks to @basil-twisleton
* [FIX] Fixed English translation. Related #140.Thanks to @basil-twisleton
* [FIX] Fixed displaying required field when it is a select tag. Related #140.Thanks to @basil-twisleton
* [FIX] Fixed issue when adding an user from LDAP when no group/profile is set (disabled by default). Fixes #157
* [MOD] Modified behavior when adding a new customer from account page. Related #140.Thanks to @basil-twisleton
* [MOD] Updated German translation. Thanks to @wagnst

=== ** v1.2.0.07 ===

* [FIX] Fixed issue when searching an user groupmembership to access to an account. Thanks to @basil-twisleton
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG-ES
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
=== ** v1.2.0.08 ===

* [FIX] Corregido error al copiar clave al portapapeles en el navegador Chrome. Related #140. Thanks to @basil-twisleton
* [FIX] Corregida traducción al inglés. Related #140.Thanks to @basil-twisleton
* [FIX] Corregido error al mostrar una etiqueta select requerida. Related #140.Thanks to @basil-twisleton
* [FIX] Corregido error al añadir usuario desde LDAP cuando el grupo o perfil no están establecidos (deshabilitado por defecto). Fixes #157
* [MOD] Modificado comportamiento cuando se añade un nuevo cliente desde la página de cuenta. Related #140.Thanks to @basil-twisleton
* [MOD] Actualizada traducción al alemán. Thanks to @wagnst

=== ** v1.2.0.07 ===

* [FIX] Arreglado error cuando se obtenía la pertenencia a grupos de un usuario para acceder a una cuenta. Thanks to @basil-twisleton
Expand Down
4 changes: 2 additions & 2 deletions ajax/ajax_accountSave.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
SP\Customer::$customerName = $newCustomer;

// Comprobar si se ha introducido un nuevo cliente
if ($newCustomer) {
if ($customerId === 0 && $newCustomer) {
try {
SP\Customer::addCustomer();
$customerId = SP\Customer::$customerLastId;
Expand Down Expand Up @@ -179,7 +179,7 @@
SP\Customer::$customerName = $newCustomer;

// Comprobar si se ha introducido un nuevo cliente
if ($newCustomer) {
if ($customerId === 0 && $newCustomer) {
try {
SP\Customer::addCustomer();
$customerId = SP\Customer::$customerLastId;
Expand Down
2 changes: 1 addition & 1 deletion css/chosen-custom.min.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Copyright (c) 2011-2015 Harvest http://getharvest.com
MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
This file is generated by `grunt build`, do not edit it by hand.
*/.chosen-container .chosen-results li.highlighted{background-color:#536dfe;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#879bff),color-stop(90%,#536dfe));background-image:-webkit-linear-gradient(#879bff 20%,#536dfe 90%);background-image:-moz-linear-gradient(#879bff 20%,#536dfe 90%);background-image:-o-linear-gradient(#879bff 20%,#536dfe 90%);background-image:linear-gradient(#879bff 20%,#536dfe 90%);color:#fff}.chosen-container-active .chosen-single{border:1px solid rgba(83,109,254,.8);box-shadow:0 0 5px rgba(0,0,0,0.3)}.chosen-container-active .chosen-choices{border:1px solid rgba(83,109,254,.8);box-shadow:0 0 5px rgba(0,0,0,0.3)}
*/.chosen-container .chosen-results li.highlighted{background-color:#536dfe;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#879bff),color-stop(90%,#536dfe));background-image:-webkit-linear-gradient(#879bff 20%,#536dfe 90%);background-image:-moz-linear-gradient(#879bff 20%,#536dfe 90%);background-image:-o-linear-gradient(#879bff 20%,#536dfe 90%);background-image:linear-gradient(#879bff 20%,#536dfe 90%);color:#fff}.chosen-container-active .chosen-single{border:1px solid rgba(83,109,254,.8);box-shadow:0 0 5px rgba(0,0,0,0.3)}.chosen-container-active .chosen-choices{border:1px solid rgba(83,109,254,.8);box-shadow:0 0 5px rgba(0,0,0,0.3)}select:invalid+.chosen-container .chosen-single{border-color:red}
2 changes: 1 addition & 1 deletion inc/UserLdap.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public static function newUserLDAP(User $User)
$data['notes'] = _('Usuario de LDAP');
$data['groupId'] = $groupId;
$data['profileId'] = $profileId;
$data['isDisabled'] = (int)($groupId && $profileId);
$data['isDisabled'] = ($groupId === 0 || $profileId === 0) ? 1 : 0;

if (DB::getQuery($query, __FUNCTION__, $data) === false) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion inc/Util.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ public static function curlIsAvailable()
*/
public static function getVersion($retBuild = false)
{
$build = '07';
$build = '08';
$version = array(1, 2, 0);

if ($retBuild) {
Expand Down
Binary file modified inc/locales/ca_ES/LC_MESSAGES/messages.mo
Binary file not shown.
Loading

0 comments on commit 50ea4e0

Please sign in to comment.