diff options
-rw-r--r-- | .htaccess | 25 | ||||
-rw-r--r-- | AUTHORS | 3 | ||||
-rw-r--r-- | CHANGELOG.md | 26 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | application/Updater.php | 2 | ||||
-rw-r--r-- | composer.lock | 121 | ||||
-rw-r--r-- | index.php | 4 | ||||
-rw-r--r-- | tpl/default/page.header.html | 4 | ||||
-rw-r--r-- | tpl/default/tools.html | 11 |
9 files changed, 125 insertions, 73 deletions
@@ -16,8 +16,33 @@ RewriteCond %{REQUEST_FILENAME} !-d | |||
16 | RewriteRule ^ index.php [QSA,L] | 16 | RewriteRule ^ index.php [QSA,L] |
17 | 17 | ||
18 | <Limit GET POST PUT DELETE OPTIONS> | 18 | <Limit GET POST PUT DELETE OPTIONS> |
19 | <IfModule version_module> | ||
20 | <IfVersion >= 2.4> | ||
21 | Require all granted | ||
22 | </IfVersion> | ||
23 | <IfVersion < 2.4> | ||
24 | Allow from all | ||
25 | Deny from none | ||
26 | </IfVersion> | ||
27 | </IfModule> | ||
28 | |||
29 | <IfModule !version_module> | ||
19 | Require all granted | 30 | Require all granted |
31 | </IfModule> | ||
20 | </Limit> | 32 | </Limit> |
33 | |||
21 | <LimitExcept GET POST PUT DELETE OPTIONS> | 34 | <LimitExcept GET POST PUT DELETE OPTIONS> |
35 | <IfModule version_module> | ||
36 | <IfVersion >= 2.4> | ||
37 | Require all denied | ||
38 | </IfVersion> | ||
39 | <IfVersion < 2.4> | ||
40 | Allow from none | ||
41 | Deny from all | ||
42 | </IfVersion> | ||
43 | </IfModule> | ||
44 | |||
45 | <IfModule !version_module> | ||
22 | Require all denied | 46 | Require all denied |
47 | </IfModule> | ||
23 | </LimitExcept> | 48 | </LimitExcept> |
@@ -1,4 +1,4 @@ | |||
1 | 664 ArthurHoaro <arthur@hoa.ro> | 1 | 687 ArthurHoaro <arthur@hoa.ro> |
2 | 355 VirtualTam <virtualtam@flibidi.net> | 2 | 355 VirtualTam <virtualtam@flibidi.net> |
3 | 195 nodiscc <nodiscc@gmail.com> | 3 | 195 nodiscc <nodiscc@gmail.com> |
4 | 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> | 4 | 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> |
@@ -15,6 +15,7 @@ | |||
15 | 4 David Sferruzza <david.sferruzza@gmail.com> | 15 | 4 David Sferruzza <david.sferruzza@gmail.com> |
16 | 4 Immánuel Fodor <immanuelfactor+github@gmail.com> | 16 | 4 Immánuel Fodor <immanuelfactor+github@gmail.com> |
17 | 3 Teromene <teromene@teromene.fr> | 17 | 3 Teromene <teromene@teromene.fr> |
18 | 3 llune <llune@users.noreply.github.com> | ||
18 | 2 Chris Kuethe <chris.kuethe@gmail.com> | 19 | 2 Chris Kuethe <chris.kuethe@gmail.com> |
19 | 2 Felix Bartels <felix@host-consultants.de> | 20 | 2 Felix Bartels <felix@host-consultants.de> |
20 | 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org> | 21 | 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org> |
diff --git a/CHANGELOG.md b/CHANGELOG.md index 04cb2fd1..aa1f0d8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file. | |||
4 | The format is based on [Keep a Changelog](http://keepachangelog.com/) | 4 | The format is based on [Keep a Changelog](http://keepachangelog.com/) |
5 | and this project adheres to [Semantic Versioning](http://semver.org/). | 5 | and this project adheres to [Semantic Versioning](http://semver.org/). |
6 | 6 | ||
7 | ## [v0.10.2](https://github.com/shaarli/Shaarli/releases/tag/v0.10.2) - 2018-08-11 | ||
8 | |||
9 | ### Fixed | ||
10 | |||
11 | - Docker build | ||
12 | |||
13 | ## [v0.10.1](https://github.com/shaarli/Shaarli/releases/tag/v0.10.1) - 2018-08-11 | ||
14 | |||
15 | ### Changed | ||
16 | |||
17 | - Accessibility: | ||
18 | - Remove alt text on the logo | ||
19 | - Remove redundant title in tools page | ||
20 | |||
21 | ### Fixed | ||
22 | |||
23 | - Fixed an error on the daily page and daily RSS | ||
24 | - Fixed an issue causing 'You are not authorized to add a link' error while logged out | ||
25 | - Fixed thumbnail path when Shaarli's path uses symbolic links | ||
26 | - Add a `mod_version` check in Shaarli's root `.htaccess` file for Apache 2.2 syntax | ||
27 | - Include assets in the release Makefile target | ||
28 | |||
29 | ### Removed | ||
30 | |||
31 | - Firefox Social API shaare has been removed | ||
32 | |||
7 | ## [v0.10.0](https://github.com/shaarli/Shaarli/releases/tag/v0.10.0) - 2018-07-28 | 33 | ## [v0.10.0](https://github.com/shaarli/Shaarli/releases/tag/v0.10.0) - 2018-07-28 |
8 | **PHP 5.5 compatibility has been dropped.** Shaarli now requires at least PHP 5.6. | 34 | **PHP 5.5 compatibility has been dropped.** Shaarli now requires at least PHP 5.6. |
9 | 35 | ||
@@ -9,7 +9,7 @@ _It is designed to be personal (single-user), fast and handy._ | |||
9 | [![](https://img.shields.io/badge/stable-v0.9.7-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.7) | 9 | [![](https://img.shields.io/badge/stable-v0.9.7-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.7) |
10 | [![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli) | 10 | [![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli) |
11 | • | 11 | • |
12 | [![](https://img.shields.io/badge/latest-v0.10.0-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.10.0) | 12 | [![](https://img.shields.io/badge/latest-v0.10.2-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.10.2) |
13 | [![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli) | 13 | [![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli) |
14 | • | 14 | • |
15 | [![](https://img.shields.io/badge/master-v0.10.x-blue.svg)](https://github.com/shaarli/Shaarli) | 15 | [![](https://img.shields.io/badge/master-v0.10.x-blue.svg)](https://github.com/shaarli/Shaarli) |
diff --git a/application/Updater.php b/application/Updater.php index c2aa1568..480bff82 100644 --- a/application/Updater.php +++ b/application/Updater.php | |||
@@ -502,7 +502,7 @@ class Updater | |||
502 | return true; | 502 | return true; |
503 | } | 503 | } |
504 | 504 | ||
505 | $thumbnailsEnabled = $this->conf->get('thumbnail.enable_thumbnails', true); | 505 | $thumbnailsEnabled = extension_loaded('gd') && $this->conf->get('thumbnail.enable_thumbnails', true); |
506 | $this->conf->set('thumbnails.mode', $thumbnailsEnabled ? Thumbnailer::MODE_ALL : Thumbnailer::MODE_NONE); | 506 | $this->conf->set('thumbnails.mode', $thumbnailsEnabled ? Thumbnailer::MODE_ALL : Thumbnailer::MODE_NONE); |
507 | $this->conf->set('thumbnails.width', 125); | 507 | $this->conf->set('thumbnails.width', 125); |
508 | $this->conf->set('thumbnails.height', 90); | 508 | $this->conf->set('thumbnails.height', 90); |
diff --git a/composer.lock b/composer.lock index 0f56338d..22c97fa9 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -8,16 +8,16 @@ | |||
8 | "packages": [ | 8 | "packages": [ |
9 | { | 9 | { |
10 | "name": "arthurhoaro/web-thumbnailer", | 10 | "name": "arthurhoaro/web-thumbnailer", |
11 | "version": "v1.2.1", | 11 | "version": "v1.3.1", |
12 | "source": { | 12 | "source": { |
13 | "type": "git", | 13 | "type": "git", |
14 | "url": "https://github.com/ArthurHoaro/web-thumbnailer.git", | 14 | "url": "https://github.com/ArthurHoaro/web-thumbnailer.git", |
15 | "reference": "a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1" | 15 | "reference": "7142bd94ec93719a756a7012ebb8e1c5813c6860" |
16 | }, | 16 | }, |
17 | "dist": { | 17 | "dist": { |
18 | "type": "zip", | 18 | "type": "zip", |
19 | "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1", | 19 | "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/7142bd94ec93719a756a7012ebb8e1c5813c6860", |
20 | "reference": "a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1", | 20 | "reference": "7142bd94ec93719a756a7012ebb8e1c5813c6860", |
21 | "shasum": "" | 21 | "shasum": "" |
22 | }, | 22 | }, |
23 | "require": { | 23 | "require": { |
@@ -52,7 +52,7 @@ | |||
52 | } | 52 | } |
53 | ], | 53 | ], |
54 | "description": "PHP library which will retrieve a thumbnail for any given URL", | 54 | "description": "PHP library which will retrieve a thumbnail for any given URL", |
55 | "time": "2018-07-17T10:21:14+00:00" | 55 | "time": "2018-08-11T12:21:52+00:00" |
56 | }, | 56 | }, |
57 | { | 57 | { |
58 | "name": "container-interop/container-interop", | 58 | "name": "container-interop/container-interop", |
@@ -1111,16 +1111,16 @@ | |||
1111 | }, | 1111 | }, |
1112 | { | 1112 | { |
1113 | "name": "phpspec/prophecy", | 1113 | "name": "phpspec/prophecy", |
1114 | "version": "1.7.6", | 1114 | "version": "1.8.0", |
1115 | "source": { | 1115 | "source": { |
1116 | "type": "git", | 1116 | "type": "git", |
1117 | "url": "https://github.com/phpspec/prophecy.git", | 1117 | "url": "https://github.com/phpspec/prophecy.git", |
1118 | "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" | 1118 | "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" |
1119 | }, | 1119 | }, |
1120 | "dist": { | 1120 | "dist": { |
1121 | "type": "zip", | 1121 | "type": "zip", |
1122 | "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", | 1122 | "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", |
1123 | "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", | 1123 | "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", |
1124 | "shasum": "" | 1124 | "shasum": "" |
1125 | }, | 1125 | }, |
1126 | "require": { | 1126 | "require": { |
@@ -1132,12 +1132,12 @@ | |||
1132 | }, | 1132 | }, |
1133 | "require-dev": { | 1133 | "require-dev": { |
1134 | "phpspec/phpspec": "^2.5|^3.2", | 1134 | "phpspec/phpspec": "^2.5|^3.2", |
1135 | "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" | 1135 | "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" |
1136 | }, | 1136 | }, |
1137 | "type": "library", | 1137 | "type": "library", |
1138 | "extra": { | 1138 | "extra": { |
1139 | "branch-alias": { | 1139 | "branch-alias": { |
1140 | "dev-master": "1.7.x-dev" | 1140 | "dev-master": "1.8.x-dev" |
1141 | } | 1141 | } |
1142 | }, | 1142 | }, |
1143 | "autoload": { | 1143 | "autoload": { |
@@ -1170,7 +1170,7 @@ | |||
1170 | "spy", | 1170 | "spy", |
1171 | "stub" | 1171 | "stub" |
1172 | ], | 1172 | ], |
1173 | "time": "2018-04-18T13:57:24+00:00" | 1173 | "time": "2018-08-05T17:53:17+00:00" |
1174 | }, | 1174 | }, |
1175 | { | 1175 | { |
1176 | "name": "phpunit/php-code-coverage", | 1176 | "name": "phpunit/php-code-coverage", |
@@ -2255,16 +2255,16 @@ | |||
2255 | }, | 2255 | }, |
2256 | { | 2256 | { |
2257 | "name": "symfony/config", | 2257 | "name": "symfony/config", |
2258 | "version": "v3.4.13", | 2258 | "version": "v3.4.14", |
2259 | "source": { | 2259 | "source": { |
2260 | "type": "git", | 2260 | "type": "git", |
2261 | "url": "https://github.com/symfony/config.git", | 2261 | "url": "https://github.com/symfony/config.git", |
2262 | "reference": "1fffdeb349ff36a25184e5564c25289b1dbfc402" | 2262 | "reference": "7b08223b7f6abd859651c56bcabf900d1627d085" |
2263 | }, | 2263 | }, |
2264 | "dist": { | 2264 | "dist": { |
2265 | "type": "zip", | 2265 | "type": "zip", |
2266 | "url": "https://api.github.com/repos/symfony/config/zipball/1fffdeb349ff36a25184e5564c25289b1dbfc402", | 2266 | "url": "https://api.github.com/repos/symfony/config/zipball/7b08223b7f6abd859651c56bcabf900d1627d085", |
2267 | "reference": "1fffdeb349ff36a25184e5564c25289b1dbfc402", | 2267 | "reference": "7b08223b7f6abd859651c56bcabf900d1627d085", |
2268 | "shasum": "" | 2268 | "shasum": "" |
2269 | }, | 2269 | }, |
2270 | "require": { | 2270 | "require": { |
@@ -2315,20 +2315,20 @@ | |||
2315 | ], | 2315 | ], |
2316 | "description": "Symfony Config Component", | 2316 | "description": "Symfony Config Component", |
2317 | "homepage": "https://symfony.com", | 2317 | "homepage": "https://symfony.com", |
2318 | "time": "2018-06-19T14:02:58+00:00" | 2318 | "time": "2018-07-26T11:19:56+00:00" |
2319 | }, | 2319 | }, |
2320 | { | 2320 | { |
2321 | "name": "symfony/console", | 2321 | "name": "symfony/console", |
2322 | "version": "v3.4.13", | 2322 | "version": "v3.4.14", |
2323 | "source": { | 2323 | "source": { |
2324 | "type": "git", | 2324 | "type": "git", |
2325 | "url": "https://github.com/symfony/console.git", | 2325 | "url": "https://github.com/symfony/console.git", |
2326 | "reference": "e54f84c50e3b12972e7750edfc5ca84b2284c44e" | 2326 | "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73" |
2327 | }, | 2327 | }, |
2328 | "dist": { | 2328 | "dist": { |
2329 | "type": "zip", | 2329 | "type": "zip", |
2330 | "url": "https://api.github.com/repos/symfony/console/zipball/e54f84c50e3b12972e7750edfc5ca84b2284c44e", | 2330 | "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73", |
2331 | "reference": "e54f84c50e3b12972e7750edfc5ca84b2284c44e", | 2331 | "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73", |
2332 | "shasum": "" | 2332 | "shasum": "" |
2333 | }, | 2333 | }, |
2334 | "require": { | 2334 | "require": { |
@@ -2384,20 +2384,20 @@ | |||
2384 | ], | 2384 | ], |
2385 | "description": "Symfony Console Component", | 2385 | "description": "Symfony Console Component", |
2386 | "homepage": "https://symfony.com", | 2386 | "homepage": "https://symfony.com", |
2387 | "time": "2018-07-10T14:02:11+00:00" | 2387 | "time": "2018-07-26T11:19:56+00:00" |
2388 | }, | 2388 | }, |
2389 | { | 2389 | { |
2390 | "name": "symfony/debug", | 2390 | "name": "symfony/debug", |
2391 | "version": "v3.4.13", | 2391 | "version": "v3.4.14", |
2392 | "source": { | 2392 | "source": { |
2393 | "type": "git", | 2393 | "type": "git", |
2394 | "url": "https://github.com/symfony/debug.git", | 2394 | "url": "https://github.com/symfony/debug.git", |
2395 | "reference": "0e3ca9cbde90fffec8038f4d4e16fd4046bbd018" | 2395 | "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc" |
2396 | }, | 2396 | }, |
2397 | "dist": { | 2397 | "dist": { |
2398 | "type": "zip", | 2398 | "type": "zip", |
2399 | "url": "https://api.github.com/repos/symfony/debug/zipball/0e3ca9cbde90fffec8038f4d4e16fd4046bbd018", | 2399 | "url": "https://api.github.com/repos/symfony/debug/zipball/d5a058ff6ecad26b30c1ba452241306ea34c65cc", |
2400 | "reference": "0e3ca9cbde90fffec8038f4d4e16fd4046bbd018", | 2400 | "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc", |
2401 | "shasum": "" | 2401 | "shasum": "" |
2402 | }, | 2402 | }, |
2403 | "require": { | 2403 | "require": { |
@@ -2440,20 +2440,20 @@ | |||
2440 | ], | 2440 | ], |
2441 | "description": "Symfony Debug Component", | 2441 | "description": "Symfony Debug Component", |
2442 | "homepage": "https://symfony.com", | 2442 | "homepage": "https://symfony.com", |
2443 | "time": "2018-06-26T08:45:54+00:00" | 2443 | "time": "2018-07-26T11:19:56+00:00" |
2444 | }, | 2444 | }, |
2445 | { | 2445 | { |
2446 | "name": "symfony/dependency-injection", | 2446 | "name": "symfony/dependency-injection", |
2447 | "version": "v3.4.13", | 2447 | "version": "v3.4.14", |
2448 | "source": { | 2448 | "source": { |
2449 | "type": "git", | 2449 | "type": "git", |
2450 | "url": "https://github.com/symfony/dependency-injection.git", | 2450 | "url": "https://github.com/symfony/dependency-injection.git", |
2451 | "reference": "3f115cc3aae4d320b26db05e9531f4e32da29b89" | 2451 | "reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1" |
2452 | }, | 2452 | }, |
2453 | "dist": { | 2453 | "dist": { |
2454 | "type": "zip", | 2454 | "type": "zip", |
2455 | "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3f115cc3aae4d320b26db05e9531f4e32da29b89", | 2455 | "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1c0e679e522591fd744fdf242fec41a43d62b2b1", |
2456 | "reference": "3f115cc3aae4d320b26db05e9531f4e32da29b89", | 2456 | "reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1", |
2457 | "shasum": "" | 2457 | "shasum": "" |
2458 | }, | 2458 | }, |
2459 | "require": { | 2459 | "require": { |
@@ -2511,20 +2511,20 @@ | |||
2511 | ], | 2511 | ], |
2512 | "description": "Symfony DependencyInjection Component", | 2512 | "description": "Symfony DependencyInjection Component", |
2513 | "homepage": "https://symfony.com", | 2513 | "homepage": "https://symfony.com", |
2514 | "time": "2018-07-16T13:57:19+00:00" | 2514 | "time": "2018-07-29T15:19:31+00:00" |
2515 | }, | 2515 | }, |
2516 | { | 2516 | { |
2517 | "name": "symfony/filesystem", | 2517 | "name": "symfony/filesystem", |
2518 | "version": "v3.4.13", | 2518 | "version": "v3.4.14", |
2519 | "source": { | 2519 | "source": { |
2520 | "type": "git", | 2520 | "type": "git", |
2521 | "url": "https://github.com/symfony/filesystem.git", | 2521 | "url": "https://github.com/symfony/filesystem.git", |
2522 | "reference": "8dab220fec8fc904821485326b29a6c670286124" | 2522 | "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6" |
2523 | }, | 2523 | }, |
2524 | "dist": { | 2524 | "dist": { |
2525 | "type": "zip", | 2525 | "type": "zip", |
2526 | "url": "https://api.github.com/repos/symfony/filesystem/zipball/8dab220fec8fc904821485326b29a6c670286124", | 2526 | "url": "https://api.github.com/repos/symfony/filesystem/zipball/a59f917e3c5d82332514cb4538387638f5bde2d6", |
2527 | "reference": "8dab220fec8fc904821485326b29a6c670286124", | 2527 | "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6", |
2528 | "shasum": "" | 2528 | "shasum": "" |
2529 | }, | 2529 | }, |
2530 | "require": { | 2530 | "require": { |
@@ -2561,20 +2561,20 @@ | |||
2561 | ], | 2561 | ], |
2562 | "description": "Symfony Filesystem Component", | 2562 | "description": "Symfony Filesystem Component", |
2563 | "homepage": "https://symfony.com", | 2563 | "homepage": "https://symfony.com", |
2564 | "time": "2018-07-09T13:25:43+00:00" | 2564 | "time": "2018-07-26T11:19:56+00:00" |
2565 | }, | 2565 | }, |
2566 | { | 2566 | { |
2567 | "name": "symfony/finder", | 2567 | "name": "symfony/finder", |
2568 | "version": "v3.4.13", | 2568 | "version": "v3.4.14", |
2569 | "source": { | 2569 | "source": { |
2570 | "type": "git", | 2570 | "type": "git", |
2571 | "url": "https://github.com/symfony/finder.git", | 2571 | "url": "https://github.com/symfony/finder.git", |
2572 | "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394" | 2572 | "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a" |
2573 | }, | 2573 | }, |
2574 | "dist": { | 2574 | "dist": { |
2575 | "type": "zip", | 2575 | "type": "zip", |
2576 | "url": "https://api.github.com/repos/symfony/finder/zipball/3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394", | 2576 | "url": "https://api.github.com/repos/symfony/finder/zipball/8a84fcb207451df0013b2c74cbbf1b62d47b999a", |
2577 | "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394", | 2577 | "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a", |
2578 | "shasum": "" | 2578 | "shasum": "" |
2579 | }, | 2579 | }, |
2580 | "require": { | 2580 | "require": { |
@@ -2610,29 +2610,32 @@ | |||
2610 | ], | 2610 | ], |
2611 | "description": "Symfony Finder Component", | 2611 | "description": "Symfony Finder Component", |
2612 | "homepage": "https://symfony.com", | 2612 | "homepage": "https://symfony.com", |
2613 | "time": "2018-06-19T20:52:10+00:00" | 2613 | "time": "2018-07-26T11:19:56+00:00" |
2614 | }, | 2614 | }, |
2615 | { | 2615 | { |
2616 | "name": "symfony/polyfill-ctype", | 2616 | "name": "symfony/polyfill-ctype", |
2617 | "version": "v1.8.0", | 2617 | "version": "v1.9.0", |
2618 | "source": { | 2618 | "source": { |
2619 | "type": "git", | 2619 | "type": "git", |
2620 | "url": "https://github.com/symfony/polyfill-ctype.git", | 2620 | "url": "https://github.com/symfony/polyfill-ctype.git", |
2621 | "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" | 2621 | "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" |
2622 | }, | 2622 | }, |
2623 | "dist": { | 2623 | "dist": { |
2624 | "type": "zip", | 2624 | "type": "zip", |
2625 | "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", | 2625 | "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", |
2626 | "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", | 2626 | "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", |
2627 | "shasum": "" | 2627 | "shasum": "" |
2628 | }, | 2628 | }, |
2629 | "require": { | 2629 | "require": { |
2630 | "php": ">=5.3.3" | 2630 | "php": ">=5.3.3" |
2631 | }, | 2631 | }, |
2632 | "suggest": { | ||
2633 | "ext-ctype": "For best performance" | ||
2634 | }, | ||
2632 | "type": "library", | 2635 | "type": "library", |
2633 | "extra": { | 2636 | "extra": { |
2634 | "branch-alias": { | 2637 | "branch-alias": { |
2635 | "dev-master": "1.8-dev" | 2638 | "dev-master": "1.9-dev" |
2636 | } | 2639 | } |
2637 | }, | 2640 | }, |
2638 | "autoload": { | 2641 | "autoload": { |
@@ -2665,20 +2668,20 @@ | |||
2665 | "polyfill", | 2668 | "polyfill", |
2666 | "portable" | 2669 | "portable" |
2667 | ], | 2670 | ], |
2668 | "time": "2018-04-30T19:57:29+00:00" | 2671 | "time": "2018-08-06T14:22:27+00:00" |
2669 | }, | 2672 | }, |
2670 | { | 2673 | { |
2671 | "name": "symfony/polyfill-mbstring", | 2674 | "name": "symfony/polyfill-mbstring", |
2672 | "version": "v1.8.0", | 2675 | "version": "v1.9.0", |
2673 | "source": { | 2676 | "source": { |
2674 | "type": "git", | 2677 | "type": "git", |
2675 | "url": "https://github.com/symfony/polyfill-mbstring.git", | 2678 | "url": "https://github.com/symfony/polyfill-mbstring.git", |
2676 | "reference": "3296adf6a6454a050679cde90f95350ad604b171" | 2679 | "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" |
2677 | }, | 2680 | }, |
2678 | "dist": { | 2681 | "dist": { |
2679 | "type": "zip", | 2682 | "type": "zip", |
2680 | "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", | 2683 | "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", |
2681 | "reference": "3296adf6a6454a050679cde90f95350ad604b171", | 2684 | "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", |
2682 | "shasum": "" | 2685 | "shasum": "" |
2683 | }, | 2686 | }, |
2684 | "require": { | 2687 | "require": { |
@@ -2690,7 +2693,7 @@ | |||
2690 | "type": "library", | 2693 | "type": "library", |
2691 | "extra": { | 2694 | "extra": { |
2692 | "branch-alias": { | 2695 | "branch-alias": { |
2693 | "dev-master": "1.8-dev" | 2696 | "dev-master": "1.9-dev" |
2694 | } | 2697 | } |
2695 | }, | 2698 | }, |
2696 | "autoload": { | 2699 | "autoload": { |
@@ -2724,20 +2727,20 @@ | |||
2724 | "portable", | 2727 | "portable", |
2725 | "shim" | 2728 | "shim" |
2726 | ], | 2729 | ], |
2727 | "time": "2018-04-26T10:06:28+00:00" | 2730 | "time": "2018-08-06T14:22:27+00:00" |
2728 | }, | 2731 | }, |
2729 | { | 2732 | { |
2730 | "name": "symfony/yaml", | 2733 | "name": "symfony/yaml", |
2731 | "version": "v3.4.13", | 2734 | "version": "v3.4.14", |
2732 | "source": { | 2735 | "source": { |
2733 | "type": "git", | 2736 | "type": "git", |
2734 | "url": "https://github.com/symfony/yaml.git", | 2737 | "url": "https://github.com/symfony/yaml.git", |
2735 | "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" | 2738 | "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2" |
2736 | }, | 2739 | }, |
2737 | "dist": { | 2740 | "dist": { |
2738 | "type": "zip", | 2741 | "type": "zip", |
2739 | "url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", | 2742 | "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", |
2740 | "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", | 2743 | "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", |
2741 | "shasum": "" | 2744 | "shasum": "" |
2742 | }, | 2745 | }, |
2743 | "require": { | 2746 | "require": { |
@@ -2783,7 +2786,7 @@ | |||
2783 | ], | 2786 | ], |
2784 | "description": "Symfony Yaml Component", | 2787 | "description": "Symfony Yaml Component", |
2785 | "homepage": "https://symfony.com", | 2788 | "homepage": "https://symfony.com", |
2786 | "time": "2018-05-03T23:18:14+00:00" | 2789 | "time": "2018-07-26T11:19:56+00:00" |
2787 | }, | 2790 | }, |
2788 | { | 2791 | { |
2789 | "name": "theseer/fdomdocument", | 2792 | "name": "theseer/fdomdocument", |
@@ -1635,9 +1635,9 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager) | |||
1635 | uasort($taglist, 'strcasecmp'); | 1635 | uasort($taglist, 'strcasecmp'); |
1636 | $link['taglist'] = $taglist; | 1636 | $link['taglist'] = $taglist; |
1637 | 1637 | ||
1638 | // Thumbnails enabled, not a note, | 1638 | // Logged in, thumbnails enabled, not a note, |
1639 | // and (never retrieved yet or no valid cache file) | 1639 | // and (never retrieved yet or no valid cache file) |
1640 | if ($thumbnailsEnabled && $link['url'][0] != '?' | 1640 | if ($loginManager->isLoggedIn() && $thumbnailsEnabled && $link['url'][0] != '?' |
1641 | && (! isset($link['thumbnail']) || ($link['thumbnail'] !== false && ! is_file($link['thumbnail']))) | 1641 | && (! isset($link['thumbnail']) || ($link['thumbnail'] !== false && ! is_file($link['thumbnail']))) |
1642 | ) { | 1642 | ) { |
1643 | $elem = $LINKSDB[$keys[$i]]; | 1643 | $elem = $LINKSDB[$keys[$i]]; |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index fc03404e..3b43a611 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -2,7 +2,7 @@ | |||
2 | <div class="pure-u-lg-0 pure-u-1"> | 2 | <div class="pure-u-lg-0 pure-u-1"> |
3 | <div class="pure-menu"> | 3 | <div class="pure-menu"> |
4 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile"> | 4 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile"> |
5 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="logo" /> | 5 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" /> |
6 | {$shaarlititle} | 6 | {$shaarlititle} |
7 | </a> | 7 | </a> |
8 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> | 8 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> |
@@ -13,7 +13,7 @@ | |||
13 | <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1"> | 13 | <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1"> |
14 | <li class="pure-menu-item pure-u-0 pure-u-lg-visible"> | 14 | <li class="pure-menu-item pure-u-0 pure-u-lg-visible"> |
15 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-desktop"> | 15 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-desktop"> |
16 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="logo" /> | 16 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" /> |
17 | {$shaarlititle} | 17 | {$shaarlititle} |
18 | </a> | 18 | </a> |
19 | </li> | 19 | </li> |
diff --git a/tpl/default/tools.html b/tpl/default/tools.html index 6b4d7bec..c9ce1eaf 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html | |||
@@ -125,25 +125,22 @@ | |||
125 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> | 125 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> |
126 | <h2 class="window-title">{'3rd party'|t}</h2> | 126 | <h2 class="window-title">{'3rd party'|t}</h2> |
127 | <div class="tools-item"> | 127 | <div class="tools-item"> |
128 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/" title="Firefox {'Plugin'|t}"> | 128 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/"> |
129 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Firefox {'plugin'|t}</span> | 129 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Firefox {'plugin'|t}</span> |
130 | </a> | 130 | </a> |
131 | </div> | 131 | </div> |
132 | <div class="tools-item"> | 132 | <div class="tools-item"> |
133 | <a href="https://chrome.google.com/webstore/detail/shiny-shaarli/hajdfkmbdmadjmmpkkbbcnllepomekin" | 133 | <a href="https://chrome.google.com/webstore/detail/shiny-shaarli/hajdfkmbdmadjmmpkkbbcnllepomekin"> |
134 | title="Chrome {'Plugin'|t}"> | ||
135 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome {'plugin'|t}</span> | 134 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome {'plugin'|t}</span> |
136 | </a> | 135 | </a> |
137 | </div> | 136 | </div> |
138 | <div class="tools-item"> | 137 | <div class="tools-item"> |
139 | <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr" | 138 | <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr"> |
140 | title="Android Shaarlier"> | ||
141 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Shaarlier</span> | 139 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Shaarlier</span> |
142 | </a> | 140 | </a> |
143 | </div> | 141 | </div> |
144 | <div class="tools-item"> | 142 | <div class="tools-item"> |
145 | <a href="https://stakali.toneiv.eu/" | 143 | <a href="https://stakali.toneiv.eu/"> |
146 | title="Android Stakali"> | ||
147 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Stakali</span> | 144 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Stakali</span> |
148 | </a> | 145 | </a> |
149 | </div> | 146 | </div> |