aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml4
-rw-r--r--AUTHORS7
-rw-r--r--CHANGELOG.md12
-rw-r--r--Dockerfile2
-rw-r--r--README.md4
-rw-r--r--composer.json4
-rw-r--r--composer.lock286
-rw-r--r--doc/md/Download-and-Installation.md2
-rw-r--r--shaarli_version.php2
-rw-r--r--tpl/default/configure.html2
-rw-r--r--tpl/default/import.html2
-rw-r--r--tpl/default/install.html2
-rw-r--r--tpl/default/linklist.html24
-rw-r--r--tpl/default/page.footer.html2
-rw-r--r--tpl/default/page.header.html24
-rw-r--r--tpl/default/picwall.html6
-rw-r--r--tpl/default/tag.cloud.html4
-rw-r--r--tpl/default/tag.list.html12
18 files changed, 218 insertions, 183 deletions
diff --git a/.travis.yml b/.travis.yml
index c6400eef..d1415423 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,6 @@ matrix:
9 php: 7.2 9 php: 7.2
10 - language: php 10 - language: php
11 php: 7.1 11 php: 7.1
12 - language: php
13 php: 7.0
14 - language: php
15 php: 5.6
16 - language: node_js 12 - language: node_js
17 node_js: 8 13 node_js: 8
18 cache: 14 cache:
diff --git a/AUTHORS b/AUTHORS
index 755d1bae..50593218 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,10 @@
1 769 ArthurHoaro <arthur@hoa.ro> 1 782 ArthurHoaro <arthur@hoa.ro>
2 401 VirtualTam <virtualtam@flibidi.net> 2 401 VirtualTam <virtualtam@flibidi.net>
3 216 nodiscc <nodiscc@gmail.com> 3 218 nodiscc <nodiscc@gmail.com>
4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> 4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net>
5 16 Luce Carević <lcarevic@access42.net>
5 15 Florian Eula <eula.florian@gmail.com> 6 15 Florian Eula <eula.florian@gmail.com>
6 13 Emilien Klein <emilien@klein.st> 7 13 Emilien Klein <emilien@klein.st>
7 13 Luce Carević <lcarevic@access42.net>
8 12 Nicolas Danelon <hi@nicolasmd.com.ar> 8 12 Nicolas Danelon <hi@nicolasmd.com.ar>
9 9 Willi Eggeling <thewilli@gmail.com> 9 9 Willi Eggeling <thewilli@gmail.com>
10 8 Christophe HENRY <christophe.henry@sbgodin.fr> 10 8 Christophe HENRY <christophe.henry@sbgodin.fr>
@@ -61,6 +61,7 @@
61 1 Rajat Hans <rajathans9@gmail.com> 61 1 Rajat Hans <rajathans9@gmail.com>
62 1 Sbgodin <Sbgodin@users.noreply.github.com> 62 1 Sbgodin <Sbgodin@users.noreply.github.com>
63 1 TsT <tst2005@gmail.com> 63 1 TsT <tst2005@gmail.com>
64 1 agentcobra <agentcobra@free.fr>
64 1 dimtion <zizou.xena@gmail.com> 65 1 dimtion <zizou.xena@gmail.com>
65 1 durcheinandr <jochen@durcheinandr.de> 66 1 durcheinandr <jochen@durcheinandr.de>
66 1 lapineige <lapineige@users.noreply.github.com> 67 1 lapineige <lapineige@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 189ed13d..abf802ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
4The format is based on [Keep a Changelog](http://keepachangelog.com/) 4The format is based on [Keep a Changelog](http://keepachangelog.com/)
5and this project adheres to [Semantic Versioning](http://semver.org/). 5and this project adheres to [Semantic Versioning](http://semver.org/).
6 6
7## [v0.11.1](https://github.com/shaarli/Shaarli/releases/tag/v0.11.1) - 2019-08-03
8
9Release to fix broken Docker build on the latest version.
10
11### Fixed
12- Fixed Docker build
13- Fixed a few documentation broken links
14- Fixed broken label in configuration page
15
16### Added
17- More accessibility improvements
18
7## [v0.11.0](https://github.com/shaarli/Shaarli/releases/tag/v0.11.0) - 2019-07-27 19## [v0.11.0](https://github.com/shaarli/Shaarli/releases/tag/v0.11.0) - 2019-07-27
8 20
9**Shaarli no longer officially support PHP 5.6 and PHP 7.0 as they've reached end of life.** 21**Shaarli no longer officially support PHP 5.6 and PHP 7.0 as they've reached end of life.**
diff --git a/Dockerfile b/Dockerfile
index d8921cee..f05cf3a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN cd shaarli \
16 16
17# Stage 3: 17# Stage 3:
18# - Frontend dependencies 18# - Frontend dependencies
19FROM node:9.9-alpine as node 19FROM node:12-alpine as node
20COPY --from=composer /app/shaarli shaarli 20COPY --from=composer /app/shaarli shaarli
21RUN cd shaarli \ 21RUN cd shaarli \
22 && yarn install \ 22 && yarn install \
diff --git a/README.md b/README.md
index 21f2eae7..6c841c63 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@ _Do you want to share the links you discover?_
6_Shaarli is a minimalist link sharing service that you can install on your own server._ 6_Shaarli is a minimalist link sharing service that you can install on your own server._
7_It is designed to be personal (single-user), fast and handy._ 7_It is designed to be personal (single-user), fast and handy._
8 8
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.10.4-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.10.4)
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&bull; 11&bull;
12[![](https://img.shields.io/badge/latest-v0.10.4-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.10.4) 12[![](https://img.shields.io/badge/latest-v0.11.0-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.11.0)
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&bull; 14&bull;
15[![](https://img.shields.io/badge/master-v0.11.x-blue.svg)](https://github.com/shaarli/Shaarli) 15[![](https://img.shields.io/badge/master-v0.11.x-blue.svg)](https://github.com/shaarli/Shaarli)
diff --git a/composer.json b/composer.json
index c23b8252..109d5d7b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,11 +11,11 @@
11 "keywords": ["bookmark", "link", "share", "web"], 11 "keywords": ["bookmark", "link", "share", "web"],
12 "config": { 12 "config": {
13 "platform": { 13 "platform": {
14 "php": "5.6.31" 14 "php": "7.1.29"
15 } 15 }
16 }, 16 },
17 "require": { 17 "require": {
18 "php": ">=5.6", 18 "php": ">=7.1",
19 "ext-json": "*", 19 "ext-json": "*",
20 "ext-zlib": "*", 20 "ext-zlib": "*",
21 "shaarli/netscape-bookmark-parser": "^2.1", 21 "shaarli/netscape-bookmark-parser": "^2.1",
diff --git a/composer.lock b/composer.lock
index 5cbcbc4a..e6c938db 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "content-hash": "432005c9db3e890f42fde27036d2a70f", 7 "content-hash": "085b03ce38cd1106ad0e3af1ef3014c2",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "arthurhoaro/web-thumbnailer", 10 "name": "arthurhoaro/web-thumbnailer",
@@ -87,16 +87,16 @@
87 }, 87 },
88 { 88 {
89 "name": "erusev/parsedown", 89 "name": "erusev/parsedown",
90 "version": "1.7.1", 90 "version": "1.7.3",
91 "source": { 91 "source": {
92 "type": "git", 92 "type": "git",
93 "url": "https://github.com/erusev/parsedown.git", 93 "url": "https://github.com/erusev/parsedown.git",
94 "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" 94 "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7"
95 }, 95 },
96 "dist": { 96 "dist": {
97 "type": "zip", 97 "type": "zip",
98 "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", 98 "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
99 "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", 99 "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
100 "shasum": "" 100 "shasum": ""
101 }, 101 },
102 "require": { 102 "require": {
@@ -129,20 +129,20 @@
129 "markdown", 129 "markdown",
130 "parser" 130 "parser"
131 ], 131 ],
132 "time": "2018-03-08T01:11:30+00:00" 132 "time": "2019-03-17T18:48:37+00:00"
133 }, 133 },
134 { 134 {
135 "name": "gettext/gettext", 135 "name": "gettext/gettext",
136 "version": "v4.6.2", 136 "version": "v4.6.3",
137 "source": { 137 "source": {
138 "type": "git", 138 "type": "git",
139 "url": "https://github.com/oscarotero/Gettext.git", 139 "url": "https://github.com/oscarotero/Gettext.git",
140 "reference": "93176b272d61fb58a9767be71c50d19149cb1e48" 140 "reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6"
141 }, 141 },
142 "dist": { 142 "dist": {
143 "type": "zip", 143 "type": "zip",
144 "url": "https://api.github.com/repos/oscarotero/Gettext/zipball/93176b272d61fb58a9767be71c50d19149cb1e48", 144 "url": "https://api.github.com/repos/oscarotero/Gettext/zipball/70c6ff2fecd275e6ef9cdd542f55939a3d1904d6",
145 "reference": "93176b272d61fb58a9767be71c50d19149cb1e48", 145 "reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6",
146 "shasum": "" 146 "shasum": ""
147 }, 147 },
148 "require": { 148 "require": {
@@ -191,7 +191,7 @@
191 "po", 191 "po",
192 "translation" 192 "translation"
193 ], 193 ],
194 "time": "2019-01-12T18:40:56+00:00" 194 "time": "2019-07-15T12:56:31+00:00"
195 }, 195 },
196 { 196 {
197 "name": "gettext/languages", 197 "name": "gettext/languages",
@@ -689,16 +689,16 @@
689 }, 689 },
690 { 690 {
691 "name": "slim/slim", 691 "name": "slim/slim",
692 "version": "3.12.0", 692 "version": "3.12.1",
693 "source": { 693 "source": {
694 "type": "git", 694 "type": "git",
695 "url": "https://github.com/slimphp/Slim.git", 695 "url": "https://github.com/slimphp/Slim.git",
696 "reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0" 696 "reference": "eaee12ef8d0750db62b8c548016d82fb33addb6b"
697 }, 697 },
698 "dist": { 698 "dist": {
699 "type": "zip", 699 "type": "zip",
700 "url": "https://api.github.com/repos/slimphp/Slim/zipball/f4947cc900b6e51cbfda58b9f1247bca2f76f9f0", 700 "url": "https://api.github.com/repos/slimphp/Slim/zipball/eaee12ef8d0750db62b8c548016d82fb33addb6b",
701 "reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0", 701 "reference": "eaee12ef8d0750db62b8c548016d82fb33addb6b",
702 "shasum": "" 702 "shasum": ""
703 }, 703 },
704 "require": { 704 "require": {
@@ -756,38 +756,40 @@
756 "micro", 756 "micro",
757 "router" 757 "router"
758 ], 758 ],
759 "time": "2019-01-15T13:21:25+00:00" 759 "time": "2019-04-16T16:47:29+00:00"
760 } 760 }
761 ], 761 ],
762 "packages-dev": [ 762 "packages-dev": [
763 { 763 {
764 "name": "doctrine/instantiator", 764 "name": "doctrine/instantiator",
765 "version": "1.0.5", 765 "version": "1.2.0",
766 "source": { 766 "source": {
767 "type": "git", 767 "type": "git",
768 "url": "https://github.com/doctrine/instantiator.git", 768 "url": "https://github.com/doctrine/instantiator.git",
769 "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" 769 "reference": "a2c590166b2133a4633738648b6b064edae0814a"
770 }, 770 },
771 "dist": { 771 "dist": {
772 "type": "zip", 772 "type": "zip",
773 "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", 773 "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
774 "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", 774 "reference": "a2c590166b2133a4633738648b6b064edae0814a",
775 "shasum": "" 775 "shasum": ""
776 }, 776 },
777 "require": { 777 "require": {
778 "php": ">=5.3,<8.0-DEV" 778 "php": "^7.1"
779 }, 779 },
780 "require-dev": { 780 "require-dev": {
781 "athletic/athletic": "~0.1.8", 781 "doctrine/coding-standard": "^6.0",
782 "ext-pdo": "*", 782 "ext-pdo": "*",
783 "ext-phar": "*", 783 "ext-phar": "*",
784 "phpunit/phpunit": "~4.0", 784 "phpbench/phpbench": "^0.13",
785 "squizlabs/php_codesniffer": "~2.0" 785 "phpstan/phpstan-phpunit": "^0.11",
786 "phpstan/phpstan-shim": "^0.11",
787 "phpunit/phpunit": "^7.0"
786 }, 788 },
787 "type": "library", 789 "type": "library",
788 "extra": { 790 "extra": {
789 "branch-alias": { 791 "branch-alias": {
790 "dev-master": "1.0.x-dev" 792 "dev-master": "1.2.x-dev"
791 } 793 }
792 }, 794 },
793 "autoload": { 795 "autoload": {
@@ -807,34 +809,37 @@
807 } 809 }
808 ], 810 ],
809 "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", 811 "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
810 "homepage": "https://github.com/doctrine/instantiator", 812 "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
811 "keywords": [ 813 "keywords": [
812 "constructor", 814 "constructor",
813 "instantiate" 815 "instantiate"
814 ], 816 ],
815 "time": "2015-06-14T21:17:01+00:00" 817 "time": "2019-03-17T17:37:11+00:00"
816 }, 818 },
817 { 819 {
818 "name": "myclabs/deep-copy", 820 "name": "myclabs/deep-copy",
819 "version": "1.7.0", 821 "version": "1.9.1",
820 "source": { 822 "source": {
821 "type": "git", 823 "type": "git",
822 "url": "https://github.com/myclabs/DeepCopy.git", 824 "url": "https://github.com/myclabs/DeepCopy.git",
823 "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" 825 "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
824 }, 826 },
825 "dist": { 827 "dist": {
826 "type": "zip", 828 "type": "zip",
827 "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", 829 "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
828 "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", 830 "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
829 "shasum": "" 831 "shasum": ""
830 }, 832 },
831 "require": { 833 "require": {
832 "php": "^5.6 || ^7.0" 834 "php": "^7.1"
835 },
836 "replace": {
837 "myclabs/deep-copy": "self.version"
833 }, 838 },
834 "require-dev": { 839 "require-dev": {
835 "doctrine/collections": "^1.0", 840 "doctrine/collections": "^1.0",
836 "doctrine/common": "^2.6", 841 "doctrine/common": "^2.6",
837 "phpunit/phpunit": "^4.1" 842 "phpunit/phpunit": "^7.1"
838 }, 843 },
839 "type": "library", 844 "type": "library",
840 "autoload": { 845 "autoload": {
@@ -857,7 +862,7 @@
857 "object", 862 "object",
858 "object graph" 863 "object graph"
859 ], 864 ],
860 "time": "2017-10-19T19:58:43+00:00" 865 "time": "2019-04-07T13:18:21+00:00"
861 }, 866 },
862 { 867 {
863 "name": "phpdocumentor/reflection-common", 868 "name": "phpdocumentor/reflection-common",
@@ -915,29 +920,35 @@
915 }, 920 },
916 { 921 {
917 "name": "phpdocumentor/reflection-docblock", 922 "name": "phpdocumentor/reflection-docblock",
918 "version": "3.3.2", 923 "version": "4.3.1",
919 "source": { 924 "source": {
920 "type": "git", 925 "type": "git",
921 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", 926 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
922 "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2" 927 "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
923 }, 928 },
924 "dist": { 929 "dist": {
925 "type": "zip", 930 "type": "zip",
926 "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", 931 "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
927 "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", 932 "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
928 "shasum": "" 933 "shasum": ""
929 }, 934 },
930 "require": { 935 "require": {
931 "php": "^5.6 || ^7.0", 936 "php": "^7.0",
932 "phpdocumentor/reflection-common": "^1.0.0", 937 "phpdocumentor/reflection-common": "^1.0.0",
933 "phpdocumentor/type-resolver": "^0.4.0", 938 "phpdocumentor/type-resolver": "^0.4.0",
934 "webmozart/assert": "^1.0" 939 "webmozart/assert": "^1.0"
935 }, 940 },
936 "require-dev": { 941 "require-dev": {
937 "mockery/mockery": "^0.9.4", 942 "doctrine/instantiator": "~1.0.5",
938 "phpunit/phpunit": "^4.4" 943 "mockery/mockery": "^1.0",
944 "phpunit/phpunit": "^6.4"
939 }, 945 },
940 "type": "library", 946 "type": "library",
947 "extra": {
948 "branch-alias": {
949 "dev-master": "4.x-dev"
950 }
951 },
941 "autoload": { 952 "autoload": {
942 "psr-4": { 953 "psr-4": {
943 "phpDocumentor\\Reflection\\": [ 954 "phpDocumentor\\Reflection\\": [
@@ -956,7 +967,7 @@
956 } 967 }
957 ], 968 ],
958 "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", 969 "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
959 "time": "2017-11-10T14:09:06+00:00" 970 "time": "2019-04-30T17:48:53+00:00"
960 }, 971 },
961 { 972 {
962 "name": "phpdocumentor/type-resolver", 973 "name": "phpdocumentor/type-resolver",
@@ -1007,16 +1018,16 @@
1007 }, 1018 },
1008 { 1019 {
1009 "name": "phpspec/prophecy", 1020 "name": "phpspec/prophecy",
1010 "version": "1.8.0", 1021 "version": "1.8.1",
1011 "source": { 1022 "source": {
1012 "type": "git", 1023 "type": "git",
1013 "url": "https://github.com/phpspec/prophecy.git", 1024 "url": "https://github.com/phpspec/prophecy.git",
1014 "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" 1025 "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
1015 }, 1026 },
1016 "dist": { 1027 "dist": {
1017 "type": "zip", 1028 "type": "zip",
1018 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", 1029 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
1019 "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", 1030 "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
1020 "shasum": "" 1031 "shasum": ""
1021 }, 1032 },
1022 "require": { 1033 "require": {
@@ -1037,8 +1048,8 @@
1037 } 1048 }
1038 }, 1049 },
1039 "autoload": { 1050 "autoload": {
1040 "psr-0": { 1051 "psr-4": {
1041 "Prophecy\\": "src/" 1052 "Prophecy\\": "src/Prophecy"
1042 } 1053 }
1043 }, 1054 },
1044 "notification-url": "https://packagist.org/downloads/", 1055 "notification-url": "https://packagist.org/downloads/",
@@ -1066,7 +1077,7 @@
1066 "spy", 1077 "spy",
1067 "stub" 1078 "stub"
1068 ], 1079 ],
1069 "time": "2018-08-05T17:53:17+00:00" 1080 "time": "2019-06-13T12:50:23+00:00"
1070 }, 1081 },
1071 { 1082 {
1072 "name": "phpunit/php-code-coverage", 1083 "name": "phpunit/php-code-coverage",
@@ -1229,29 +1240,29 @@
1229 }, 1240 },
1230 { 1241 {
1231 "name": "phpunit/php-token-stream", 1242 "name": "phpunit/php-token-stream",
1232 "version": "1.4.12", 1243 "version": "2.0.2",
1233 "source": { 1244 "source": {
1234 "type": "git", 1245 "type": "git",
1235 "url": "https://github.com/sebastianbergmann/php-token-stream.git", 1246 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
1236 "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" 1247 "reference": "791198a2c6254db10131eecfe8c06670700904db"
1237 }, 1248 },
1238 "dist": { 1249 "dist": {
1239 "type": "zip", 1250 "type": "zip",
1240 "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", 1251 "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
1241 "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", 1252 "reference": "791198a2c6254db10131eecfe8c06670700904db",
1242 "shasum": "" 1253 "shasum": ""
1243 }, 1254 },
1244 "require": { 1255 "require": {
1245 "ext-tokenizer": "*", 1256 "ext-tokenizer": "*",
1246 "php": ">=5.3.3" 1257 "php": "^7.0"
1247 }, 1258 },
1248 "require-dev": { 1259 "require-dev": {
1249 "phpunit/phpunit": "~4.2" 1260 "phpunit/phpunit": "^6.2.4"
1250 }, 1261 },
1251 "type": "library", 1262 "type": "library",
1252 "extra": { 1263 "extra": {
1253 "branch-alias": { 1264 "branch-alias": {
1254 "dev-master": "1.4-dev" 1265 "dev-master": "2.0-dev"
1255 } 1266 }
1256 }, 1267 },
1257 "autoload": { 1268 "autoload": {
@@ -1274,7 +1285,7 @@
1274 "keywords": [ 1285 "keywords": [
1275 "tokenizer" 1286 "tokenizer"
1276 ], 1287 ],
1277 "time": "2017-12-04T08:55:13+00:00" 1288 "time": "2017-11-27T05:48:46+00:00"
1278 }, 1289 },
1279 { 1290 {
1280 "name": "phpunit/phpcov", 1291 "name": "phpunit/phpcov",
@@ -1467,6 +1478,7 @@
1467 "mock", 1478 "mock",
1468 "xunit" 1479 "xunit"
1469 ], 1480 ],
1481 "abandoned": true,
1470 "time": "2017-06-30T09:13:00+00:00" 1482 "time": "2017-06-30T09:13:00+00:00"
1471 }, 1483 },
1472 { 1484 {
@@ -1475,12 +1487,12 @@
1475 "source": { 1487 "source": {
1476 "type": "git", 1488 "type": "git",
1477 "url": "https://github.com/Roave/SecurityAdvisories.git", 1489 "url": "https://github.com/Roave/SecurityAdvisories.git",
1478 "reference": "d155baccb43ba2542941fbcba258b85ce7786419" 1490 "reference": "ea693fa060702164985511acc3ceb5389c9ac761"
1479 }, 1491 },
1480 "dist": { 1492 "dist": {
1481 "type": "zip", 1493 "type": "zip",
1482 "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/d155baccb43ba2542941fbcba258b85ce7786419", 1494 "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ea693fa060702164985511acc3ceb5389c9ac761",
1483 "reference": "d155baccb43ba2542941fbcba258b85ce7786419", 1495 "reference": "ea693fa060702164985511acc3ceb5389c9ac761",
1484 "shasum": "" 1496 "shasum": ""
1485 }, 1497 },
1486 "conflict": { 1498 "conflict": {
@@ -1494,14 +1506,14 @@
1494 "aws/aws-sdk-php": ">=3,<3.2.1", 1506 "aws/aws-sdk-php": ">=3,<3.2.1",
1495 "brightlocal/phpwhois": "<=4.2.5", 1507 "brightlocal/phpwhois": "<=4.2.5",
1496 "bugsnag/bugsnag-laravel": ">=2,<2.0.2", 1508 "bugsnag/bugsnag-laravel": ">=2,<2.0.2",
1497 "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=3.1,<3.1.4|>=3.4,<3.4.14|>=3.5,<3.5.17|>=3.6,<3.6.4", 1509 "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.5.18|>=3.6,<3.6.15|>=3.7,<3.7.7",
1498 "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", 1510 "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
1499 "cartalyst/sentry": "<=2.1.6", 1511 "cartalyst/sentry": "<=2.1.6",
1500 "codeigniter/framework": "<=3.0.6", 1512 "codeigniter/framework": "<=3.0.6",
1501 "composer/composer": "<=1.0.0-alpha11", 1513 "composer/composer": "<=1-alpha.11",
1502 "contao-components/mediaelement": ">=2.14.2,<2.21.1", 1514 "contao-components/mediaelement": ">=2.14.2,<2.21.1",
1503 "contao/core": ">=2,<3.5.35", 1515 "contao/core": ">=2,<3.5.39",
1504 "contao/core-bundle": ">=4,<4.4.18|>=4.5,<4.5.8", 1516 "contao/core-bundle": ">=4,<4.4.39|>=4.5,<4.7.5",
1505 "contao/listing-bundle": ">=4,<4.4.8", 1517 "contao/listing-bundle": ">=4,<4.4.8",
1506 "contao/newsletter-bundle": ">=4,<4.1", 1518 "contao/newsletter-bundle": ">=4,<4.1",
1507 "david-garcia/phpwhois": "<=4.3.1", 1519 "david-garcia/phpwhois": "<=4.3.1",
@@ -1515,9 +1527,10 @@
1515 "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", 1527 "doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
1516 "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1", 1528 "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1",
1517 "dompdf/dompdf": ">=0.6,<0.6.2", 1529 "dompdf/dompdf": ">=0.6,<0.6.2",
1518 "drupal/core": ">=7,<7.60|>=8,<8.5.8|>=8.6,<8.6.2", 1530 "drupal/core": ">=7,<7.67|>=8,<8.6.16|>=8.7,<8.7.1|>8.7.3,<8.7.5",
1519 "drupal/drupal": ">=7,<7.60|>=8,<8.5.8|>=8.6,<8.6.2", 1531 "drupal/drupal": ">=7,<7.67|>=8,<8.6.16|>=8.7,<8.7.1|>8.7.3,<8.7.5",
1520 "erusev/parsedown": "<1.7", 1532 "erusev/parsedown": "<1.7.2",
1533 "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.4",
1521 "ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.13.1|>=6,<6.7.9.1|>=6.8,<6.13.5.1|>=7,<7.2.4.1|>=7.3,<7.3.2.1", 1534 "ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.13.1|>=6,<6.7.9.1|>=6.8,<6.13.5.1|>=7,<7.2.4.1|>=7.3,<7.3.2.1",
1522 "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.6|>=5.4,<5.4.12.3|>=2011,<2017.12.4.3|>=2018.6,<2018.6.1.4|>=2018.9,<2018.9.1.3", 1535 "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.6|>=5.4,<5.4.12.3|>=2011,<2017.12.4.3|>=2018.6,<2018.6.1.4|>=2018.9,<2018.9.1.3",
1523 "ezsystems/repository-forms": ">=2.3,<2.3.2.1", 1536 "ezsystems/repository-forms": ">=2.3,<2.3.2.1",
@@ -1530,7 +1543,7 @@
1530 "fuel/core": "<1.8.1", 1543 "fuel/core": "<1.8.1",
1531 "gree/jose": "<=2.2", 1544 "gree/jose": "<=2.2",
1532 "gregwar/rst": "<1.0.3", 1545 "gregwar/rst": "<1.0.3",
1533 "guzzlehttp/guzzle": ">=6,<6.2.1|>=4.0.0-rc2,<4.2.4|>=5,<5.3.1", 1546 "guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1",
1534 "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10", 1547 "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10",
1535 "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30", 1548 "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30",
1536 "illuminate/database": ">=4,<4.0.99|>=4.1,<4.1.29", 1549 "illuminate/database": ">=4,<4.0.99|>=4.1,<4.1.29",
@@ -1544,10 +1557,10 @@
1544 "la-haute-societe/tcpdf": "<6.2.22", 1557 "la-haute-societe/tcpdf": "<6.2.22",
1545 "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30", 1558 "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30",
1546 "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", 1559 "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
1547 "league/commonmark": ">=0.15.6,<0.18.1", 1560 "league/commonmark": "<0.18.3",
1548 "magento/magento1ce": "<1.9.4", 1561 "magento/magento1ce": "<1.9.4.1",
1549 "magento/magento1ee": ">=1.9,<1.14.4", 1562 "magento/magento1ee": ">=1.9,<1.14.4.1",
1550 "magento/product-community-edition": ">=2,<2.2.7", 1563 "magento/product-community-edition": ">=2,<2.2.8|>=2.3,<2.3.1",
1551 "monolog/monolog": ">=1.8,<1.12", 1564 "monolog/monolog": ">=1.8,<1.12",
1552 "namshi/jose": "<2.2", 1565 "namshi/jose": "<2.2",
1553 "onelogin/php-saml": "<2.10.4", 1566 "onelogin/php-saml": "<2.10.4",
@@ -1565,7 +1578,7 @@
1565 "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", 1578 "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3",
1566 "phpwhois/phpwhois": "<=4.2.5", 1579 "phpwhois/phpwhois": "<=4.2.5",
1567 "phpxmlrpc/extras": "<0.6.1", 1580 "phpxmlrpc/extras": "<0.6.1",
1568 "propel/propel": ">=2.0.0-alpha1,<=2.0.0-alpha7", 1581 "propel/propel": ">=2-alpha.1,<=2-alpha.7",
1569 "propel/propel1": ">=1,<=1.7.1", 1582 "propel/propel1": ">=1,<=1.7.1",
1570 "pusher/pusher-php-server": "<2.2.1", 1583 "pusher/pusher-php-server": "<2.2.1",
1571 "robrichards/xmlseclibs": ">=1,<3.0.2", 1584 "robrichards/xmlseclibs": ">=1,<3.0.2",
@@ -1575,11 +1588,14 @@
1575 "shopware/shopware": "<5.3.7", 1588 "shopware/shopware": "<5.3.7",
1576 "silverstripe/cms": ">=3,<=3.0.11|>=3.1,<3.1.11", 1589 "silverstripe/cms": ">=3,<=3.0.11|>=3.1,<3.1.11",
1577 "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", 1590 "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3",
1578 "silverstripe/framework": ">=3,<3.3", 1591 "silverstripe/framework": ">=3,<3.6.7|>=3.7,<3.7.3|>=4,<4.4",
1592 "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.1.2",
1593 "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1",
1594 "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4",
1579 "silverstripe/userforms": "<3", 1595 "silverstripe/userforms": "<3",
1580 "simple-updates/phpwhois": "<=1", 1596 "simple-updates/phpwhois": "<=1",
1581 "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", 1597 "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4",
1582 "simplesamlphp/simplesamlphp": "<1.16.3", 1598 "simplesamlphp/simplesamlphp": "<1.17.3",
1583 "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", 1599 "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1",
1584 "slim/slim": "<2.6", 1600 "slim/slim": "<2.6",
1585 "smarty/smarty": "<3.1.33", 1601 "smarty/smarty": "<3.1.33",
@@ -1589,39 +1605,45 @@
1589 "stormpath/sdk": ">=0,<9.9.99", 1605 "stormpath/sdk": ">=0,<9.9.99",
1590 "swiftmailer/swiftmailer": ">=4,<5.4.5", 1606 "swiftmailer/swiftmailer": ">=4,<5.4.5",
1591 "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", 1607 "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2",
1592 "sylius/sylius": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", 1608 "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
1593 "symfony/dependency-injection": ">=2,<2.0.17", 1609 "sylius/grid-bundle": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
1610 "sylius/sylius": ">=1,<1.1.18|>=1.2,<1.2.17|>=1.3,<1.3.12|>=1.4,<1.4.4",
1611 "symfony/cache": ">=3.1,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1612 "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1594 "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", 1613 "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1",
1595 "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2", 1614 "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1596 "symfony/http-foundation": ">=2,<2.7.49|>=2.8,<2.8.44|>=3,<3.3.18|>=3.4,<3.4.14|>=4,<4.0.14|>=4.1,<4.1.3", 1615 "symfony/http-foundation": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1597 "symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8", 1616 "symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8",
1598 "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", 1617 "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13",
1618 "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1599 "symfony/polyfill": ">=1,<1.10", 1619 "symfony/polyfill": ">=1,<1.10",
1600 "symfony/polyfill-php55": ">=1,<1.10", 1620 "symfony/polyfill-php55": ">=1,<1.10",
1621 "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1601 "symfony/routing": ">=2,<2.0.19", 1622 "symfony/routing": ">=2,<2.0.19",
1602 "symfony/security": ">=2,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.19|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", 1623 "symfony/security": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1603 "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", 1624 "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
1604 "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.37|>=3,<3.3.17|>=3.4,<3.4.7|>=4,<4.0.7", 1625 "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.37|>=3,<3.3.17|>=3.4,<3.4.7|>=4,<4.0.7",
1605 "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", 1626 "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
1606 "symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", 1627 "symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
1607 "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", 1628 "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1608 "symfony/serializer": ">=2,<2.0.11", 1629 "symfony/serializer": ">=2,<2.0.11",
1609 "symfony/symfony": ">=2,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", 1630 "symfony/symfony": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
1610 "symfony/translation": ">=2,<2.0.17", 1631 "symfony/translation": ">=2,<2.0.17",
1611 "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", 1632 "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3",
1612 "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", 1633 "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
1613 "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", 1634 "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
1614 "tecnickcom/tcpdf": "<6.2.22", 1635 "tecnickcom/tcpdf": "<6.2.22",
1615 "thelia/backoffice-default-template": ">=2.1,<2.1.2", 1636 "thelia/backoffice-default-template": ">=2.1,<2.1.2",
1616 "thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2", 1637 "thelia/thelia": ">=2.1-beta.1,<2.1.3",
1617 "theonedemon/phpwhois": "<=4.2.5", 1638 "theonedemon/phpwhois": "<=4.2.5",
1618 "titon/framework": ">=0,<9.9.99", 1639 "titon/framework": ">=0,<9.9.99",
1619 "truckersmp/phpwhois": "<=4.3.1", 1640 "truckersmp/phpwhois": "<=4.3.1",
1620 "twig/twig": "<1.20", 1641 "twig/twig": "<1.38|>=2,<2.7",
1621 "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.21|>=9,<9.5.2", 1642 "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.27|>=9,<9.5.8",
1622 "typo3/cms-core": ">=8,<8.7.21|>=9,<9.5.2", 1643 "typo3/cms-core": ">=8,<8.7.27|>=9,<9.5.8",
1623 "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5", 1644 "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5",
1624 "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", 1645 "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4",
1646 "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1",
1625 "ua-parser/uap-php": "<3.8", 1647 "ua-parser/uap-php": "<3.8",
1626 "wallabag/tcpdf": "<6.2.22", 1648 "wallabag/tcpdf": "<6.2.22",
1627 "willdurand/js-translation-bundle": "<2.1.1", 1649 "willdurand/js-translation-bundle": "<2.1.1",
@@ -1637,6 +1659,7 @@
1637 "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2", 1659 "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2",
1638 "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2", 1660 "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2",
1639 "zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5", 1661 "zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5",
1662 "zendframework/zend-developer-tools": ">=1.2.2,<1.2.3",
1640 "zendframework/zend-diactoros": ">=1,<1.8.4", 1663 "zendframework/zend-diactoros": ">=1,<1.8.4",
1641 "zendframework/zend-feed": ">=1,<2.10.3", 1664 "zendframework/zend-feed": ">=1,<2.10.3",
1642 "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1", 1665 "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1",
@@ -1671,7 +1694,7 @@
1671 } 1694 }
1672 ], 1695 ],
1673 "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", 1696 "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
1674 "time": "2019-01-15T19:39:37+00:00" 1697 "time": "2019-07-18T15:17:58+00:00"
1675 }, 1698 },
1676 { 1699 {
1677 "name": "sebastian/code-unit-reverse-lookup", 1700 "name": "sebastian/code-unit-reverse-lookup",
@@ -2305,16 +2328,16 @@
2305 }, 2328 },
2306 { 2329 {
2307 "name": "symfony/console", 2330 "name": "symfony/console",
2308 "version": "v3.4.21", 2331 "version": "v3.4.30",
2309 "source": { 2332 "source": {
2310 "type": "git", 2333 "type": "git",
2311 "url": "https://github.com/symfony/console.git", 2334 "url": "https://github.com/symfony/console.git",
2312 "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a" 2335 "reference": "12940f20a816c978860fa4925b3f1bbb27e9ac46"
2313 }, 2336 },
2314 "dist": { 2337 "dist": {
2315 "type": "zip", 2338 "type": "zip",
2316 "url": "https://api.github.com/repos/symfony/console/zipball/a700b874d3692bc8342199adfb6d3b99f62cc61a", 2339 "url": "https://api.github.com/repos/symfony/console/zipball/12940f20a816c978860fa4925b3f1bbb27e9ac46",
2317 "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a", 2340 "reference": "12940f20a816c978860fa4925b3f1bbb27e9ac46",
2318 "shasum": "" 2341 "shasum": ""
2319 }, 2342 },
2320 "require": { 2343 "require": {
@@ -2326,6 +2349,9 @@
2326 "symfony/dependency-injection": "<3.4", 2349 "symfony/dependency-injection": "<3.4",
2327 "symfony/process": "<3.3" 2350 "symfony/process": "<3.3"
2328 }, 2351 },
2352 "provide": {
2353 "psr/log-implementation": "1.0"
2354 },
2329 "require-dev": { 2355 "require-dev": {
2330 "psr/log": "~1.0", 2356 "psr/log": "~1.0",
2331 "symfony/config": "~3.3|~4.0", 2357 "symfony/config": "~3.3|~4.0",
@@ -2335,7 +2361,7 @@
2335 "symfony/process": "~3.3|~4.0" 2361 "symfony/process": "~3.3|~4.0"
2336 }, 2362 },
2337 "suggest": { 2363 "suggest": {
2338 "psr/log-implementation": "For using the console logger", 2364 "psr/log": "For using the console logger",
2339 "symfony/event-dispatcher": "", 2365 "symfony/event-dispatcher": "",
2340 "symfony/lock": "", 2366 "symfony/lock": "",
2341 "symfony/process": "" 2367 "symfony/process": ""
@@ -2370,36 +2396,36 @@
2370 ], 2396 ],
2371 "description": "Symfony Console Component", 2397 "description": "Symfony Console Component",
2372 "homepage": "https://symfony.com", 2398 "homepage": "https://symfony.com",
2373 "time": "2019-01-04T04:42:43+00:00" 2399 "time": "2019-07-24T14:46:41+00:00"
2374 }, 2400 },
2375 { 2401 {
2376 "name": "symfony/debug", 2402 "name": "symfony/debug",
2377 "version": "v3.4.21", 2403 "version": "v4.3.3",
2378 "source": { 2404 "source": {
2379 "type": "git", 2405 "type": "git",
2380 "url": "https://github.com/symfony/debug.git", 2406 "url": "https://github.com/symfony/debug.git",
2381 "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186" 2407 "reference": "527887c3858a2462b0137662c74837288b998ee3"
2382 }, 2408 },
2383 "dist": { 2409 "dist": {
2384 "type": "zip", 2410 "type": "zip",
2385 "url": "https://api.github.com/repos/symfony/debug/zipball/26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186", 2411 "url": "https://api.github.com/repos/symfony/debug/zipball/527887c3858a2462b0137662c74837288b998ee3",
2386 "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186", 2412 "reference": "527887c3858a2462b0137662c74837288b998ee3",
2387 "shasum": "" 2413 "shasum": ""
2388 }, 2414 },
2389 "require": { 2415 "require": {
2390 "php": "^5.5.9|>=7.0.8", 2416 "php": "^7.1.3",
2391 "psr/log": "~1.0" 2417 "psr/log": "~1.0"
2392 }, 2418 },
2393 "conflict": { 2419 "conflict": {
2394 "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" 2420 "symfony/http-kernel": "<3.4"
2395 }, 2421 },
2396 "require-dev": { 2422 "require-dev": {
2397 "symfony/http-kernel": "~2.8|~3.0|~4.0" 2423 "symfony/http-kernel": "~3.4|~4.0"
2398 }, 2424 },
2399 "type": "library", 2425 "type": "library",
2400 "extra": { 2426 "extra": {
2401 "branch-alias": { 2427 "branch-alias": {
2402 "dev-master": "3.4-dev" 2428 "dev-master": "4.3-dev"
2403 } 2429 }
2404 }, 2430 },
2405 "autoload": { 2431 "autoload": {
@@ -2426,29 +2452,29 @@
2426 ], 2452 ],
2427 "description": "Symfony Debug Component", 2453 "description": "Symfony Debug Component",
2428 "homepage": "https://symfony.com", 2454 "homepage": "https://symfony.com",
2429 "time": "2019-01-01T13:45:19+00:00" 2455 "time": "2019-07-23T11:21:36+00:00"
2430 }, 2456 },
2431 { 2457 {
2432 "name": "symfony/finder", 2458 "name": "symfony/finder",
2433 "version": "v3.4.21", 2459 "version": "v4.3.3",
2434 "source": { 2460 "source": {
2435 "type": "git", 2461 "type": "git",
2436 "url": "https://github.com/symfony/finder.git", 2462 "url": "https://github.com/symfony/finder.git",
2437 "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e" 2463 "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2"
2438 }, 2464 },
2439 "dist": { 2465 "dist": {
2440 "type": "zip", 2466 "type": "zip",
2441 "url": "https://api.github.com/repos/symfony/finder/zipball/3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e", 2467 "url": "https://api.github.com/repos/symfony/finder/zipball/9638d41e3729459860bb96f6247ccb61faaa45f2",
2442 "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e", 2468 "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2",
2443 "shasum": "" 2469 "shasum": ""
2444 }, 2470 },
2445 "require": { 2471 "require": {
2446 "php": "^5.5.9|>=7.0.8" 2472 "php": "^7.1.3"
2447 }, 2473 },
2448 "type": "library", 2474 "type": "library",
2449 "extra": { 2475 "extra": {
2450 "branch-alias": { 2476 "branch-alias": {
2451 "dev-master": "3.4-dev" 2477 "dev-master": "4.3-dev"
2452 } 2478 }
2453 }, 2479 },
2454 "autoload": { 2480 "autoload": {
@@ -2475,20 +2501,20 @@
2475 ], 2501 ],
2476 "description": "Symfony Finder Component", 2502 "description": "Symfony Finder Component",
2477 "homepage": "https://symfony.com", 2503 "homepage": "https://symfony.com",
2478 "time": "2019-01-01T13:45:19+00:00" 2504 "time": "2019-06-28T13:16:30+00:00"
2479 }, 2505 },
2480 { 2506 {
2481 "name": "symfony/polyfill-ctype", 2507 "name": "symfony/polyfill-ctype",
2482 "version": "v1.10.0", 2508 "version": "v1.11.0",
2483 "source": { 2509 "source": {
2484 "type": "git", 2510 "type": "git",
2485 "url": "https://github.com/symfony/polyfill-ctype.git", 2511 "url": "https://github.com/symfony/polyfill-ctype.git",
2486 "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" 2512 "reference": "82ebae02209c21113908c229e9883c419720738a"
2487 }, 2513 },
2488 "dist": { 2514 "dist": {
2489 "type": "zip", 2515 "type": "zip",
2490 "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", 2516 "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
2491 "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", 2517 "reference": "82ebae02209c21113908c229e9883c419720738a",
2492 "shasum": "" 2518 "shasum": ""
2493 }, 2519 },
2494 "require": { 2520 "require": {
@@ -2500,7 +2526,7 @@
2500 "type": "library", 2526 "type": "library",
2501 "extra": { 2527 "extra": {
2502 "branch-alias": { 2528 "branch-alias": {
2503 "dev-master": "1.9-dev" 2529 "dev-master": "1.11-dev"
2504 } 2530 }
2505 }, 2531 },
2506 "autoload": { 2532 "autoload": {
@@ -2533,20 +2559,20 @@
2533 "polyfill", 2559 "polyfill",
2534 "portable" 2560 "portable"
2535 ], 2561 ],
2536 "time": "2018-08-06T14:22:27+00:00" 2562 "time": "2019-02-06T07:57:58+00:00"
2537 }, 2563 },
2538 { 2564 {
2539 "name": "symfony/polyfill-mbstring", 2565 "name": "symfony/polyfill-mbstring",
2540 "version": "v1.10.0", 2566 "version": "v1.11.0",
2541 "source": { 2567 "source": {
2542 "type": "git", 2568 "type": "git",
2543 "url": "https://github.com/symfony/polyfill-mbstring.git", 2569 "url": "https://github.com/symfony/polyfill-mbstring.git",
2544 "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" 2570 "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
2545 }, 2571 },
2546 "dist": { 2572 "dist": {
2547 "type": "zip", 2573 "type": "zip",
2548 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", 2574 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
2549 "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", 2575 "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
2550 "shasum": "" 2576 "shasum": ""
2551 }, 2577 },
2552 "require": { 2578 "require": {
@@ -2558,7 +2584,7 @@
2558 "type": "library", 2584 "type": "library",
2559 "extra": { 2585 "extra": {
2560 "branch-alias": { 2586 "branch-alias": {
2561 "dev-master": "1.9-dev" 2587 "dev-master": "1.11-dev"
2562 } 2588 }
2563 }, 2589 },
2564 "autoload": { 2590 "autoload": {
@@ -2592,24 +2618,24 @@
2592 "portable", 2618 "portable",
2593 "shim" 2619 "shim"
2594 ], 2620 ],
2595 "time": "2018-09-21T13:07:52+00:00" 2621 "time": "2019-02-06T07:57:58+00:00"
2596 }, 2622 },
2597 { 2623 {
2598 "name": "symfony/yaml", 2624 "name": "symfony/yaml",
2599 "version": "v3.4.21", 2625 "version": "v4.3.3",
2600 "source": { 2626 "source": {
2601 "type": "git", 2627 "type": "git",
2602 "url": "https://github.com/symfony/yaml.git", 2628 "url": "https://github.com/symfony/yaml.git",
2603 "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea" 2629 "reference": "34d29c2acd1ad65688f58452fd48a46bd996d5a6"
2604 }, 2630 },
2605 "dist": { 2631 "dist": {
2606 "type": "zip", 2632 "type": "zip",
2607 "url": "https://api.github.com/repos/symfony/yaml/zipball/554a59a1ccbaac238a89b19c8e551a556fd0e2ea", 2633 "url": "https://api.github.com/repos/symfony/yaml/zipball/34d29c2acd1ad65688f58452fd48a46bd996d5a6",
2608 "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea", 2634 "reference": "34d29c2acd1ad65688f58452fd48a46bd996d5a6",
2609 "shasum": "" 2635 "shasum": ""
2610 }, 2636 },
2611 "require": { 2637 "require": {
2612 "php": "^5.5.9|>=7.0.8", 2638 "php": "^7.1.3",
2613 "symfony/polyfill-ctype": "~1.8" 2639 "symfony/polyfill-ctype": "~1.8"
2614 }, 2640 },
2615 "conflict": { 2641 "conflict": {
@@ -2624,7 +2650,7 @@
2624 "type": "library", 2650 "type": "library",
2625 "extra": { 2651 "extra": {
2626 "branch-alias": { 2652 "branch-alias": {
2627 "dev-master": "3.4-dev" 2653 "dev-master": "4.3-dev"
2628 } 2654 }
2629 }, 2655 },
2630 "autoload": { 2656 "autoload": {
@@ -2651,7 +2677,7 @@
2651 ], 2677 ],
2652 "description": "Symfony Yaml Component", 2678 "description": "Symfony Yaml Component",
2653 "homepage": "https://symfony.com", 2679 "homepage": "https://symfony.com",
2654 "time": "2019-01-01T13:45:19+00:00" 2680 "time": "2019-07-24T14:47:54+00:00"
2655 }, 2681 },
2656 { 2682 {
2657 "name": "theseer/fdomdocument", 2683 "name": "theseer/fdomdocument",
@@ -2754,12 +2780,12 @@
2754 "prefer-stable": false, 2780 "prefer-stable": false,
2755 "prefer-lowest": false, 2781 "prefer-lowest": false,
2756 "platform": { 2782 "platform": {
2757 "php": ">=5.6", 2783 "php": ">=7.1",
2758 "ext-json": "*", 2784 "ext-json": "*",
2759 "ext-zlib": "*" 2785 "ext-zlib": "*"
2760 }, 2786 },
2761 "platform-dev": [], 2787 "platform-dev": [],
2762 "platform-overrides": { 2788 "platform-overrides": {
2763 "php": "5.6.31" 2789 "php": "7.1.29"
2764 } 2790 }
2765} 2791}
diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md
index 8c9e8a32..ec68762e 100644
--- a/doc/md/Download-and-Installation.md
+++ b/doc/md/Download-and-Installation.md
@@ -1,7 +1,7 @@
1To install Shaarli, simply place the files in a directory under your webserver's 1To install Shaarli, simply place the files in a directory under your webserver's
2Document Root (or directly at the document root). 2Document Root (or directly at the document root).
3 3
4Also, please make sure your server is properly [configured](Server-configuration). 4Also, please make sure your server is properly [configured](Server-configuration.md).
5 5
6Multiple releases branches are available: 6Multiple releases branches are available:
7 7
diff --git a/shaarli_version.php b/shaarli_version.php
index c8334a2f..1941d6c3 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
<?php /* 0.11.0 */ ?> <?php /* 0.11.1 */ ?>
diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 83033624..c1a6a6bc 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -199,7 +199,7 @@
199 <div class="pure-g"> 199 <div class="pure-g">
200 <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}"> 200 <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
201 <div class="form-label"> 201 <div class="form-label">
202 <label for="hidePublicLinks"> 202 <label for="updateCheck">
203 <span class="label-name">{'Check updates'|t}</span><br> 203 <span class="label-name">{'Check updates'|t}</span><br>
204 <span class="label-desc">{'Notify me when a new release is ready'|t}</span> 204 <span class="label-desc">{'Notify me when a new release is ready'|t}</span>
205 </label> 205 </label>
diff --git a/tpl/default/import.html b/tpl/default/import.html
index 20f854d1..c41afcdb 100644
--- a/tpl/default/import.html
+++ b/tpl/default/import.html
@@ -69,7 +69,7 @@
69 </div> 69 </div>
70 <div class="pure-u-lg-2-3 pure-u-1"> 70 <div class="pure-u-lg-2-3 pure-u-1">
71 <div class="form-input"> 71 <div class="form-input">
72 <input type="text" name="default_tags" id="default_tags" placeholder="{'Tag'|t}"> 72 <input type="text" name="default_tags" id="default_tags" aria-label="{'Tag'|t}" placeholder="{'Tag'|t}">
73 </div> 73 </div>
74 </div> 74 </div>
75 </div> 75 </div>
diff --git a/tpl/default/install.html b/tpl/default/install.html
index f0e7040e..c6f501f0 100644
--- a/tpl/default/install.html
+++ b/tpl/default/install.html
@@ -17,7 +17,7 @@
17 <h2 class="window-title">{'Install Shaarli'|t}</h2> 17 <h2 class="window-title">{'Install Shaarli'|t}</h2>
18 18
19 <div class="center"> 19 <div class="center">
20 {'It looks like it\'s the first time you run Shaarli. Please configure it.'|t} 20 <p>{'It looks like it\'s the first time you run Shaarli. Please configure it.'|t}</p>
21 </div> 21 </div>
22 22
23 <div class="pure-g"> 23 <div class="pure-g">
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index a025d53c..ffc236c7 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -19,19 +19,19 @@
19<div id="search-linklist" class="searchform-block search-linklist"> 19<div id="search-linklist" class="searchform-block search-linklist">
20 20
21 <form method="GET" class="pure-form searchform" name="searchform"> 21 <form method="GET" class="pure-form searchform" name="searchform">
22 <input type="text" tabindex="1" name="searchterm" class="searchterm" placeholder="{'Search text'|t}" 22 <input type="text" name="searchterm" class="searchterm" aria-label="{'Search text'|t}" placeholder="{'Search text'|t}"
23 {if="!empty($search_term)"} 23 {if="!empty($search_term)"}
24 value="{$search_term}" 24 value="{$search_term}"
25 {/if} 25 {/if}
26 > 26 >
27 <input type="text" tabindex="2" name="searchtags" class="searchtags" placeholder="{'Filter by tag'|t}" 27 <input type="text" name="searchtags" class="searchtags" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
28 {if="!empty($search_tags)"} 28 {if="!empty($search_tags)"}
29 value="{$search_tags}" 29 value="{$search_tags}"
30 {/if} 30 {/if}
31 autocomplete="off" data-multiple data-autofirst data-minChars="1" 31 autocomplete="off" data-multiple data-autofirst data-minChars="1"
32 data-list="{loop="$tags"}{$key}, {/loop}" 32 data-list="{loop="$tags"}{$key}, {/loop}"
33 > 33 >
34 <button type="submit" class="search-button"><i class="fa fa-search"></i></button> 34 <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
35 </form> 35 </form>
36</div> 36</div>
37 37
@@ -94,7 +94,7 @@
94 {'tagged'|t} 94 {'tagged'|t}
95 {loop="$exploded_tags"} 95 {loop="$exploded_tags"}
96 <span class="label label-tag" title="{'Remove tag'|t}"> 96 <span class="label label-tag" title="{'Remove tag'|t}">
97 <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times" aria-hidden="true"></i></span></a> 97 <a href="?removetag={function="urlencode($value)"}" aria-label="{'Remove tag'|t}">{$value}<span class="remove"><i class="fa fa-times" aria-hidden="true"></i></span></a>
98 </span> 98 </span>
99 {/loop} 99 {/loop}
100 {/if} 100 {/if}
@@ -136,11 +136,11 @@
136 {if="$thumbnails_enabled && !empty($value.thumbnail)"} 136 {if="$thumbnails_enabled && !empty($value.thumbnail)"}
137 <div class="linklist-item-thumbnail" style="width:{$thumbnails_width}px;height:{$thumbnails_height}px;"> 137 <div class="linklist-item-thumbnail" style="width:{$thumbnails_width}px;height:{$thumbnails_height}px;">
138 <div class="thumbnail"> 138 <div class="thumbnail">
139 <a href="{$value.real_url}">
140 {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} 139 {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
140 <a href="{$value.real_url}" aria-hidden="true" tabindex="-1">
141 <img data-src="{$value.thumbnail}#" class="b-lazy" 141 <img data-src="{$value.thumbnail}#" class="b-lazy"
142 src="" 142 src=""
143 alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> 143 alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />
144 </a> 144 </a>
145 </div> 145 </div>
146 </div> 146 </div>
@@ -158,9 +158,9 @@
158 <h2> 158 <h2>
159 <a href="{$value.real_url}"> 159 <a href="{$value.real_url}">
160 {if="strpos($value.url, $value.shorturl) === false"} 160 {if="strpos($value.url, $value.shorturl) === false"}
161 <i class="fa fa-external-link"></i> 161 <i class="fa fa-external-link" aria-hidden="true"></i>
162 {else} 162 {else}
163 <i class="fa fa-sticky-note"></i> 163 <i class="fa fa-sticky-note" aria-hidden="true"></i>
164 {/if} 164 {/if}
165 165
166 <span class="linklist-link">{$value.title}</span> 166 <span class="linklist-link">{$value.title}</span>
@@ -177,7 +177,7 @@
177 <div class="linklist-item-infos clear"> 177 <div class="linklist-item-infos clear">
178 {if="$value.tags"} 178 {if="$value.tags"}
179 <div class="linklist-item-tags"> 179 <div class="linklist-item-tags">
180 <i class="fa fa-tags"></i> 180 <i class="fa fa-tags" aria-hidden="true"></i>
181 {$tag_counter=count($value.taglist)} 181 {$tag_counter=count($value.taglist)}
182 {loop="value.taglist"} 182 {loop="value.taglist"}
183 <span class="label label-tag" title="{$strAddTag}"> 183 <span class="label label-tag" title="{$strAddTag}">
@@ -216,7 +216,7 @@
216 <div class="linklist-item-infos-controls-group pure-u-0 pure-u-lg-visible"> 216 <div class="linklist-item-infos-controls-group pure-u-0 pure-u-lg-visible">
217 <span class="linklist-item-infos-controls-item ctrl-pin"> 217 <span class="linklist-item-infos-controls-item ctrl-pin">
218 <span title="{$strSticky}" class="pin-link pinned-link pure-u-0 pure-u-lg-visible"> 218 <span title="{$strSticky}" class="pin-link pinned-link pure-u-0 pure-u-lg-visible">
219 <i class="fa fa-thumb-tack"></i> 219 <i class="fa fa-thumb-tack" aria-hidden="true"></i>
220 </span> 220 </span>
221 </span> 221 </span>
222 </div> 222 </div>
@@ -226,7 +226,7 @@
226 {if="!$hide_timestamps || $is_logged_in"} 226 {if="!$hide_timestamps || $is_logged_in"}
227 {$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink} 227 {$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink}
228 <span class="linkdate" title="{$updated}"> 228 <span class="linkdate" title="{$updated}">
229 <i class="fa fa-clock-o"></i> 229 <i class="fa fa-clock-o" aria-hidden="true"></i>
230 {$value.created|format_date} 230 {$value.created|format_date}
231 {if="$value.updated_timestamp"}*{/if} 231 {if="$value.updated_timestamp"}*{/if}
232 &middot; 232 &middot;
@@ -248,7 +248,7 @@
248 </div><div 248 </div><div
249 {ignore}do not add space or line break between these div - Firefox issue{/ignore} 249 {ignore}do not add space or line break between these div - Firefox issue{/ignore}
250 class="linklist-item-infos-url pure-u-lg-5-12 pure-u-1"> 250 class="linklist-item-infos-url pure-u-lg-5-12 pure-u-1">
251 <a href="{$value.real_url}" title="{$value.title}"> 251 <a href="{$value.real_url}" aria-label="{$value.title}" title="{$value.title}">
252 <i class="fa fa-link" aria-hidden="true"></i> {$value.url} 252 <i class="fa fa-link" aria-hidden="true"></i> {$value.url}
253 </a> 253 </a>
254 <div class="linklist-item-buttons pure-u-0 pure-u-lg-visible"> 254 <div class="linklist-item-buttons pure-u-0 pure-u-lg-visible">
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index ce858e8c..0899826b 100644
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -1,4 +1,4 @@
1</div> 1</main>
2 2
3<div class="pure-g"> 3<div class="pure-g">
4 <div class="pure-u-2-24"></div> 4 <div class="pure-u-2-24"></div>
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 0ba1993f..4f063dc3 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -7,7 +7,7 @@
7 {$shaarlititle} 7 {$shaarlititle}
8 </a> 8 </a>
9 </header> 9 </header>
10 <a href="#" class="menu-toggle" id="menu-toggle" aria-label="Menu"><s class="bar" aria-hidden="true"></s><s class="bar" aria-hidden="true"></s></a> 10 <a href="#" class="menu-toggle" id="menu-toggle" aria-label="{'Menu'|t}"><s class="bar" aria-hidden="true"></s><s class="bar" aria-hidden="true"></s></a>
11 </div> 11 </div>
12 </div> 12 </div>
13 <div class="pure-u-1"> 13 <div class="pure-u-1">
@@ -99,37 +99,37 @@
99 </div> 99 </div>
100</div> 100</div>
101 101
102<div id="content" class="container"> 102<main id="content" class="container" role="main">
103 <div id="search" class="subheader-form searchform-block header-search"> 103 <div id="search" class="subheader-form searchform-block header-search">
104 <form method="GET" class="pure-form searchform" name="searchform"> 104 <form method="GET" class="pure-form searchform" name="searchform">
105 <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}" 105 <input type="text" id="searchform_value" name="searchterm" aria-label="{'Search text'|t}" placeholder="{'Search text'|t}"
106 {if="!empty($search_term)"} 106 {if="!empty($search_term)"}
107 value="{$search_term}" 107 value="{$search_term}"
108 {/if} 108 {/if}
109 > 109 >
110 <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="{'Filter by tag'|t}" 110 <input type="text" name="searchtags" id="tagfilter_value" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
111 {if="!empty($search_tags)"} 111 {if="!empty($search_tags)"}
112 value="{$search_tags}" 112 value="{$search_tags}"
113 {/if} 113 {/if}
114 autocomplete="off" data-multiple data-autofirst data-minChars="1" 114 autocomplete="off" data-multiple data-autofirst data-minChars="1"
115 data-list="{loop="$tags"}{$key}, {/loop}" 115 data-list="{loop="$tags"}{$key}, {/loop}"
116 > 116 >
117 <button type="submit" class="search-button"><i class="fa fa-search"></i></button> 117 <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
118 </form> 118 </form>
119 </div> 119 </div>
120 <div id="actions" class="subheader-form"> 120 <div id="actions" class="subheader-form">
121 <div class="pure-g"> 121 <div class="pure-g">
122 <div class="pure-u-1"> 122 <div class="pure-u-1">
123 <a href="" id="actions-delete" class="button"> 123 <a href="" id="actions-delete" class="button">
124 <i class="fa fa-trash"></i> 124 <i class="fa fa-trash" aria-hidden="true"></i>
125 {'Delete'|t} 125 {'Delete'|t}
126 </a>&nbsp; 126 </a>&nbsp;
127 <a href="" class="actions-change-visibility button" data-visibility="public"> 127 <a href="" class="actions-change-visibility button" data-visibility="public">
128 <i class="fa fa-globe"></i> 128 <i class="fa fa-globe" aria-hidden="true"></i>
129 {'Set public'|t} 129 {'Set public'|t}
130 </a>&nbsp; 130 </a>&nbsp;
131 <a href="" class="actions-change-visibility button" data-visibility="private"> 131 <a href="" class="actions-change-visibility button" data-visibility="private">
132 <i class="fa fa-user-secret"></i> 132 <i class="fa fa-user-secret" aria-hidden="true"></i>
133 {'Set private'|t} 133 {'Set private'|t}
134 </a> 134 </a>
135 </div> 135 </div>
@@ -138,15 +138,15 @@
138 {if="!$is_logged_in"} 138 {if="!$is_logged_in"}
139 <form method="post" name="loginform"> 139 <form method="post" name="loginform">
140 <div class="subheader-form header-login-form" id="header-login-form"> 140 <div class="subheader-form header-login-form" id="header-login-form">
141 <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3"> 141 <input type="text" name="login" aria-label="{'Username'|t}" placeholder="{'Username'|t}" >
142 <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5"> 142 <input type="password" name="password" aria-label="{'Password'|t}" placeholder="{'Password'|t}" >
143 <div class="remember-me"> 143 <div class="remember-me">
144 <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6" checked> 144 <input type="checkbox" name="longlastingsession" id="longlastingsession" checked>
145 <label for="longlastingsession">{'Remember me'|t}</label> 145 <label for="longlastingsession">{'Remember me'|t}</label>
146 </div> 146 </div>
147 <input type="hidden" name="token" value="{$token}"> 147 <input type="hidden" name="token" value="{$token}">
148 <input type="hidden" name="returnurl"> 148 <input type="hidden" name="returnurl">
149 <input type="submit" value="Login" tabindex="7"> 149 <input type="submit" value="Login">
150 </div> 150 </div>
151 </form> 151 </form>
152 {/if} 152 {/if}
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html
index 5a959244..73359949 100644
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -32,13 +32,13 @@
32 {/loop} 32 {/loop}
33 </div> 33 </div>
34 34
35 <div id="picwall-container" class="picwall-container"> 35 <div id="picwall-container" class="picwall-container" role="list">
36 {loop="$linksToDisplay"} 36 {loop="$linksToDisplay"}
37 <div class="picwall-pictureframe"> 37 <div class="picwall-pictureframe" role="listitem">
38 {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} 38 {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
39 <img data-src="{$value.thumbnail}#" class="b-lazy" 39 <img data-src="{$value.thumbnail}#" class="b-lazy"
40 src="" 40 src=""
41 alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> 41 alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />
42 <a href="{$value.real_url}"><span class="info">{$value.title}</span></a> 42 <a href="{$value.real_url}"><span class="info">{$value.title}</span></a>
43 {loop="$value.picwall_plugin"} 43 {loop="$value.picwall_plugin"}
44 {$value} 44 {$value}
diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html
index bedf3f8c..b9c0b162 100644
--- a/tpl/default/tag.cloud.html
+++ b/tpl/default/tag.cloud.html
@@ -26,14 +26,14 @@
26 <div class="pure-u-1 pure-u-lg-1-2"> 26 <div class="pure-u-1 pure-u-lg-1-2">
27 <form method="GET"> 27 <form method="GET">
28 <input type="hidden" name="do" value="tagcloud"> 28 <input type="hidden" name="do" value="tagcloud">
29 <input type="text" name="searchtags" placeholder="{'Filter by tag'|t}" 29 <input type="text" name="searchtags" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
30 {if="!empty($search_tags)"} 30 {if="!empty($search_tags)"}
31 value="{$search_tags}" 31 value="{$search_tags}"
32 {/if} 32 {/if}
33 autocomplete="off" data-multiple data-autofirst data-minChars="1" 33 autocomplete="off" data-multiple data-autofirst data-minChars="1"
34 data-list="{loop="$tags"}{$key}, {/loop}" 34 data-list="{loop="$tags"}{$key}, {/loop}"
35 > 35 >
36 <button type="submit" class="search-button"><i class="fa fa-search"></i></button> 36 <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
37 </form> 37 </form>
38 </div> 38 </div>
39 <div class="pure-u-lg-1-4"></div> 39 <div class="pure-u-lg-1-4"></div>
diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html
index 41eab246..d5777465 100644
--- a/tpl/default/tag.list.html
+++ b/tpl/default/tag.list.html
@@ -26,14 +26,14 @@
26 <div class="pure-u-1 pure-u-lg-1-2"> 26 <div class="pure-u-1 pure-u-lg-1-2">
27 <form method="GET"> 27 <form method="GET">
28 <input type="hidden" name="do" value="taglist"> 28 <input type="hidden" name="do" value="taglist">
29 <input type="text" name="searchtags" placeholder="{'Filter by tag'|t}" 29 <input type="text" name="searchtags" aria-label="{'Filter by tag'|t}" placeholder="{'Filter by tag'|t}"
30 {if="!empty($search_tags)"} 30 {if="!empty($search_tags)"}
31 value="{$search_tags}" 31 value="{$search_tags}"
32 {/if} 32 {/if}
33 autocomplete="off" data-multiple data-autofirst data-minChars="1" 33 autocomplete="off" data-multiple data-autofirst data-minChars="1"
34 data-list="{loop="$tags"}{$key}, {/loop}" 34 data-list="{loop="$tags"}{$key}, {/loop}"
35 > 35 >
36 <button type="submit" class="search-button"><i class="fa fa-search"></i></button> 36 <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
37 </form> 37 </form>
38 </div> 38 </div>
39 <div class="pure-u-lg-1-4"></div> 39 <div class="pure-u-lg-1-4"></div>
@@ -50,9 +50,9 @@
50 <div class="tag-list-item pure-g" data-tag="{$key}"> 50 <div class="tag-list-item pure-g" data-tag="{$key}">
51 <div class="pure-u-1"> 51 <div class="pure-u-1">
52 {if="$is_logged_in===true"} 52 {if="$is_logged_in===true"}
53 <a href="#" class="delete-tag"><i class="fa fa-trash"></i></a>&nbsp;&nbsp; 53 <a href="#" class="delete-tag" aria-label="{'Delete'|t}"><i class="fa fa-trash" aria-hidden="true"></i></a>&nbsp;&nbsp;
54 <a href="?do=changetag&fromtag={$key|urlencode}" class="rename-tag"> 54 <a href="?do=changetag&fromtag={$key|urlencode}" class="rename-tag" aria-label="{'Rename tag'|t}">
55 <i class="fa fa-pencil-square-o {$key}"></i> 55 <i class="fa fa-pencil-square-o {$key}" aria-hidden="true"></i>
56 </a> 56 </a>
57 {/if} 57 {/if}
58 58
@@ -66,7 +66,7 @@
66 {if="$is_logged_in===true"} 66 {if="$is_logged_in===true"}
67 <div class="rename-tag-form pure-u-1"> 67 <div class="rename-tag-form pure-u-1">
68 <input type="text" name="{$key}" value="{$key}" class="rename-tag-input" /> 68 <input type="text" name="{$key}" value="{$key}" class="rename-tag-input" />
69 <a href="#" class="validate-rename-tag"><i class="fa fa-check"></i></a> 69 <a href="#" class="validate-rename-tag"><i class="fa fa-check" aria-hidden="true"></i></a>
70 </div> 70 </div>
71 {/if} 71 {/if}
72 </div> 72 </div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 12:04:48 +0000