From 6ccad6c05881d7316ccc3ab35989d8fab554e408 Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Mon, 14 Jun 2021 09:39:39 +0200 Subject: [PATCH 01/30] prepare release 0.15.3 --- CHANGELOG.md | 9 ++++++--- appinfo/info.xml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6802b3d20..92bc8993e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -## [Unreleased] -. +## [0.15.3] - 2021-06-14 + +### Fixed +- Fixed read LDAP attribute value 0 returned as null [#599](https://github.com/owncloud/user_ldap/issues/599) ## [0.15.2] - 2020-06-16 @@ -128,7 +130,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) - Add hint for max search term length - [#105](https://github.com/owncloud/user_ldap/issues/105) - Allow proxy to check next server - [#101](https://github.com/owncloud/user_ldap/issues/101) -[Unreleased]: https://github.com/owncloud/user_ldap/compare/v0.15.2...master +[Unreleased]: https://github.com/owncloud/user_ldap/compare/v0.15.3...master +[0.15.5]: https://github.com/owncloud/user_ldap/compare/v0.15.2...v0.15.3 [0.15.2]: https://github.com/owncloud/user_ldap/compare/v0.15.1...v0.15.2 [0.15.1]: https://github.com/owncloud/user_ldap/compare/v0.15.0...v0.15.1 [0.15.0]: https://github.com/owncloud/user_ldap/compare/v0.14.0...v0.15.0 diff --git a/appinfo/info.xml b/appinfo/info.xml index b7aaeab21..f6d7645e9 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -14,7 +14,7 @@ More information is available in the [LDAP User and Group Backend documentation] AGPL Jörn Friedrich Dreyer, Tom Needham, Juan Pablo Villafañez Ramos, Dominik Schmidt and Arthur Schiwon - 0.15.2 + 0.15.3 From ffddf010b9d9129ca01b0b4364825ec8c5b4046d Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Mon, 14 Jun 2021 10:29:07 +0200 Subject: [PATCH 02/30] Updated changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92bc8993e..60a5dbbe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) ### Fixed - Fixed read LDAP attribute value 0 returned as null [#599](https://github.com/owncloud/user_ldap/issues/599) +- Security: filter special characters from password field [#636](https://github.com/owncloud/user_ldap/issues/636) +- LDAP multiple base dns break pagination [#307](https://github.com/owncloud/user_ldap/issues/307) + +### Changed +- Add warning for disabling email login regarding strict login check [#581](https://github.com/owncloud/user_ldap/issues/581) (Requires 10.5.0) +- Facelift [#597](https://github.com/owncloud/user_ldap/issues/597) +- Bump libraries + ## [0.15.2] - 2020-06-16 From 2781b9ed4dace9e626869667dc987815a5877c30 Mon Sep 17 00:00:00 2001 From: hurradieweltgehtunter Date: Thu, 1 Jul 2021 12:23:20 +0200 Subject: [PATCH 03/30] Fixes fixes #642 fixes #645 fixes #646 --- css/settings.css | 36 ++++++++++++++++++++---- js/wizard/view.js | 10 +++++++ templates/part.wizard-loginfilter.php | 8 +++--- templates/part.wizard-server.php | 12 ++++---- templates/part.wizard-userfilter.php | 4 +-- templates/settings.php | 40 +++++++++++++-------------- 6 files changed, 73 insertions(+), 37 deletions(-) diff --git a/css/settings.css b/css/settings.css index bad218e10..58505e2c5 100644 --- a/css/settings.css +++ b/css/settings.css @@ -1,6 +1,5 @@ -#ldap section { - margin-bottom: 2rem; - width: 100% !important; +#ldap { + width: calc(100% - 40px); } @media all and (min-width: 768px) { @@ -9,6 +8,10 @@ } } +#ldap section { + margin-bottom: 2rem; +} + #ldap section h3 { border-bottom: 1px solid #efefef; margin-left: -41px; @@ -75,6 +78,23 @@ #ldap .tablerow .hint { clear: both; font-size: .8em; + position: relative; + padding-left: 1rem; +} + +#ldap .tablerow .hint:before { + background: url('/core/img/actions/info.svg'); + background-size: contain; + background-position: 50% 100%; + background-repeat: no-repeat; + display: inline-block; + height: 1.3em; + width: 1.3em; + margin-right: 0rem; + content: ' '; + position: absolute; + margin-left: -1rem; + top: 3px; } #ldap .tablerow .hint img { @@ -269,15 +289,16 @@ select[multiple=multiple] + button { #ldap .header { position: fixed; background: #fff; - width: inherit; top: 5.5em; padding-top: 1.7em; z-index: 1; + width: calc(100% - 40px); } @media all and (min-width: 768px) { #ldap .header { top: 3.5em; + width: 60%; } } @@ -316,10 +337,15 @@ select[multiple=multiple] + button { color: #333333; border: none; background: transparent; - padding: 0.7em 1.3em; + padding: 0.2rem 1.3rem; display: none; } +#ldap .ui-tabs .ui-tabs-nav li.stateIndicator div { + font-weight: 100; + font-size: 75%; +} + @media all and (min-width: 768px) { #ldap .ui-tabs .ui-tabs-nav li.stateIndicator { display: block; diff --git a/js/wizard/view.js b/js/wizard/view.js index 27d9b8e39..055ec90cc 100644 --- a/js/wizard/view.js +++ b/js/wizard/view.js @@ -55,6 +55,14 @@ OCA = OCA || {}; }); $('.ldap_action_test_connection').click(this.onTestButtonClick); + + $('#ldap_host').on('input', function () { + $('.ldap_config_state_indicator_subline').html($('#ldap_host').val() + ':' + $('#ldap_port').val()) + }) + + $('#ldap_port').on('input', function () { + $('.ldap_config_state_indicator_subline').html($('#ldap_host').val() + ':' + $('#ldap_port').val()) + }) }, /** @@ -258,6 +266,8 @@ OCA = OCA || {}; if(!_.isUndefined(this.tabs[newTabID])) { this._controlUpdate(this.tabs[newTabID].tabIndex); } + + $('.ldap_config_state_indicator_subline').html($('#ldap_host').val() + ':' + $('#ldap_port').val()) }, /** diff --git a/templates/part.wizard-loginfilter.php b/templates/part.wizard-loginfilter.php index fdf21e392..2cde8bf2e 100644 --- a/templates/part.wizard-loginfilter.php +++ b/templates/part.wizard-loginfilter.php @@ -7,14 +7,14 @@
- t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.'));?>" + t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.'));?>
- t('Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed. WARNING: Disabling login with email might require enabling strict login checking to be effective, please refer to ownCloud documentation for more details!'));?> + t('Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed. WARNING: Disabling login with email might require enabling strict login checking to be effective, please refer to ownCloud documentation for more details!'));?>
@@ -33,7 +33,7 @@
- t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: "uid=%%uid"'));?> + t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: "uid=%%uid"'));?>
@@ -44,7 +44,7 @@
- Attempts to receive a DN for the given loginname and the current login filter + Attempts to receive a DN for the given loginname and the current login filter
diff --git a/templates/part.wizard-server.php b/templates/part.wizard-server.php index 808f3e0e9..ef047824f 100644 --- a/templates/part.wizard-server.php +++ b/templates/part.wizard-server.php @@ -56,7 +56,7 @@ class="ldapIconCopy icon-default-style"
- t('You can omit the protocol, except you require SSL. Then start with ldaps://')); ?> + t('You can omit the protocol, except you require SSL. Then start with ldaps://')); ?>
@@ -64,7 +64,7 @@ class="ldapIconCopy icon-default-style"
- t('Enable StartTLS support (also known as LDAP over TLS) for the connection. Note that this is different than LDAPS (LDAP over SSL) which doesn\'t need this checkbox checked. You\'ll need to import the LDAP server\'s certificate in your %s server.', $theme->getName())); ?> + t('Enable StartTLS support (also known as LDAP over TLS) for the connection. Note that this is different than LDAPS (LDAP over SSL) which doesn\'t need this checkbox checked. You\'ll need to import the LDAP server\'s certificate in your %s server.', $theme->getName())); ?>
@@ -72,7 +72,7 @@ class="ldapIconCopy icon-default-style"
- t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.')); ?> + t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.')); ?>
@@ -80,7 +80,7 @@ class="ldapIconCopy icon-default-style"
- t('For anonymous access, leave DN and Password empty.')); ?> + t('For anonymous access, leave DN and Password empty.')); ?>
@@ -89,7 +89,7 @@ class="ldapIconCopy icon-default-style"
- t('You can specify Base DN for users and groups in the Advanced tab')); ?> + t('You can specify Base DN for users and groups in the Advanced tab')); ?>
@@ -105,7 +105,7 @@ class="ldapIconCopy icon-default-style"
- t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?> + t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?>
diff --git a/templates/part.wizard-userfilter.php b/templates/part.wizard-userfilter.php index e39580d24..029c4db41 100644 --- a/templates/part.wizard-userfilter.php +++ b/templates/part.wizard-userfilter.php @@ -7,7 +7,7 @@
- t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?> + t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?>
@@ -45,7 +45,7 @@
- t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?> + t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>
diff --git a/templates/settings.php b/templates/settings.php index b4ba5e7b4..275af4503 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -62,7 +62,7 @@ ?>
  • t('Advanced')); ?>
  • t('Expert')); ?>
    • -
    • +
  • @@ -94,7 +94,7 @@
    - t('Give an optional backup host. It must be a replica of the main LDAP/AD server.')); ?> + t('Give an optional backup host. It must be a replica of the main LDAP/AD server.')); ?>
    @@ -103,25 +103,25 @@
    - t('Only connect to the replica server.')); ?> + t('Only connect to the replica server.')); ?>
    - t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName())); ?> + t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName())); ?>
    - t('in seconds. A change empties the cache.')); ?> + t('in seconds. A change empties the cache.')); ?>
    - t('timeout for all the ldap network operations, in seconds.')); ?> + t('timeout for all the ldap network operations, in seconds.')); ?>
    @@ -134,28 +134,28 @@
    - t('The LDAP attribute to use to generate the user\'s display name.')); ?> + t('The LDAP attribute to use to generate the user\'s display name.')); ?>
    - t('Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«.')); ?> + t('Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«.')); ?>
    - t('Base User Tree')); ?> + t('Base User Tree')); ?>
    - t('User Search Attributes')); ?> + t('User Search Attributes')); ?>
    @@ -166,21 +166,21 @@
    - t('The LDAP attribute to use to generate the groups\'s display name.')); ?> + t('The LDAP attribute to use to generate the groups\'s display name.')); ?>
    - t('Base Group Tree')); ?> + t('Base Group Tree')); ?>
    - t('Group Search Attributes')); ?> + t('Group Search Attributes')); ?>
    @@ -200,19 +200,19 @@
    - t('The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)')); ?> + t('The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)')); ?>
    - t('When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)')); ?> + t('When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)')); ?>
    - t('Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)')); ?> + t('Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)')); ?>
    @@ -225,28 +225,28 @@
    - t('Leave empty for user\'s default quota. Otherwise, specify an LDAP/AD attribute.')); ?> + t('Leave empty for user\'s default quota. Otherwise, specify an LDAP/AD attribute.')); ?>
    - t('Override default quota for LDAP users who do not have a quota set in the Quota Field.')); ?> + t('Override default quota for LDAP users who do not have a quota set in the Quota Field.')); ?>
    - t('Set the user\'s email from their LDAP attribute. Leave it empty for default behaviour.')); ?> + t('Set the user\'s email from their LDAP attribute. Leave it empty for default behaviour.')); ?>
    - t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.')); ?> + t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.')); ?>
    From 06595d8facca2d60e7734a67a2628cca7c1e82a5 Mon Sep 17 00:00:00 2001 From: hurradieweltgehtunter Date: Thu, 1 Jul 2021 13:43:46 +0200 Subject: [PATCH 04/30] Fixes #644 --- css/settings.css | 39 ++++++++++++++++++++++++------- js/wizard/view.js | 12 +++++++--- templates/part.wizardcontrols.php | 1 - templates/settings.php | 5 ++++ 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/css/settings.css b/css/settings.css index 58505e2c5..7f0389b06 100644 --- a/css/settings.css +++ b/css/settings.css @@ -235,14 +235,6 @@ select[multiple=multiple] + button { cursor: wait; } -#ldap .ldap_saving { - margin-right: 15px; - color: orange; - font-weight: bold; -} - -#ldap .ldap_saving img { height: 15px; } - #ldap .app-name .ldap_config_state_indicator_container { display: inline-block; margin-left: 2em; @@ -333,7 +325,8 @@ select[multiple=multiple] + button { left: 1.3em; } -#ldap .ui-tabs .ui-tabs-nav li.stateIndicator { +#ldap .ui-tabs .ui-tabs-nav li.stateIndicator, +#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper { color: #333333; border: none; background: transparent; @@ -341,6 +334,34 @@ select[multiple=multiple] + button { display: none; } +#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper { + padding: 0.5rem 1.3rem; + display: block; +} + +#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving { + margin-right: 15px; + color: orange; + font-weight: bold; +} + +#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving .done { + display: none; + color: #128c12; +} + +#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving.done img { + display: none; +} + +#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving.done .done { + display: inline; +} + +#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving.done .working { + display: none; +} + #ldap .ui-tabs .ui-tabs-nav li.stateIndicator div { font-weight: 100; font-size: 75%; diff --git a/js/wizard/view.js b/js/wizard/view.js index 055ec90cc..718477bcc 100644 --- a/js/wizard/view.js +++ b/js/wizard/view.js @@ -339,7 +339,7 @@ OCA = OCA || {}; * shows a save spinner */ showSaveSpinner: function() { - this.$saveSpinners.removeClass('hidden'); + this.$saveSpinners.show() $('#ldap *').addClass('save-cursor'); }, @@ -347,8 +347,14 @@ OCA = OCA || {}; * hides the save spinner */ hideSaveSpinner: function() { - this.$saveSpinners.addClass('hidden'); - $('#ldap *').removeClass('save-cursor'); + this.$saveSpinners.addClass('done') + setTimeout(function() { + $('#ldap .ldap_saving').fadeOut(1000, function () { + $('#ldap .ldap_saving').removeClass('done') + }); + $('#ldap *').removeClass('save-cursor'); + + }, 1000) }, /** diff --git a/templates/part.wizardcontrols.php b/templates/part.wizardcontrols.php index 19ffd2858..029d20f94 100644 --- a/templates/part.wizardcontrols.php +++ b/templates/part.wizardcontrols.php @@ -1,5 +1,4 @@
    -
    diff --git a/templates/settings.php b/templates/settings.php index 275af4503..b15602e3e 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -69,6 +69,11 @@ t('Help')); ?>
    • +
  • +
    + t('Saving'));?> ...t('Saved'));?> +
    +
    • Date: Thu, 1 Jul 2021 13:47:00 +0200 Subject: [PATCH 05/30] hide save indicator initially --- templates/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/settings.php b/templates/settings.php index b15602e3e..21299900d 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -70,7 +70,7 @@
  • -
    +
    • From b571ecd18a4bebd529fe2785e14b9299dd3378ea Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Thu, 1 Jul 2021 14:03:44 +0200 Subject: [PATCH 06/30] manual merge https://github.com/owncloud/user_ldap/pull/589 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60a5dbbe0..21dfddbd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) - Reissue search in case of missing cookie in continued paged search - [#551](https://github.com/owncloud/user_ldap/issues/551) ### Changed +- Set ownCloud min-version to 10.4 - Bump libraries ## [0.15.1] - 2020-03-09 From 92e25878a8256150e88d05f4262a7bd2f5b207ff Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Thu, 1 Jul 2021 14:08:54 +0200 Subject: [PATCH 07/30] merge min-version correctly --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21dfddbd8..d06bc2a97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,13 +16,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) - Bump libraries + ## [0.15.2] - 2020-06-16 ### Fixed - Reissue search in case of missing cookie in continued paged search - [#551](https://github.com/owncloud/user_ldap/issues/551) ### Changed -- Set ownCloud min-version to 10.4 - Bump libraries ## [0.15.1] - 2020-03-09 @@ -41,6 +41,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) ### Changed - Drop PHP 7.0 - [#474](https://github.com/owncloud/user_ldap/issues/474) +- Requires ownCloud min-version 10.4 ## [0.14.0] - 2019-11-11 From c660ee6d33b0ea02ee6aea4bc267dd8f1f12af2f Mon Sep 17 00:00:00 2001 From: hurradieweltgehtunter Date: Thu, 1 Jul 2021 14:55:27 +0200 Subject: [PATCH 08/30] Update host indicator when config is loaded not on tab change --- js/wizard/configModel.js | 2 ++ js/wizard/view.js | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/wizard/configModel.js b/js/wizard/configModel.js index cb2538362..a0dfd5729 100644 --- a/js/wizard/configModel.js +++ b/js/wizard/configModel.js @@ -449,6 +449,8 @@ OCA = OCA || {}; $.each(result['configuration'], function(key, value) { model.configuration[key] = value; }); + + $('.ldap_config_state_indicator_subline').html(result['configuration']['ldap_host'] + ':' + result['configuration']['ldap_port']) } model.loadingConfig = false; model._broadcast('configLoaded', model.configuration); diff --git a/js/wizard/view.js b/js/wizard/view.js index 718477bcc..d7f2df504 100644 --- a/js/wizard/view.js +++ b/js/wizard/view.js @@ -266,8 +266,6 @@ OCA = OCA || {}; if(!_.isUndefined(this.tabs[newTabID])) { this._controlUpdate(this.tabs[newTabID].tabIndex); } - - $('.ldap_config_state_indicator_subline').html($('#ldap_host').val() + ':' + $('#ldap_port').val()) }, /** From 04b38a79399bdd554b44ddbb0a08fc5a31a34d84 Mon Sep 17 00:00:00 2001 From: hurradieweltgehtunter Date: Thu, 1 Jul 2021 15:09:06 +0200 Subject: [PATCH 09/30] improve host/port indicator update --- js/wizard/configModel.js | 5 +++-- js/wizard/view.js | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/wizard/configModel.js b/js/wizard/configModel.js index a0dfd5729..c1ff00bc7 100644 --- a/js/wizard/configModel.js +++ b/js/wizard/configModel.js @@ -449,8 +449,6 @@ OCA = OCA || {}; $.each(result['configuration'], function(key, value) { model.configuration[key] = value; }); - - $('.ldap_config_state_indicator_subline').html(result['configuration']['ldap_host'] + ':' + result['configuration']['ldap_port']) } model.loadingConfig = false; model._broadcast('configLoaded', model.configuration); @@ -628,6 +626,9 @@ OCA = OCA || {}; configPrefix: configID, errorMessage: _.isUndefined(result['message']) ? '' : result['message'] }; + + $('.ldap_config_state_indicator_subline').html('') + model._broadcast('deleteConfiguration', payload); } }; diff --git a/js/wizard/view.js b/js/wizard/view.js index d7f2df504..0987d7d96 100644 --- a/js/wizard/view.js +++ b/js/wizard/view.js @@ -223,6 +223,9 @@ OCA = OCA || {}; view._updateStatusIndicator(view.STATUS_UNTESTED); view.basicStatusCheck(view); view.functionalityCheck(); + if (view['configModel']['configuration']['ldap_host'] !== '') + $('.ldap_config_state_indicator_subline').html(view['configModel']['configuration']['ldap_host'] + ':' + view['configModel']['configuration']['ldap_port']) + }, /** From 62bae0d643a7f9eda2ec5e135ed44b055a52427f Mon Sep 17 00:00:00 2001 From: hurradieweltgehtunter Date: Wed, 7 Jul 2021 09:06:45 +0200 Subject: [PATCH 10/30] fixes #656 --- js/wizard/view.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/wizard/view.js b/js/wizard/view.js index 0987d7d96..64e6d70c5 100644 --- a/js/wizard/view.js +++ b/js/wizard/view.js @@ -63,6 +63,8 @@ OCA = OCA || {}; $('#ldap_port').on('input', function () { $('.ldap_config_state_indicator_subline').html($('#ldap_host').val() + ':' + $('#ldap_port').val()) }) + + $('.ui-tabs .ui-tabs-panel').css('margin-top', $('#ldap .header').outerHeight()) }, /** @@ -488,7 +490,6 @@ OCA = OCA || {}; })(); $(document).ready(function () { - $('.ui-tabs .ui-tabs-panel').css('margin-top', $('#ldap .header').outerHeight()) $(window).on('resize', function(){ $('.ui-tabs .ui-tabs-panel').css('margin-top', $('#ldap .header').outerHeight()) }); From ce5e3a2ac3f8b6ed871982bdc9bfe3761418678b Mon Sep 17 00:00:00 2001 From: hurradieweltgehtunter Date: Wed, 7 Jul 2021 09:14:01 +0200 Subject: [PATCH 11/30] fixes #653 --- templates/part.wizard-loginfilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/part.wizard-loginfilter.php b/templates/part.wizard-loginfilter.php index 2cde8bf2e..44ac1c7da 100644 --- a/templates/part.wizard-loginfilter.php +++ b/templates/part.wizard-loginfilter.php @@ -27,7 +27,7 @@