]>
git.immae.eu Git - github/shaarli/Shaarli.git/log
Ganesh Kandu [Tue, 27 Oct 2020 12:12:35 +0000 (17:42 +0530)]
Replaced PHP_EOL to "\n"
i was getting error
```
An error occurred while parsing JSON configuration file (data/config.json.php): error code #4
➜ Syntax error
Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as jsonlint.com.
```
after debug i found
```php
$data = str_replace(self::getPhpHeaders(), '', $data);
$data = str_replace(self::getPhpSuffix(), '', $data);
```
doesn't removing php header and php suffix
cause of this issue was PHP_EOL represents the endline character for the current system. if my ```config.json.php``` was encoded with unix ( LF ) and php running on windows windows encoding ( CR LF ) is not same as unix encoding ( LF ) so ```str_replace``` doesn't replace strin then it causes issue.
ArthurHoaro [Sat, 24 Oct 2020 09:37:29 +0000 (11:37 +0200)]
Merge pull request #1601 from ArthurHoaro/feature/psr3
ArthurHoaro [Wed, 21 Oct 2020 13:55:39 +0000 (15:55 +0200)]
Merge pull request #1605 from ArthurHoaro/fix/nginx-doc-rule
Fix: nginx - add rule to disable url-rewriting for the docs
ArthurHoaro [Wed, 21 Oct 2020 13:23:30 +0000 (15:23 +0200)]
Fix: nginx - add rule to disable url-rewriting for the docs
Related to #1603
ArthurHoaro [Tue, 20 Oct 2020 19:37:20 +0000 (21:37 +0200)]
Merge pull request #1602 from ArthurHoaro/fix/root-exceptions
Dislay an error if an exception occurs in the error handler
ArthurHoaro [Tue, 20 Oct 2020 16:32:46 +0000 (18:32 +0200)]
Dislay an error if an exception occurs in the error handler
Related to #1598
ArthurHoaro [Tue, 20 Oct 2020 09:47:07 +0000 (11:47 +0200)]
Use PSR-3 logger for login attempts
Fixes #1122
ArthurHoaro [Tue, 20 Oct 2020 08:39:58 +0000 (10:39 +0200)]
Composer: explicitly import katzgrau/klogger (already included in netscape-bookmark-parser)
ArthurHoaro [Tue, 20 Oct 2020 08:30:02 +0000 (10:30 +0200)]
Merge pull request #1584 from ArthurHoaro/feature/async-thumbnail-retrieval
Asynchronous retrieval of bookmark's thumbnails
ArthurHoaro [Thu, 15 Oct 2020 09:46:24 +0000 (11:46 +0200)]
Asynchronous retrieval of bookmark's thumbnails
This feature is based general.enable_async_metadata setting and works with existing metadata.js file.
The script is compatible with any template:
- the thumbnail div bloc must have attribute
- the bookmark bloc must have attribute with the bookmark ID as value
Fixes #1564
ArthurHoaro [Tue, 20 Oct 2020 08:14:28 +0000 (10:14 +0200)]
Merge pull request #1567 from ArthurHoaro/feature/async-title-retrieval
ArthurHoaro [Tue, 20 Oct 2020 08:08:03 +0000 (10:08 +0200)]
Merge pull request #1600 from yudete/master
yudete [Mon, 19 Oct 2020 01:25:51 +0000 (10:25 +0900)]
Update translations (Japanese)
yudete [Mon, 19 Oct 2020 01:17:35 +0000 (10:17 +0900)]
Update translations (Japanese)
ArthurHoaro [Fri, 16 Oct 2020 18:40:49 +0000 (20:40 +0200)]
Merge pull request #1588 from ArthurHoaro/feature/search-highlight
ArthurHoaro [Mon, 12 Oct 2020 10:23:57 +0000 (12:23 +0200)]
add search highlight unit tests
ArthurHoaro [Mon, 12 Oct 2020 09:35:55 +0000 (11:35 +0200)]
Feature: highlight fulltext search results
How it works:
1. when a fulltext search is made, Shaarli looks for the first
occurence position of every term matching the search. No change here,
but we store these positions in an array, in Bookmark's additionalContent.
2. when formatting bookmarks (through BookmarkFormatter
implementation):
1. first we insert specific tokens at every search result positions
2. we format the content (escape HTML, apply markdown, etc.)
3. as a last step, we replace our token with displayable span
elements
Cons: this tightens coupling between search filters and formatters
Pros: it was absolutely necessary not to perform the
search twice. this solution has close to no impact on performances.
Fixes #205
ArthurHoaro [Fri, 16 Oct 2020 18:15:19 +0000 (20:15 +0200)]
Merge pull request #1596 from ArthurHoaro/feature/better-rename-tag
Improve Manage tags page
ArthurHoaro [Fri, 16 Oct 2020 18:03:25 +0000 (20:03 +0200)]
Improve Manage tags page
Fixes #1125
ArthurHoaro [Fri, 16 Oct 2020 17:26:03 +0000 (19:26 +0200)]
Merge pull request #1593 from ArthurHoaro/fix/no-url-rewriting
ArthurHoaro [Fri, 16 Oct 2020 17:20:45 +0000 (19:20 +0200)]
Doc: typo
ArthurHoaro [Fri, 16 Oct 2020 11:06:06 +0000 (13:06 +0200)]
Inject ROOT_PATH in plugin instead of regenerating it everywhere
ArthurHoaro [Fri, 16 Oct 2020 10:47:11 +0000 (12:47 +0200)]
Support using Shaarli without URL rewriting
- Shaarli can be fully used by prefixing any URL with /index.php/
- {$base_path} used in templates already works with this configuration
- Assets path (outside of theme's assets) must be prefixed with {$root_url}/
- Documentation section in « Server configuration »
Fixes #1590
ArthurHoaro [Fri, 16 Oct 2020 10:16:54 +0000 (12:16 +0200)]
Merge pull request #1592 from ArthurHoaro/fix/strict-type-daily
Strict types: fix an issue in daily where the date could be an int
ArthurHoaro [Fri, 16 Oct 2020 10:04:46 +0000 (12:04 +0200)]
Strict types: fix an issue in daily where the date could be an int
ArthurHoaro [Thu, 15 Oct 2020 09:20:33 +0000 (11:20 +0200)]
Improve metadata retrieval (performances and accuracy)
- Use dedicated function to download headers to avoid apply multiple regexps on headers
- Also try to extract title from meta tags
ArthurHoaro [Fri, 25 Sep 2020 11:29:36 +0000 (13:29 +0200)]
Add a setting to retrieve bookmark metadata asynchrounously
- There is a new standalone script (metadata.js) which requests
a new controller to get bookmark metadata and fill the form async
- This feature is enabled with the new setting: general.enable_async_metadata
(enabled by default)
- general.retrieve_description is now enabled by default
- A small rotating loader animation has a been added to bookmark inputs
when metadata is being retrieved (default template)
- Custom JS htmlentities has been removed and mathiasbynens/he
library is used instead
Fixes #1563
ArthurHoaro [Thu, 15 Oct 2020 07:06:27 +0000 (09:06 +0200)]
Merge pull request #1591 from ArthurHoaro/doc/server-conf-php-v
Doc: add PHP 7.4 and 8.0 as supported version
ArthurHoaro [Thu, 15 Oct 2020 06:59:51 +0000 (08:59 +0200)]
Doc: add PHP 7.4 and 8.0 as supported version
ArthurHoaro [Tue, 13 Oct 2020 11:56:07 +0000 (13:56 +0200)]
Merge pull request #1583 from ArthurHoaro/feature/bookmark-strict-types
Add strict types for bookmarks management
ArthurHoaro [Fri, 2 Oct 2020 15:50:59 +0000 (17:50 +0200)]
Add strict types for bookmarks management
Parameters typing and using strict types overall increase the codebase
quality by enforcing the a given parameter will have the expected type.
It also removes the need to unnecessary unit tests checking methods
behavior with invalid input.
ArthurHoaro [Tue, 13 Oct 2020 11:30:37 +0000 (13:30 +0200)]
Merge pull request #1570 from ArthurHoaro/feature/datastore-mutex
Add mutex on datastore I/O operations
ArthurHoaro [Sat, 26 Sep 2020 12:18:01 +0000 (14:18 +0200)]
Add mutex on datastore I/O operations
To make sure that there is no concurrent operation on the datastore file.
Fixes #1132
ArthurHoaro [Tue, 13 Oct 2020 10:26:55 +0000 (12:26 +0200)]
Merge pull request #1540 from ArthurHoaro/fix/metadata-regexes
Improve regex to extract HTML metadata (title, description, etc.)
ArthurHoaro [Tue, 13 Oct 2020 10:26:01 +0000 (12:26 +0200)]
Merge pull request #1525 from ArthurHoaro/feature/rest-api-bookmark-dates
REST API: allow override of creation and update dates
ArthurHoaro [Tue, 13 Oct 2020 10:25:12 +0000 (12:25 +0200)]
Merge pull request #1521 from ArthurHoaro/feature/markdown-extra
Add Markdown Extra formatter
ArthurHoaro [Thu, 27 Aug 2020 13:25:18 +0000 (15:25 +0200)]
Add Markdown Extra formatter
Library: [Parsedown Extra](https://github.com/erusev/parsedown-extra)
Also sort dependencies alphabetically.
Fixes #1169
ArthurHoaro [Tue, 13 Oct 2020 09:59:54 +0000 (11:59 +0200)]
Update badge versions
ArthurHoaro [Tue, 13 Oct 2020 09:49:07 +0000 (11:49 +0200)]
Merge pull request #1589 from ArthurHoaro/changelog/v0.12.0
CHANGELOG and AUTHORS for v0.12.0
ArthurHoaro [Tue, 13 Oct 2020 09:44:31 +0000 (11:44 +0200)]
CHANGELOG and AUTHORS for v0.12.0
ArthurHoaro [Thu, 8 Oct 2020 06:54:19 +0000 (08:54 +0200)]
Merge pull request #1586 from ArthurHoaro/changelog/v0.12.0-beta-2
CHANGELOG and AUTHORS for v0.12.0-beta-2
ArthurHoaro [Thu, 8 Oct 2020 06:41:30 +0000 (08:41 +0200)]
CHANGELOG and AUTHORS for v0.12.0-beta-2
ArthurHoaro [Thu, 8 Oct 2020 06:19:06 +0000 (08:19 +0200)]
Merge pull request #1585 from ArthurHoaro/fix/xss-and-tag-search
Security: fix multiple XSS vulnerabilities + fix search tags with special chars
ArthurHoaro [Tue, 6 Oct 2020 15:30:18 +0000 (17:30 +0200)]
Security: fix multiple XSS vulnerabilities + fix search tags with special chars
XSS vulnerabilities fixed in editlink, linklist, tag.cloud and tag.list.
Also fixed tag search with special characters: urlencode function needs to be applied on raw data, before espaping, otherwise the rendered URL is wrong.
nodiscc [Sun, 4 Oct 2020 11:45:24 +0000 (11:45 +0000)]
Merge pull request #1579 from sprak3000/issue-1437-tag-sort-buttons-ui
Fix #1437 - Make tag cloud/list views buttons more obvious
nodiscc [Sun, 4 Oct 2020 11:33:57 +0000 (11:33 +0000)]
Merge pull request #1581 from nodiscc/compose-traefik-version
docker-compose.yml: pin traefik image to 1.7-alpine
nodiscc [Sat, 3 Oct 2020 12:33:15 +0000 (14:33 +0200)]
docker-compose.yml: pin traefik image to 1.7-alpine
- fixes https://github.com/shaarli/Shaarli/issues/1493
- https://hub.docker.com/_/traefik/
ArthurHoaro [Sat, 3 Oct 2020 10:59:16 +0000 (12:59 +0200)]
Merge pull request #1575 from ArthurHoaro/feature/php8
ArthurHoaro [Sat, 3 Oct 2020 10:59:01 +0000 (12:59 +0200)]
Merge pull request #1574 from stoeps13/hosting-fix
sprak3000 [Fri, 2 Oct 2020 18:06:02 +0000 (14:06 -0400)]
Issue #1437 - Make tag cloud/list views buttons more obvious
This work alters the markup and CSS for the tag sort UI to match the button feel filters and links per page uses.
ArthurHoaro [Fri, 2 Oct 2020 12:24:07 +0000 (14:24 +0200)]
Merge pull request #1577 from ArthurHoaro/fix/edit-zero
Fix a bug preventing to edit bookmark with ID #0
ArthurHoaro [Wed, 30 Sep 2020 13:57:57 +0000 (15:57 +0200)]
Revert unrelated changes and add unit tests
ArthurHoaro [Wed, 30 Sep 2020 13:31:34 +0000 (15:31 +0200)]
Fix a bug preventing to edit bookmark with ID #0
Christoph Stoettner [Wed, 30 Sep 2020 10:29:54 +0000 (12:29 +0200)]
Fix identation
Christoph Stoettner [Wed, 30 Sep 2020 10:27:44 +0000 (12:27 +0200)]
Change to ->container->environment
ArthurHoaro [Wed, 30 Sep 2020 09:59:42 +0000 (11:59 +0200)]
Merge pull request #1576 from ArthurHoaro/release/v0.12.0-beta-1/changelog
Update CHANGELOG and AUTHOR
ArthurHoaro [Wed, 30 Sep 2020 09:55:51 +0000 (11:55 +0200)]
Update CHANGELOG and AUTHOR
ArthurHoaro [Wed, 30 Sep 2020 09:35:57 +0000 (11:35 +0200)]
Merge pull request #1569 from ArthurHoaro/fix/bad-encoding
Fix warning if the encoding retrieved from external headers is invalid
ArthurHoaro [Wed, 30 Sep 2020 09:12:17 +0000 (11:12 +0200)]
Merge pull request #1566 from nodiscc/makefile-composer-install
doc/Makefile: remove references to composer update
ArthurHoaro [Sat, 26 Sep 2020 11:28:38 +0000 (13:28 +0200)]
Fix warning if the encoding retrieved from external headers is invalid
Also fixed the regex to support this failing header: charset="utf-8"\r\n"
ArthurHoaro [Tue, 29 Sep 2020 16:49:02 +0000 (18:49 +0200)]
Use assertRegExp polyfill instead of regexMatches
ArthurHoaro [Tue, 29 Sep 2020 16:44:52 +0000 (18:44 +0200)]
Ignore PHP deps when removing phpunit in PHP 8.0 environment
ArthurHoaro [Tue, 29 Sep 2020 16:43:20 +0000 (18:43 +0200)]
Update composer dependencies from PHP 7.1
ArthurHoaro [Tue, 29 Sep 2020 16:41:21 +0000 (18:41 +0200)]
Fix missing @expectedException convertion
ArthurHoaro [Tue, 29 Sep 2020 13:00:11 +0000 (15:00 +0200)]
Compatibility with PHP 8
ArthurHoaro [Tue, 29 Sep 2020 12:41:40 +0000 (14:41 +0200)]
Compatibility with PHPUnit 9
ArthurHoaro [Tue, 29 Sep 2020 09:43:18 +0000 (11:43 +0200)]
Run CI against PHP 8.0
Christoph Stoettner [Tue, 29 Sep 2020 10:15:04 +0000 (12:15 +0200)]
Workaround for hoster (ionos)
The hoster writes the environment variable with bearer token to
REDIRECT_HTTP_AUTHORIZATION and needs to provide RewriteBase / to
.htaccess
ArthurHoaro [Tue, 29 Sep 2020 09:36:27 +0000 (11:36 +0200)]
Merge pull request #1572 from ArthurHoaro/feature/php8
ArthurHoaro [Sun, 27 Sep 2020 12:07:08 +0000 (14:07 +0200)]
Convert legacy PHPUnit @expected* to new ->expect*
Converted automatically using https://github.com/ArthurHoaro/convert-legacy-phpunit-expect
ArthurHoaro [Sat, 26 Sep 2020 13:08:39 +0000 (15:08 +0200)]
Comply with PHPUnit V8: setup/teardown functions must return void
ArthurHoaro [Sat, 26 Sep 2020 12:43:21 +0000 (14:43 +0200)]
tmp
ArthurHoaro [Sat, 26 Sep 2020 12:33:27 +0000 (14:33 +0200)]
Travis CI: run composer update instead of install
And ignore PHP 7.1 platform requirement, in order to get matching version of PHPUnit
ArthurHoaro [Sat, 26 Sep 2020 09:58:32 +0000 (11:58 +0200)]
Merge pull request #1568 from ArthurHoaro/fix/vintage-linkdate
Fix undefined linkdate variable in vintage theme
ArthurHoaro [Fri, 25 Sep 2020 16:24:53 +0000 (18:24 +0200)]
Fix undefined linkdate variable in vintage theme
Fixes #1371
ArthurHoaro [Fri, 25 Sep 2020 08:59:51 +0000 (10:59 +0200)]
Merge pull request #1560 from ArthurHoaro/fix/redirect-wrong-path
Fix invalid redirection using the path of an external domain
ArthurHoaro [Fri, 25 Sep 2020 08:59:40 +0000 (10:59 +0200)]
Merge pull request #1558 from ArthurHoaro/fix/plugins-base-path
Fix plugin base path in core plugins
ArthurHoaro [Fri, 25 Sep 2020 08:57:25 +0000 (10:57 +0200)]
Merge pull request #1565 from nodiscc/rm-makefile-summary
Makefile: remove static_analysis_summary from all: target
nodiscc [Thu, 24 Sep 2020 19:49:01 +0000 (21:49 +0200)]
doc/Makefile: remove references to composer update
- add make composer_dependencies_dev Makefile target and use this instead
- fix composer initial installation procedure
- fix php-xdebug install instructions
nodiscc [Thu, 24 Sep 2020 19:45:17 +0000 (21:45 +0200)]
Makefile: remove static_analysis_summary from all: target
static_analysis_summary was removed in
37c9c6b #diff-
b67911656ef5d18c4ae36cb6741b7965 but not from the all: target dependencies. Therefore running make all always fails.
fixes https://github.com/shaarli/Shaarli/issues/1459
ArthurHoaro [Wed, 23 Sep 2020 13:50:23 +0000 (15:50 +0200)]
Merge pull request #1561 from ArthurHoaro/feature/front-deps-upgrade
ArthurHoaro [Tue, 22 Sep 2020 16:14:18 +0000 (18:14 +0200)]
Fix ESLint after dependency upgrade
ArthurHoaro [Tue, 22 Sep 2020 15:57:54 +0000 (17:57 +0200)]
Bump NodeJS version on travis build
ArthurHoaro [Tue, 22 Sep 2020 15:49:49 +0000 (17:49 +0200)]
Upgrade front end dependencies
Mostly in order to get rid of deprecated deps, and upgrade vulnerable ones.
- Upgrade webpack from 3.x to 4.x
- Moved babel package to main repo
- Replaced deprecated extract-text-webpack-plugin with extract-text-webpack-plugin
- Replaced deprecated babel-minify-webpack-plugin with terser-webpack-plugin
- Replaced deprecated node-sass with (dart) sass package
- Replaced deprecated sass-lint with stylelint (the rules might be a bit different
Related to #1531: trivy doesn't raise any more issue
ArthurHoaro [Tue, 22 Sep 2020 13:17:13 +0000 (15:17 +0200)]
Fix invalid redirection using the path of an external domain
Fixes #1554
ArthurHoaro [Tue, 22 Sep 2020 12:15:13 +0000 (14:15 +0200)]
Merge pull request #1559 from ArthurHoaro/fix/edit-redirect
Fix redirection to referer after editing a link
ArthurHoaro [Tue, 22 Sep 2020 12:08:54 +0000 (14:08 +0200)]
Merge pull request #1539 from ArthurHoaro/feature/manual-root-url
ArthurHoaro [Tue, 22 Sep 2020 12:04:10 +0000 (14:04 +0200)]
Fix redirection to referer after editing a link
Fixes #1545
ArthurHoaro [Tue, 22 Sep 2020 10:44:08 +0000 (12:44 +0200)]
Fix plugin base path in core plugins
Also fix note check in archiveorg plugin, and regression on vintage template.
Documentation regarding relative path has been added.
Fixes #1548
ArthurHoaro [Tue, 22 Sep 2020 09:45:58 +0000 (11:45 +0200)]
Merge pull request #1556 from kcaran/apache_methods
Keith Carangelo [Mon, 14 Sep 2020 19:32:51 +0000 (15:32 -0400)]
Added PATCH to the allowed Apache request methods.
ArthurHoaro [Sat, 12 Sep 2020 19:41:58 +0000 (21:41 +0200)]
Merge pull request #1553 from ArthurHoaro/fix/404-page
Properly handle 404 errors
ArthurHoaro [Sat, 12 Sep 2020 19:41:24 +0000 (21:41 +0200)]
Merge pull request #1551 from ArthurHoaro/fix/plugin-save-metadata
Plugins: do not save metadata along plugin parameters
ArthurHoaro [Thu, 3 Sep 2020 12:52:34 +0000 (14:52 +0200)]
Fix subfolder configuration in unit tests
ArthurHoaro [Thu, 3 Sep 2020 12:51:41 +0000 (14:51 +0200)]
Add manual configuration for root URL
This new setting under 'general.root_url' allows to override automatic discovery of Shaarli instance's URL.
Fixes #1339
nodiscc [Sat, 12 Sep 2020 12:38:05 +0000 (12:38 +0000)]
Merge pull request #1389 from shaarli/doc-rework-setup
doc: rework installation/setup guides, general refactoring
ArthurHoaro [Thu, 3 Sep 2020 09:58:09 +0000 (11:58 +0200)]
doc: Docker minor improvements
Immánuel! [Sun, 30 Aug 2020 14:30:23 +0000 (16:30 +0200)]
Add 2 plugins to the 3rd party plugin list
Besides adding 2 new plugins, also reordered the list by ABC and fixed some discrepancies in the details to restore balance in the force
nodiscc [Mon, 24 Aug 2020 19:33:53 +0000 (21:33 +0200)]
doc: nginx config: document ipv4 and ipv6 listen directives
nodiscc [Mon, 24 Aug 2020 19:32:44 +0000 (21:32 +0200)]
doc: apache config: remove useless documentroot directive in HTTP-only virtualhost (only used for redirects)