Commit Graph

1698 Commits

Author SHA1 Message Date
Ajay Ramachandran
fd69e91880 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into chapters 2021-10-17 19:25:16 -04:00
Ajay Ramachandran
ad3f0c1a06 Don't filter segments when switching videos still
Fixes #989
2021-10-16 13:41:07 -04:00
Ajay Ramachandran
4bc180077e Fix segments sometimes displaying after the seek bar if at the end 2021-10-16 13:15:47 -04:00
Ajay Ramachandran
0f4eeb4fe9 Add chapter name option when submitting 2021-10-16 01:36:44 -04:00
Ajay Ramachandran
9a24b906f9 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into chapters 2021-10-15 19:57:18 -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
Ajay Ramachandran
496528be65 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into chapters 2021-10-14 21:58:37 -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
f2c1ee4894 Use default action type from config 2021-10-14 00:03:48 -04: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
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
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
e20b60979c Add initial chapter name rendering 2021-10-12 23:33:41 -04:00
Ajay Ramachandran
a2b054844a Fix unsubmitted segments sometimes not skipping 2021-10-11 22:22:36 -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
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
4afc2c153a Restart Voting button. Wiki links. SkipNotice Improvements 2021-10-06 23:02:26 +02:00
FlorianZahn
93f02877a7 copy segments basics done 2021-10-06 08:15:15 +02:00
Ajay Ramachandran
4045978b54 Support older browsers 2021-10-05 20:51:20 -04:00
Ajay Ramachandran
56bc3fca04 Hide skip to highlight right away when dismissing 2021-10-05 20:06:18 -04:00
FlorianZahn
c571a9ecb6 made the tool tip fully opaque for better readability 2021-10-04 21:37:15 +02:00