diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..b6a81206
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,5 @@
+- [ ] I agree to license my contribution under LGPL-3.0 **or** my contribution is from another project with a license compatible with LGPL-3.0
+
+To test this pull request, follow the [instructions in the wiki](https://github.com/ajayyy/SponsorBlock/wiki/Testing-a-Pull-Request).
+
+***
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 60e01530..68a6f2e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,10 @@ jobs:
- name: Copy configuration
run: cp config.json.example config.json
+ # Run linter
+ - name: Lint
+ run: npm run lint
+
# Create Chrome artifacts
- name: Create Chrome artifacts
run: npm run build:chrome
diff --git a/.gitignore b/.gitignore
index a3112c1c..2833884c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ node_modules
web-ext-artifacts
.vscode/
dist/
-tmp/
\ No newline at end of file
+tmp/
+.DS_Store
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..60bd0953
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1 @@
+If you make any contributions to SponsorBlock after this file was created, you are agreeing that any code you have contributed will be licensed under LGPL-3.0.
diff --git a/README.md b/README.md
index 3c13765c..0a404c57 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
-
+
- Videos will automatically be skipped if they are found in the database. You can open the popup by clicking the extension icon to get a preview of what they are.
+ Video segments will automatically be skipped if they are found in the database. You can open the popup by clicking the extension icon to get a preview of what they are.

- There are hotkeys if you want to use them. You must be focused on the YouTube player to use them. Press the semicolon key to indicate the start/end of a sponsor segment and click the appostrophe to submit. - These can be changed in the options. If you don't use QWERTY, you should probably change the keybinds. + There are hotkeys if you want to use them. You must be focused on the YouTube player to use them. Press the semicolon key to indicate the start/end of a sponsor segment and click the apostrophe to submit. + These can be changed in the options. If you don't use QWERTY, you should probably change the keybinding.
The awesome Invidious API is used to grab the time the video was published.
-Some icons made by Gregor Cresnar from www.flaticon.com and are licensed by CC 3.0 BY
+Some icons made by Gregor Cresnar from www.flaticon.com and are licensed by CC 3.0 BY
-Some icons made by Freepik from www.flaticon.com and are licensed by CC 3.0 BY
+Some icons made by Freepik from www.flaticon.com and are licensed by CC 3.0 BY
diff --git a/public/icons/PlayerCancelSegmentIconSponsorBlocker.svg b/public/icons/PlayerCancelSegmentIconSponsorBlocker.svg new file mode 100644 index 00000000..6b48b6d0 --- /dev/null +++ b/public/icons/PlayerCancelSegmentIconSponsorBlocker.svg @@ -0,0 +1,67 @@ + + diff --git a/public/icons/PlayerDeleteIconSponsorBlocker.svg b/public/icons/PlayerDeleteIconSponsorBlocker.svg new file mode 100644 index 00000000..d5298853 --- /dev/null +++ b/public/icons/PlayerDeleteIconSponsorBlocker.svg @@ -0,0 +1,88 @@ + + diff --git a/public/icons/PlayerDeleteIconSponsorBlocker256px.png b/public/icons/PlayerDeleteIconSponsorBlocker256px.png deleted file mode 100644 index c44f383d..00000000 Binary files a/public/icons/PlayerDeleteIconSponsorBlocker256px.png and /dev/null differ diff --git a/public/icons/PlayerInfoIconSponsorBlocker.svg b/public/icons/PlayerInfoIconSponsorBlocker.svg new file mode 100644 index 00000000..297e82b1 --- /dev/null +++ b/public/icons/PlayerInfoIconSponsorBlocker.svg @@ -0,0 +1,120 @@ + + diff --git a/public/icons/PlayerInfoIconSponsorBlocker256px.png b/public/icons/PlayerInfoIconSponsorBlocker256px.png deleted file mode 100644 index 8a0e44a7..00000000 Binary files a/public/icons/PlayerInfoIconSponsorBlocker256px.png and /dev/null differ diff --git a/public/icons/PlayerStartIconSponsorBlocker.svg b/public/icons/PlayerStartIconSponsorBlocker.svg new file mode 100644 index 00000000..d31c673a --- /dev/null +++ b/public/icons/PlayerStartIconSponsorBlocker.svg @@ -0,0 +1,71 @@ + + diff --git a/public/icons/PlayerStartIconSponsorBlocker256px.png b/public/icons/PlayerStartIconSponsorBlocker256px.png deleted file mode 100644 index 3adff0a4..00000000 Binary files a/public/icons/PlayerStartIconSponsorBlocker256px.png and /dev/null differ diff --git a/public/icons/PlayerStopIconSponsorBlocker.svg b/public/icons/PlayerStopIconSponsorBlocker.svg new file mode 100644 index 00000000..a56e263e --- /dev/null +++ b/public/icons/PlayerStopIconSponsorBlocker.svg @@ -0,0 +1,67 @@ + + diff --git a/public/icons/PlayerStopIconSponsorBlocker256px.png b/public/icons/PlayerStopIconSponsorBlocker256px.png deleted file mode 100644 index 80ef4a6e..00000000 Binary files a/public/icons/PlayerStopIconSponsorBlocker256px.png and /dev/null differ diff --git a/public/icons/PlayerUploadFailedIconSponsorBlocker.svg b/public/icons/PlayerUploadFailedIconSponsorBlocker.svg new file mode 100644 index 00000000..b40cca8d --- /dev/null +++ b/public/icons/PlayerUploadFailedIconSponsorBlocker.svg @@ -0,0 +1,71 @@ + + diff --git a/public/icons/PlayerUploadFailedIconSponsorBlocker256px.png b/public/icons/PlayerUploadFailedIconSponsorBlocker256px.png deleted file mode 100644 index 57c80838..00000000 Binary files a/public/icons/PlayerUploadFailedIconSponsorBlocker256px.png and /dev/null differ diff --git a/public/icons/PlayerUploadIconSponsorBlocker.svg b/public/icons/PlayerUploadIconSponsorBlocker.svg new file mode 100644 index 00000000..07c5fc58 --- /dev/null +++ b/public/icons/PlayerUploadIconSponsorBlocker.svg @@ -0,0 +1,67 @@ + + diff --git a/public/icons/PlayerUploadIconSponsorBlocker256px.png b/public/icons/PlayerUploadIconSponsorBlocker256px.png deleted file mode 100644 index 5be42678..00000000 Binary files a/public/icons/PlayerUploadIconSponsorBlocker256px.png and /dev/null differ diff --git a/public/icons/clipboard.svg b/public/icons/clipboard.svg new file mode 100644 index 00000000..01dffe9f --- /dev/null +++ b/public/icons/clipboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/options/options.html b/public/options/options.html index 04620a9e..9daef3b3 100644 --- a/public/options/options.html +++ b/public/options/options.html @@ -81,6 +81,27 @@ +