aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--composer.json16
-rw-r--r--docs/en/index.rst1
-rw-r--r--docs/en/user/errors_during_fetching.rst27
-rw-r--r--docs/fr/index.rst1
-rw-r--r--docs/fr/user/errors_during_fetching.rst27
-rw-r--r--docs/img/user/refetch.pngbin0 -> 1956 bytes
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php39
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig127
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig130
12 files changed, 365 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index 9ae43639..819d29fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,9 +34,11 @@ matrix:
34 allow_failures: 34 allow_failures:
35 - php: hhvm 35 - php: hhvm
36 36
37# exclude v1 branches
37branches: 38branches:
38 only: 39 except:
39 - v2 40 - master
41 - dev
40 42
41before_script: 43before_script:
42 - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; 44 - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
diff --git a/composer.json b/composer.json
index fe6880aa..a1a7ebb4 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,20 @@
29 }, 29 },
30 "require": { 30 "require": {
31 "php": ">=5.5.9", 31 "php": ">=5.5.9",
32 "ext-pcre": "*",
33 "ext-dom": "*",
34 "ext-curl": "*",
35 "ext-gd": "*",
36 "ext-session": "*",
37 "ext-ctype": "*",
38 "ext-hash": "*",
39 "ext-simplexml": "*",
40 "ext-json": "*",
41 "ext-mbstring": "*",
42 "ext-xml": "*",
43 "ext-iconv": "*",
44 "ext-tokenizer": "*",
45 "ext-pdo": "*",
32 "symfony/symfony": "3.0.*", 46 "symfony/symfony": "3.0.*",
33 "doctrine/orm": "^2.5", 47 "doctrine/orm": "^2.5",
34 "doctrine/doctrine-bundle": "^1.6", 48 "doctrine/doctrine-bundle": "^1.6",
@@ -111,7 +125,7 @@
111 } 125 }
112 }, 126 },
113 "autoload": { 127 "autoload": {
114 "psr-4": { "": "src/" }, 128 "psr-4": { "Wallabag\\": "src/Wallabag/" },
115 "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] 129 "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
116 }, 130 },
117 "config": { 131 "config": {
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 1bac9ed7..ab58ca6b 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -28,6 +28,7 @@ The main documentation for this application is organized into a couple sections:
28 user/login 28 user/login
29 user/configuration 29 user/configuration
30 user/first_article 30 user/first_article
31 user/errors_during_fetching
31 user/import 32 user/import
32 user/download_articles 33 user/download_articles
33 user/filters 34 user/filters
diff --git a/docs/en/user/errors_during_fetching.rst b/docs/en/user/errors_during_fetching.rst
new file mode 100644
index 00000000..d3efc848
--- /dev/null
+++ b/docs/en/user/errors_during_fetching.rst
@@ -0,0 +1,27 @@
1Errors during fetching articles
2===============================
3
4Why does the fetch of an article fail?
5--------------------------------------
6
7There may be several reasons:
8
9- network problem
10- wallabag can't fetch content due to the website structure
11
12How can I help to fix that?
13---------------------------
14
15- `by sending us an email with the article's URL <mailto:hello@wallabag.org>`_
16- by trying to fix this article by yourself :) by creating a file for the article.
17 You can use this tool http://siteconfig.fivefilters.org/.
18
19How can I try to re-fetch this article?
20---------------------------------------
21
22If wallabag failed when fetching an article, you can click on the reload button
23(the third on the below picture).
24
25.. image:: ../../img/user/refetch.png
26 :alt: Refetch content
27 :align: center
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index af5ed14f..5adc5ab5 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -29,6 +29,7 @@ La documentation principale de cette application est découpée en plusieurs sec
29 user/login 29 user/login
30 user/configuration 30 user/configuration
31 user/first_article 31 user/first_article
32 user/errors_during_fetching
32 user/import 33 user/import
33 user/download_articles 34 user/download_articles
34 user/filters 35 user/filters
diff --git a/docs/fr/user/errors_during_fetching.rst b/docs/fr/user/errors_during_fetching.rst
new file mode 100644
index 00000000..b20e5973
--- /dev/null
+++ b/docs/fr/user/errors_during_fetching.rst
@@ -0,0 +1,27 @@
1Erreur durant la récupération des articles
2==========================================
3
4Pourquoi la récupération des articles échoue ?
5----------------------------------------------
6
7Il peut y avoir plusieurs raisons :
8
9- problème de connexion internet
10- wallabag ne peut pas récupérer le contenu à cause de la structure du site web
11
12Comment puis-je aider pour réparer ça ?
13---------------------------------------
14
15- `en nous envoyant un email avec l'URL de l'article <mailto:hello@wallabag.org>`_
16- en essayant de réparer cet article par vous-même :) en créant un fichier pour l'article.
17 Vous pouvez utiliser cet outil http://siteconfig.fivefilters.org/.
18
19Comment puis-je réessayer de récupérer le contenu ?
20---------------------------------------------------
21
22Si wallabag échoue en récupérant l'article, vous pouvez cliquer sur le bouton suivant
23(le troisième sur l'image ci-dessous).
24
25.. image:: ../../img/user/refetch.png
26 :alt: Refetch content
27 :align: center
diff --git a/docs/img/user/refetch.png b/docs/img/user/refetch.png
new file mode 100644
index 00000000..ff905248
--- /dev/null
+++ b/docs/img/user/refetch.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 2e241757..771b3c5a 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -26,6 +26,14 @@ class InstallCommand extends ContainerAwareCommand
26 */ 26 */
27 protected $defaultOutput; 27 protected $defaultOutput;
28 28
29 /**
30 * @var array
31 */
32 protected $functionExists = [
33 'curl_exec',
34 'curl_multi_init',
35 ];
36
29 protected function configure() 37 protected function configure()
30 { 38 {
31 $this 39 $this
@@ -65,27 +73,32 @@ class InstallCommand extends ContainerAwareCommand
65 73
66 $fulfilled = true; 74 $fulfilled = true;
67 75
68 $label = '<comment>PCRE</comment>'; 76 $label = '<comment>PDO Drivers</comment>';
69 if (extension_loaded('pcre')) { 77 if (extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql')) {
70 $status = '<info>OK!</info>'; 78 $status = '<info>OK!</info>';
71 $help = ''; 79 $help = '';
72 } else { 80 } else {
73 $fulfilled = false; 81 $fulfilled = false;
74 $status = '<error>ERROR!</error>'; 82 $status = '<error>ERROR!</error>';
75 $help = 'You should enabled PCRE extension'; 83 $help = 'Needs one of sqlite, mysql or pgsql PDO drivers';
76 } 84 }
85
77 $rows[] = array($label, $status, $help); 86 $rows[] = array($label, $status, $help);
78 87
79 $label = '<comment>DOM</comment>'; 88 foreach ($this->functionExists as $functionRequired) {
80 if (extension_loaded('DOM')) { 89 $label = '<comment>'.$functionRequired.'</comment>';
81 $status = '<info>OK!</info>'; 90
82 $help = ''; 91 if (function_exists($functionRequired)) {
83 } else { 92 $status = '<info>OK!</info>';
84 $fulfilled = false; 93 $help = '';
85 $status = '<error>ERROR!</error>'; 94 } else {
86 $help = 'You should enabled DOM extension'; 95 $fulfilled = false;
96 $status = '<error>ERROR!</error>';
97 $help = 'You need the '.$functionRequired.' function activated';
98 }
99
100 $rows[] = array($label, $status, $help);
87 } 101 }
88 $rows[] = array($label, $status, $help);
89 102
90 $table = new Table($this->defaultOutput); 103 $table = new Table($this->defaultOutput);
91 $table 104 $table
@@ -180,7 +193,7 @@ class InstallCommand extends ContainerAwareCommand
180 $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>'); 193 $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>');
181 194
182 $questionHelper = $this->getHelperSet()->get('question'); 195 $questionHelper = $this->getHelperSet()->get('question');
183 $question = new ConfirmationQuestion('Would you like to create a new user ? (y/N)', false); 196 $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (y/N)', true);
184 197
185 if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) { 198 if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
186 return $this; 199 return $this;
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 1aa66be1..677c33da 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -39,7 +39,7 @@ services:
39 wallabag_core.graby: 39 wallabag_core.graby:
40 class: Graby\Graby 40 class: Graby\Graby
41 arguments: 41 arguments:
42 - { error_message: false } 42 - { error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." }
43 calls: 43 calls:
44 - [ setLogger, [ "@logger" ] ] 44 - [ setLogger, [ "@logger" ] ]
45 tags: 45 tags:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 65280ebc..ebb1a95a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -149,7 +149,12 @@ via Paypal: "via Paypal"
149Take wallabag with you: "Emportez wallabag avec vous" 149Take wallabag with you: "Emportez wallabag avec vous"
150Social: "Social" 150Social: "Social"
151powered by: "propulsé par" 151powered by: "propulsé par"
152 152Contributors: "Contributeurs"
153Thank you to contributors on wallabag web application: "Merci aux contributeurs de l'application web de wallabag"
154Third-party libraries: Librairies tierces
155"Here are the list of third-party libraries used in wallabag (with their licenses):": "Voici la liste des dépendances utilisées dans wallabag (et leur license) :"
156Package: Dépendance
157License: Licence
153 158
154# Howto 159# Howto
155Form: "Formulaire" 160Form: "Formulaire"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
index 38f08da6..fdd12cf7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
@@ -42,4 +42,131 @@
42 <dd>by contributing to the project: <a href="https://github.com/wallabag/wallabag/issues/1254">an issue lists all our needs</a></dd> 42 <dd>by contributing to the project: <a href="https://github.com/wallabag/wallabag/issues/1254">an issue lists all our needs</a></dd>
43 <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd> 43 <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd>
44 </dl> 44 </dl>
45
46 <h2>{% trans %}Contributors{% endtrans %}</h2>
47 <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}Thank you to contributors on wallabag web application{% endtrans %}</a></p>
48
49 <h2>{% trans %}Third-party libraries{% endtrans %}</h2>
50 <p>{% trans %}Here are the list of third-party libraries used in wallabag (with their licenses):{% endtrans %}</p>
51 <table>
52 <tr>
53 <th>{% trans %}Package{% endtrans %}</th>
54 <th>{% trans %}License{% endtrans %}</th>
55 </tr>
56 <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
57 <tr><td>CraueConfigBundle</td><td>MIT</td></tr>
58 <tr><td>doctrine/annotations</td><td>MIT</td></tr>
59 <tr><td>doctrine/cache</td><td>MIT</td></tr>
60 <tr><td>doctrine/collections</td><td>MIT</td></tr>
61 <tr><td>doctrine/common</td><td>MIT</td></tr>
62 <tr><td>doctrine/dbal</td><td>MIT</td></tr>
63 <tr><td>doctrine/doctrine-bundle</td><td>MIT</td></tr>
64 <tr><td>doctrine/doctrine-cache-bundle</td><td>MIT</td></tr>
65 <tr><td>doctrine/doctrine-migrations-bundle</td><td>MIT</td></tr>
66 <tr><td>doctrine/inflector</td><td>MIT</td></tr>
67 <tr><td>doctrine/instantiator</td><td>MIT</td></tr>
68 <tr><td>doctrine/lexer</td><td>MIT</td></tr>
69 <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr>
70 <tr><td>doctrine/orm</td><td>MIT</td></tr>
71 <tr><td>ezyang/htmlpurifier</td><td>LGPL</td></tr>
72 <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr>
73 <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr>
74 <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr>
75 <tr><td>friendsofsymfony/user-bundle</td><td>MIT</td></tr>
76 <tr><td>gedmo/doctrine-extensions</td><td>MIT</td></tr>
77 <tr><td>grandt/binstring</td><td>LGPL-2.1</td></tr>
78 <tr><td>grandt/phpepub</td><td>LGPL-2.1</td></tr>
79 <tr><td>grandt/phpresizegif</td><td>LGPL-2.1</td></tr>
80 <tr><td>grandt/phpzipmerge</td><td>LGPL-2.1</td></tr>
81 <tr><td>grandt/relativepath</td><td>LGPL-2.1</td></tr>
82 <tr><td>guzzlehttp/guzzle</td><td>MIT</td></tr>
83 <tr><td>guzzlehttp/ringphp</td><td>MIT</td></tr>
84 <tr><td>guzzlehttp/streams</td><td>MIT</td></tr>
85 <tr><td>hoa/compiler</td><td>BSD-3-Clause</td></tr>
86 <tr><td>hoa/consistency</td><td>BSD-3-Clause</td></tr>
87 <tr><td>hoa/event</td><td>BSD-3-Clause</td></tr>
88 <tr><td>hoa/exception</td><td>BSD-3-Clause</td></tr>
89 <tr><td>hoa/file</td><td>BSD-3-Clause</td></tr>
90 <tr><td>hoa/iterator</td><td>BSD-3-Clause</td></tr>
91 <tr><td>hoa/math</td><td>BSD-3-Clause</td></tr>
92 <tr><td>hoa/protocol</td><td>BSD-3-Clause</td></tr>
93 <tr><td>hoa/regex</td><td>BSD-3-Clause</td></tr>
94 <tr><td>hoa/ruler</td><td>BSD-3-Clausev
95 <tr><td>hoa/stream</td><td>BSD-3-Clause</td></tr>
96 <tr><td>hoa/ustring</td><td>BSD-3-Clause</td></tr>
97 <tr><td>hoa/visitor</td><td>BSD-3-Clause</td></tr>
98 <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
99 <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
100 <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
101 <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
102 <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
103 <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
104 <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
105 <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
106 <tr><td>jms/metadata</td><td>Apache</td></tr>
107 <tr><td>jms/parser-lib</td><td>Apache2</td></tr>
108 <tr><td>jms/serializer</td><td>Apache2</td></tr>
109 <tr><td>jms/serializer-bundle</td><td>Apache2</td></tr>
110 <tr><td>kphoen/rulerz</td><td>MIT</td></tr>
111 <tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr>
112 <tr><td>kriswallsmith/assetic</td><td>MIT</td></tr>
113 <tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr>
114 <tr><td>liip/theme-bundle</td><td>MIT</td></tr>
115 <tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr>
116 <tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr>
117 <tr><td>monolog/monolog</td><td>MIT</td></tr>
118 <tr><td>neitanod/forceutf8</td><td>BSD-3-Clause</td></tr>
119 <tr><td>nelmio/api-doc-bundle</td><td>MIT</td></tr>
120 <tr><td>nelmio/cors-bundle</td><td>MIT</td></tr>
121 <tr><td>ocramius/proxy-manager</td><td>MIT</td></tr>
122 <tr><td>pagerfanta/pagerfanta</td><td>MIT</td></tr>
123 <tr><td>paragonie/random_compat</td><td>MIT</td></tr>
124 <tr><td>phpcollection/phpcollection</td><td>Apache2</td></tr>
125 <tr><td>phpoption/phpoption</td><td>Apache2</td></tr>
126 <tr><td>phpzip/phpzip</td><td>LGPL-2.1</td></tr>
127 <tr><td>psr/log</td><td>MIT</td></tr>
128 <tr><td>react/promise</td><td>MIT</td></tr>
129 <tr><td>scheb/two-factor-bundle</td><td>MIT</td></tr>
130 <tr><td>sensio/distribution-bundle</td><td>MIT</td></tr>
131 <tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr>
132 <tr><td>sensiolabs/security-checker</td><td>MIT</td></tr>
133 <tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr>
134 <tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr>
135 <tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr>
136 <tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr>
137 <tr><td>swiftmailer/swiftmailer</td><td>MIT</td></tr>
138 <tr><td>symfony/assetic-bundle</td><td>MIT</td></tr>
139 <tr><td>symfony/monolog-bundle</td><td>MIT</td></tr>
140 <tr><td>All of Symfony</td><td>MIT-licenced</td></tr>
141 <tr><td>tecnickcom/tcpdf</td><td>LGPLv3</td></tr>
142 <tr><td>twig/extensions</td><td>MIT</td></tr>
143 <tr><td>twig/twig</td><td>BSD-3-Clause</td></tr>
144 <tr><td>wallabag/php-mobi</td><td>Apache-2.0</td></tr>
145 <tr><td>willdurand/hateoas</td><td>MIT</td></tr>
146 <tr><td>willdurand/hateoas-bundle</td><td>MIT</td></tr>
147 <tr><td>willdurand/jsonp-callback-validator</td><td>MIT</td></tr>
148 <tr><td>willdurand/negotiation</td><td>MIT</td></tr>
149 <tr><td>zendframework/zend-code</td><td>BSD-3-Clause</td></tr>
150 <tr><td>zendframework/zend-eventmanager</td><td>BSD-3-Clause</td></tr>
151 <tr><td>doctrine/data-fixtures</td><td>MIT</td></tr>
152 <tr><td>doctrine/doctrine-fixtures-bundle</td><td>MIT</td></tr>
153 <tr><td>phpdocumentor/reflection-docblock</td><td>MIT</td></tr>
154 <tr><td>phpspec/prophecy</td><td>MIT</td></tr>
155 <tr><td>phpunit/php-code-coverage</td><td>BSD-3-Clause</td></tr>
156 <tr><td>phpunit/php-file-iterator</td><td>BSD-3-Clause</td></tr>
157 <tr><td>phpunit/php-text-template</td><td>BSD-3-Clause</td></tr>
158 <tr><td>phpunit/php-timer</td><td>BSD-3-Clause</td></tr>
159 <tr><td>phpunit/php-token-stream</td><td>BSD-3-Clause</td></tr>
160 <tr><td>phpunit/phpunit</td><td>BSD-3-Clause</td></tr>
161 <tr><td>phpunit/phpunit-mock-objects</td><td>BSD-3-Clause</td></tr>
162 <tr><td>sebastian/comparator</td><td>BSD-3-Clause</td></tr>
163 <tr><td>sebastian/diff</td><td>BSD-3-Clause</td></tr>
164 <tr><td>sebastian/environment</td><td>BSD-3-Clause</td></tr>
165 <tr><td>sebastian/exporter</td><td>BSD-3-Clause</td></tr>
166 <tr><td>sebastian/global-state</td><td>BSD-3-Clause</td></tr>
167 <tr><td>sebastian/recursion-context</td><td>BSD-3-Clause</td></tr>
168 <tr><td>sebastian/version</td><td>BSD-3-Clause</td></tr>
169 <tr><td>sensio/generator-bundle</td><td>MIT</td></tr>
170 <tr><td>symfony/phpunit-bridge</td><td>MIT</td></tr>
171 </table>
45{% endblock %} 172{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
index d6b8e28a..1368bb09 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
@@ -14,6 +14,8 @@
14 <li class="tab col s3"><a class="active" href="#set1">{% trans %}Who is behind wallabag{% endtrans %}</a></li> 14 <li class="tab col s3"><a class="active" href="#set1">{% trans %}Who is behind wallabag{% endtrans %}</a></li>
15 <li class="tab col s3"><a href="#set2">{% trans %}Getting help{% endtrans %}</a></li> 15 <li class="tab col s3"><a href="#set2">{% trans %}Getting help{% endtrans %}</a></li>
16 <li class="tab col s3"><a href="#set3">{% trans %}Helping wallabag{% endtrans %}</a></li> 16 <li class="tab col s3"><a href="#set3">{% trans %}Helping wallabag{% endtrans %}</a></li>
17 <li class="tab col s3"><a href="#set4">{% trans %}Contributors{% endtrans %}</a></li>
18 <li class="tab col s3"><a href="#set5">{% trans %}Third-party libraries{% endtrans %}</a></li>
17 </ul> 19 </ul>
18 </div> 20 </div>
19 21
@@ -49,6 +51,134 @@
49 </dl> 51 </dl>
50 </div> 52 </div>
51 53
54 <div id="set4" class="col s12">
55 <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}Thank you to contributors on wallabag web application{% endtrans %}</a></p>
56 </div>
57
58 <div id="set5" class="col s12">
59 <p>{% trans %}Here are the list of third-party libraries used in wallabag (with their licenses):{% endtrans %}</p>
60 <table>
61 <tr>
62 <th>{% trans %}Package{% endtrans %}</th>
63 <th>{% trans %}License{% endtrans %}</th>
64 </tr>
65 <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
66 <tr><td>CraueConfigBundle</td><td>MIT</td></tr>
67 <tr><td>doctrine/annotations</td><td>MIT</td></tr>
68 <tr><td>doctrine/cache</td><td>MIT</td></tr>
69 <tr><td>doctrine/collections</td><td>MIT</td></tr>
70 <tr><td>doctrine/common</td><td>MIT</td></tr>
71 <tr><td>doctrine/dbal</td><td>MIT</td></tr>
72 <tr><td>doctrine/doctrine-bundle</td><td>MIT</td></tr>
73 <tr><td>doctrine/doctrine-cache-bundle</td><td>MIT</td></tr>
74 <tr><td>doctrine/doctrine-migrations-bundle</td><td>MIT</td></tr>
75 <tr><td>doctrine/inflector</td><td>MIT</td></tr>
76 <tr><td>doctrine/instantiator</td><td>MIT</td></tr>
77 <tr><td>doctrine/lexer</td><td>MIT</td></tr>
78 <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr>
79 <tr><td>doctrine/orm</td><td>MIT</td></tr>
80 <tr><td>ezyang/htmlpurifier</td><td>LGPL</td></tr>
81 <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr>
82 <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr>
83 <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr>
84 <tr><td>friendsofsymfony/user-bundle</td><td>MIT</td></tr>
85 <tr><td>gedmo/doctrine-extensions</td><td>MIT</td></tr>
86 <tr><td>grandt/binstring</td><td>LGPL-2.1</td></tr>
87 <tr><td>grandt/phpepub</td><td>LGPL-2.1</td></tr>
88 <tr><td>grandt/phpresizegif</td><td>LGPL-2.1</td></tr>
89 <tr><td>grandt/phpzipmerge</td><td>LGPL-2.1</td></tr>
90 <tr><td>grandt/relativepath</td><td>LGPL-2.1</td></tr>
91 <tr><td>guzzlehttp/guzzle</td><td>MIT</td></tr>
92 <tr><td>guzzlehttp/ringphp</td><td>MIT</td></tr>
93 <tr><td>guzzlehttp/streams</td><td>MIT</td></tr>
94 <tr><td>hoa/compiler</td><td>BSD-3-Clause</td></tr>
95 <tr><td>hoa/consistency</td><td>BSD-3-Clause</td></tr>
96 <tr><td>hoa/event</td><td>BSD-3-Clause</td></tr>
97 <tr><td>hoa/exception</td><td>BSD-3-Clause</td></tr>
98 <tr><td>hoa/file</td><td>BSD-3-Clause</td></tr>
99 <tr><td>hoa/iterator</td><td>BSD-3-Clause</td></tr>
100 <tr><td>hoa/math</td><td>BSD-3-Clause</td></tr>
101 <tr><td>hoa/protocol</td><td>BSD-3-Clause</td></tr>
102 <tr><td>hoa/regex</td><td>BSD-3-Clause</td></tr>
103 <tr><td>hoa/ruler</td><td>BSD-3-Clausev
104 <tr><td>hoa/stream</td><td>BSD-3-Clause</td></tr>
105 <tr><td>hoa/ustring</td><td>BSD-3-Clause</td></tr>
106 <tr><td>hoa/visitor</td><td>BSD-3-Clause</td></tr>
107 <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
108 <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
109 <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
110 <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
111 <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
112 <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
113 <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
114 <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
115 <tr><td>jms/metadata</td><td>Apache</td></tr>
116 <tr><td>jms/parser-lib</td><td>Apache2</td></tr>
117 <tr><td>jms/serializer</td><td>Apache2</td></tr>
118 <tr><td>jms/serializer-bundle</td><td>Apache2</td></tr>
119 <tr><td>kphoen/rulerz</td><td>MIT</td></tr>
120 <tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr>
121 <tr><td>kriswallsmith/assetic</td><td>MIT</td></tr>
122 <tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr>
123 <tr><td>liip/theme-bundle</td><td>MIT</td></tr>
124 <tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr>
125 <tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr>
126 <tr><td>monolog/monolog</td><td>MIT</td></tr>
127 <tr><td>neitanod/forceutf8</td><td>BSD-3-Clause</td></tr>
128 <tr><td>nelmio/api-doc-bundle</td><td>MIT</td></tr>
129 <tr><td>nelmio/cors-bundle</td><td>MIT</td></tr>
130 <tr><td>ocramius/proxy-manager</td><td>MIT</td></tr>
131 <tr><td>pagerfanta/pagerfanta</td><td>MIT</td></tr>
132 <tr><td>paragonie/random_compat</td><td>MIT</td></tr>
133 <tr><td>phpcollection/phpcollection</td><td>Apache2</td></tr>
134 <tr><td>phpoption/phpoption</td><td>Apache2</td></tr>
135 <tr><td>phpzip/phpzip</td><td>LGPL-2.1</td></tr>
136 <tr><td>psr/log</td><td>MIT</td></tr>
137 <tr><td>react/promise</td><td>MIT</td></tr>
138 <tr><td>scheb/two-factor-bundle</td><td>MIT</td></tr>
139 <tr><td>sensio/distribution-bundle</td><td>MIT</td></tr>
140 <tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr>
141 <tr><td>sensiolabs/security-checker</td><td>MIT</td></tr>
142 <tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr>
143 <tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr>
144 <tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr>
145 <tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr>
146 <tr><td>swiftmailer/swiftmailer</td><td>MIT</td></tr>
147 <tr><td>symfony/assetic-bundle</td><td>MIT</td></tr>
148 <tr><td>symfony/monolog-bundle</td><td>MIT</td></tr>
149 <tr><td>All of Symfony</td><td>MIT-licenced</td></tr>
150 <tr><td>tecnickcom/tcpdf</td><td>LGPLv3</td></tr>
151 <tr><td>twig/extensions</td><td>MIT</td></tr>
152 <tr><td>twig/twig</td><td>BSD-3-Clause</td></tr>
153 <tr><td>wallabag/php-mobi</td><td>Apache-2.0</td></tr>
154 <tr><td>willdurand/hateoas</td><td>MIT</td></tr>
155 <tr><td>willdurand/hateoas-bundle</td><td>MIT</td></tr>
156 <tr><td>willdurand/jsonp-callback-validator</td><td>MIT</td></tr>
157 <tr><td>willdurand/negotiation</td><td>MIT</td></tr>
158 <tr><td>zendframework/zend-code</td><td>BSD-3-Clause</td></tr>
159 <tr><td>zendframework/zend-eventmanager</td><td>BSD-3-Clause</td></tr>
160 <tr><td>doctrine/data-fixtures</td><td>MIT</td></tr>
161 <tr><td>doctrine/doctrine-fixtures-bundle</td><td>MIT</td></tr>
162 <tr><td>phpdocumentor/reflection-docblock</td><td>MIT</td></tr>
163 <tr><td>phpspec/prophecy</td><td>MIT</td></tr>
164 <tr><td>phpunit/php-code-coverage</td><td>BSD-3-Clause</td></tr>
165 <tr><td>phpunit/php-file-iterator</td><td>BSD-3-Clause</td></tr>
166 <tr><td>phpunit/php-text-template</td><td>BSD-3-Clause</td></tr>
167 <tr><td>phpunit/php-timer</td><td>BSD-3-Clause</td></tr>
168 <tr><td>phpunit/php-token-stream</td><td>BSD-3-Clause</td></tr>
169 <tr><td>phpunit/phpunit</td><td>BSD-3-Clause</td></tr>
170 <tr><td>phpunit/phpunit-mock-objects</td><td>BSD-3-Clause</td></tr>
171 <tr><td>sebastian/comparator</td><td>BSD-3-Clause</td></tr>
172 <tr><td>sebastian/diff</td><td>BSD-3-Clause</td></tr>
173 <tr><td>sebastian/environment</td><td>BSD-3-Clause</td></tr>
174 <tr><td>sebastian/exporter</td><td>BSD-3-Clause</td></tr>
175 <tr><td>sebastian/global-state</td><td>BSD-3-Clause</td></tr>
176 <tr><td>sebastian/recursion-context</td><td>BSD-3-Clause</td></tr>
177 <tr><td>sebastian/version</td><td>BSD-3-Clause</td></tr>
178 <tr><td>sensio/generator-bundle</td><td>MIT</td></tr>
179 <tr><td>symfony/phpunit-bridge</td><td>MIT</td></tr>
180 </table>
181 </div>
52 </div> 182 </div>
53 183
54 </div> 184 </div>