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

2404 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ArthurHoaro
d496fd857d
Merge pull request #1699 from bschwede/master 
Update German translations, added new strings to server.html
 2021-01-26 16:23:44 +01:00
bschwede
e570cc8b1a Update German translations, added new strings to server.html 2021-01-25 00:51:36 +01:00
ArthurHoaro
9b8c0a4560 Handle pagination through BookmarkService 
Handle all search results through SearchResult object.
This is a required step toward implementing a BookmarkService based on SQL database.

Related to #953
 2021-01-20 15:01:29 +01:00
ArthurHoaro
055d97f9a9
Merge pull request #1695 from ArthurHoaro/fix/ut-curl 2021-01-20 11:31:35 +01:00
ArthurHoaro
9ef8555ad2 Support search highlights when matching URL content 
DefaultFormatter:
  - format 'a' tag content and not href attribute
  - format hashtags properly
Markdown(Extra)Formatter:
  - Extend Parsedown to format highlight properly: https://github.com/erusev/parsedown/wiki/Tutorial:-Create-Extensions

Fixes #1681
 2021-01-19 17:49:19 +01:00
ArthurHoaro
dafd3f081a format_date: include timezone in IntlDateFormatter object 
@see https://www.php.net/manual/en/intldateformatter.format.php

> If a DateTime or an IntlCalendar object is passed, its timezone is not considered. The object will be formatted using the formaterʼs configured timezone. If one wants to use the timezone of the object to be formatted, IntlDateFormatter::setTimeZone() must be called before with the objectʼs timezone.
 2021-01-19 15:03:28 +01:00
ArthurHoaro
6b76ce6f62 curl usage: support HTTP/2 response code header 2021-01-19 15:03:18 +01:00
ArthurHoaro
baac4388b1
Merge pull request #1693 from ArthurHoaro/fix/bulk-add-delete 
Fix: bulk add - delete existing link
 2021-01-19 14:31:15 +01:00
ArthurHoaro
5b5d22a3df
Merge pull request #1691 from ArthurHoaro/fix/bulk-add-js-checkboxes 
Fix: bulk add - private status
 2021-01-19 14:30:40 +01:00
ArthurHoaro
3d6278e86f Fix: bulk add redirection with ending slash 
Otherwise cookie may not be store under the right subfolder, thus generating tokens in the wrong session file.

Fixes #1690
 2021-01-19 14:26:04 +01:00
ArthurHoaro
93175b6e9d Fix: bulk add - delete existing link 
Do not send redirect response in bookmark delete controller if the request comes from bulk creation page.

Fixes #1683
 2021-01-19 12:54:34 +01:00
ArthurHoaro
47ac77adbb Fix: bulk add - private status 
Use 'checked' attribute instead of 'value' for checkboxes. 'value' always returns 'on'.

Fixes #1684
 2021-01-19 11:55:50 +01:00
ArthurHoaro
ffa39719a1
Merge pull request #1689 from ArthurHoaro/fix/bulk-add-html-label 
Fix: bulk add - use unique HTML ID
 2021-01-19 11:48:38 +01:00
ArthurHoaro
31c4be2b60
Merge pull request #1688 from ArthurHoaro/fix/bulk-single-url 2021-01-19 11:48:29 +01:00
ArthurHoaro
2fbdb7d657
Merge pull request #1687 from ArthurHoaro/feature/template-name 
Inject current template name in templates
 2021-01-19 11:48:18 +01:00
ArthurHoaro
8fbc29de02 Fix: bulk add - use unique HTML ID 
Use links loop ID to make ID unique and fix browser labels behaviour.

Fixes #1685
 2021-01-19 11:35:42 +01:00
ArthurHoaro
9e55beebfd Fix: error when using bulk shaare with a single URL 
Make sure that header metadata associated with permalink is only used in linklist template.

Fixes #1686
 2021-01-19 11:18:56 +01:00
ArthurHoaro
ccd1862d5f Inject current template name in templates 
Use either legacy key _PAGE_ or new 'template' one.

Related to https://github.com/kalvn/Shaarli-Material/issues/118
 2021-01-19 10:34:11 +01:00
nodiscc
544bbdaf83
Merge pull request #1675 from yudete/master 
Update Japanese translations
 2021-01-04 17:51:05 +00:00
yudete
bf02f8ba8e Update Japanese translations 2021-01-04 18:55:03 +09:00
yude
e6754f2154
Merge pull request #2 from shaarli/master 
Merge fork source
 2021-01-04 18:51:10 +09:00
ArthurHoaro
ed4ee8f029
Merge pull request #1671 from ArthurHoaro/fix/plugin-colors-update 
Fix default_colors plugin: update CSS file on color change
 2021-01-03 11:43:54 +01:00
ArthurHoaro
20ba77a2dc
Merge pull request #1672 from ArthurHoaro/feature/api-parse-tags-string 2021-01-03 11:43:31 +01:00
ArthurHoaro
0640c1a6db API: POST/PUT Link - properly parse tags string 
Even though the documentation specify that tags should be passed as an array, tags string is actually allowed. So this adds a proper parsing with configured separator.

Related to #1651
 2020-12-29 13:01:04 +01:00
ArthurHoaro
035a002edc Fix default_colors plugin: update CSS file on color change 
Last update of this plugin remove the save_plugin_parameters hook.

Fixes #1657
 2020-12-29 11:59:14 +01:00
ArthurHoaro
fe58bdcd9e
Merge pull request #1664 from ArthurHoaro/fix/metadata-sync 
Fix: synchronous metadata retrieval is failing in strict mode
 2020-12-29 11:44:10 +01:00
ArthurHoaro
8ed5fbef8f
Merge pull request #1665 from ArthurHoaro/fix/metadata-regexes-2 
Fix metadata extract regex (2)
 2020-12-29 11:43:39 +01:00
ArthurHoaro
b01b3b83a7
Merge pull request #1666 from ArthurHoaro/feature/daily-rss-cache 
Daily RSS Cache: invalidate cache base on the date
 2020-12-29 11:43:00 +01:00