Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2232 commits 8 branches 1 tag 12 MiB
Commit graph

2232 commits

This branch
This branch
All branches
Author SHA1 Message Date
ArthurHoaro
bbb2dd30ac
Merge pull request #1751 from oblab/patch-2 2021-05-15 10:47:37 +02:00
Olivier
62c9b3a6d9
Update daily.html 
Change permalink in daily.html file : <a href="{$base_path}/?{$link.shorturl}" title="{'Permalink'|t}">
by : <a href="{$base_path}/shaare/{$link.shorturl}" title="{'Permalink'|t}">
 2021-05-15 10:42:59 +02:00
Olivier
bbcb18931c
Update includes.html 
Change the permalink in meta property : <meta property="og:url" content="{$index_url}?{$link.shorturl}" />
by : <meta property="og:url" content="{$index_url}shaare/{$link.shorturl}" /> ?
 2021-05-15 10:40:29 +02:00
nodiscc
d4da270289
doc: update CI documentation 
- use cloud.drone.io badges for builds on the master branch
- stable/0.x badges will need to be updated when the next stable/0.x release is published
 2021-05-13 14:28:25 +02:00
nodiscc
832739e58f
switch continuous integration system to Drone CI: 
- add .drone.yml, reimplement tasks from .travis.yml (php/node/python test suites)
- ref. https://github.com/shaarli/Shaarli/issues/1649
- https://www.drone.io/enterprise/opensource/
- https://cloud.drone.io/shaarli/Shaarli/settings
- https://docs.drone.io/pipeline/docker/syntax/steps/
- https://docs.drone.io/pipeline/docker/syntax/cloning/
- https://docs.drone.io/pipeline/environment/reference/
- https://docs.drone.io/pipeline/configuration/
- https://docs.drone.io/pipeline/overview/
- https://docs.drone.io/pipeline/docker/syntax/volumes/
- https://docs.drone.io/pipeline/docker/syntax/volumes/temporary/
- php: use custom php base images with prebuilt PHP extensions and composer (speed up build process) (https://hub.docker.com/r/shaarli/drone-ci-base, https://www.github.com/shaarli/drone-ci-base, https://hub.docker.com/repository/docker/shaarli/drone-ci-base/builds)
- no need to port $PATH update command, the default node:10 image already has the correct $PATH
- don't force pull of latest images to speed up builds
- the default is to use a local/cached image when the image is not tagged :latest
- https://docs.drone.io/pipeline/docker/syntax/parallelism/
- https://docs.drone.io/pipeline/environment/reference/drone-git-http-url/
- ignore PHP version requirements for https://packagist.org/packages/pubsubhubbub/publisher, pending merge of https://github.com/pubsubhubbub/php-publisher/pull/11
- closes https://github.com/shaarli/Shaarli/issues/1649
 2021-05-13 14:28:11 +02:00
ArthurHoaro
0f4cd55599
Merge pull request #1748 from ArthurHoaro/fix/mkdocs 
Fix documentation build
 2021-05-13 11:43:43 +02:00
ArthurHoaro
e660450a2b Fix documentation build 
- pages parameters has been deprecated and renamed by nav
  - the build fails with an empty extra_css array
 2021-05-13 11:36:37 +02:00
ArthurHoaro
45b3c7cb7a
Merge pull request #1747 from ArthurHoaro/chore/bump-front-deps 
Bump dependency versions
 2021-05-08 14:18:56 +02:00
ArthurHoaro
723e93f439 Bump dependency versions 2021-05-08 13:40:20 +02:00
ArthurHoaro
6225cc9c86
Merge pull request #1746 from shaarli/dependabot/npm_and_yarn/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21
 2021-05-08 12:54:27 +02:00
dependabot[bot]
824f3c6dff
Bump lodash from 4.17.20 to 4.17.21 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-08 10:38:45 +00:00
ArthurHoaro
4ca1b33b0e
Merge pull request #1743 from shaarli/dependabot/npm_and_yarn/ssri-6.0.2 
Bump ssri from 6.0.1 to 6.0.2
 2021-04-20 08:11:16 +02:00
dependabot[bot]
c273f511aa
Bump ssri from 6.0.1 to 6.0.2 
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-20 02:24:55 +00:00
nodiscc
a5482cf9af
Merge pull request #1739 from ralienpp/master 
Add '406 not acceptable' to the Troubleshooting section
 2021-04-14 15:53:13 +00:00
Alexander Railean
060e6d9498 Correct HTTP status code 206->406 2021-04-12 21:05:21 +02:00
Alexander Railean
e00b9dc099 Add '206 not acceptable' to the Troubleshooting section 2021-04-12 21:03:43 +02:00
nodiscc
0ed6614981
Merge pull request #1738 from shaarli/doc-fix-casing 
doc: plugins.md: fix link casing
 2021-04-12 18:28:08 +00:00
nodiscc
9700d9ea3e
doc: plugins.md: fix link casing 
fixes https://github.com/shaarli/Shaarli/issues/1737
 2021-04-12 18:15:58 +00:00
nodiscc
9f87e82cdb
Merge pull request #1734 from ArthurHoaro/doc/php-extensions 
Documentation: include all PHP extensions installed in our official Docker image
 2021-04-05 10:52:37 +00:00
ArthurHoaro
5bf3deb815
Merge pull request #1733 from ArthurHoaro/feature/phpcs-tests 2021-04-05 11:34:03 +02:00
ArthurHoaro
ba4fa9460a Documentation: include all PHP extensions installed in our official Docker image 
Fixes #1700
 2021-04-05 11:27:45 +02:00
ArthurHoaro
8b428dabea
Merge pull request #1732 from ArthurHoaro/fix/legacy-bookmarklet-url 
Change legacy URL route for Add Note bookmarklet
 2021-04-05 11:10:54 +02:00
ArthurHoaro
af764dfd4e
Merge pull request #1731 from ArthurHoaro/fix/search-highlight-table 
Search highlight: do not use special characters for tokens
 2021-04-05 11:10:43 +02:00
ArthurHoaro
44b0825860 Coding style: update documentation (static analysis section) 
Related to #95
 2021-04-05 11:08:02 +02:00
ArthurHoaro
830a73dcf6 Coding style: manually fix remaining errors in tests after PHPCBF 
Related to #95
 2021-04-05 11:00:28 +02:00
ArthurHoaro
0681511699 Coding style: Apply automatic PHPCBF to tests forlder (PSR12) 
Related to #95
 2021-04-05 09:39:34 +02:00
ArthurHoaro
9665870b39 Change legacy URL route for Add Note bookmarklet 2021-04-05 09:29:44 +02:00
ArthurHoaro
b2a43bc861 Search highlight: do not use special characters for tokens 
It messes with Markdown syntax (tables in this case).

Fixes #1729
 2021-04-05 09:15:25 +02:00
ArthurHoaro
bd7ed438fa
Merge pull request #1728 from yude/master 2021-04-04 11:52:09 +02:00
yudejp
b29f14d67e
Update Japanese translation 2021-04-04 13:20:25 +09:00
yude
0a47426f88
Merge pull request #3 from shaarli/master 
Merge upstream
 2021-04-04 11:25:48 +09:00
ArthurHoaro
2c2c349e8a
Merge pull request #1725 from ajabep/patch-1 
Fix a crash when generating an atom feed with no bookmarks
 2021-04-03 13:16:54 +02:00
Ajabep
2ea2c99dcb
Fix a bug 
When we try to access the atom feed and have no bookmarks, it raised the following exception :

```
Call to a member function reorder() on array /webroot/application/bookmark/BookmarkFileService.php:143
#0 /webroot/application/feed/FeedBuilder.php(106): Shaarli\Bookmark\BookmarkFileService->search(Array, 'public', false, false, true)
#1 /webroot/application/front/controller/visitor/FeedController.php(47): Shaarli\Feed\FeedBuilder->buildData('atom', Array)
#2 /webroot/application/front/controller/visitor/FeedController.php(20): Shaarli\Front\Controller\Visitor\FeedController->processRequest('atom', Object(Slim\Http\Request), Object(Slim\Http\Response))
#3 [internal function]: Shaarli\Front\Controller\Visitor\FeedController->atom(Object(Slim\Http\Request), Object(Slim\Http\Response), Array)
#4 /webroot/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php(40): call_user_func(Array, Object(Slim\Http\Request), Object(Slim\Http\Response), Array)
#5 /webroot/vendor/slim/slim/Slim/Route.php(281): Slim\Handlers\Strategies\RequestResponse->__invoke(Array, Object(Slim\Http\Request), Object(Slim\Http\Response), Array)
#6 /webroot/application/front/ShaarliMiddleware.php(55): Slim\Route->__invoke(Object(Slim\Http\Request), Object(Slim\Http\Response))
#7 [internal function]: Shaarli\Front\ShaarliMiddleware->__invoke(Object(Slim\Http\Request), Object(Slim\Http\Response), Object(Slim\Route))
#8 /webroot/vendor/slim/slim/Slim/DeferredCallable.php(57): call_user_func_array(Array, Array)
#9 [internal function]: Slim\DeferredCallable->__invoke(Object(Slim\Http\Request), Object(Slim\Http\Response), Object(Slim\Route))
#10 /webroot/vendor/slim/slim/Slim/MiddlewareAwareTrait.php(70): call_user_func(Object(Slim\DeferredCallable), Object(Slim\Http\Request), Object(Slim\Http\Response), Object(Slim\Route))
#11 /webroot/vendor/slim/slim/Slim/MiddlewareAwareTrait.php(117): Slim\Route->Slim\{closure}(Object(Slim\Http\Request), Object(Slim\Http\Response))
#12 /webroot/vendor/slim/slim/Slim/Route.php(268): Slim\Route->callMiddlewareStack(Object(Slim\Http\Request), Object(Slim\Http\Response))
#13 /webroot/vendor/slim/slim/Slim/App.php(503): Slim\Route->run(Object(Slim\Http\Request), Object(Slim\Http\Response))
#14 /webroot/vendor/slim/slim/Slim/MiddlewareAwareTrait.php(117): Slim\App->__invoke(Object(Slim\Http\Request), Object(Slim\Http\Response))
#15 /webroot/vendor/slim/slim/Slim/App.php(392): Slim\App->callMiddlewareStack(Object(Slim\Http\Request), Object(Slim\Http\Response))
#16 /webroot/vendor/slim/slim/Slim/App.php(297): Slim\App->process(Object(Slim\Http\Request), Object(Slim\Http\Response))
#17 /webroot/index.php(177): Slim\App->run(true)
#18 {main}
```
 2021-04-02 21:14:09 +02:00
ArthurHoaro
4543717881
Merge pull request #1724 from shaarli/dependabot/npm_and_yarn/y18n-4.0.1 
Bump y18n from 4.0.0 to 4.0.1
 2021-03-30 17:11:08 +02:00
dependabot[bot]
fe170cb571
Bump y18n from 4.0.0 to 4.0.1 
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-30 14:59:13 +00:00
Keith Carangelo
755c094bdd Merge branch 'master' of github.com:Shaarli/Shaarli into upstream 2021-03-29 11:27:32 -04:00
nodiscc
8b8ed23ae1
Merge pull request #1718 from shaarli/doc-apache-directoryindex 
doc: apache: explicitly set index.php as DirectoryIndex
 2021-03-27 14:17:40 +00:00
ArthurHoaro
28123e7283
Merge pull request #1722 from ArthurHoaro/feature/bump-thumbnailer 
Bump WebThumbnailer version to fix Instagram issue
 2021-03-27 13:26:34 +01:00
ArthurHoaro
546c776acd Bump WebThumbnailer version to fix Instagram issue 
Related to #1711
 2021-03-27 13:22:55 +01:00
ArthurHoaro
e1847ae5a7
Merge pull request #1719 from shaarli/dependabot/npm_and_yarn/elliptic-6.5.4 
Bump elliptic from 6.5.3 to 6.5.4
 2021-03-27 12:20:28 +01:00
dependabot[bot]
fb0d610c80
Bump elliptic from 6.5.3 to 6.5.4 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-09 01:59:38 +00:00
nodiscc
c5cd2f16f4
Merge pull request #1717 from jalr/patch-1 
Fix typo in documentation
 2021-03-07 15:06:33 +00:00
nodiscc
3bb6205e7f
doc: apache: explicitely ste index.php as DirectoryIndex 
WIthout this directive apache will try other default/global DirectoryIndex files resulting in useless file access/error messages in logs

```
[Sun Mar 07 14:04:25.383960 2021] [authz_core:error] [pid 946:tid 139985284290304] [client 10.0.0.1:42616] AH01630: client denied by server configuration: /var/www/links.example.org/index.html
[Sun Mar 07 14:04:25.384293 2021] [authz_core:error] [pid 946:tid 139985284290304] [client 10.0.0.1:42616] AH01630: client denied by server configuration: /var/www/links.example.org/index.cgi
[Sun Mar 07 14:04:25.384465 2021] [authz_core:error] [pid 946:tid 139985284290304] [client 10.0.0.1:42616] AH01630: client denied by server configuration: /var/www/links.example.org/index.pl
```
 2021-03-07 13:08:31 +00:00
jalr
94dadd85a0
Fix typo 2021-03-07 10:58:15 +00:00
ArthurHoaro
9db1ccdf2c
Merge pull request #1698 from ArthurHoaro/feature/plugins-search-filter 
New plugin hook: ability to add custom filters to Shaarli search engine
 2021-02-04 11:11:33 +01:00
ArthurHoaro
bcba6bd353 New plugin hook: ability to add custom filters to Shaarli search engine 
A new plugin hook has been added: hook_test_filter_search_entry
This hook allows to filter out bookmark with custom plugin code when a search is performed.

Related to #143
 2021-02-04 11:02:50 +01:00
ArthurHoaro
8997ae6c8e
Merge pull request #1697 from ArthurHoaro/feature/pagination 
Handle pagination through BookmarkService
 2021-02-04 10:57:44 +01:00
ArthurHoaro
11edc143b4
Merge pull request #1696 from ArthurHoaro/fix/search-highlight-url 2021-02-04 10:57:12 +01:00
ArthurHoaro
a1cd7a3b2f ShaarliParsedown: add PHPDoc/comments 2021-02-04 10:53:23 +01:00
ArthurHoaro
83b4eb1795
Merge pull request #1694 from ArthurHoaro/fix/bulk-add-redirect-token 
Fix: bulk add redirection with ending slash
 2021-01-26 16:25:09 +01:00