aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #1337 from ArthurHoaro/hotfix/docker-buildArthurHoaro2019-07-291-1/+1
|\ \ | | | | | | Docker: Bump NodeJS version to prevent an issue with node-sass
| * | Docker: Bump NodeJS version to prevent an issue with node-sassArthurHoaro2019-07-291-1/+1
|/ /
* | Merge pull request #1327 from llune/masterArthurHoaro2019-07-298-38/+38
|\ \ | |/ |/| a11y fixes
| * maj linklist Luce Carević2019-07-281-0/+2
| | | | | | put back the link on the thumbmail and fix a11y
| * fix a11yLuce Carević2019-07-137-27/+25
| |
| * fix a11yLuce Carević2019-07-133-14/+14
| |
* | Bump badges versionArthurHoaro2019-07-271-2/+2
| |
* | Merge pull request #1333 from ArthurHoaro/hotfix/sticky-updateArthurHoaro2019-07-271-14/+10
|\ \ | | | | | | Persist sticky status on bookmark update
| * | Persist sticky status on bookmark updateArthurHoaro2019-07-271-14/+10
| | | | | | | | | | | | Fixes #1331
* | | Merge pull request #1334 from ArthurHoaro/changelog-v11ArthurHoaro2019-07-272-4/+51
|\ \ \ | |/ / |/| | Changelog and authors for v0.11 release
| * | Changelog and authors for v0.11 releaseArthurHoaro2019-07-272-4/+51
|/ / | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro>
* | Merge pull request #1332 from rajathans/master_fixArthurHoaro2019-07-271-1/+0
|\ \ | | | | | | Responsive issue with delete button fix
| * | Responsive issue with delete button fixRajat Hans2019-07-241-1/+0
|/ /
* | Merge pull request #1317 from ArthurHoaro/feature/default-colorsArthurHoaro2019-07-2013-39/+439
|\ \ | |/ |/| Plugin to override default template colors
| * Default colors plugin - DocumentationArthurHoaro2019-07-202-0/+21
| |
| * Default colors plugin - TranslationsArthurHoaro2019-07-201-10/+43
| |
| * Add the new hook save_plugin_parameters to the demo pluginArthurHoaro2019-07-202-0/+22
| |