Commit graph

2178 commits

Author SHA1 Message Date
Ajay Ramachandran
5ee6a2195d
Merge pull request #1002 from maximmax42/patch-1
Added margin-bottom for #sponsorblockPopup
2021-10-15 19:28:54 -04:00
Ajay Ramachandran
63d4c1aedb
New Crowdin updates (#990) 2021-10-15 19:01:03 -04:00
Ajay Ramachandran
e9204be96f
Merge pull request #988 from FlorianZahn/copySegment
Copy segments into your unsubmitted and SkipNotice changes
2021-10-15 19:00:38 -04:00
Ajay Ramachandran
0863061665
Fix indentation in manifest 2021-10-15 18:57:36 -04:00
FlorianZahn
8aea74160c only change color if user isVip 2021-10-15 21:01:32 +02:00
FlorianZahn
d375a97e99 Vip Warning also in popup 2021-10-15 20:52:15 +02:00
Ajay Ramachandran
fe5499e80a Code style fixes and react errors 2021-10-15 00:56:48 -04:00
Ajay Ramachandran
598da2a7fe Merge branch 'copySegment' of https://github.com/florianzahn/sponsorblock into pr/FlorianZahn/988 2021-10-15 00:31:09 -04:00
Ajay Ramachandran
fcbeeb9fc1 Remove extra segment lookup and use lockbyhash lookup 2021-10-15 00:31:07 -04:00
FlorianZahn
d82ef63d89 fix loading text not displaying upon voting 2021-10-14 19:05:36 +02:00
FlorianZahn
a457a8009e SkipNotice countdown now updates again on config update 2021-10-14 08:05:55 +02:00
FlorianZahn
7698be8462
Remove merge mistake 2021-10-14 07:21:07 +02:00
FlorianZahn
738868da8d
Merge branch 'master' into copySegment 2021-10-14 07:16:55 +02:00
Ajay Ramachandran
fc7fc693ed Fix getting locked category 2021-10-13 23:57:59 -04:00
Ajay Ramachandran
27f5997e5a Add return types to vip fetching functions 2021-10-13 23:34:25 -04:00
Ajay Ramachandran
45274f5c72 Wait for vip info to be fetched 2021-10-13 23:32:52 -04:00
Ajay Ramachandran
2bdfd3f39b Merge branch 'copySegment' of https://github.com/florianzahn/sponsorblock into pr/FlorianZahn/988 2021-10-13 23:25:48 -04:00
Ajay Ramachandran
9b9174ab9a Simplify vip info fetching 2021-10-13 23:25:46 -04:00
FlorianZahn
3e3e9796b1
syntax error
Co-authored-by: Ajay Ramachandran <dev@ajay.app>
2021-10-14 05:19:18 +02:00
Ajay Ramachandran
ff5fa4c724 Move config values and close notice 2021-10-13 23:14:51 -04:00
Ajay Ramachandran
b8ab05ccad
Merge pull request #985 from FlorianZahn/editSegmentTimesByScrolling
Scrolling over the edit-segment-time component will change them.
2021-10-13 22:37:31 -04:00
FlorianZahn
93e440385f
Removed console.log and redundancy 2021-10-14 02:16:04 +02:00
FlorianZahn
af66a77026
Fixed logic mistake if undovotes are ever implemented 2021-10-14 02:11:15 +02:00
Maxim
75607dea1c
Added margin-bottom for #sponsorblockPopup
This margin is to separate popup window from playlist/related videos list
2021-10-13 22:48:07 +05:00
FlorianZahn
5b353b05ac
replaced tab with 4 spaces 2021-10-13 06:22:50 +02:00
FlorianZahn
3162ab93a1
Formatting 2021-10-13 06:19:48 +02:00
FlorianZahn
b18f631d33
better if/else readability
Co-authored-by: Ajay Ramachandran <dev@ajay.app>
2021-10-13 06:14:03 +02:00
FlorianZahn
2e254cb917
prettier spaces
Co-authored-by: Ajay Ramachandran <dev@ajay.app>
2021-10-13 06:13:32 +02:00
FlorianZahn
77ce9433a7
removed response.ok for response === 200 2021-10-13 06:08:14 +02:00
FlorianZahn
509e54762f Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into editSegmentTimesByScrolling 2021-10-13 06:02:50 +02:00
FlorianZahn
caeb347137 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into copySegment 2021-10-13 05:55:21 +02:00
Ajay Ramachandran
a2b054844a Fix unsubmitted segments sometimes not skipping 2021-10-11 22:22:36 -04:00
Ajay Ramachandran
5b79d4ef48 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock 2021-10-11 19:02:22 -04:00
Ajay Ramachandran
3de66ebe23 Potentially fix info button reappearing 2021-10-11 19:02:20 -04:00
FlorianZahn
60ef51b7f5 I forgot to change the 24h countdown back to 24h instead of 1 seconds 2021-10-11 03:50:19 +02:00
FlorianZahn
aa8ee02277 Added colored text if a category is locked for submitting and changing category 2021-10-11 03:49:14 +02:00
FlorianZahn
b927ebbbf7 Lint fixes 2021-10-10 10:56:27 +02:00
FlorianZahn
d72d5dcbcb Lint fixes 2021-10-10 10:50:35 +02:00
FlorianZahn
d9f703d808 Vip warning added when downvoting. sry that it is in the same branch, but this is the most current UI 2021-10-10 10:47:47 +02:00
FlorianZahn
a9cc43c586 Changed heigt of 2nd notice. Minor changes. Upvoting lets downvoted segment reappear 2021-10-10 00:41:21 +02:00
FlorianZahn
844567dcdf Lit fixes 2021-10-09 08:13:02 +02:00
FlorianZahn
52ed4f73f4 SkipNotice now remembers what has already been voted. Also nicer highlighting of current selection. 2021-10-09 08:08:46 +02:00
FlorianZahn
907bd68e4e Buttons now change color depending on state. Added colorPalette config entry 2021-10-09 02:43:39 +02:00
Ajay Ramachandran
f35afaf6bc
bump version 2021-10-06 21:10:31 -04:00
Ajay Ramachandran
85b1b51b76 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock 2021-10-06 21:02:02 -04:00
Ajay Ramachandran
9dc5449e37 Make capitalization consistent 2021-10-06 21:01:59 -04:00
FlorianZahn
6ea226c972 Added string to the language file 2021-10-06 23:38:06 +02:00
FlorianZahn
44f9ab9806 changed let to const 2021-10-06 23:16:53 +02:00
FlorianZahn
edd1011737 margin in ContinueVoting 2021-10-06 23:13:10 +02:00
FlorianZahn
08558bfaeb Merge branch 'copySegment' of https://github.com/FlorianZahn/SponsorBlock into copySegment 2021-10-06 23:08:22 +02:00