Skip to content

Commit

Permalink
Merge branch 'main_master' into fix_nav_bar_home
Browse files Browse the repository at this point in the history
# 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/unfold.js
# registry/dist/components/live/auto-draw.js
# registry/dist/components/live/badge-helper.js
# registry/dist/components/live/danmaku-sendbar.js
# registry/dist/components/live/download-records.js
# registry/dist/components/live/gift-box.js
# registry/dist/components/live/home-mute.js
# registry/dist/components/live/pip.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/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/video/recommended-live.js
# registry/dist/components/style/hide/video/related-videos.js
# registry/dist/components/style/hide/video/top-mask.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/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/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/download-audio.js
# registry/dist/components/utils/image-exporter.js
# registry/dist/components/utils/image-resolution.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/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/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/control-background.js
# registry/dist/components/video/player/default-mode.js
# registry/dist/components/video/player/double-click-fullscreen.js
# registry/dist/components/video/player/focus.js
# registry/dist/components/video/player/intersection-actions.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/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/trending-search.js
# registry/dist/plugins/settings-panel/recent-components.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/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/mpv-output.js
  • Loading branch information
timongh committed Dec 23, 2021
2 parents 499c175 + c551a9f commit 91ed29d
Show file tree
Hide file tree
Showing 95 changed files with 125 additions and 125 deletions.
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ body:
id: feature
attributes:
label: 关于哪一项功能
description: 可以在设置中尝试开启/关闭某项功能来排查
description: (指本脚本的某项具体功能, 不是指 b 站的) 可以在设置中尝试开启 / 关闭某项功能来排查
placeholder: 请输入
validations:
required: true
- type: textarea
id: description
attributes:
label: 问题描述
description: 如何重现此问题, 在哪个页面里出现这个问题, 比如视频相关的可以提供一下av号
description: 如何重现此问题, 在哪个页面里出现这个问题, 比如视频相关的可以提供一下 av / BV 号
placeholder: 请输入
validations:
required: true
- type: input
id: script-version
attributes:
label: 脚本版本
description: 可在设置面板底部找到脚本版本信息
description: 可在设置面板的关于弹窗中找到脚本版本信息
placeholder: 请输入
validations:
required: true
Expand Down Expand Up @@ -57,7 +57,7 @@ body:
id: logs
attributes:
label: 错误信息
description: 脚本直接报告的错误信息, 或者浏览器开发者工具 (F12 或 Ctrl+Shift+I 召唤) 里 Console / 控制台 一栏的输出
description: 脚本直接报告的错误信息, 或者浏览器开发者工具 (F12 或 Ctrl+Shift+I 召唤) 里 Console / 控制台 一栏的输出, 在过滤里填入 `-/^DevTools/ -jinkela -[Report -BY_CLIENT`, 剩下的信息就可以粘贴过来. <img width="400" src="https://user-images.githubusercontent.com/26504152/145991238-c3f3bc87-6cda-4192-afd1-c25843afe0db.png">
render: shell
placeholder: 请输入
validations:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

| | 更新延迟 | 正式版 | 预览版 |
| -------- | -------- | ------ | -------------------------------------------------------------------------------------------------------- |
| jsDelivr | 24h | [安装](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@master/dist/bilibili-evolved.user.js) | [安装](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@preview/dist/bilibili-evolved.preview.user.js) |
| jsDelivr | 24h | 暂不可用 | 暂不可用 |
| GitHub | <1h | [安装](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/dist/bilibili-evolved.user.js) | [安装](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/dist/bilibili-evolved.preview.user.js) |

# 设置
Expand Down
2 changes: 1 addition & 1 deletion dist/bilibili-evolved.preview.user.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/bilibili-evolved.user.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion registry/dist/components/feeds/copy-link.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion registry/dist/components/feeds/disable-details.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion registry/dist/components/feeds/extend-live.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 91ed29d

Please sign in to comment.