]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge remote-tracking branch 'origin/master' into 2.4
authorJeremy Benoist <jeremy.benoist@gmail.com>
Tue, 15 Jan 2019 08:41:18 +0000 (09:41 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Tue, 15 Jan 2019 08:41:18 +0000 (09:41 +0100)
commit5419a8368ebb4b4d57f481b842f1fcc576c9149d
treecd970bb8f3ec5e6487fc1e3bd2de1f89455d3d90
parent5c331bf0f9ef679aaf91ef29b13120272fcccbf5
parentf6b9e883c01196d5aec249f6e8e02e07d0da4089
Merge remote-tracking branch 'origin/master' into 2.4
31 files changed:
app/Resources/static/themes/material/css/cards.scss
composer.json
src/Wallabag/ApiBundle/Controller/EntryRestController.php
src/Wallabag/CoreBundle/Controller/ExportController.php
src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php
src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php
src/Wallabag/CoreBundle/Repository/EntryRepository.php
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
src/Wallabag/ImportBundle/Import/BrowserImport.php
src/Wallabag/ImportBundle/Import/InstapaperImport.php
src/Wallabag/ImportBundle/Import/PinboardImport.php
src/Wallabag/ImportBundle/Import/PocketImport.php
src/Wallabag/ImportBundle/Import/ReadabilityImport.php
src/Wallabag/ImportBundle/Import/WallabagImport.php
src/Wallabag/UserBundle/Resources/views/layout.html.twig
tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
web/wallassets/material.css