mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-13 18:59:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5746 from yguedidi/remove-bundle-inheritance

Browse source
This commit is contained in:
Jérémy Benoist 2022-04-24 08:07:09 +02:00 committed by GitHub
parent 88fd7afeb5 82fc828442
commit 7e6d0d61db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig → app/Resources/FOSUserBundle/views/ChangePassword/changePassword_content.html.twig
View file

0
src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig → app/Resources/FOSUserBundle/views/Registration/check_email.html.twig
View file

0
src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig → app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig
View file

0
src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig → app/Resources/FOSUserBundle/views/Registration/register_content.html.twig
View file

0
src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig → app/Resources/FOSUserBundle/views/Resetting/check_email.html.twig
View file

0
src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig → app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig
View file

0
src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig → app/Resources/FOSUserBundle/views/Resetting/reset_content.html.twig
View file

0
src/Wallabag/UserBundle/Resources/views/Security/login.html.twig → app/Resources/FOSUserBundle/views/Security/login.html.twig
View file

0
src/Wallabag/UserBundle/Resources/views/layout.html.twig → app/Resources/FOSUserBundle/views/layout.html.twig
View file

12
app/config/routing.yml
View file

@ -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"

4
src/Wallabag/UserBundle/WallabagUserBundle.php
View file

@ -6,8 +6,4 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
class WallabagUserBundle extends Bundle
{
public function getParent()
{
return 'FOSUserBundle';
}
}