oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-10-15 19:42:08 +00:00
Code Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.3

Browse source
This commit is contained in:
Jeremy Benoist 2017-05-09 13:55:31 +02:00
commit 54c2d164a3
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
13 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Form/Type/ConfigType.php
View file

@ -39,9 +39,11 @@ class ConfigType extends AbstractType
])
->add('items_per_page', null, [
'label' => 'config.form_settings.items_per_page_label',
'property_path' => 'itemsPerPage',
])
->add('reading_speed', ChoiceType::class, [
'label' => 'config.form_settings.reading_speed.label',
'property_path' => 'readingSpeed',
'choices' => [
'config.form_settings.reading_speed.100_word' => '0.5',
'config.form_settings.reading_speed.200_word' => '1',
@ -51,6 +53,7 @@ class ConfigType extends AbstractType
])
->add('action_mark_as_read', ChoiceType::class, [
'label' => 'config.form_settings.action_mark_as_read.label',
'property_path' => 'actionMarkAsRead',
'choices' => [
'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
@ -61,6 +64,7 @@ class ConfigType extends AbstractType
'label' => 'config.form_settings.language_label',
])
->add('pocket_consumer_key', null, [
'property_path' => 'pocketConsumerKey',
'label' => 'config.form_settings.pocket_consumer_key_label',
])
->add('save', SubmitType::class, [

1
src/Wallabag/CoreBundle/Form/Type/RssType.php
View file

@ -14,6 +14,7 @@ class RssType extends AbstractType
$builder
->add('rss_limit', null, [
'label' => 'config.form_rss.rss_limit',
'property_path' => 'rssLimit',
])
->add('save', SubmitType::class, [
'label' => 'config.form.save',

4
src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
View file

@ -106,8 +106,8 @@
<tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
<tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
<tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
<tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
<tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
<tr><td>j0k3r/graby</td><td>MIT</td></tr>
<tr><td>j0k3r/graby-site-config</td><td>Public domain</td></tr>
<tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
<tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
<tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>