Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-02-07 | 1 | -0/+1 |
|\ | |||||
| * | Update composer.json to add php-tidy (ext-tidy) | Eloi Coutant | 2019-01-16 | 1 | -0/+1 |
| | | | | | | Should fix https://github.com/wallabag/wallabag/issues/3844 for milestone https://github.com/wallabag/wallabag/milestone/63. | ||||
* | | Add backup codes | Jeremy Benoist | 2019-01-23 | 1 | -1/+2 |
| | | |||||
* | | Enable OTP 2FA | Jeremy Benoist | 2019-01-23 | 1 | -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-ocramius | Jérémy Benoist | 2019-01-18 | 1 | -3/+8 |
|\ \ | | | | | | | Bump ocramius/proxy-manager | ||||
| * | | Bump ocramius/proxy-manager | Thomas Citharel | 2019-01-17 | 1 | -3/+8 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | Enable PHPStan | Jeremy Benoist | 2019-01-18 | 1 | -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.4 | Jeremy Benoist | 2019-01-15 | 1 | -2/+2 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Come back to stable version | Jeremy Benoist | 2019-01-14 | 1 | -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-authenticator | Jeremy Benoist | 2018-12-13 | 1 | -1/+1 |
| | | |||||
* | | Use our own fork for CraueConfigBundle | Jeremy Benoist | 2018-11-28 | 1 | -1/+6 |
| | | | | | | | | Mostly to fix utf8mb4 issue | ||||
* | | Fix tests | Jeremy Benoist | 2018-11-28 | 1 | -21/+20 |
| | | |||||
* | | Jump to unrelease predis | Jeremy Benoist | 2018-11-28 | 1 | -1/+1 |
| | | | | | | | | To fix deprecated message regarding `each()` | ||||
* | | Cleanup | Jeremy Benoist | 2018-11-28 | 1 | -7/+22 |
| | | |||||
* | | Jump to PHP 7.1+ | Jeremy Benoist | 2018-11-25 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2018-11-25 | 1 | -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 break | Jeremy Benoist | 2018-11-23 | 1 | -1/+1 |
| | | | | | | | | Because branch 4.8 & 5.7 have been removed | ||||
* | | Jump to Symfony 3.4 | Jeremy Benoist | 2018-10-04 | 1 | -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 Benoist | 2018-02-24 | 1 | -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-bundle | Jeremy Benoist | 2017-12-18 | 1 | -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 footprint | Kevin Decherf | 2017-11-19 | 1 | -28/+28 |
| | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Jump to Simpleue 2.0 | Jeremy Benoist | 2017-11-18 | 1 | -1/+1 |
| | | | | The 1.3.0 tag is introducing BC so we jump to the 2.0 | ||||
* | Jump to Symfony 3.3 & update others deps | Jeremy Benoist | 2017-10-09 | 1 | -7/+7 |
| | | | | Also update tests urls | ||||
* | better entry txt export using html2text | Nicolas Hart | 2017-08-27 | 1 | -1/+2 |
| | |||||
* | Add a real configuration for CS-Fixer | Jeremy Benoist | 2017-07-01 | 1 | -1/+1 |
| | |||||
* | Crypt site credential password | Jeremy Benoist | 2017-06-20 | 1 | -2/+3 |
| | |||||
* | Merge pull request #3137 from aaa2000/isolated-tests | Jérémy Benoist | 2017-06-01 | 1 | -2/+3 |
|\ | | | | | Isolated tests | ||||
| * | Isolated tests | adev | 2017-05-31 | 1 | -2/+3 |
| | | | | | | | | Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation. | ||||
* | | PR has been merged in graby | Jérémy Benoist | 2017-05-31 | 1 | -1/+1 |
| | | |||||
* | | Remove htmlawed and use graby instead | Jeremy Benoist | 2017-05-31 | 1 | -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 html | Jeremy Benoist | 2017-05-31 | 1 | -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-authenticator | Jeremy Benoist | 2017-05-24 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 1 | -1/+1 |
|\ | |||||
| * | Lock guzzle-site-authenticator to avoid error | Jeremy Benoist | 2017-05-16 | 1 | -1/+1 |
| | | |||||
* | | Upgraded CraueConfigBundle to 2.0 | Nicolas Lœuillet | 2017-05-12 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-01 | 1 | -1/+1 |
|\| | |||||
| * | Make symfony-assets-install use `relative` symlinks | Olivier Mehani | 2017-04-22 | 1 | -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 FOSUserBundle | Jeremy Benoist | 2017-04-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2861 from wallabag/2.3-droping-5.5 | Jérémy Benoist | 2017-03-28 | 1 | -2/+2 |
|\ \ | |/ |/| | Dropping PHP 5.5 | ||||
| * | Dropping PHP 5.5 | Jeremy Benoist | 2017-02-11 | 1 | -2/+2 |
| | | |||||
* | | Use wallabag/tcpdf | Jeremy Benoist | 2017-02-24 | 1 | -1/+1 |
|/ | | | | It should restore the PHP 7.1 compatibility | ||||
* | Update RulerZ | Kévin Gomez | 2017-02-05 | 1 | -2/+1 |
| | |||||
* | Restored correct version for framework-extra-bundle | Nicolas Lœuillet | 2017-02-04 | 1 | -1/+1 |
| | | | The bundle was fixed in latest version. | ||||
* | Freezed sensio/framework-extra-bundle version | Nicolas Lœuillet | 2017-02-02 | 1 | -1/+1 |
| | |||||
* | Lock kphoen/rulerz to avoid breaking changes | Jeremy Benoist | 2017-01-26 | 1 | -0/+1 |
| | |||||
* | Use latest bdunogier/guzzle-site-authenticator | Jeremy Benoist | 2017-01-10 | 1 | -1/+1 |
| | |||||
* | Use simple-phpunit instead of phpunit | Jeremy Benoist | 2016-12-13 | 1 | -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.2 | Nicolas Lœuillet | 2016-11-30 | 1 | -1/+1 |
| | |||||
* | Fix MonologBundle deprecation | Jeremy Benoist | 2016-11-22 | 1 | -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 branch | Jeremy Benoist | 2016-11-22 | 1 | -1/+1 |
| |