]> git.immae.eu Git - github/wallabag/wallabag.git/commit - src/Wallabag/ImportBundle/Command/ImportCommand.php
Update after previous merge
authorJeremy Benoist <jeremy.benoist@gmail.com>
Wed, 30 Dec 2015 09:06:45 +0000 (10:06 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Sat, 2 Jan 2016 22:27:41 +0000 (23:27 +0100)
commit77a7752a592af9ac821621a34d9955533baf40a0
tree304b29f1d01a93a61f75f3206aabf845ff3fbe35
parent7ec2897ee0ad190dcb9f77032d785f2f9661b754
Update after previous merge

PR #1443 was merged into this branch to handle all import type in the same place.
app/config/config.yml
src/Wallabag/CoreBundle/Controller/ImportController.php [deleted file]
src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
src/Wallabag/CoreBundle/Resources/views/themes/material/Import/index.html.twig [deleted file]
src/Wallabag/ImportBundle/Command/ImportCommand.php [moved from src/Wallabag/CoreBundle/Command/ImportCommand.php with 98% similarity]
src/Wallabag/ImportBundle/Controller/ImportController.php
src/Wallabag/ImportBundle/DependencyInjection/Configuration.php
src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php
src/Wallabag/ImportBundle/Form/Type/UploadImportType.php [moved from src/Wallabag/CoreBundle/Form/Type/UploadImportType.php with 92% similarity]
src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig