Commit graph

942 commits

Author SHA1 Message Date
Ajay Ramachandran
25436d9620 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into add-invidious
# Conflicts:
#	background.js
2020-01-09 20:42:31 -05:00
Ajay Ramachandran
8d3a633d85
Merge pull request #226 from ajayyy/ajay-config-listener
Config callback updating
2020-01-09 20:41:18 -05:00
Ajay Ramachandran
f67568e3b6 Fixed indentation. 2020-01-09 20:29:47 -05:00
Ajay Ramachandran
d902cc5efe Made buttons update with the config. 2020-01-09 20:29:20 -05:00
Ajay Ramachandran
9e89eb521a Added config callback support. 2020-01-09 20:09:32 -05:00
Ajay Ramachandran
f4c5f50f8c Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into add-invidious 2020-01-09 19:53:49 -05:00
Ajay Ramachandran
4301a6bfe3
Merge pull request #225 from ajayyy/experimental-ajay
Option page fixes
2020-01-09 19:53:40 -05:00
Ajay Ramachandran
2c5a78947a Added instance display 2020-01-09 19:52:20 -05:00
Ajay Ramachandran
8f7eb82b6e Remove unnecessary code 2020-01-09 19:42:18 -05:00
Ajay Ramachandran
d2e1373e2a Fixed more merging issues. 2020-01-09 19:23:05 -05:00
Ajay Ramachandran
d705610855 Fix merge issues 2020-01-09 19:19:30 -05:00
Ajay Ramachandran
c40b6576d6 Updated gitignore. 2020-01-09 15:02:06 -05:00
Ajay Ramachandran
1c3e2fcdad Fixed help page style issue. 2020-01-09 15:01:42 -05:00
Ajay Ramachandran
7acc6c3329 Added warning message when changing the userID. 2020-01-09 15:00:03 -05:00
Ajay Ramachandran
1715ee327f Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental-ajay 2020-01-09 14:28:40 -05:00
Ajay Ramachandran
0481943737 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into add-invidious
# Conflicts:
#	background.js
#	content.js
#	options/options.js
2020-01-09 14:28:06 -05:00
Ajay Ramachandran
c53bc20294
Merge pull request #219 from OfficialNoob/patch-26
Config proxy [WIP]
2020-01-09 13:24:33 -05:00
Ajay Ramachandran
a8fc22eae8 Reformatted variable name. 2020-01-09 13:17:26 -05:00
Ajay Ramachandran
4ba82f6e00 Set local config right away 2020-01-09 13:16:27 -05:00
Ajay Ramachandran
8fd671d4d3 Added docs and improved consistency. 2020-01-09 12:46:04 -05:00
Ajay Ramachandran
309b1b007e Removed unneeded function 2020-01-09 12:39:48 -05:00
Ajay Ramachandran
d0e7213cc4 Added docs and removed reflection. Also removed inheritance. 2020-01-09 12:38:15 -05:00
Ajay Ramachandran
a2e9688418 Formatting + duplicate code removal. 2020-01-09 12:30:09 -05:00
Ajay Ramachandran
f42c23cd9a Formatting fixes 2020-01-09 12:12:49 -05:00
Official Noob
52f60d70e2
Map support :D 2020-01-09 16:39:23 +00:00
Official Noob
339d05e157
:/ 2020-01-08 23:27:34 +00:00
Official Noob
c0c3640638
Reverted back <Not working> 2020-01-08 23:16:02 +00:00
Official Noob
a314139302
Map storage encoding 2020-01-08 22:22:18 +00:00
Official Noob
bfa0472f84
Reflect 2020-01-08 19:52:41 +00:00
Ajay Ramachandran
fa19e435cc Switched to a listener map. 2020-01-07 22:59:50 -05:00
Ajay Ramachandran
eb4bf89194 Fixed default 2020-01-07 22:12:53 -05:00
Ajay Ramachandran
da8a1376a7 Converted options page to new config system. 2020-01-07 22:02:16 -05:00
Ajay Ramachandran
267132cdde Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into patch-26 2020-01-07 21:24:54 -05:00
Ajay Ramachandran
b8ebe5076b Fixed indentation. 2020-01-07 21:23:59 -05:00
Ajay Ramachandran
cb9877b3b4 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental-ajay 2020-01-06 22:31:17 -05:00
Ajay Ramachandran
c73b9ed5a6 Remove redundant code. 2020-01-06 22:30:35 -05:00
Ajay Ramachandran
1bd0b4349f
Fixed build not ignoring ignored folder 2020-01-06 19:51:49 -05:00
Official Noob
d15785146f
Update options.js 2020-01-06 23:42:02 +00:00
Official Noob
47d9d93818
Added SB.js to options html 2020-01-06 23:34:33 +00:00
Official Noob
601ff44145
Forgot comma 2020-01-06 23:29:04 +00:00
Official Noob
cbd451949b
Added hideDiscordLink, hideDiscordLink 2020-01-06 23:27:07 +00:00
Official Noob
a7dc207c5f
Fix format conflict 2020-01-06 23:12:48 +00:00
Official Noob
c20b67d11f
Fixed syntax 2020-01-06 21:20:22 +00:00
Official Noob
0b9def800b
Update SB.js 2020-01-06 21:17:28 +00:00
Official Noob
d8ae73e96a
Update SB.js 2020-01-06 21:14:31 +00:00
Ajay Ramachandran
c99f7925eb
Fixed migrate 2020-01-06 16:13:50 -05:00
Official Noob
3627661e1f
Backwards compatibility 2020-01-06 21:11:37 +00:00
Official Noob
f1c68a98cf
removed SB.config.dontShowNoticeOld 2020-01-06 18:59:38 +00:00
Official Noob
92f10d51aa
Removed SB.config.dontShowNoticeOld 2020-01-06 18:58:47 +00:00
Official Noob
bdae68be35
() => 2020-01-06 18:56:37 +00:00