Skip to content

[pull] master from the1812:master#59

Open
pull[bot] wants to merge 3524 commits into
shell-script:masterfrom
the1812:master
Open

[pull] master from the1812:master#59
pull[bot] wants to merge 3524 commits into
shell-script:masterfrom
the1812:master

Conversation

@pull

@pull pull Bot commented Apr 5, 2021

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

the1812 and others added 26 commits December 13, 2025 15:31
为下载文件自定义文件命名添加了up主的uid选项
[组件 - 保存视频元数据] 支持联合投稿创作团队信息
- Add missing author information
  - Explicitly add "Amazon Q" to claim this plugin as AI-generated
- Add missing property call

Co-authored-by: Grant Howard <[email protected]>
[新增插件] 下载视频 - ABDM 输出支持
feat(快捷键扩展): 添加视频进度按百分比跳转
原先情况下,\.*  匹配  "." , 不匹配任意字符,按照b站url的情况下,它应该是匹配任意字符,所以我去掉了 “\”
Fix regex pattern for roomId in Widget.vue
the1812 and others added 30 commits July 1, 2026 21:11
修复评论区初始化时过早访问全局 dqa 导致的脚本初始化失败
# Conflicts:
#	dist/bilibili-evolved.preview.user.js
#	dist/bilibili-evolved.user.js
#	registry/dist/components/feeds/copy-link.js
#	registry/dist/components/feeds/disable-details.js
#	registry/dist/components/feeds/extend-live.js
#	registry/dist/components/feeds/filter.js
#	registry/dist/components/feeds/fixed-sidebars.js
#	registry/dist/components/feeds/fold-comments.js
#	registry/dist/components/feeds/full-content.js
#	registry/dist/components/feeds/full-title.js
#	registry/dist/components/feeds/hide-comment-preview.js
#	registry/dist/components/feeds/image-auto-back-to-top.js
#	registry/dist/components/feeds/unfold.js
#	registry/dist/components/live/badge-helper.js
#	registry/dist/components/live/danmaku-sendbar.js
#	registry/dist/components/live/gift-box.js
#	registry/dist/components/live/home-mute.js
#	registry/dist/components/live/original.js
#	registry/dist/components/live/remove-watermark.js
#	registry/dist/components/live/showgirl.js
#	registry/dist/components/live/side-bar.js
#	registry/dist/components/style/always-show-duration.js
#	registry/dist/components/style/auto-hide-sidebar.js
#	registry/dist/components/style/clear-home.js
#	registry/dist/components/style/custom-navbar.js
#	registry/dist/components/style/dark-mode.js
#	registry/dist/components/style/dark-mode/follow-system.js
#	registry/dist/components/style/dark-mode/schedule.js
#	registry/dist/components/style/hide/bangumi/reviews.js
#	registry/dist/components/style/hide/bangumi/sponsors.js
#	registry/dist/components/style/hide/banner.js
#	registry/dist/components/style/hide/trending-search.js
#	registry/dist/components/style/hide/user-card.js
#	registry/dist/components/style/hide/video/recommended-live.js
#	registry/dist/components/style/hide/video/related-videos.js
#	registry/dist/components/style/hide/video/share.js
#	registry/dist/components/style/hide/video/top-mask.js
#	registry/dist/components/style/home-redesign/fresh.js
#	registry/dist/components/style/home-redesign/minimal.js
#	registry/dist/components/style/player-on-top-new.js
#	registry/dist/components/style/player-on-top.js
#	registry/dist/components/style/player-shadow.js
#	registry/dist/components/style/scrollbar.js
#	registry/dist/components/style/sidebar-offset.js
#	registry/dist/components/style/simplify/comments.js
#	registry/dist/components/style/simplify/home.js
#	registry/dist/components/style/simplify/live.js
#	registry/dist/components/style/special-danmaku.js
#	registry/dist/components/style/v1-panel.js
#	registry/dist/components/touch/combo-like.js
#	registry/dist/components/touch/double-click-control.js
#	registry/dist/components/touch/mini-player.js
#	registry/dist/components/touch/player-control.js
#	registry/dist/components/touch/player-gestures.js
#	registry/dist/components/utils/auto-like.js
#	registry/dist/components/utils/black-list.js
#	registry/dist/components/utils/change-update-urls.js
#	registry/dist/components/utils/check-in-center.js
#	registry/dist/components/utils/column-unlock.js
#	registry/dist/components/utils/comments/copy-link.js
#	registry/dist/components/utils/comments/disable-search-link.js
#	registry/dist/components/utils/dev-client.js
#	registry/dist/components/utils/download-audio.js
#	registry/dist/components/utils/image-exporter.js
#	registry/dist/components/utils/image-resolution.js
#	registry/dist/components/utils/import-series.js
#	registry/dist/components/utils/keymap.js
#	registry/dist/components/utils/remove-promotions.js
#	registry/dist/components/utils/url-params-clean.js
#	registry/dist/components/utils/v1-migrate.js
#	registry/dist/components/utils/view-cover.js
#	registry/dist/components/utils/watchlater-redirect.js
#	registry/dist/components/video/av-url.js
#	registry/dist/components/video/biliplus-redirect.js
#	registry/dist/components/video/bvid-convert.js
#	registry/dist/components/video/danmaku/airborne.js
#	registry/dist/components/video/danmaku/download.js
#	registry/dist/components/video/danmaku/expand.js
#	registry/dist/components/video/danmaku/unescape.js
#	registry/dist/components/video/default-location.js
#	registry/dist/components/video/download.js
#	registry/dist/components/video/full-description.js
#	registry/dist/components/video/full-episode-title.js
#	registry/dist/components/video/outer-watchlater.js
#	registry/dist/components/video/player/auto-light.js
#	registry/dist/components/video/player/common/mini-rxjs.js
#	registry/dist/components/video/player/common/mini-rxjs/operators/util.js
#	registry/dist/components/video/player/control-background.js
#	registry/dist/components/video/player/default-mode.js
#	registry/dist/components/video/player/disable-scroll-volume.js
#	registry/dist/components/video/player/double-click-fullscreen.js
#	registry/dist/components/video/player/extend-speed.js
#	registry/dist/components/video/player/focus.js
#	registry/dist/components/video/player/intersection-actions.js
#	registry/dist/components/video/player/invert-scroll-volume.js
#	registry/dist/components/video/player/legacy-auto-play.js
#	registry/dist/components/video/player/preserve-danmaku-input.js
#	registry/dist/components/video/player/remember-speed.js
#	registry/dist/components/video/player/remove-popup.js
#	registry/dist/components/video/player/screenshot.js
#	registry/dist/components/video/player/seek-by-frames.js
#	registry/dist/components/video/player/show-cover.js
#	registry/dist/components/video/player/show-upload-time.js
#	registry/dist/components/video/player/skip-charge-list.js
#	registry/dist/components/video/quick-favorite.js
#	registry/dist/components/video/seo-redirect.js
#	registry/dist/components/video/subtitle/download.js
#	registry/dist/plugins/launch-bar/audio-search.js
#	registry/dist/plugins/launch-bar/bangumi-search.js
#	registry/dist/plugins/launch-bar/cv-search.js
#	registry/dist/plugins/launch-bar/number-search.js
#	registry/dist/plugins/launch-bar/trending-search.js
#	registry/dist/plugins/launch-bar/uid-search.js
#	registry/dist/plugins/settings-panel/recent-components.js
#	registry/dist/plugins/style/custom-navbar-channel.js
#	registry/dist/plugins/style/custom-navbar-dark-mode.js
#	registry/dist/plugins/utils/keymap-dark-mode.js
#	registry/dist/plugins/utils/keymap-empty-action.ts.js
#	registry/dist/plugins/utils/keymap-toggle-danmaku-list.js
#	registry/dist/plugins/utils/keymap-toggle-player-light.js
#	registry/dist/plugins/utils/keymap-toggle-subtitle.js
#	registry/dist/plugins/v-loading/reimu.js
#	registry/dist/plugins/video/download/aria2-output.js
#	registry/dist/plugins/video/download/idm-output.js
#	registry/dist/plugins/video/download/manual-input.js
#	registry/dist/plugins/video/download/motrix-output.js
#	registry/dist/plugins/video/download/mpv-output-playlist.js
#	registry/dist/plugins/video/download/mpv-output.js
#	registry/dist/plugins/video/player/speed.js
显示视频投稿时间修复稍后再看页面切换视频后不显示投稿时间问题
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.