From: Nicolas Lœuillet Date: Tue, 22 Nov 2016 08:39:43 +0000 (+0100) Subject: Merge pull request #2614 from wallabag/api-reload X-Git-Tag: 2.2.0~3^2~53 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ba838dae5ac5bf0a65165ee075138aefbccbc3a2;hp=56da73969ac49e400ade89248f87c643047221d6;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2614 from wallabag/api-reload Add ability to reload entry from API --- diff --git a/CHANGELOG.md b/CHANGELOG.md index de523f91..ad916426 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## Changelog +### 2.1.5 2016/11/21 +- [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r) +- [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb) +- [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb) + ### 2.1.4 2016/11/19 - [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r) - [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r) diff --git a/app/config/config.yml b/app/config/config.yml index 53c26beb..487e934b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.2.0-dev + version: 2.1.5 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' @@ -218,7 +218,9 @@ fos_oauth_server: auth_code_class: Wallabag\ApiBundle\Entity\AuthCode service: user_provider: fos_user.user_manager - + options: + refresh_token_lifetime: 1209600 + scheb_two_factor: trusted_computer: enabled: true diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7a22cb98..f821f2a8 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -55,3 +55,4 @@ parameters: redis_host: localhost redis_port: 6379 redis_path: null + redis_password: null diff --git a/composer.json b/composer.json index 6d7a7adf..1548d6ec 100644 --- a/composer.json +++ b/composer.json @@ -89,7 +89,7 @@ "doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/data-fixtures": "~1.1.1", "sensio/generator-bundle": "^3.0", - "phpunit/phpunit": "~5.0", + "phpunit/phpunit": "~4.0", "symfony/phpunit-bridge": "^3.0", "friendsofphp/php-cs-fixer": "~1.9", "m6web/redis-mock": "^2.0" @@ -128,7 +128,10 @@ "psr-4": { "Tests\\": "tests/" } }, "config": { - "bin-dir": "bin" + "bin-dir": "bin", + "platform": { + "php": "5.5.9" + } }, "minimum-stability": "dev", "prefer-stable": true diff --git a/docs/de/user/parameters.rst b/docs/de/user/parameters.rst index a5a4e4f2..8d8f9206 100644 --- a/docs/de/user/parameters.rst +++ b/docs/de/user/parameters.rst @@ -39,6 +39,7 @@ Wenn du nicht weißt, welchen Wert du setzen sollst, belasse es bei dem Standard redis_host: localhost redis_port: 6379 redis_path: null + redis_password: null Bedeutung von jedem Parameter ----------------------------- @@ -91,3 +92,4 @@ Bedeutung von jedem Parameter "redis_host", "localhost", "IP oder Hostname des Zielservers (ignoriert bei Unix Schema)" "redis_port", "6379", "TCP/IP Port des Zielservers (ignoriert bei Unix Schema)" "redis_path", "null", "Pfad zur Unix Domain Socket Datei, wenn Redis Unix Domain Sockets nutzt" + "redis_password", "null", "Kennwort, welches in der Redis-Server-Konfiguration definiert ist (Parameter `requirepass` in `redis.conf`)" diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst index eb312f7e..d8a209e7 100644 --- a/docs/en/user/parameters.rst +++ b/docs/en/user/parameters.rst @@ -39,6 +39,7 @@ If you don't know which value you need to set, please leave the default one. redis_host: localhost redis_port: 6379 redis_path: null + redis_password: null Meaning of each parameter ------------------------- @@ -92,3 +93,4 @@ Meaning of each parameter "redis_host", "localhost", "IP or hostname of the target server (ignored for unix scheme)" "redis_port", "6379", "TCP/IP port of the target server (ignored for unix scheme)" "redis_path", "null", "Path of the UNIX domain socket file used when connecting to Redis using UNIX domain sockets" + "redis_password", "null", "Password defined in the Redis server configuration (parameter `requirepass` in `redis.conf`)" diff --git a/docs/fr/user/parameters.rst b/docs/fr/user/parameters.rst index d1c20ceb..b2e33524 100644 --- a/docs/fr/user/parameters.rst +++ b/docs/fr/user/parameters.rst @@ -39,6 +39,7 @@ Si vous ne savez pas quelle valeur vous devez mettre, laissez celle par défaut. redis_host: localhost redis_port: 6379 redis_path: null + redis_password: null Meaning of each parameter ------------------------- @@ -91,3 +92,4 @@ Meaning of each parameter "redis_host", "localhost", "IP ou hôte du serveur cible (ignoré pour un schéma unix)" "redis_port", "6379", "Port TCP/IP du serveur cible (ignoré pour un schéma unix)" "redis_path", "null", "Chemin du fichier de socket du domaine UNIX utilisé quand on se connecte à Redis en utilisant les sockets du domaine UNIX" + "redis_password", "null", "Mot de passe défini dans la configuration serveur de Redis (paramètre `requirepass` dans `redis.conf`)" diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 0036f45e..0280bc18 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -110,6 +110,7 @@ services: host: '%redis_host%' port: '%redis_port%' path: '%redis_path%' + password: '%redis_password%' wallabag_core.exception_controller: class: Wallabag\CoreBundle\Controller\ExceptionController diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 38fc4ceb..c124b744 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -61,7 +61,7 @@ config: save: 'Zapisz' form_settings: theme_label: 'Temat' - items_per_page_label: 'Ilość elementóœ na stronie' + items_per_page_label: 'Ilość elementów na stronie' language_label: 'Język' reading_speed: label: 'Prędkość czytania' @@ -76,11 +76,11 @@ config: redirect_current_page: 'do bieżącej strony' pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' android_configuration: Skonfiguruj swoją androidową aplikację - # help_theme: "wallabag is customizable. You can choose your prefered theme here." - # help_items_per_page: "You can change the number of articles displayed on each page." - # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." - # help_language: "You can change the language of wallabag interface." - # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." + help_theme: "Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw." + help_items_per_page: "Możesz zmienić ilość artykułów wyświetlanych na każdej stronie." + help_reading_speed: "wallabag oblicza czas czytania każdego artykułu. Dzięki tej liście możesz określić swoje tempo. Wallabag przeliczy ponownie czas potrzebny, na przeczytanie każdego z artykułów." + help_language: "Możesz zmienić język interfejsu wallabag." + help_pocket_consumer_key: "Wymagane dla importu z Pocket. Możesz go stworzyć na swoim koncie Pocket." form_rss: description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌' token_label: 'Token RSS' @@ -98,7 +98,7 @@ config: name_label: 'Nazwa' email_label: 'Adres email' twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' - # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." + help_twoFactorAuthentication: "Jeżeli włączysz autoryzację dwuetapową. Za każdym razem, kiedy będziesz chciał się zalogować, dostaniesz kod na swój e-mail." delete: title: Usuń moje konto (niebezpieczna strefa !) description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany. @@ -112,7 +112,7 @@ config: entries: usuń WSZYTSTKIE wpisy confirm: Jesteś pewien? (tej operacji NIE MOÅ»NA cofnąć) form_password: - # description: "You can change your password here. Your new password should by at least 8 characters long." + description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków." old_password_label: 'Stare hasło' new_password_label: 'Nowe hasło' repeat_new_password_label: 'Powtórz nowe hasło' @@ -162,7 +162,7 @@ entry: archived: 'Zarchiwizowane wpisy' filtered: 'Odfiltrowane wpisy' filtered_tags: 'Filtrowane po tagach:' - # filtered_search: 'Filtered by search:' + filtered_search: 'Filtrowanie po wyszukiwaniu:' untagged: 'Odtaguj wpisy' list: number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.' @@ -186,7 +186,7 @@ entry: preview_picture_label: 'Posiada podgląd obrazu' preview_picture_help: 'Podgląd obrazu' language_label: 'Język' - # http_status_label: 'HTTP status' + http_status_label: 'Status HTTP' reading_time: label: 'Czas czytania w minutach' from: 'od' @@ -229,7 +229,7 @@ entry: form_new: url_label: Url search: - # placeholder: 'What are you looking for?' + placeholder: 'Czego szukasz?' edit: page_title: 'Edytuj wpis' title_label: 'Tytuł' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig index c8a303a6..b7a48551 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig @@ -15,7 +15,7 @@
  • - {{ 'quickstart.configure.title'|trans }} + {{ 'quickstart.configure.title'|trans }}

    {{ 'quickstart.configure.description'|trans }}

    @@ -31,7 +31,7 @@
  • - {{ 'quickstart.first_steps.title'|trans }} + {{ 'quickstart.first_steps.title'|trans }}

    {{ 'quickstart.first_steps.description'|trans }}

    @@ -46,7 +46,7 @@
  • - {{ 'quickstart.migrate.title'|trans }} + {{ 'quickstart.migrate.title'|trans }}

    {{ 'quickstart.migrate.description'|trans }}

    @@ -63,7 +63,7 @@
  • - {{ 'quickstart.developer.title'|trans }} + {{ 'quickstart.developer.title'|trans }}

    {{ 'quickstart.developer.description'|trans }}

    @@ -79,7 +79,7 @@
  • - {{ 'quickstart.docs.title'|trans }} + {{ 'quickstart.docs.title'|trans }}

    {{ 'quickstart.docs.description'|trans }}

    @@ -95,7 +95,7 @@
  • - {{ 'quickstart.support.title'|trans }} + {{ 'quickstart.support.title'|trans }}

    {{ 'quickstart.support.description'|trans }}