Skip to content

Commit 4884dec

Browse files
authored
Merge pull request shaarli#2138 from 7Ds7/refactor-video-plugin
Refactor video plugin
2 parents 8a1f3d3 + a38e988 commit 4884dec

File tree

6 files changed

+223
-10613
lines changed

6 files changed

+223
-10613
lines changed

plugins/playvideos/README.md

Lines changed: 19 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Adds a `► Play Videos` button to [Shaarli](https://github.com/shaarli/Shaarli)
44

55
<!-- TODO screenshot -->
66

7-
This uses code from https://zaius.github.io/youtube_playlist/ and is currently only compatible with Youtube videos.
7+
This plugin is currently only compatible with Youtube videos.
88

99
#### Installation and setup
1010

@@ -13,7 +13,7 @@ This is a default Shaarli plugin, you just have to enable it. See [Shaarli confi
1313

1414
#### Troubleshooting
1515

16-
If your server has [Content Security Policy](http://content-security-policy.com/) headers enabled, this may prevent the script from loading fully. You should relax the CSP in your server settings. Example CSP rule for apache2:
16+
If your server has [Content Security Policy](http://content-security-policy.com/) headers enabled, this may prevent the script from loading fully. You should relax the CSP in your server settings. Example CSP rule for apache2:
1717

1818
```apache
1919
<Directory /path/to/shaarli>
@@ -27,52 +27,29 @@ You may place the `Header` directive in the `<Directory...` section of your [web
2727
### License
2828
```
2929
File: youtube_playlist.js
30-
Copyright: (c) 2010-2014, David Kelso <[email protected]>
31-
License: The ISC License (http://opensource.org/licenses/ISC)
30+
Copyright: (c) 2025 The Shaarli Community, see AUTHORS
31+
License: zlib/libpng
3232
33-
Files: jquery*.js
34-
License: MIT License (http://opensource.org/licenses/MIT)
35-
Copyright: (C) jQuery Foundation and other contributors, https://jquery.com/download/
36-
37-
-----------------------------------------------------
33+
----------------------------------------------------
34+
ZLIB/LIBPNG LICENSE
3835
39-
The ISC License (http://opensource.org/licenses/ISC)
36+
This software is provided 'as-is', without any express or implied warranty.
37+
In no event will the authors be held liable for any damages arising from
38+
the use of this software.
4039
41-
Copyright (c) 2010-2014, David Kelso (david at kelso dot id dot au)
42-
Copyright (c) 2010-2014, nodiscc (nodiscc at gmail dot com)
40+
Permission is granted to anyone to use this software for any purpose,
41+
including commercial applications, and to alter it and redistribute it
42+
freely, subject to the following restrictions:
4343
44-
Permission to use, copy, modify, and/or distribute this software for any
45-
purpose with or without fee is hereby granted, provided that the above
46-
copyright notice and this permission notice appear in all copies.
44+
1. The origin of this software must not be misrepresented; you must not
45+
claim that you wrote the original software. If you use this software
46+
in a product, an acknowledgment in the product documentation would
47+
be appreciated but is not required.
4748
48-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
49-
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
50-
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
51-
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
52-
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
53-
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
54-
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE
49+
2. Altered source versions must be plainly marked as such, and must
50+
not be misrepresented as being the original software.
5551
56-
----------------------------------------------------
57-
MIT LICENSE
58-
59-
Permission is hereby granted, free of charge, to any person obtaining a copy
60-
of this software and associated documentation files (the "Software"), to deal
61-
in the Software without restriction, including without limitation the rights
62-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
63-
copies of the Software, and to permit persons to whom the Software is
64-
furnished to do so, subject to the following conditions:
65-
66-
The above copyright notice and this permission notice shall be included in
67-
all copies or substantial portions of the Software.
68-
69-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
70-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
71-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
72-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
73-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
74-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
75-
THE SOFTWARE.
52+
3. This notice may not be removed or altered from any source distribution.
7653
7754
----------------------------------------------------
7855
```

0 commit comments

Comments
 (0)