Commit graph

22 commits

Author SHA1 Message Date
Jerome Charaoui 29dca43236 Retain imported content if fetching fails, fixes #2658 2016-12-02 22:41:35 -05:00
Jeremy Benoist 68003139e1
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.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.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
2016-11-19 15:30:49 +01:00
Nicolas Lœuillet 10b3509757
Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Jeremy Benoist 8d7b4f0eff
Display a bigger image in case of image content
If the content is only an image, we can display a bigger preview image because we won’t have text to display.

Also, split different card view to avoid too much complexity in the entries.html.twig
2016-11-08 22:17:46 +01:00
Jeremy Benoist 48656e0eaa
Fixing tests 2016-10-30 11:27:09 +01:00
Jeremy Benoist 7f55941856
Use doctrine event to download images 2016-10-30 10:48:29 +01:00
Jeremy Benoist 45fd7e09d7
Cleanup 2016-10-30 09:58:53 +01:00
Jeremy Benoist 156bf62758
CS 2016-10-29 16:25:45 +02:00
Thomas Citharel 419214d722
Download pictures successfully
Needs to rewrite them properly (get base url)
2016-10-29 16:25:45 +02:00
Thomas Citharel 4dface6670
first draft (from v1) 2016-10-29 16:25:45 +02:00
Jeremy Benoist 82fc3290d4
CS 2016-09-25 12:03:49 +02:00
Jeremy Benoist 401135852c
Use scheduled entity insertions to avoid tag duplicate
Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
2016-09-25 12:03:49 +02:00
Jeremy Benoist 4094ea4771 Convert array + phpDoc
Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
2016-04-12 12:25:29 +02:00
Jeremy Benoist 4d0ec0e721 Fix some Scrutinizer issues 2016-03-27 20:54:57 +02:00
Jeremy Benoist c2656f96d4 Move assignTagsToEntry in ContentProxy helper 2016-02-19 14:22:20 +01:00
Nicolas Lœuillet 347fa6beb0 php cs 2015-12-08 09:20:03 +01:00
Kévin Gomez 1c9cd2a7f0 Errors in the automatic tagging do not prevent the entry from being added 2015-11-11 16:23:49 +01:00
Kévin Gomez c3510620ad PoC of rule-based tagging 2015-11-11 16:23:49 +01:00
Jeremy Benoist da3d4998c0 Move readingTime & domainName in ContentProxy
So, everything is centralized in one place when we save a new entry.
2015-09-28 19:35:33 +02:00
Jeremy Benoist 98f0929f16 Handle entry in language
Fix #1333
2015-09-22 20:52:13 +02:00
Jeremy Benoist f1e29e69cb CS 2015-09-10 22:00:53 +02:00
Jeremy Benoist 558d9aabab Move fetching content in a separate class 2015-09-10 21:57:25 +02:00