]>
source.dussan.org Git - nextcloud-server.git/log
Vincent Petry [Wed, 27 Jul 2022 07:27:50 +0000 (09:27 +0200)]
Merge pull request #33307 from nextcloud/bump/nextcloud-dialogs-3.1.2-to-3.1.4
Bump nextcloud-dialogs from 3.1.2 to 3.1.4
Vincent Petry [Wed, 27 Jul 2022 07:23:50 +0000 (09:23 +0200)]
Merge pull request #33271 from nextcloud/enh/a11y-new-file-menu
Use explicit name for new file/folder menu
Vincent Petry [Thu, 21 Jul 2022 14:26:49 +0000 (16:26 +0200)]
Bump nextcloud-dialogs from 3.1.2 to 3.1.4
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Vincent Petry [Tue, 26 Jul 2022 21:10:12 +0000 (23:10 +0200)]
Merge pull request #30030 from nextcloud/fexists
Fix disabled `php_uname`
Vincent Petry [Tue, 26 Jul 2022 21:08:04 +0000 (23:08 +0200)]
Merge pull request #30510 from nextcloud/user-cleanup-storage-before-cache
delete files before cleaning cache when cleaning user files
Vincent Petry [Tue, 26 Jul 2022 20:34:27 +0000 (22:34 +0200)]
Merge pull request #33361 from nextcloud/techdebt/noid/further-cleanup
Further markup cleanup
Anna [Tue, 26 Jul 2022 18:59:33 +0000 (20:59 +0200)]
Merge pull request #33251 from cneukom/feature/birthday-calendar-reminder-settings
Birthday Calendar Reminder Setting
Pytal [Tue, 26 Jul 2022 17:51:21 +0000 (10:51 -0700)]
Merge pull request #33360 from nextcloud/adjust-acceptance-tests-to-changes-in-sharing-tab
blizzz [Tue, 26 Jul 2022 17:22:56 +0000 (19:22 +0200)]
Merge pull request #33341 from nextcloud/fix/29617/no-purge-when-birthday-calendar-doesnt-exist
Don't try to purge objects from the birthday calendar when it doesn't exist
Vincent Petry [Tue, 26 Jul 2022 16:05:03 +0000 (18:05 +0200)]
Merge pull request #32733 from nextcloud/dependabot/npm_and_yarn/underscore-1.13.4
Bump underscore from 1.12.0 to 1.13.4
Vincent Petry [Tue, 26 Jul 2022 16:01:45 +0000 (18:01 +0200)]
Merge pull request #33358 from nextcloud/techdebt/noid/remove-old-notification-container
Remove obsolete notification container
Louis [Tue, 26 Jul 2022 15:11:07 +0000 (17:11 +0200)]
Merge pull request #31728 from nextcloud/bugfix/30791/update-subshare-owner-on-move
Update owner of subdir on move into/out of share
Vincent Petry [Tue, 26 Jul 2022 13:34:19 +0000 (15:34 +0200)]
Add missing closing spans and avoid empty href
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Vincent Petry [Tue, 26 Jul 2022 12:54:28 +0000 (14:54 +0200)]
Remove obsolete notification container
The future is TOAST 🍞
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Vincent Petry [Tue, 26 Jul 2022 13:44:57 +0000 (15:44 +0200)]
Fix core tests by stubbing debounce
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Vincent Petry [Tue, 26 Jul 2022 13:34:00 +0000 (15:34 +0200)]
Removed id=modified in files app
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Daniel Calviño Sánchez [Tue, 26 Jul 2022 13:13:18 +0000 (15:13 +0200)]
Adjust acceptance tests to changes in sharing tab
The name of the user shared with is now marked with a "span" rather than
with "h5".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
dependabot[bot] [Tue, 26 Jul 2022 12:29:49 +0000 (12:29 +0000)]
Bump underscore from 1.12.0 to 1.13.4
Bumps [underscore](https://github.com/jashkenas/underscore) from 1.12.0 to 1.13.4.
- [Release notes](https://github.com/jashkenas/underscore/releases)
- [Commits](https://github.com/jashkenas/underscore/compare/1.12.0...1.13.4)
---
updated-dependencies:
- dependency-name: underscore
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Louis Chemineau [Thu, 23 Jun 2022 14:32:52 +0000 (16:32 +0200)]
Add argument to getSharesInFolder enable deep share lookup
Signed-off-by: Louis Chemineau <louis@chmn.me>
Louis Chemineau [Wed, 27 Apr 2022 11:32:44 +0000 (13:32 +0200)]
Skip testMovedIntoShareChangeOwner
Signed-off-by: Louis Chemineau <louis@chmn.me>
Louis Chemineau [Wed, 27 Apr 2022 11:17:22 +0000 (13:17 +0200)]
Recursively fetch subshares
Signed-off-by: Louis Chemineau <louis@chmn.me>
Vincent Petry [Fri, 1 Apr 2022 10:42:00 +0000 (12:42 +0200)]
Int test for share owner change on move
Added tests to verify share owner change when moving the parent of a
subshare in and out of a received share.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Louis Chemineau [Thu, 31 Mar 2022 10:08:42 +0000 (12:08 +0200)]
Change share owner when moving share out of share
Signed-off-by: Louis Chemineau <louis@chmn.me>
Louis Chemineau [Thu, 31 Mar 2022 09:38:26 +0000 (11:38 +0200)]
Prevent column name conflict between tables
Signed-off-by: Louis Chemineau <louis@chmn.me>
Vincent Petry [Mon, 28 Mar 2022 07:28:37 +0000 (09:28 +0200)]
Update owner of subdir on move into/out of share
When moving a directory into or out of a received share, make sure to
also update the share owner column for shares that exist insie the
directory.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Louis Chemineau [Thu, 31 Mar 2022 14:51:29 +0000 (16:51 +0200)]
Test moving share in and out of another share
Signed-off-by: Louis Chemineau <louis@chmn.me>
Vincent Petry [Tue, 26 Jul 2022 10:21:13 +0000 (12:21 +0200)]
Merge pull request #33320 from nextcloud/bugfix/noid/remove-files-duplicate-dom-ids
Replace files app ids to classes
Côme Chilliet [Tue, 26 Jul 2022 09:39:32 +0000 (11:39 +0200)]
Merge pull request #33031 from nextcloud/fix/improve-local-ip-detection
Improve local IP detection
Simon L [Tue, 26 Jul 2022 08:21:19 +0000 (10:21 +0200)]
Merge pull request #33166 from Lukasdoe/master
Add button disable on submit for login grant
Vincent Petry [Fri, 22 Jul 2022 14:11:01 +0000 (16:11 +0200)]
Replace files app ids to classes
Replaced ids to classes for the following:
- #filestable -> .files-filestable
- #fileList -> .files-fileList
- #controls -> .files-controls
- #emptycontent -> .emptyfilelist.emptycontent
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Joas Schilling [Tue, 26 Jul 2022 08:11:51 +0000 (10:11 +0200)]
Merge pull request #33315 from nextcloud/bugfix/33314/allow-reseting-status-only-with-message-id
Reset user status based on message ID only
Vincent Petry [Tue, 26 Jul 2022 07:13:24 +0000 (09:13 +0200)]
Merge pull request #33206 from nextcloud/enh/27869/consolidate
Consolidate account property getters
Nextcloud bot [Tue, 26 Jul 2022 02:26:49 +0000 (02:26 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Pytal [Mon, 25 Jul 2022 18:50:49 +0000 (11:50 -0700)]
Merge pull request #33334 from nextcloud/bugfix/appmenu-text
Thomas Citharel [Mon, 25 Jul 2022 13:15:14 +0000 (15:15 +0200)]
Don't try to purge objects from the birthday calendar when it doesn't exist
Doesn't matter much as it's been recreated afterwards with (ensureCalendarExists).
Closes #29617
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
blizzz [Mon, 25 Jul 2022 15:56:03 +0000 (17:56 +0200)]
Merge pull request #33129 from nextcloud/fix-reading-blob-as-resources
Fix reading blob data as resource
blizzz [Mon, 25 Jul 2022 15:46:41 +0000 (17:46 +0200)]
Merge pull request #33342 from nextcloud/bugfix/delete-comments-that-have-expired-now
Delete comments that expired now
Vitor Mattos [Mon, 25 Jul 2022 14:30:20 +0000 (11:30 -0300)]
Delete comments that expired now
Signed-off-by: Vitor Mattos <vitor@php.rio>
Lukas Döllerer [Thu, 7 Jul 2022 22:07:54 +0000 (00:07 +0200)]
Add button disable on submit for login grant
Signed-off-by: Lukas Döllerer <info@lukas-doellerer.de>
Carl Schwan [Mon, 25 Jul 2022 13:29:02 +0000 (15:29 +0200)]
Merge pull request #33338 from nextcloud/fix/contrast-search-icon
Fix contrast of the search icon
Carl Schwan [Mon, 25 Jul 2022 10:48:35 +0000 (12:48 +0200)]
Fix contrast of the search icon
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Vincent Petry [Mon, 25 Jul 2022 09:41:05 +0000 (11:41 +0200)]
Merge pull request #33321 from nextcloud/bugfix/noid/fix-sharing-lighthouse-issues
Fix sharing panel lighthouse warnings
Thomas Citharel [Wed, 6 Jul 2022 07:53:59 +0000 (09:53 +0200)]
Fix reading blob data as resource
PostgreSQL returns data as resource when using IQueryBuilder::PARAM_LOB
(which is used for QBMapper).
Previously we just converted this resource using settype, which produced
things like "Resource id #14" instead of the actual resource data.
Now we read the stream correctly if the returned data is a resource
See context at #22472
Fixes #22439
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Julius Härtl [Mon, 25 Jul 2022 06:49:46 +0000 (08:49 +0200)]
Make sure app menu text opacity matches the icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Nextcloud bot [Mon, 25 Jul 2022 02:27:10 +0000 (02:27 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sun, 24 Jul 2022 02:27:42 +0000 (02:27 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sat, 23 Jul 2022 02:26:18 +0000 (02:26 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
blizzz [Fri, 22 Jul 2022 22:12:51 +0000 (00:12 +0200)]
Merge pull request #33324 from nextcloud/fix/noid/controller_tests
fix Controller tests
blizzz [Fri, 22 Jul 2022 22:01:30 +0000 (00:01 +0200)]
Merge pull request #32869 from nextcloud/dav-no-deleted-user-activities
Avoid calendar & addressbook activities being created on user being deleted
blizzz [Fri, 22 Jul 2022 20:20:43 +0000 (22:20 +0200)]
Merge pull request #33308 from nextcloud/fs-setup-builtin-wrappers
always triger setup of builtin storage wrappers
Arthur Schiwon [Fri, 22 Jul 2022 20:15:08 +0000 (22:15 +0200)]
fix Controller tests
- added pageTitle in code was missing in expectations
- fixed warnings of superflouos parameter
- fixed wrong type of mock
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Vincent Petry [Fri, 22 Jul 2022 16:16:51 +0000 (18:16 +0200)]
Recompilation attempt with updated npm
node v14.20.0
npm 8.15.0
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Vincent Petry [Fri, 22 Jul 2022 15:49:55 +0000 (17:49 +0200)]
Fix sharing panel lighthouse warnings
Replaced h5 with span and adjusted selectors.
Fixed ul/li hierarchy of some elements.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Vincent Petry [Fri, 22 Jul 2022 09:44:00 +0000 (11:44 +0200)]
Merge pull request #33306 from nextcloud/bugfix/32350/rename-files-settings
Rename files settings on the bottom left
Joas Schilling [Fri, 22 Jul 2022 09:02:37 +0000 (11:02 +0200)]
Reset user status based on message ID only
Since some statuses (call) can occure with different status
(away and dnd) we need to reset only based on the message id.
But as it can not be set by the user this is still save and okay.
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Fri, 22 Jul 2022 02:25:14 +0000 (02:25 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Robin Appelman [Thu, 21 Jul 2022 14:36:32 +0000 (16:36 +0200)]
always triger setup of builtin storage wrappers
Signed-off-by: Robin Appelman <robin@icewind.nl>
Vincent Petry [Thu, 21 Jul 2022 13:56:34 +0000 (15:56 +0200)]
Merge pull request #33297 from nextcloud/fix/filepicker-new-button
FilePicker: Hide `newButton` outline if only picking is allowed
Vincent Petry [Thu, 21 Jul 2022 13:55:50 +0000 (15:55 +0200)]
Change casing of settings label
Co-authored-by: Jan C. Borchardt <hey@jancborchardt.net>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Vincent Petry [Thu, 21 Jul 2022 12:30:34 +0000 (14:30 +0200)]
Rename files settings on the bottom left
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Vincent Petry [Thu, 21 Jul 2022 12:12:39 +0000 (14:12 +0200)]
Merge pull request #33281 from nextcloud/enh/a11y-login-page-title
Identify the login page explicitly by the page title
Carl Schwan [Thu, 21 Jul 2022 11:59:51 +0000 (13:59 +0200)]
Merge pull request #32646 from jld3103/fix/user-status-heartbeat-api
Make user status heartbeat API publicly accessible
Vincent Petry [Thu, 21 Jul 2022 11:42:58 +0000 (13:42 +0200)]
Merge pull request #33304 from jld3103/feature/neon-user-agent
Add Neon user-agent
jld3103 [Sun, 29 May 2022 14:40:19 +0000 (16:40 +0200)]
Make user status heartbeat API publicly accessible
Signed-off-by: jld3103 <jld3103yt@gmail.com>
jld3103 [Thu, 21 Jul 2022 10:38:15 +0000 (12:38 +0200)]
Add Neon user-agent
Signed-off-by: jld3103 <jld3103yt@gmail.com>
Vincent Petry [Thu, 21 Jul 2022 07:41:21 +0000 (09:41 +0200)]
Merge pull request #33293 from nextcloud/last-login-minute
only update last login timestamp with minute percision
Vincent Petry [Thu, 21 Jul 2022 07:40:16 +0000 (09:40 +0200)]
Merge pull request #33287 from nextcloud/bugfix/focus-outline-bubble-menu
Add legacy popover focus outline
Nextcloud bot [Thu, 21 Jul 2022 02:26:49 +0000 (02:26 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Christopher Ng [Mon, 11 Jul 2022 23:58:32 +0000 (23:58 +0000)]
Consolidate account property getters
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Pytal [Thu, 21 Jul 2022 01:04:40 +0000 (18:04 -0700)]
Merge pull request #33242 from nextcloud/enh/email-material-icons
Christopher Ng [Sat, 16 Jul 2022 00:12:15 +0000 (00:12 +0000)]
Use material design icons in Email component
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Christopher Ng [Wed, 20 Jul 2022 23:55:50 +0000 (23:55 +0000)]
Identify the login page explicitly by the page title
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Ferdinand Thiessen [Sat, 16 Jul 2022 13:19:20 +0000 (15:19 +0200)]
FilePicker: Hide also outline of `new` button if type is `CHOOSE`
If the filepicker mode is set to `FILEPICKER_TYPE_CHOOSE`
currently only the button but not the outline of it is hidden.
This also hides the outline to fix #33142
Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Robin Appelman [Wed, 20 Jul 2022 14:43:42 +0000 (16:43 +0200)]
only update last login timestamp with minute percision
Signed-off-by: Robin Appelman <robin@icewind.nl>
Vincent Petry [Wed, 20 Jul 2022 12:45:35 +0000 (14:45 +0200)]
Merge pull request #33266 from nextcloud/bugfix/noid/skip-content-public
Add skip content buttons to the public page layout
Julius Härtl [Wed, 20 Jul 2022 06:42:13 +0000 (08:42 +0200)]
Add legacy popover focus outline
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Wed, 20 Jul 2022 05:20:29 +0000 (07:20 +0200)]
Merge pull request #33286 from nextcloud/dependabot/npm_and_yarn/terser-4.8.1
Bump terser from 4.8.0 to 4.8.1
dependabot[bot] [Wed, 20 Jul 2022 02:36:12 +0000 (02:36 +0000)]
Bump terser from 4.8.0 to 4.8.1
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)
---
updated-dependencies:
- dependency-name: terser
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Nextcloud bot [Wed, 20 Jul 2022 02:25:44 +0000 (02:25 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Vincent Petry [Tue, 19 Jul 2022 08:36:20 +0000 (10:36 +0200)]
Merge pull request #33260 from nextcloud/fix/carl/quota
Fix quota nav item
Julius Härtl [Tue, 19 Jul 2022 06:15:13 +0000 (08:15 +0200)]
Merge pull request #33270 from nextcloud/fix/noid/location-legacy-appfile
fix loading legacy app.php with multi app dir
Julius Härtl [Tue, 19 Jul 2022 06:14:54 +0000 (08:14 +0200)]
Merge pull request #33267 from nextcloud/bugfix/noid/button-hover
Use hover css variable for primary buttons
Nextcloud bot [Tue, 19 Jul 2022 02:25:49 +0000 (02:25 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
dependabot[bot] [Mon, 18 Jul 2022 23:24:17 +0000 (23:24 +0000)]
Merge pull request #33268 from nextcloud/dependabot/composer/bamarni/composer-bin-plugin-1.8.0
Christopher Ng [Mon, 18 Jul 2022 18:28:28 +0000 (18:28 +0000)]
Use explicit name for new file/folder menu
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Arthur Schiwon [Mon, 18 Jul 2022 18:19:02 +0000 (20:19 +0200)]
fix loading legacy app.php with multi app dir
- requireAppFile() only appends /appinfo/app.php
- without the absolute path, require_once looks into include_path
- the first match in inlcude_path however migth be different from appPath
- fixed by providing the tested(!), full path to the app
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Pytal [Mon, 18 Jul 2022 17:43:36 +0000 (10:43 -0700)]
Merge pull request #33246 from nextcloud/bugfix/noid/dark-primary-light
dependabot[bot] [Mon, 18 Jul 2022 16:58:24 +0000 (16:58 +0000)]
Bump bamarni/composer-bin-plugin from 1.5.0 to 1.8.0
Bumps [bamarni/composer-bin-plugin](https://github.com/bamarni/composer-bin-plugin) from 1.5.0 to 1.8.0.
- [Release notes](https://github.com/bamarni/composer-bin-plugin/releases)
- [Commits](https://github.com/bamarni/composer-bin-plugin/compare/v1.5.0...1.8.0)
---
updated-dependencies:
- dependency-name: bamarni/composer-bin-plugin
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Pytal [Mon, 18 Jul 2022 16:54:22 +0000 (09:54 -0700)]
Merge pull request #33240 from nextcloud/fix/login-input-focus
Julius Härtl [Mon, 18 Jul 2022 16:14:02 +0000 (18:14 +0200)]
Use hover css variable for primary buttons and add proper focus outline
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Mon, 18 Jul 2022 16:00:22 +0000 (18:00 +0200)]
Add skip content buttons to the public page layout
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Mon, 18 Jul 2022 12:34:31 +0000 (14:34 +0200)]
Merge pull request #33255 from nextcloud/fix/login-password-translation
LoginForm: Fix password label translation call
Carl Schwan [Mon, 18 Jul 2022 11:25:10 +0000 (13:25 +0200)]
Fix quota nav item
- Spacing was not correctly set
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Carl Schwan [Mon, 18 Jul 2022 10:34:11 +0000 (12:34 +0200)]
Merge pull request #32981 from nextcloud/typing/carl/simplefs
Add typing to SimpleFS
Marcel Klehr [Mon, 18 Jul 2022 07:59:45 +0000 (09:59 +0200)]
LoginForm: Fix password label translation call
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
blizzz [Mon, 18 Jul 2022 09:50:43 +0000 (11:50 +0200)]
Merge pull request #27929 from nextcloud/enh/allowSsoToProvideSecret
Allow SSO authentication to provide a user secret
Carl Schwan [Mon, 18 Jul 2022 09:47:53 +0000 (11:47 +0200)]
Merge pull request #32521 from nextcloud/cleanup/oauth2-admin-setting
Cleanup oauth2 admin settings
Carl Schwan [Mon, 18 Jul 2022 08:32:11 +0000 (10:32 +0200)]
Merge pull request #33064 from nextcloud/feat/capped-memorycache-ocp
Move CappedMemoryCache to OCP
Daniel [Mon, 18 Jul 2022 07:51:19 +0000 (09:51 +0200)]
Merge pull request #32963 from nextcloud/s3-crt-bundle-download
also use nextcloud certificate bundle when downloading from s3
Vincent Petry [Mon, 18 Jul 2022 07:24:57 +0000 (09:24 +0200)]
Merge pull request #33247 from nextcloud/bugfix/noid/skip-button-ids
Allow to override #app-content and #app-navigation hrefs for content skipping