aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-02-071-0/+1
|\
| * Update composer.json to add php-tidy (ext-tidy)Eloi Coutant2019-01-161-0/+1
| | | | | | Should fix https://github.com/wallabag/wallabag/issues/3844 for milestone https://github.com/wallabag/wallabag/milestone/63.
* | Add backup codesJeremy Benoist2019-01-231-1/+2
| |
* | Enable OTP 2FAJeremy Benoist2019-01-231-3/+3
| | | | | | | | | | | | | | | | | | - Update SchebTwoFactorBundle to version 3 - Enable Google 2fa on the bundle - Disallow ability to use both email and google as 2fa - Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7) - use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add` - update admin to be able to create/reset the 2fa
* | Merge pull request #3858 from wallabag/bump-ocramiusJérémy Benoist2019-01-181-3/+8
|\ \ | | | | | | Bump ocramius/proxy-manager
| * | Bump ocramius/proxy-managerThomas Citharel2019-01-171-3/+8
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Enable PHPStanJeremy Benoist2019-01-181-1/+5
| | | | | | | | | | | | | | | - Fix error for level 0 & 1 (level 7 has 699 errors...) - Add `updated_at` to site_credential (so the `timestamps()` method applies correctly)
* | | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-01-151-2/+2
|\ \ \ | |/ / |/| / | |/
| * Come back to stable versionJeremy Benoist2019-01-141-1/+1
| | | | | | | | Previous one was used because some PHPUnit version where deleted and tests can't be run anymore.
| * No more dev for guzzle-site-authenticatorJeremy Benoist2018-12-131-1/+1
| |
* | Use our own fork for CraueConfigBundleJeremy Benoist2018-11-281-1/+6
| | | | | | | | Mostly to fix utf8mb4 issue
* | Fix testsJeremy Benoist2018-11-281-21/+20
| |
* | Jump to unrelease predisJeremy Benoist2018-11-281-1/+1
| | | | | | | | To fix deprecated message regarding `each()`
* | CleanupJeremy Benoist2018-11-281-7/+22
| |
* | Jump to PHP 7.1+Jeremy Benoist2018-11-251-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-11-251-1/+1
|\| | | | | | | | | | | | | | | # Conflicts: # web/wallassets/baggy.js # web/wallassets/manifest.json # web/wallassets/material.css # web/wallassets/material.js
| * Use latest bridge to avoid PHPUnit breakJeremy Benoist2018-11-231-1/+1
| | | | | | | | Because branch 4.8 & 5.7 have been removed
* | Jump to Symfony 3.4Jeremy Benoist2018-10-041-5/+4
|/ | | | | | | Thanks to the BC compatibility, almost nothing have to be changed. All changes are related to new bundle version of: - SensioFrameworkExtraBundle - DoctrineFixturesBundle
* Looked UserBundle again.Jeremy Benoist2018-02-241-1/+1
| | | | | | | See https://github.com/FriendsOfSymfony/FOSUserBundle/compare/v2.0.2...v2.1.0#diff-8a79d0e62995dd549be4e463c35a8cc3 It generate an error about a variable called `registration_enabled` which can not be found. So I guess we are in the case of “such usage” about BC in UserBundle. Don’t want to loose time finding how to fix it. Rollback to the working version.
* Update dama/doctrine-test-bundleJeremy Benoist2017-12-181-1/+1
| | | | | | Because: PHP Fatal error: Class 'PHPUnit_Framework_BaseTestListener' not found in /home/travis/build/wallabag/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/LegacyPHPUnitListener.php on line 7
* composer: update dependency versions to reduce memory footprintKevin Decherf2017-11-191-28/+28
| | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Jump to Simpleue 2.0Jeremy Benoist2017-11-181-1/+1
| | | | The 1.3.0 tag is introducing BC so we jump to the 2.0
* Jump to Symfony 3.3 & update others depsJeremy Benoist2017-10-091-7/+7
| | | | Also update tests urls
* better entry txt export using html2textNicolas Hart2017-08-271-1/+2
|
* Add a real configuration for CS-FixerJeremy Benoist2017-07-011-1/+1
|
* Crypt site credential passwordJeremy Benoist2017-06-201-2/+3
|
* Merge pull request #3137 from aaa2000/isolated-testsJérémy Benoist2017-06-011-2/+3
|\ | | | | Isolated tests
| * Isolated testsadev2017-05-311-2/+3
| | | | | | | | Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
* | PR has been merged in grabyJérémy Benoist2017-05-311-1/+1
| |
* | Remove htmlawed and use graby insteadJeremy Benoist2017-05-311-1/+0
| | | | | | | | | | Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side). Still needs some tests.
* | Use graby ContentExtractor to clean htmlJeremy Benoist2017-05-311-1/+1
|/ | | | It might be better to re-use some graby functionalities to clean html instead of building a new system.
* Switch back to latest guzzle-site-authenticatorJeremy Benoist2017-05-241-1/+1
|
* Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-191-1/+1
|\
| * Lock guzzle-site-authenticator to avoid errorJeremy Benoist2017-05-161-1/+1
| |
* | Upgraded CraueConfigBundle to 2.0Nicolas Lœuillet2017-05-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-011-1/+1
|\|
| * Make symfony-assets-install use `relative` symlinksOlivier Mehani2017-04-221-1/+1
| | | | | | | | | | | | | | This facilitates packaging, when installing in a different work PREFIX than the final install location. Signed-off-by: Olivier Mehani <shtrom@ssji.net>
* | Remove dev FOSUserBundleJeremy Benoist2017-04-181-1/+1
| |
* | Merge pull request #2861 from wallabag/2.3-droping-5.5Jérémy Benoist2017-03-281-2/+2
|\ \ | |/ |/| Dropping PHP 5.5
| * Dropping PHP 5.5Jeremy Benoist2017-02-111-2/+2
| |
* | Use wallabag/tcpdfJeremy Benoist2017-02-241-1/+1
|/ | | | It should restore the PHP 7.1 compatibility
* Update RulerZKévin Gomez2017-02-051-2/+1
|
* Restored correct version for framework-extra-bundleNicolas Lœuillet2017-02-041-1/+1
| | | The bundle was fixed in latest version.
* Freezed sensio/framework-extra-bundle versionNicolas Lœuillet2017-02-021-1/+1
|
* Lock kphoen/rulerz to avoid breaking changesJeremy Benoist2017-01-261-0/+1
|
* Use latest bdunogier/guzzle-site-authenticatorJeremy Benoist2017-01-101-1/+1
|
* Use simple-phpunit instead of phpunitJeremy Benoist2016-12-131-1/+0
| | | | | To avoid problem with the Yaml constant http://symfony.com/blog/how-to-solve-phpunit-issues-in-symfony-3-2-applications
* Upgrade to Symfony 3.2Nicolas Lœuillet2016-11-301-1/+1
|
* Fix MonologBundle deprecationJeremy Benoist2016-11-221-1/+1
| | | | The Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\DebugHandlerPass class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.
* Re-use FOSUser master branchJeremy Benoist2016-11-221-1/+1
|