Skip to content

Commit 4b21e75

Browse files
committed
Merge branch 'development' into feature/playlist-2023-05
* development: (65 commits) Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again (FreeTubeApp#3958) Replace labeler workflow with GH labeler (FreeTubeApp#3966) Fix HTML styling (e.g., hashtag links) showing up as raw HTML in descriptions (FreeTubeApp#3946) Make certain controls non-selectable / non-draggable - Part II (FreeTubeApp#3957) Translated using Weblate (German) Show video list buttons on hover or focus (FreeTubeApp#3954) Bump @babel/eslint-parser from 7.22.10 to 7.22.11 (FreeTubeApp#3962) Bump youtubei.js from 6.0.0 to 6.1.0 (FreeTubeApp#3965) Bump eslint-plugin-n from 16.0.1 to 16.0.2 (FreeTubeApp#3964) Bump eslint from 8.47.0 to 8.48.0 (FreeTubeApp#3963) Bump marked from 7.0.4 to 7.0.5 (FreeTubeApp#3961) Bump @babel/core from 7.22.10 to 7.22.11 (FreeTubeApp#3959) Make certain controls non-selectable / non-draggable (FreeTubeApp#3947) Add updated video resolution to auto selector (FreeTubeApp#3935) Fix Save icon blocking issue (FreeTubeApp#3951) * Update URL parser to recognize youtube.com/live/xxxxxxx (FreeTubeApp#3930) Translated using Weblate (Czech) Translated using Weblate (Portuguese) Translated using Weblate (Polish) Translated using Weblate (Arabic) ... # Conflicts: # src/renderer/main.js # src/renderer/scss-partials/_ft-list-item.scss
2 parents 433eb0d + 1a6c9e9 commit 4b21e75

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+789
-429
lines changed

.github/issue-labeler.yml

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
'B: visual':
2+
- '(visual bug)'
3+
4+
'B: Unofficial Download':
5+
- '(AUR|Chocolatey|FreeTubeCordova|PortableApps|winget|Scoop|Snapcraft|MPR|Nix)'
6+
7+
'B: keyboard control':
8+
- '(keyboard control not working)'
9+
10+
'B: text/string':
11+
- '(text/string issue)'
12+
13+
'B: content not loading':
14+
- '(content not loading)'
15+
16+
'B: accessibility':
17+
- '(accessibility issue)'
18+
19+
'B: usability':
20+
- '(usability issue)'
21+
22+
'B: crash':
23+
- '(causes crash)'
24+
25+
'B: feature stopped working':
26+
- '(feature stopped working)'
27+
28+
'B: inconsistent behavior':
29+
- '(inconsistent behavior)'
30+
31+
'B: data loss':
32+
- '(data loss)'
33+
34+
'B: race condition':
35+
- '(race condition)'
36+
37+
'B: API issue':
38+
- '(API issue)'
39+
40+
'B: developer mode':
41+
- '(only happens in developer mode)'
42+
43+
'E: improvement existing feature':
44+
- '(improvement to existing feature)'
45+
46+
'E: new optional setting':
47+
- '(new optional setting)'
48+
49+
'E: visual improvement':
50+
- '(visual improvement)'
51+
52+
'E: display more information':
53+
- '(display more information to user)'
54+
55+
'E: ease of use improvement':
56+
- '(ease of use improvement)'
57+
58+
'E: support external software':
59+
- '(support for external software)'
60+
61+
'E: new feature':
62+
- '(new feature)'
63+
64+
'E: keyboard shortcut':
65+
- '(new keyboard shortcut)'
File renamed without changes.

.github/workflows/autoLabelIssue.yaml

-104
This file was deleted.

.github/workflows/label-issue.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: "Issue Labeler"
2+
on:
3+
issues:
4+
types: [opened]
5+
6+
permissions:
7+
issues: write
8+
contents: read
9+
10+
jobs:
11+
triage:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: github/[email protected]
15+
with:
16+
configuration-path: .github/issue-labeler.yml
17+
enable-versioned-regex: 0
18+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label-pr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ jobs:
1414
- uses: actions/labeler@v4
1515
with:
1616
repo-token: "${{ secrets.GITHUB_TOKEN }}"
17+
configuration-path: .github/pr-labeler.yml

package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"autolinker": "^4.0.0",
6464
"electron-context-menu": "^3.6.1",
6565
"lodash.debounce": "^4.0.8",
66-
"marked": "^7.0.2",
66+
"marked": "^7.0.5",
6767
"path-browserify": "^1.0.1",
6868
"process": "^0.11.10",
6969
"video.js": "7.21.5",
@@ -78,11 +78,11 @@
7878
"vue-router": "^3.6.5",
7979
"vue-tiny-slider": "^0.1.39",
8080
"vuex": "^3.6.2",
81-
"youtubei.js": "^6.0.0"
81+
"youtubei.js": "^6.1.0"
8282
},
8383
"devDependencies": {
84-
"@babel/core": "^7.22.10",
85-
"@babel/eslint-parser": "^7.22.10",
84+
"@babel/core": "^7.22.11",
85+
"@babel/eslint-parser": "^7.22.11",
8686
"@babel/plugin-proposal-class-properties": "^7.18.6",
8787
"@babel/preset-env": "^7.22.10",
8888
"@double-great/stylelint-a11y": "^2.0.2",
@@ -92,12 +92,12 @@
9292
"css-minimizer-webpack-plugin": "^5.0.1",
9393
"electron": "^22.3.18",
9494
"electron-builder": "^24.6.3",
95-
"eslint": "^8.47.0",
95+
"eslint": "^8.48.0",
9696
"eslint-config-prettier": "^9.0.0",
9797
"eslint-config-standard": "^17.1.0",
98-
"eslint-plugin-import": "^2.28.0",
98+
"eslint-plugin-import": "^2.28.1",
9999
"eslint-plugin-jsonc": "^2.9.0",
100-
"eslint-plugin-n": "^16.0.1",
100+
"eslint-plugin-n": "^16.0.2",
101101
"eslint-plugin-prettier": "^4.2.1",
102102
"eslint-plugin-promise": "^6.1.1",
103103
"eslint-plugin-unicorn": "^48.0.1",
@@ -107,16 +107,16 @@
107107
"html-webpack-plugin": "^5.5.3",
108108
"js-yaml": "^4.1.0",
109109
"json-minimizer-webpack-plugin": "^4.0.0",
110-
"lefthook": "^1.4.8",
110+
"lefthook": "^1.4.9",
111111
"mini-css-extract-plugin": "^2.7.6",
112112
"npm-run-all": "^4.1.5",
113113
"postcss": "^8.4.26",
114-
"postcss-scss": "^4.0.6",
114+
"postcss-scss": "^4.0.7",
115115
"prettier": "^2.8.8",
116116
"rimraf": "^5.0.1",
117-
"sass": "^1.65.1",
117+
"sass": "^1.66.1",
118118
"sass-loader": "^13.3.2",
119-
"stylelint": "^15.10.2",
119+
"stylelint": "^15.10.3",
120120
"stylelint-config-sass-guidelines": "^10.0.0",
121121
"stylelint-config-standard": "^34.0.0",
122122
"stylelint-high-performance-animation": "^1.9.0",

src/renderer/App.css

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
.flexBox {
2828
display: block;
29+
user-select: unset;
30+
-webkit-user-select: unset;
2931
}
3032

3133
#changeLogText {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
.vote-count {
2+
padding-bottom: 6px;
3+
font-size: smaller;
4+
}
5+
6+
.empty-circle {
7+
background-color: transparent;
8+
border-radius: 50%;
9+
border-style: solid;
10+
border-width: 2px;
11+
display: block;
12+
float: left;
13+
height: 10px;
14+
left: 5px;
15+
position: relative;
16+
top: 8px;
17+
width: 10px;
18+
}
19+
20+
.filled-circle {
21+
border-radius: 50%;
22+
background-color: black;
23+
float: left;
24+
height: 6px;
25+
left: 2px;
26+
top: 2px;
27+
position: relative;
28+
width: 6px;
29+
}
30+
31+
.option-text {
32+
border-radius: 5px;
33+
border-style: solid;
34+
border-width: 2px;
35+
padding: 5px 25px;
36+
}
37+
38+
.option {
39+
padding-bottom: 10px;
40+
}
41+
42+
.correct-option {
43+
background-color: #78da71;
44+
}
45+
46+
.incorrect-option {
47+
background-color: #dd4e4e;
48+
}
49+
50+
.reveal-answer {
51+
text-align: center;
52+
cursor: pointer;
53+
}
54+
55+
.reveal-answer:hover > .option-text, .reveal-answer:focus > .option-text {
56+
background-color: var(--side-nav-hover-color)
57+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { defineComponent } from 'vue'
2+
import { formatNumber } from '../../helpers/utils'
3+
4+
export default defineComponent({
5+
name: 'FtCommunityPoll',
6+
props: {
7+
data: {
8+
type: Object,
9+
required: true
10+
}
11+
},
12+
data: function () {
13+
return {
14+
revealAnswer: false
15+
}
16+
},
17+
computed: {
18+
formattedVotes: function () {
19+
return formatNumber(this.data.totalVotes)
20+
},
21+
}
22+
})

0 commit comments

Comments
 (0)