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

2022-05-13 13:50:50 +02:00
parent 49d5f27cd0 e1957c08e4
commit 4947ea6758
106 changed files with 2100 additions and 1461 deletions
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@ -41,6 +41,18 @@ homepage:
 fos_user:
    resource: "@FOSUserBundle/Resources/config/routing/all.xml"

+fos_user_security_login:
+    path: /login
+    defaults:
+        _controller: Wallabag\UserBundle\Controller\SecurityController::loginAction
+    methods: [GET, POST]
+
+fos_user_registration_register:
+    path: /register
+    defaults:
+        _controller: Wallabag\UserBundle\Controller\RegistrationController::registerAction
+    methods: [GET, POST]
+
 fos_oauth_server_token:
    resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"

--- a/app/config/tests/parameters_test.mysql.yml
+++ b/app/config/tests/parameters_test.mysql.yml
@ -1,6 +1,6 @@
 parameters:
    test_database_driver: pdo_mysql
-    test_database_host: localhost
+    test_database_host: 127.0.0.1
    test_database_port: 3306
    test_database_name: wallabag_test
    test_database_user: root
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@ -22,6 +22,7 @@ wallabag_core:
        uk: 'Українська'
        hr: 'Hrvatski'
        cs: 'Čeština'
+        el: 'Ελληνικά'
    items_on_page: 12
    theme: material
    language: '%locale%'