aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #4152 from ldidry/add-env-var-dev.shJérémy Benoist2019-11-191-2/+5
|\ \ | | | | | | Add environment variables to control scripts/dev.sh behavior
| * | Add environment variables to control scripts/dev.sh behaviorLuc Didry2019-10-091-2/+5
| |/
* | Merge pull request #4150 from ldidry/fix-3804Jérémy Benoist2019-11-193-0/+16
|\ \ | | | | | | 💄 Add untagged list link to filter menu
| * | 💄 Add untagged list link to filter menuLuc Didry2019-10-103-0/+16
| |/ | | | | | | Fix #3804
* | Merge pull request #4195 from wallabag/dependabot/composer/doctrine/orm-2.6.6Jérémy Benoist2019-11-193-12/+12
|\ \ | | | | | | Bump doctrine/orm from 2.6.4 to 2.6.6
| * | Fix tests (again..)Jeremy Benoist2019-11-192-2/+2
| | |
| * | Bump doctrine/orm from 2.6.4 to 2.6.6dependabot-preview[bot]2019-11-191-10/+10
|/ / | | | | | | | | | | | | Bumps [doctrine/orm](https://github.com/doctrine/orm) from 2.6.4 to 2.6.6. - [Release notes](https://github.com/doctrine/orm/releases) - [Commits](https://github.com/doctrine/orm/compare/v2.6.4...v2.6.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4175 from wallabag/import-elcuratorNicolas Lœuillet2019-11-1525-1/+342
|\ \ | | | | | | Added elCurator import
| * | Added elCurator importNicolas Lœuillet2019-11-1525-1/+342
|/ /
* | Merge pull request #4190 from ↵Jérémy Benoist2019-11-141-17/+17
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/symfony/monolog-bundle-3.5.0 Bump symfony/monolog-bundle from 3.4.0 to 3.5.0
| * | Bump symfony/monolog-bundle from 3.4.0 to 3.5.0dependabot-preview[bot]2019-11-141-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [symfony/monolog-bundle](https://github.com/symfony/monolog-bundle) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/symfony/monolog-bundle/releases) - [Changelog](https://github.com/symfony/monolog-bundle/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/monolog-bundle/compare/v3.4.0...v3.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #4188 from ↵Jérémy Benoist2019-11-141-24/+27
|\ \ \ | |/ / |/| | | | | | | | wallabag/dependabot/composer/doctrine/doctrine-fixtures-bundle-3.3.0 Bump doctrine/doctrine-fixtures-bundle from 3.2.2 to 3.3.0
| * | Bump doctrine/doctrine-fixtures-bundle from 3.2.2 to 3.3.0dependabot-preview[bot]2019-11-141-24/+27
|/ / | | | | | | | | | | | | | | Bumps [doctrine/doctrine-fixtures-bundle](https://github.com/doctrine/DoctrineFixturesBundle) from 3.2.2 to 3.3.0. - [Release notes](https://github.com/doctrine/DoctrineFixturesBundle/releases) - [Changelog](https://github.com/doctrine/DoctrineFixturesBundle/blob/master/CHANGELOG-3.1.md) - [Commits](https://github.com/doctrine/DoctrineFixturesBundle/compare/3.2.2...3.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4183 from wallabag/update-depsJérémy Benoist2019-11-1487-673/+225
|\ \ | | | | | | Update deps
| * | Fix testsJeremy Benoist2019-11-131-2/+2
| | |
| * | Security updateJeremy Benoist2019-11-131-68/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updating symfony/symfony (v3.4.34 => v3.4.35) - Updating monolog/monolog (1.25.1 => 1.25.2) - Updating j0k3r/graby (2.0.2 => 2.1.0) - Updating symfony/http-client (v4.3.7 => v4.3.8) - Updating symfony/mime (v4.3.7 => v4.3.8) - Updating symfony/phpunit-bridge (v4.3.7 => v4.3.8) - Updating zendframework/zend-diactoros (2.1.5 => 2.2.0)
| * | Locked dbal to 2.9.2Jeremy Benoist2019-11-122-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the 2.9.3 seems to break test. Like a conflict with `DoctrineTestBundle` I guess (which can't be updated because we are still allowing PHP 7.1 and is not). The generated error usually appear when we update data using a service during test (like changing the craue config). Here is the error: ``` Testing tests/Wallabag/CoreBundle/Controller/ PHP Fatal error: Uncaught PDOException: There is no active transaction in /Users/jeremy/Sites/github/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php:142 Stack trace: #0 /Users/jeremy/Sites/github/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php(142): PDO->rollBack() #1 /Users/jeremy/Sites/github/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitListener.php(39): DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver::rollBack() #2 /Users/jeremy/Sites/github/wallabag/vendor/bin/.phpunit/phpunit-7.4/src/Framework/TestResult.php(412): DAMA\DoctrineTestBundle\PHPUnit\PHPUnitListener->endTest(Object(Tests\Wallabag\CoreBundle\Controller\ConfigControllerTest), 3.3917479515076) #3 /Users/jeremy/Sites/github/wallabag/vendor/bin/.phpunit/phpunit-7.4/src/Framework/TestResult.php(893): PHPUnit\Framework\TestResult->endTest(Object(Tests\Wallabag\CoreBundle\Controller\ConfigControllerTest), 3.3917479515076 in /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php on line 91 Fatal error: Uncaught PDOException: There is no active transaction in /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php on line 91 InvalidArgumentException: The controller for URI "/config" is not callable. The "kernel" service is synthetic, it needs to be set at boot time before it can be used. in /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php on line 91 Call Stack: 3.4732 57305872 1. Symfony\Component\Debug\ErrorHandler->handleException() /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php:0 3.5000 58014320 2. Symfony\Component\Debug\ErrorHandler->handleException() /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php:613 ```
| * | Fix testsJeremy Benoist2019-11-121-1/+0
| | |
| * | Update depsJeremy Benoist2019-11-1284-698/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also CS (because cs-fixer got an update) Package operations: 0 installs, 26 updates, 0 removals - Updating twig/twig (v2.12.1 => v2.12.2) - Updating symfony/symfony (v3.4.33 => v3.4.34) - Updating doctrine/event-manager (v1.0.0 => 1.1.0) - Updating doctrine/collections (v1.6.2 => 1.6.3) - Updating doctrine/cache (v1.8.1 => 1.9.0) - Updating doctrine/persistence (1.1.1 => 1.2.0) - Updating doctrine/inflector (v1.3.0 => 1.3.1) - Updating symfony/mime (v4.3.5 => v4.3.7) - Updating swiftmailer/swiftmailer (v6.2.1 => v6.2.3) - Updating symfony/swiftmailer-bundle (v3.3.0 => v3.3.1) - Updating doctrine/dbal (v2.9.2 => v2.9.3) - Updating doctrine/instantiator (1.2.0 => 1.3.0) - Updating j0k3r/graby-site-config (1.0.93 => 1.0.94) - Updating phpoption/phpoption (1.5.0 => 1.5.2) - Updating symfony/http-client-contracts (v1.1.7 => v1.1.8) - Updating symfony/http-client (v4.3.5 => v4.3.7) - Updating sensiolabs/security-checker (v6.0.2 => v6.0.3) - Updating paragonie/constant_time_encoding (v2.2.3 => v2.3.0) - Updating scheb/two-factor-bundle (v4.7.1 => v4.8.0) - Updating symfony/phpunit-bridge (v4.3.6 => v4.3.7) - Updating composer/xdebug-handler (1.3.3 => 1.4.0) - Updating friendsofphp/php-cs-fixer (v2.15.3 => v2.16.0) - Updating doctrine/data-fixtures (v1.3.2 => 1.3.3) - Updating nette/schema (v1.0.0 => v1.0.1) - Updating nikic/php-parser (v4.2.4 => v4.3.0) - Updating sentry/sentry (2.2.2 => 2.2.4)
* | | Merge pull request #4163 from aaa2000/docker-increase-php-memory-limitJérémy Benoist2019-11-121-0/+2
|\ \ \ | | | | | | | | Increase php memory limit PHP Docker
| * | | Increase php memory limit PHP Dockeradev2019-10-271-0/+2
| | | |
* | | | Merge pull request #4162 from aaa2000/docker-add-extensionsJérémy Benoist2019-11-121-2/+7
|\ \ \ \ | |_|/ / |/| | | Add package and PHP extension to PHP docker
| * | | Add package and PHP extension to PHP dockeradev2019-10-271-2/+7
| |/ /
* | | Merge pull request #4171 from ↵Jérémy Benoist2019-11-111-5/+5
|\ \ \ | | | | | | | | | | | | | | | | wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.6 Bump symfony/phpunit-bridge from 4.3.5 to 4.3.6
| * | | Bump symfony/phpunit-bridge from 4.3.5 to 4.3.6dependabot-preview[bot]2019-11-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/symfony/phpunit-bridge/releases) - [Changelog](https://github.com/symfony/phpunit-bridge/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/phpunit-bridge/compare/v4.3.5...v4.3.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #4170 from ↵Jérémy Benoist2019-11-111-20/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | wallabag/dependabot/composer/symfony/symfony-3.4.33 Bump symfony/symfony from 3.4.32 to 3.4.33
| * | | | Bump symfony/symfony from 3.4.32 to 3.4.33dependabot-preview[bot]2019-11-041-20/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.32 to 3.4.33. - [Release notes](https://github.com/symfony/symfony/releases) - [Changelog](https://github.com/symfony/symfony/blob/v3.4.33/CHANGELOG-3.4.md) - [Commits](https://github.com/symfony/symfony/compare/v3.4.32...v3.4.33) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #4167 from ↵Jérémy Benoist2019-11-111-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | wallabag/dependabot/composer/guzzlehttp/guzzle-5.3.4 Bump guzzlehttp/guzzle from 5.3.3 to 5.3.4
| * | | | Bump guzzlehttp/guzzle from 5.3.3 to 5.3.4dependabot-preview[bot]2019-10-311-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/5.3.4/CHANGELOG.md) - [Commits](https://github.com/guzzle/guzzle/compare/5.3.3...5.3.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #4174 from ↵Jérémy Benoist2019-11-111-5/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | wallabag/dependabot/composer/m6web/redis-mock-4.7.0 Bump m6web/redis-mock from 4.6.1 to 4.7.0
| * | | Bump m6web/redis-mock from 4.6.1 to 4.7.0dependabot-preview[bot]2019-11-051-5/+5
|/ / / | | | | | | | | | | | | | | | | | | Bumps [m6web/redis-mock](https://github.com/M6Web/RedisMock) from 4.6.1 to 4.7.0. - [Release notes](https://github.com/M6Web/RedisMock/releases) - [Commits](https://github.com/M6Web/RedisMock/compare/v4.6.1...v4.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #4160 from ↵Jérémy Benoist2019-10-231-23/+26
|\ \ \ | | | | | | | | | | | | | | | | wallabag/dependabot/composer/phpstan/phpstan-0.11.19 Bump phpstan/phpstan from 0.11.18 to 0.11.19
| * | | Bump phpstan/phpstan from 0.11.18 to 0.11.19dependabot-preview[bot]2019-10-231-23/+26
|/ / / | | | | | | | | | | | | | | | | | | Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.11.18 to 0.11.19. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.11.18...0.11.19) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #4159 from wallabag/fix/tests-update-depsJérémy Benoist2019-10-222-124/+126
|\ \ \ | | | | | | | | Fix tests & update deps
| * | | Fix tests & update depsJeremy Benoist2019-10-222-124/+126
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updating twig/twig (v2.12.0 => v2.12.1) - Updating symfony/mime (v4.3.4 => v4.3.5) - Updating friendsofsymfony/rest-bundle (2.5.0 => 2.6.0) - Updating j0k3r/graby-site-config (1.0.91 => 1.0.93) - Updating monolog/monolog (1.24.0 => 1.25.1) - Updating simplepie/simplepie (1.5.2 => 1.5.3) - Updating symfony/http-client-contracts (v1.1.6 => v1.1.7) - Updating symfony/http-client (v4.3.4 => v4.3.5) - Updating nette/utils (v3.0.1 => v3.0.2) - Updating phpstan/phpstan (0.11.17 => 0.11.18) - Updating zendframework/zend-code (3.3.2 => 3.4.0) - Updating php-amqplib/php-amqplib (v2.10.0 => v2.10.1) - Updating beberlei/assert (v3.2.3 => v3.2.6) - Updating zendframework/zend-diactoros (2.1.3 => 2.1.5) - Updating sentry/sentry (2.2.1 => 2.2.2)
* | | Merge pull request #4156 from ↵Jérémy Benoist2019-10-211-5/+6
|\ \ \ | | | | | | | | | | | | | | | | wallabag/dependabot/composer/phpstan/phpstan-0.11.17 Bump phpstan/phpstan from 0.11.16 to 0.11.17
| * | | Bump phpstan/phpstan from 0.11.16 to 0.11.17dependabot-preview[bot]2019-10-211-5/+6
| |/ / | | | | | | | | | | | | | | | | | | Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.11.16 to 0.11.17. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.11.16...0.11.17) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #4155 from ↵Jérémy Benoist2019-10-211-17/+17
|\ \ \ | |/ / |/| | | | | | | | wallabag/dependabot/composer/symfony/swiftmailer-bundle-3.3.0 Bump symfony/swiftmailer-bundle from 3.2.8 to 3.3.0
| * | Bump symfony/swiftmailer-bundle from 3.2.8 to 3.3.0dependabot-preview[bot]2019-10-211-17/+17
|/ / | | | | | | | | | | | | | | Bumps [symfony/swiftmailer-bundle](https://github.com/symfony/swiftmailer-bundle) from 3.2.8 to 3.3.0. - [Release notes](https://github.com/symfony/swiftmailer-bundle/releases) - [Changelog](https://github.com/symfony/swiftmailer-bundle/blob/master/CHANGELOG) - [Commits](https://github.com/symfony/swiftmailer-bundle/compare/v3.2.8...v3.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4149 from ldidry/fix-4130Jérémy Benoist2019-10-112-4/+4
|\ \ | |/ |/| 🐛 — Fix duplicated icons on "Search engine" and "new link" forms
| * 🐛 — Fix duplicated icons on "Search engine" and "new link" formsLuc Didry2019-10-092-4/+4
|/
* Merge pull request #4141 from SofLesc/portuguese-translationsJérémy Benoist2019-10-082-193/+193
|\ | | | | Updating portuguese translations
| * Updating portuguese translationsSofia Lescano2019-10-072-193/+193
| |
* | Merge pull request #4147 from wallabag/add-code-of-conduct-1Nicolas Lœuillet2019-10-081-0/+76
|\ \ | | | | | | Create code of conduct
| * | Create code of conductThomas Citharel2019-10-081-0/+76
|/ /
* | Merge pull request #4145 from ↵Jérémy Benoist2019-10-081-5/+5
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.5 Bump symfony/phpunit-bridge from 4.3.4 to 4.3.5
| * | Bump symfony/phpunit-bridge from 4.3.4 to 4.3.5dependabot-preview[bot]2019-10-081-5/+5
|/ / | | | | | | | | | | | | | | Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.4 to 4.3.5. - [Release notes](https://github.com/symfony/phpunit-bridge/releases) - [Changelog](https://github.com/symfony/phpunit-bridge/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/phpunit-bridge/compare/v4.3.4...v4.3.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4146 from ↵Jérémy Benoist2019-10-081-26/+25
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/symfony/symfony-3.4.32 Bump symfony/symfony from 3.4.31 to 3.4.32
| * | Bump symfony/symfony from 3.4.31 to 3.4.32dependabot-preview[bot]2019-10-081-26/+25
|/ / | | | | | | | | | | | | | | Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.31 to 3.4.32. - [Release notes](https://github.com/symfony/symfony/releases) - [Changelog](https://github.com/symfony/symfony/blob/v3.4.32/CHANGELOG-3.4.md) - [Commits](https://github.com/symfony/symfony/compare/v3.4.31...v3.4.32) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4139 from SofLesc/spanish-translationsJérémy Benoist2019-10-072-111/+111
|\ \ | | | | | | Update spanish translations
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 15:40:59 +0000