aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1383 from doc75/doc_dockerAurélien Tamisier2019-11-261-7/+1
|\ | | | | Fix #1382 - update documentation related to docker images
| * Fix #1382 - update documentation related to docker images base image and PHP ↵Guillaume Virlet2019-11-261-7/+1
|/ | | | version used
* Merge pull request #1379 from rfolo9li/patch-1nodiscc2019-11-091-1/+1
|\ | | | | Add php-json as required PHP module
| * doc: add explanation of php-json requirementnodiscc2019-11-091-1/+1
| |
| * Added php-json as required PHP modulerfolo9li2019-11-091-1/+1
|/ | | | | | | | | | | | Without php-json the installation stops with a white screen and the following error: > 09-Nov-2019 14:05:46 UTC] PHP Fatal error: Uncaught Error: Call to undefined function Shaarli\Config\json_encode() in /var/www/html/shaarli/application/config/ConfigJson.php:48 > Stack trace: > #0 /var/www/html/shaarli/application/config/ConfigManager.php(239): Shaarli\Config\ConfigJson->write('data/config.jso...', Array) > #1 /var/www/html/shaarli/index.php(1835): Shaarli\Config\ConfigManager->write(false) > #2 /var/www/html/shaarli/index.php(178): install(Object(Shaarli\Config\ConfigManager), Object(Shaarli\Security\SessionManager), Object(Shaarli\Security\LoginManager)) > #3 {main} > thrown in /var/www/html/shaarli/application/config/ConfigJson.php on line 48 Tested with Shaarli 0.10.4 on CentOS 8 with Httpd 2.4.37 and PHP 7.2.11.
* Merge pull request #1374 from paulvandenburg/demo-plugin-typosnodiscc2019-10-271-14/+9
|\ | | | | Fix some typos and remove a few unnecessary comments in demo plugin
| * Fix some typos and remove a few unnecessary comments in demo pluginPaul van den Burg2019-10-261-14/+9
|/
* Merge pull request #1366 from shaarli/doc-setuptools-mkdocsnodiscc2019-10-021-0/+3
|\ | | | | doc: CI/dev tools: add paragraph about documentation/mkdocs
| * fix typonodiscc2019-10-021-1/+1
| |
| * doc: CI/dev tools: add paragraph about documentation/mkdocsnodiscc2019-09-191-0/+3
| | | | | | Fixes https://github.com/shaarli/Shaarli/issues/1335
* | Merge pull request #1368 from NerosTie/patch-1nodiscc2019-09-281-2/+0
|\ \ | | | | | | emojione & twemoji removed
| * | emojione & twemoji removedNeros2019-09-251-2/+0
|/ / | | | | Since emojis are in every web browsers now, these plugins have no purpose anymore. And they are very outdated.
* | Merge pull request #1367 from shaarli/thumbnailer-soundcloudnodiscc2019-09-211-0/+1
|\ \ | |/ |/| thumbnailer: add soundcloud.com to list of common media domains
| * thumbnailer: add soundcloud.com to list of common media domainsnodiscc2019-09-211-0/+1
|/ | | OpenGraph thumbnails are well supported on soundcloud.com, displaying an album/track/artist cover image
* Merge pull request #1361 from Lucas-C/patch-1nodiscc2019-09-191-0/+1
|\ | | | | Add pelican shaarli_poster plugin to list of integrations
| * doc: update shaarli_poster pelican plugin urlnodiscc2019-09-191-1/+1
| |
| * Add pelican shaarli_poster plugin to list of integrationsLucas Cimon2019-09-041-0/+1
| |
* | Merge pull request #1365 from shaarli/dependabot/npm_and_yarn/mixin-deep-1.3.2nodiscc2019-09-191-3/+3
|\ \ | | | | | | Bump mixin-deep from 1.3.1 to 1.3.2
| * | Bump mixin-deep from 1.3.1 to 1.3.2dependabot[bot]2019-09-191-3/+3
|/ / | | | | | | | | | | | | Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2) Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #1364 from ArthurHoaro/hotfix/md-rss-permalinknodiscc2019-09-141-1/+1
|\ \ | | | | | | Fix RSS permalink included in Markdown bloc
| * | Fix RSS permalink included in Markdown blocArthurHoaro2019-09-121-1/+1
|/ / | | | | | | Adds another line break before inserting RSS permalink to avoid including it in markdown blocs, such as blockquote.
* | Fix undefined thumbnail in OpenGraph headers (#1363)ArthurHoaro2019-09-102-2/+2
|\ \ | |/ |/| Fix undefined thumbnail in OpenGraph headers
| * Fix undefined thumbnail on OpenGraph headersArthurHoaro2019-09-102-2/+2
| | | | | | | | Fixes #1362
* | Merge pull request #1359 from shaarli/dependabot/npm_and_yarn/lodash-4.17.15ArthurHoaro2019-08-271-3/+3
|\ \ | | | | | | Bump lodash from 4.17.11 to 4.17.15
| * | Bump lodash from 4.17.11 to 4.17.15dependabot[bot]2019-08-271-3/+3
|/ / | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15) Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #1355 from ArthurHoaro/hotfix/feed-md-directlinkArthurHoaro2019-08-152-1/+11
|\ \ | | | | | | Markdown plugin: fix RSS feed direct link reverse
| * | Markdown plugin: fix RSS feed direct link reverseArthurHoaro2019-08-152-1/+11
| |/ | | | | | | The plugin was only reversing permalinks and failed with setting rss_permalinks set to false
* | Merge pull request #1354 from ArthurHoaro/hotfix/img-lazy-loadingArthurHoaro2019-08-151-0/+2
|\ \ | |/ |/| Fix image lazy loading issues
| * Fix image lazy loading issuesArthurHoaro2019-08-151-0/+2
|/ | | | | For some reason, bLazy won't load the image if the img block has either 0 height or width.
* Merge pull request #1351 from ArthurHoaro/hotfix/index-php-versionnodiscc2019-08-101-3/+1
|\ | | | | Bump PHP version check in index.php
| * Bump PHP version check in index.phpArthurHoaro2019-08-101-3/+1
|/ | | | Fixes #1249
* Merge pull request #1352 from ArthurHoaro/hotfix/ut-errorArthurHoaro2019-08-101-13/+12
|\ | | | | Fix UT: LinkDBTest - make each tests independant
| * Fix UT: LinkDBTest - make each tests independantArthurHoaro2019-08-101-13/+12
|/ | | | | Otherwise the datastore is empty in the last test, making it inconsistent due to dates issues.
* Merge pull request #1336 from ArthurHoaro/hotfix/atom-authorArthurHoaro2019-08-102-2/+2
|\ | | | | ATOM Feed: use instance name as author name instead of URL
| * ATOM Feed: use instance name as author name instead of URLArthurHoaro2019-07-292-2/+2
| | | | | | | | Related FreshRSS/FreshRSS#2466
* | Merge pull request #1350 from ArthurHoaro/hotfix/sort-consistencyArthurHoaro2019-08-102-2/+40
|\ \ | | | | | | Make sure that bookmark sort is consistent, even with equal timestamps
| * | Make sure that bookmark sort is consistent, even with equal timestampsArthurHoaro2019-08-072-2/+40
| | | | | | | | | | | | Fixes #1348
* | | Merge pull request #1346 from kalvn/fixdailynoticeArthurHoaro2019-08-101-1/+1
|\ \ \ | |/ / |/| | Fixes a Undefined index: thumbnail in daily page.
| * | Fixes a Undefined index: thumbnail in daily page.kalvn2019-08-041-1/+1
|/ /
* | Bump badge versionArthurHoaro2019-08-031-1/+1
| |
* | Merge pull request #1345 from ArthurHoaro/changelog-v0.11.1ArthurHoaro2019-08-032-3/+16
|\ \ | | | | | | Changelog v0.11.1
| * | Changelog v0.11.1ArthurHoaro2019-08-032-3/+16
|/ /
* | Merge pull request #1344 from agentcobra/agentcobra-patch-1ArthurHoaro2019-08-031-1/+1
|\ \ | | | | | | little fix template
| * | little fix templateagentcobra2019-08-011-1/+1
| | | | | | | | | fix link between label and checkbox (updateCheck)
* | | Merge pull request #1342 from ArthurHoaro/hotfix/composer-php71ArthurHoaro2019-08-012-132/+158
|\ \ \ | | | | | | | | Upgrade composer dependencies from PHP 7.1
| * | | Upgrade composer dependencies from PHP 7.1ArthurHoaro2019-08-012-132/+158
|/ / /
* | | Merge pull request #1341 from ArthurHoaro/hotfix/travis-eolArthurHoaro2019-08-011-4/+0
|\ \ \ | | | | | | | | Remove Travis unit tests against PHP 5.6 and 7.0
| * | | Remove Travis unit tests against PHP 5.6 and 7.0ArthurHoaro2019-08-011-4/+0
|/ / /
* | | Merge pull request #1340 from shaarli/fix-doc-linksnodiscc2019-08-011-1/+1
|\ \ \ | |/ / |/| | doc: fix broken markdown link
| * | doc: fix broken markdown linknodiscc2019-08-011-1/+1
|/ / | | | | | | fixes https://github.com/shaarli/Shaarli/issues/1330