diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Command/Encryption/DecryptAll.php | 2 | ||||
| -rw-r--r-- | core/css/multiselect.css | 4 | ||||
| -rw-r--r-- | core/js/files/client.js | 8 | ||||
| -rw-r--r-- | core/js/public/appconfig.js | 12 | ||||
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 28 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 2 | ||||
| -rw-r--r-- | core/shipped.json | 1 |
7 files changed, 32 insertions, 25 deletions
diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php index 7d77cc62e67..e02d7be5bb6 100644 --- a/core/Command/Encryption/DecryptAll.php +++ b/core/Command/Encryption/DecryptAll.php @@ -134,7 +134,7 @@ class DecryptAll extends Command { $uid = $input->getArgument('user'); if ($uid === '') { - $message = 'your ownCloud'; + $message = 'your Nextcloud'; } else { $message = "$uid's account"; } diff --git a/core/css/multiselect.css b/core/css/multiselect.css index cc1d6a3b468..8bcbd0e563d 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -31,9 +31,6 @@ ul.multiselectoptions.up { ul.multiselectoptions>li { overflow: hidden; white-space: nowrap; -} - -ul.multiselectoptions > li > input[type="checkbox"]+label:before { margin-left: 7px; } ul.multiselectoptions > li input[type='checkbox']+label { @@ -106,6 +103,7 @@ ul.multiselectoptions input.new { ul.multiselectoptions > li.creator { padding: 10px; + margin: 0; font-weight: bold; } ul.multiselectoptions > li.creator > input { diff --git a/core/js/files/client.js b/core/js/files/client.js index fdc51c4a197..87559b2084c 100644 --- a/core/js/files/client.js +++ b/core/js/files/client.js @@ -734,7 +734,7 @@ /** * Returns the dav.Client instance used internally * - * @since 9.2 + * @since 11.0.0 * @return {dav.Client} */ getClient: function() { @@ -744,7 +744,7 @@ /** * Returns the user name * - * @since 9.2 + * @since 11.0.0 * @return {String} userName */ getUserName: function() { @@ -754,7 +754,7 @@ /** * Returns the password * - * @since 9.2 + * @since 11.0.0 * @return {String} password */ getPassword: function() { @@ -764,7 +764,7 @@ /** * Returns the base URL * - * @since 9.2 + * @since 11.0.0 * @return {String} base URL */ getBaseUrl: function() { diff --git a/core/js/public/appconfig.js b/core/js/public/appconfig.js index cde2700c86c..de04f334ca8 100644 --- a/core/js/public/appconfig.js +++ b/core/js/public/appconfig.js @@ -20,7 +20,7 @@ /** * @namespace - * @since 9.2.0 + * @since 11.0.0 */ OCP.AppConfig = { /** @@ -46,7 +46,7 @@ OCP.AppConfig = { /** * @param {Object} [options] * @param {function} [options.success] - * @since 9.2.0 + * @since 11.0.0 */ getApps: function(options) { this._call('get', '', options); @@ -57,7 +57,7 @@ OCP.AppConfig = { * @param {Object} [options] * @param {function} [options.success] * @param {function} [options.error] - * @since 9.2.0 + * @since 11.0.0 */ getKeys: function(app, options) { this._call('get', '/' + app, options); @@ -70,7 +70,7 @@ OCP.AppConfig = { * @param {Object} [options] * @param {function} [options.success] * @param {function} [options.error] - * @since 9.2.0 + * @since 11.0.0 */ getValue: function(app, key, defaultValue, options) { options = options || {}; @@ -88,7 +88,7 @@ OCP.AppConfig = { * @param {Object} [options] * @param {function} [options.success] * @param {function} [options.error] - * @since 9.2.0 + * @since 11.0.0 */ setValue: function(app, key, value, options) { options = options || {}; @@ -105,7 +105,7 @@ OCP.AppConfig = { * @param {Object} [options] * @param {function} [options.success] * @param {function} [options.error] - * @since 9.2.0 + * @since 11.0.0 */ deleteKey: function(app, key, options) { this._call('delete', '/' + app + '/' + key, options); diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index bbc8f1b4547..85a20dce01a 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -134,10 +134,15 @@ var clipboard = new Clipboard('.clipboardButton'); clipboard.on('success', function(e) { var $input = $(e.trigger); - $input.tooltip({placement: 'bottom', trigger: 'manual', title: t('core', 'Copied!')}); - $input.tooltip('show'); + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copied!')) + .tooltip('fixTitle') + .tooltip({placement: 'bottom', trigger: 'manual'}) + .tooltip('show'); _.delay(function() { - $input.tooltip('hide'); + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copy')) + .tooltip('fixTitle'); }, 3000); }); clipboard.on('error', function (e) { @@ -151,14 +156,15 @@ actionMsg = t('core', 'Press Ctrl-C to copy.'); } - $input.tooltip({ - placement: 'bottom', - trigger: 'manual', - title: actionMsg - }); - $input.tooltip('show'); + $input.tooltip('hide') + .attr('data-original-title', actionMsg) + .tooltip('fixTitle') + .tooltip({placement: 'bottom', trigger: 'manual'}) + .tooltip('show'); _.delay(function () { - $input.tooltip('hide'); + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copy')) + .tooltip('fixTitle'); }, 3000); }); @@ -336,6 +342,8 @@ mailButtonText: t('core', 'Send') })); + this.$el.find('.clipboardButton').tooltip({placement: 'bottom', title: t('core', 'Copy'), trigger: 'hover'}); + this.delegateEvents(); return this; diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index b277a1226c7..0a29dec73ca 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -400,7 +400,7 @@ var infoTemplate = this._getRemoteShareInfoTemplate(); remoteShareInfo = infoTemplate({ docLink: this.configModel.getFederatedShareDocLink(), - tooltip: t('core', 'Share with people on other servers using the syntax username@example.com/nextcloud') + tooltip: t('core', 'Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud') }); } diff --git a/core/shipped.json b/core/shipped.json index 9855a663847..f831d17f36a 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -21,6 +21,7 @@ "files_videoplayer", "firstrunwizard", "gallery", + "logreader", "notifications", "password_policy", "provisioning_api", |