Merge pull request #1642 from wallabag/v2-escape-preview

Unescape content for Material card

Merge pull request #1644 from wallabag/v2-enable-confirmation-parameter

Fix #1622: parameter for FosUser confirmation

Merge pull request #1645 from wallabag/v2-fix-loadtemplate-sendemail

Fix #1643: fix the way to load the HTML template in 2factor auth

Fix #1643: fix the way to load the HTML template in 2factor auth

CS

Fix #1622: parameter for FosUser confirmation

Merge pull request #1612 from wallabag/v2-settings-page

Settings page

Unescape content for Material card

Using slice & striptags, the content is automatically escaped.
If some html character need to be displayed, they'll be escape too, sth like `&`.
Using |raw, the content isn't escape twice and is well displayed.

Merge pull request #1641 from wallabag/v2-doc-typo

Update import.rst to fix a doc typo

Update import.rst

Merge pull request #1601 from wallabag/v2-import-from-v2

[#1590] Add JSON import from wallabag v2

Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight

[#1604] First draft to fix SensioLabsInsight report

Merge pull request #1639 from wallabag/v2-change-test-dbname

Fix #1635: change database name for test environments (mysql/pgsql)

Fix Shaarli url traduction

Fix fos_user

Fix #1635: change database name for test environments (mysql/pgsql)

Fix from_email & fos_user

Add new export config

Fix permission to settings page

CS

Fix tests

Use alias to get container parameters

Create internal setting on install & fixtures

We don't need migration yet

Add warning message for PocketImport

Warn user if pocket_consumer_key isn't defined

Add CraueConfig for internal settings

Always include warning message

We'll remove it later, on the stable release

Move default configuration out of parameters

These default configuration value shouldn't be in parameters.yml.

Merge pull request #1630 from wallabag/v2-add-gitter-badge

Add @GitterHQ badge on README

Add @GitterHQ badge on README

Merge pull request #1629 from wallabag/fixexportformats

fix #1620 and introduce new parameters to export

Merge pull request #1628 from ogunkarakus/v2-turkish-translation

Add Turkish translation

fix #1620 and introduce new parameters to export

Add Turkish translation

Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>

Merge pull request #1625 from wallabag/v2-fix-1621

[#1621] Add default address for FosUser

[#1621] Add default address for FosUser

SensioLabsInsight fixes

[#1604] First draft to fix SensioLabsInsight report

Merge pull request #1619 from wallabag/v2-themes-folder

Move public assets for themes

Move public assets for themes

So they can be installed using the `assets:install` command and there'll no longer symlink in the repo
They moved from `web/themes/...` to `bundles/wallabagcore/themes/...`

Merge pull request #1618 from wallabag/v2-readme

Updated version in README

Updated version in README

Merge pull request #1614 from wallabag/v2-few-fixes

Few fixes

CS

Add for deleting rule from an other user

Use FOSUserEvents instead of c/p a controller

The `resetAction` was overriden to redirect user to the homepage instead of `fos_user_profile_show`.
Instead of copying the whole method we can simply use FOSUserEvents to handle that.

Fix bad type after using findByUrlAndUserId

It returns an object since few commits this part of (untested) code still use an array.
Also add test for that part of code.

Fix bad redirection when adding a new user

Add tests on TagAllCommand

Some simple tests

Use PHP7 random_bytes to generate RSS Token

random_bytes is a PHP 7 function wich has been ported to PHP 5 using paragonie/random_compat

Merge pull request #1565 from wallabag/v2-2fa-html

Use HTML email for 2FA

Update HTML 2FA template

Split paragraph in translation
Inject wallabag_url for image in HTML template
Remove username & password from config_dev.yml (null are already the default value)

#1490 HTML in E-Mails

CS

Use HTML email for 2FA

Related to #1490

Merge pull request #1610 from wallabag/v2-composer-lock-release

Disable xdebug all the time

Disable xdebug all the time

Use travis_wait to avoid travis timeout on `composer up`
Jump to `memory_limit -1` for `composer up`
Also, since composer.lock is ignored, we can remove it.

Merge pull request #1606 from wallabag/v2-tag-cascade

Remove tag relation when removing an entry

Merge pull request #1607 from wallabag/v2-composer-lock

Ignore composer.lock

Ignore composer.lock

Having a big composer.lock on a final project can have side effect on incoming PR that add a new vendor.
Mostly because conflict are too frequent.

By ignoring composer.lock we ease the PR submission and rebase.

BUT we need to be careful when we release a new version of wallabag. We should manually `git add -f composer.lock` to update it.

Since composer.lock will no longer be commited I switch the `composer install` to a `composer up` in the travis configuration.

Remove tag relation when removing an entry

Fix #1453

[#1590] Add JSON import from wallabag v2

Merge pull request #1599 from wallabag/v2-fix-pt-documentation

Add configuration for portuguese documentation

Add configuration for portuguese documentation

Merge pull request #1594 from araujo0205/patch-1

Create index.rst

Create index.rst

Merge pull request #1587 from wallabag/v2-translator

Use translator interface instead of final class

Use translator interface instead of final class

Symfony use a different class when in dev mode and prod mode.

Prod loads `Symfony\Bundle\FrameworkBundle\Translation\Translator`.
Dev loads `Symfony\Component\Translation\DataCollectorTranslator` to gather information for the debug bar.

Fix #1585

Merge pull request #1584 from wallabag/v2-cleanup

some cleanup

some cleanup:
* move capistrano config files
* remove useless files

Merge pull request #1564 from wallabag/v2-remove-flattr

Remove Flattr references

Merge pull request #1583 from wallabag/v2-fix-delete

Fix `findOneByUrl` side effect in tests

remove flattr on about page

Merge pull request #1524 from wallabag/sf2.8

Upgrade to Symfony 3.0

Fix `findOneByUrl` side effect in tests

Fix #1566

Merge pull request #1560 from wallabag/v2-quickstart

Fix #1501 Quickstart for beginners

Quickstart for beginners

Update graby stuff

Update readme & fix console permission

Last deps update

Add assets config

To avoid :
> Twig_Error_Syntax: Unknown "asset" function in

Update path in build file

Update to Symfony 3.0.x

Switch to Symfony 3 structure

Remove some commented code

Update to friendsofsymfony/oauth-server-bundle@1.5.0-BETA

Fix Pocket generateUrl parameters

Update deps

LexikFormFilterBundle & RulerZBundle are now Symfony 3 compatible

There are still some issue with FOSOAuthServerBundle

Fix recent update

- some missing url parameters from WallabagRestController & EntryController
- use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature)
- update ImportBundle (url & form)

TwoFactorBundle -> 2.0

Switch to psr-4

Update bundle & stock file

- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler

Symfony Upgrade Fixer FTW

symfony-upgrade-fixer fix src/Wallabag/

Improve composer.json

Following great article from Jordi: http://seld.be/notes/new-composer-patterns

Changelogs summary:

 - paragonie/random_compat updated from 1.1.1 to 1.1.4
   See changes: https://github.com/paragonie/random_compat/compare/1.1.1...1.1.4
   Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.4

 - doctrine/cache updated from v1.5.2 to v1.5.4
   See changes: https://github.com/doctrine/cache/compare/v1.5.2...v1.5.4
   Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.4

 - sensio/framework-extra-bundle updated from v3.0.11 to v3.0.12
   See changes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/compare/v3.0.11...v3.0.12
   Release notes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/releases/tag/v3.0.12

 - nelmio/cors-bundle updated from 1.4.0 to 1.4.1
   See changes: https://github.com/nelmio/NelmioCorsBundle/compare/1.4.0...1.4.1
   Release notes: https://github.com/nelmio/NelmioCorsBundle/releases/tag/1.4.1

 - friendsofsymfony/rest-bundle updated from 1.7.4 to 1.7.6
   See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.4...1.7.6
   Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.6

 - nelmio/api-doc-bundle updated from 2.11.0 to 2.11.1
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.0...2.11.1
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.1

 - neitanod/forceutf8 updated from v1.5 to v2.0
   See changes: https://github.com/neitanod/forceutf8/compare/v1.5...v2.0
   Release notes: https://github.com/neitanod/forceutf8/releases/tag/v2.0

 - j0k3r/graby-site-config updated from 1.0.9 to 1.0.10
   See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.9...1.0.10
   Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.10

 - j0k3r/graby updated from 1.0.6 to 1.0.7
   See changes: https://github.com/j0k3r/graby/compare/1.0.6...1.0.7
   Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.7

 - sebastian/diff updated from 1.4.0 to 1.4.1
   See changes: https://github.com/sebastianbergmann/diff/compare/1.4.0...1.4.1
   Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.1

 - phpunit/phpunit updated from 4.8.19 to 4.8.21
   See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.19...4.8.21
   Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.21

 - kphoen/rulerz updated from 0.16.1 to 0.16.2
   See changes: https://github.com/K-Phoen/rulerz/compare/0.16.1...0.16.2
   Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.2

Wallabag now require PHP >= 5.5

See https://github.com/K-Phoen/rulerz/pull/21/files#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780

Remove weak deprecation :boom:

Update deps

Changelogs summary:

 - doctrine/cache updated from v1.5.1 to v1.5.2
   See changes: https://github.com/doctrine/cache/compare/v1.5.1...v1.5.2
   Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.2

 - doctrine/common updated from v2.5.1 to v2.5.2
   See changes: https://github.com/doctrine/common/compare/v2.5.1...v2.5.2
   Release notes: https://github.com/doctrine/common/releases/tag/v2.5.2

 - symfony/polyfill-mbstring installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-mbstring/releases/tag/v1.0.0

 - symfony/polyfill-util installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-util/releases/tag/v1.0.0

 - paragonie/random_compat installed in version 1.1.1
   Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.1

 - symfony/polyfill-php70 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php70/releases/tag/v1.0.0

 - symfony/polyfill-php56 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php56/releases/tag/v1.0.0

 - ircmaxell/password-compat installed in version v1.0.4
   Release notes: https://github.com/ircmaxell/password_compat/releases/tag/v1.0.4

 - symfony/polyfill-php55 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php55/releases/tag/v1.0.0

 - symfony/polyfill-php54 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php54/releases/tag/v1.0.0

 - symfony/polyfill-intl-icu installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-intl-icu/releases/tag/v1.0.0

 - symfony/symfony updated from v2.7.7 to v2.8.0
   See changes: https://github.com/symfony/symfony/compare/v2.7.7...v2.8.0
   Release notes: https://github.com/symfony/symfony/releases/tag/v2.8.0

 - symfony/security-acl installed in version v2.7.7
   Release notes: https://github.com/symfony/security-acl/releases/tag/v2.7.7

 - doctrine/orm updated from v2.5.1 to v2.5.2
   See changes: https://github.com/doctrine/doctrine2/compare/v2.5.1...v2.5.2
   Release notes: https://github.com/doctrine/doctrine2/releases/tag/v2.5.2

 - kriswallsmith/assetic updated from v1.3.1 to v1.3.2
   See changes: https://github.com/kriswallsmith/assetic/compare/v1.3.1...v1.3.2
   Release notes: https://github.com/kriswallsmith/assetic/releases/tag/v1.3.2

 - symfony/assetic-bundle updated from v2.7.0 to v2.7.1
   See changes: https://github.com/symfony/assetic-bundle/compare/v2.7.0...v2.7.1
   Release notes: https://github.com/symfony/assetic-bundle/releases/tag/v2.7.1

 - symfony/swiftmailer-bundle updated from v2.3.8 to v2.3.9
   See changes: https://github.com/symfony/swiftmailer-bundle/compare/v2.3.8...v2.3.9
   Release notes: https://github.com/symfony/swiftmailer-bundle/releases/tag/v2.3.9

 - symfony/monolog-bundle updated from 2.8.1 to v2.8.2
   See changes: https://github.com/symfony/monolog-bundle/compare/2.8.1...v2.8.2
   Release notes: https://github.com/symfony/monolog-bundle/releases/tag/v2.8.2

 - sensio/distribution-bundle updated from v3.0.33 to v3.0.34
   See changes: https://github.com/sensiolabs/SensioDistributionBundle/compare/v3.0.33...v3.0.34
   Release notes: https://github.com/sensiolabs/SensioDistributionBundle/releases/tag/v3.0.34

 - friendsofsymfony/rest-bundle updated from 1.7.2 to 1.7.4
   See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.2...1.7.4
   Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.4

 - nelmio/api-doc-bundle updated from 2.10.3 to 2.11.0
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.10.3...2.11.0
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.0

 - j0k3r/graby-site-config updated from 1.0.6 to 1.0.9
   See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.6...1.0.9
   Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.9

 - j0k3r/safecurl updated from v1.1.1 to 2.0.2
   See changes: https://github.com/j0k3r/safecurl/compare/v1.1.1...2.0.2
   Release notes: https://github.com/j0k3r/safecurl/releases/tag/2.0.2

 - j0k3r/graby updated from 1.0.4 to 1.0.6
   See changes: https://github.com/j0k3r/graby/compare/1.0.4...1.0.6
   Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.6

 - scheb/two-factor-bundle updated from v1.4.7 to v1.5.0
   See changes: https://github.com/scheb/two-factor-bundle/compare/v1.4.7...v1.5.0
   Release notes: https://github.com/scheb/two-factor-bundle/releases/tag/v1.5.0

 - sebastian/recursion-context updated from 1.0.1 to 1.0.2
   See changes: https://github.com/sebastianbergmann/recursion-context/compare/1.0.1...1.0.2
   Release notes: https://github.com/sebastianbergmann/recursion-context/releases/tag/1.0.2

 - sebastian/environment updated from 1.3.2 to 1.3.3
   See changes: https://github.com/sebastianbergmann/environment/compare/1.3.2...1.3.3
   Release notes: https://github.com/sebastianbergmann/environment/releases/tag/1.3.3

 - sebastian/diff updated from 1.3.0 to 1.4.0
   See changes: https://github.com/sebastianbergmann/diff/compare/1.3.0...1.4.0
   Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.0

 - phpunit/phpunit updated from 4.8.18 to 4.8.19
   See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.18...4.8.19
   Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.19

 - symfony/phpunit-bridge updated from v2.7.7 to v2.8.0
   See changes: https://github.com/symfony/phpunit-bridge/compare/v2.7.7...v2.8.0
   Release notes: https://github.com/symfony/phpunit-bridge/releases/tag/v2.8.0

 - doctrine/doctrine-cache-bundle updated from 1.2.1 to 1.2.2
   See changes: https://github.com/doctrine/DoctrineCacheBundle/compare/1.2.1...1.2.2
   Release notes: https://github.com/doctrine/DoctrineCacheBundle/releases/tag/1.2.2

 - doctrine/doctrine-bundle updated from v1.5.2 to 1.6.1
   See changes: https://github.com/doctrine/DoctrineBundle/compare/v1.5.2...1.6.1
   Release notes: https://github.com/doctrine/DoctrineBundle/releases/tag/1.6.1

 - phpzip/phpzip updated from 2.0.7 to 2.0.8
   See changes: https://github.com/Grandt/PHPZip/compare/2.0.7...2.0.8
   Release notes: https://github.com/Grandt/PHPZip/releases/tag/2.0.8

 - kphoen/rulerz updated from 0.14.0 to 0.16.1
   See changes: https://github.com/K-Phoen/rulerz/compare/0.14.0...0.16.1
   Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.1

 - friendsofsymfony/user-bundle updated from dev-master to dev-master
   See changes: https://github.com/FriendsOfSymfony/FOSUserBundle/compare/45d6f40...e39b040

Merge pull request #1574 from jjanvier/readme

Fix typo and set version in the README

Fix typo and set version in the README

Merge pull request #1561 from FabienM/docker-compose

Add basic docker-compose configuration