aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Replaced PHP_EOL to "\n"Ganesh Kandu2020-10-271-2/+2
| | | | | | | | | | | | | | | | | 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.
* Merge pull request #1601 from ArthurHoaro/feature/psr3ArthurHoaro2020-10-2417-125/+172
|\
| * Use PSR-3 logger for login attemptsArthurHoaro2020-10-2015-124/+170
| | | | | | | | Fixes #1122
| * Composer: explicitly import katzgrau/klogger (already included in ↵ArthurHoaro2020-10-202-1/+2
| | | | | | | | netscape-bookmark-parser)
* | Merge pull request #1605 from ArthurHoaro/fix/nginx-doc-ruleArthurHoaro2020-10-212-1/+11
|\ \ | | | | | | Fix: nginx - add rule to disable url-rewriting for the docs
| * | Fix: nginx - add rule to disable url-rewriting for the docsArthurHoaro2020-10-212-1/+11
| |/ | | | | | | Related to #1603
* | Merge pull request #1602 from ArthurHoaro/fix/root-exceptionsArthurHoaro2020-10-203-7/+19
|\ \ | |/ |/| Dislay an error if an exception occurs in the error handler
| * Dislay an error if an exception occurs in the error handlerArthurHoaro2020-10-203-7/+19
|/ | | | Related to #1598
* Merge pull request #1584 from ArthurHoaro/feature/async-thumbnail-retrievalArthurHoaro2020-10-2010-42/+279
|\ | | | | Asynchronous retrieval of bookmark's thumbnails
| * Asynchronous retrieval of bookmark's thumbnailsArthurHoaro2020-10-2010-42/+279
|/ | | | | | | | | 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
* Merge pull request #1567 from ArthurHoaro/feature/async-title-retrievalArthurHoaro2020-10-2022-245/+677
|\
| * Improve metadata retrieval (performances and accuracy)ArthurHoaro2020-10-155-177/+237
| | | | | | | | | | - Use dedicated function to download headers to avoid apply multiple regexps on headers - Also try to extract title from meta tags
| * Add a setting to retrieve bookmark metadata asynchrounouslyArthurHoaro2020-10-1519-75/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Merge pull request #1600 from yudete/masterArthurHoaro2020-10-201-999/+1039
|\ \
| * | Update translations (Japanese)yudete2020-10-191-2/+24
| | |
| * | Update translations (Japanese)yudete2020-10-191-999/+1017
|/ /
* | Merge pull request #1588 from ArthurHoaro/feature/search-highlightArthurHoaro2020-10-1613-38/+533
|\ \
| * | add search highlight unit testsArthurHoaro2020-10-166-3/+184
| | |
| * | Feature: highlight fulltext search resultsArthurHoaro2020-10-167-35/+349
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #1596 from ArthurHoaro/feature/better-rename-tagArthurHoaro2020-10-164-47/+49
|\ \ | | | | | | Improve Manage tags page
| * | Improve Manage tags pageArthurHoaro2020-10-164-47/+49
|/ / | | | | | | Fixes #1125
* | Merge pull request #1593 from ArthurHoaro/fix/no-url-rewritingArthurHoaro2020-10-1615-16/+41
|\ \
| * | Doc: typoArthurHoaro2020-10-161-1/+1
| | |
| * | Inject ROOT_PATH in plugin instead of regenerating it everywhereArthurHoaro2020-10-167-9/+14
| | |
| * | Support using Shaarli without URL rewritingArthurHoaro2020-10-1610-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge pull request #1592 from ArthurHoaro/fix/strict-type-dailyArthurHoaro2020-10-162-3/+3
|\ \ \ | |_|/ |/| | Strict types: fix an issue in daily where the date could be an int
| * | Strict types: fix an issue in daily where the date could be an intArthurHoaro2020-10-162-3/+3
| |/
* | Merge pull request #1591 from ArthurHoaro/doc/server-conf-php-vArthurHoaro2020-10-151-2/+4
|\| | | | | Doc: add PHP 7.4 and 8.0 as supported version
| * Doc: add PHP 7.4 and 8.0 as supported versionArthurHoaro2020-10-151-2/+4
|/
* Merge pull request #1583 from ArthurHoaro/feature/bookmark-strict-typesArthurHoaro2020-10-1319-285/+209
|\ | | | | Add strict types for bookmarks management
| * Add strict types for bookmarks managementArthurHoaro2020-10-1319-285/+209
|/ | | | | | | | 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.
* Merge pull request #1570 from ArthurHoaro/feature/datastore-mutexArthurHoaro2020-10-1326-63/+218
|\ | | | | Add mutex on datastore I/O operations
| * Add mutex on datastore I/O operationsArthurHoaro2020-10-1326-63/+218
|/ | | | | | To make sure that there is no concurrent operation on the datastore file. Fixes #1132
* Merge pull request #1540 from ArthurHoaro/fix/metadata-regexesArthurHoaro2020-10-132-2/+93
|\ | | | | Improve regex to extract HTML metadata (title, description, etc.)
| * Improve regex to extract HTML metadata (title, description, etc.)ArthurHoaro2020-09-032-2/+93
| | | | | | | | | | | | Also added a bunch of tests to cover more use cases. Fixes #1375
* | Merge pull request #1525 from ArthurHoaro/feature/rest-api-bookmark-datesArthurHoaro2020-10-134-8/+18
|\ \ | | | | | | REST API: allow override of creation and update dates
| * | REST API: allow override of creation and update datesArthurHoaro2020-08-294-8/+18
| | | | | | | | | | | | | | | | | | | | | Note that if they're not provided, default behaviour will apply: creation and update dates will be autogenerated, and not empty. Fixes #1223
* | | Merge pull request #1521 from ArthurHoaro/feature/markdown-extraArthurHoaro2020-10-137-13/+256
|\ \ \ | | | | | | | | Add Markdown Extra formatter
| * | | Add Markdown Extra formatterArthurHoaro2020-10-137-13/+256
|/ / / | | | | | | | | | | | | | | | | | | | | | Library: [Parsedown Extra](https://github.com/erusev/parsedown-extra) Also sort dependencies alphabetically. Fixes #1169
* | | Update badge versionsArthurHoaro2020-10-131-3/+3
| | |
* | | Merge pull request #1589 from ArthurHoaro/changelog/v0.12.0ArthurHoaro2020-10-132-6/+4
|\ \ \ | | | | | | | | CHANGELOG and AUTHORS for v0.12.0
| * | | CHANGELOG and AUTHORS for v0.12.0ArthurHoaro2020-10-132-6/+4
|/ / /
* | | Merge pull request #1586 from ArthurHoaro/changelog/v0.12.0-beta-2ArthurHoaro2020-10-082-4/+10
|\ \ \ | | | | | | | | CHANGELOG and AUTHORS for v0.12.0-beta-2
| * | | CHANGELOG and AUTHORS for v0.12.0-beta-2ArthurHoaro2020-10-082-4/+10
|/ / /
* | | Merge pull request #1585 from ArthurHoaro/fix/xss-and-tag-searchArthurHoaro2020-10-0811-27/+68
|\ \ \ | | | | | | | | Security: fix multiple XSS vulnerabilities + fix search tags with special chars
| * | | Security: fix multiple XSS vulnerabilities + fix search tags with special charsArthurHoaro2020-10-0611-27/+68
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #1579 from sprak3000/issue-1437-tag-sort-buttons-uinodiscc2020-10-042-5/+5
|\ \ \ | | | | | | | | Fix #1437 - Make tag cloud/list views buttons more obvious
| * | | Issue #1437 - Make tag cloud/list views buttons more obvioussprak30002020-10-022-5/+5
| | | | | | | | | | | | | | | | This work alters the markup and CSS for the tag sort UI to match the button feel filters and links per page uses.
* | | | Merge pull request #1581 from nodiscc/compose-traefik-versionnodiscc2020-10-041-1/+1
|\ \ \ \ | | | | | | | | | | docker-compose.yml: pin traefik image to 1.7-alpine
| * | | | docker-compose.yml: pin traefik image to 1.7-alpinenodiscc2020-10-031-1/+1
|/ / / / | | | | | | | | | | | | | | | | - fixes https://github.com/shaarli/Shaarli/issues/1493 - https://hub.docker.com/_/traefik/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 04:17:51 +0000