aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Update app/config/config.ymlfix/4215/add-label-and-issuer-to-o2p-configThomas Citharel2020-03-261-1/+1
|
* Add label and issuer to otp configThomas Citharel2020-03-261-0/+2
| | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Merge pull request #4293 from ↵Kevin Decherf2020-03-151-9/+12
|\ | | | | | | | | wallabag/dependabot/composer/friendsofsymfony/oauth2-php-1.3.0 [Security] Bump friendsofsymfony/oauth2-php from 1.2.3 to 1.3.0
| * [Security] Bump friendsofsymfony/oauth2-php from 1.2.3 to 1.3.0dependabot-preview[bot]2020-03-151-9/+12
| | | | | | | | | | | | | | | | Bumps [friendsofsymfony/oauth2-php](https://github.com/FriendsOfSymfony/oauth2-php) from 1.2.3 to 1.3.0. **This update includes a security fix.** - [Release notes](https://github.com/FriendsOfSymfony/oauth2-php/releases) - [Changelog](https://github.com/FriendsOfSymfony/oauth2-php/blob/master/CHANGELOG.txt) - [Commits](https://github.com/FriendsOfSymfony/oauth2-php/compare/1.2.3...1.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4290 from wallabag/ab0c5ef1Kevin Decherf2020-03-156-79/+0
|\ \ | | | | | | Remove capistrano-related files
| * | Remove capistrano-related filesKevin Decherf2020-03-086-79/+0
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #4278 from wallabag/fix/4240Kevin Decherf2020-03-155-17/+104
|\ \ | |/ |/| Fix entries export from search view
| * travis: remove double triggers for PR, remove nightlyKevin Decherf2020-02-231-3/+5
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * ExportController: fix entries export from search viewKevin Decherf2020-02-234-14/+99
| | | | | | | | | | | | Fixes #4240 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #4287 from ↵Kevin Decherf2020-03-061-5/+5
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.2 Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2
| * | Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2dependabot-preview[bot]2020-03-051-5/+5
|/ / | | | | | | | | | | | | | | Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.7.1 to 2.7.2. - [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases) - [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/master/CHANGELOG.md) - [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.7.1...2.7.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4282 from ↵Kevin Decherf2020-02-291-5/+5
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.1 Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1
| * | Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1dependabot-preview[bot]2020-02-251-5/+5
|/ / | | | | | | | | | | | | | | Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases) - [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/2.7.1/CHANGELOG.md) - [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.7.0...2.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4280 from ↵Kevin Decherf2020-02-191-6/+6
|\ \ | |/ |/| | | | | wallabag/dependabot/composer/scheb/two-factor-bundle-4.14.0 Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0
| * Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0dependabot-preview[bot]2020-02-171-6/+6
|/ | | | | | | Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.13.0 to 4.14.0. - [Release notes](https://github.com/scheb/two-factor-bundle/releases) - [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.13.0...v4.14.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #4277 from ↵Jérémy Benoist2020-02-031-5/+5
|\ | | | | | | | | wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.11 Bump symfony/phpunit-bridge from 4.3.10 to 4.3.11
| * Bump symfony/phpunit-bridge from 4.3.10 to 4.3.11dependabot-preview[bot]2020-02-031-5/+7
| | | | | | | | | | | | | | | | Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.10 to 4.3.11. - [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.10...v4.3.11) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4276 from ↵Jérémy Benoist2020-02-031-5/+5
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/scheb/two-factor-bundle-4.13.0 Bump scheb/two-factor-bundle from 4.12.0 to 4.13.0
| * | Bump scheb/two-factor-bundle from 4.12.0 to 4.13.0dependabot-preview[bot]2020-02-031-5/+7
| |/ | | | | | | | | | | | | Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.12.0 to 4.13.0. - [Release notes](https://github.com/scheb/two-factor-bundle/releases) - [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.12.0...v4.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4275 from ↵Jérémy Benoist2020-02-031-7/+10
|\ \ | |/ |/| | | | | wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.0 Bump friendsofsymfony/rest-bundle from 2.6.0 to 2.7.0
| * Bump friendsofsymfony/rest-bundle from 2.6.0 to 2.7.0dependabot-preview[bot]2020-02-031-7/+10
|/ | | | | | | | Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases) - [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/master/CHANGELOG.md) - [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.6.0...2.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #4264 from herrriehm/masterJérémy Benoist2020-01-2816-19/+19
|\ | | | | cosmetic changes
| * Update messages.es.ymlSebastian Riehm2020-01-271-1/+1
| |
| * fixed annoying typoSebastian Riehm2020-01-261-3/+3
| |
| * Update wallabag.ymlSebastian Riehm2020-01-261-3/+3
| | | | | | reverted generic urls
| * cosmetic changes:Sebastian Riehm2020-01-2516-19/+19
| | | | | | | | | | | | - http to https - replaced generic .com by specific TLD - updated some dead urls
* | Merge pull request #4257 from Simounet/feat/lang-attributeJérémy Benoist2020-01-285-9/+51
|\ \ | | | | | | Use lang attribute
| * | Use lang attributeSimounet2020-01-235-9/+51
| | |
* | | Merge pull request #4263 from wallabag/4251-firefox-printJérémy Benoist2020-01-274-2/+14
|\ \ \ | |_|/ |/| | Fix print of long pages
| * | baggy: remove logo from printed pagesKevin Decherf2020-01-252-1/+7
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | material: replace display: flex with block in print modeKevin Decherf2020-01-252-1/+7
|/ / | | | | | | | | | | | | | | | | | | | | This change is a workaround for a reported issue with printing flex items on Firefox See: https://bugzilla.mozilla.org/show_bug.cgi?id=939897 Fixes #4251 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #4261 from wallabag/dependabot/composer/j0k3r/graby-2.1.1Jérémy Benoist2020-01-241-25/+20
|\ \ | | | | | | Bump j0k3r/graby from 2.1.0 to 2.1.1
| * | Bump j0k3r/graby from 2.1.0 to 2.1.1dependabot-preview[bot]2020-01-241-25/+20
|/ / | | | | | | | | | | | | Bumps [j0k3r/graby](https://github.com/j0k3r/graby) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/j0k3r/graby/releases) - [Commits](https://github.com/j0k3r/graby/compare/2.1.0...2.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4260 from ↵Jérémy Benoist2020-01-231-18/+17
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/symfony/symfony-3.4.37 Bump symfony/symfony from 3.4.36 to 3.4.37
| * | Bump symfony/symfony from 3.4.36 to 3.4.37dependabot-preview[bot]2020-01-231-18/+17
|/ / | | | | | | | | | | | | | | Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.36 to 3.4.37. - [Release notes](https://github.com/symfony/symfony/releases) - [Changelog](https://github.com/symfony/symfony/blob/v3.4.37/CHANGELOG-3.4.md) - [Commits](https://github.com/symfony/symfony/compare/v3.4.36...v3.4.37) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4258 from ↵Jérémy Benoist2020-01-221-5/+5
|\ \ | |/ |/| | | | | wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.10 Bump symfony/phpunit-bridge from 4.3.9 to 4.3.10
| * Bump symfony/phpunit-bridge from 4.3.9 to 4.3.10dependabot-preview[bot]2020-01-221-5/+5
|/ | | | | | | | Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.9 to 4.3.10. - [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.9...v4.3.10) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #4255 from Simounet/feat/actions-from-sticky-btnJérémy Benoist2020-01-216-13/+43
|\ | | | | Feat/actions from sticky btn
| * Entry action buttons displayed on page end reachedSimounet2020-01-215-11/+28
| |
| * Sticky nav on entry action button clickSimounet2020-01-215-4/+17
|/
* Merge pull request #4254 from Simounet/feat/sidebar-sub-entries-no-hoverJérémy Benoist2020-01-212-9/+9
|\ | | | | Sidebar sub entries not conditioned by hover anymore
| * Sidebar sub entries not conditioned by hover anymoreSimounet2020-01-192-9/+9
| |
* | Merge pull request #4256 from ↵Jérémy Benoist2020-01-201-33/+37
|\ \ | |/ |/| | | | | wallabag/dependabot/composer/doctrine/doctrine-bundle-1.12.7 Bump doctrine/doctrine-bundle from 1.12.6 to 1.12.7
| * Bump doctrine/doctrine-bundle from 1.12.6 to 1.12.7dependabot-preview[bot]2020-01-201-33/+37
|/ | | | | | | Bumps [doctrine/doctrine-bundle](https://github.com/doctrine/DoctrineBundle) from 1.12.6 to 1.12.7. - [Release notes](https://github.com/doctrine/DoctrineBundle/releases) - [Commits](https://github.com/doctrine/DoctrineBundle/compare/1.12.6...1.12.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #4249 from wallabag/fix/env-not-well-definedJérémy Benoist2020-01-141-1/+8
|\ | | | | Ensure ENV is well defined when using make
| * Improve check by using listJeremy Benoist2020-01-131-6/+3
| | | | | | | | See https://stackoverflow.com/a/27335439/569101
| * Ensure ENV is well defined when using makeJeremy Benoist2020-01-131-1/+11
| | | | | | | | | | | | | | | | This command should fail before calling other commands (which will fail to because the environment is wrong): ``` ENV=toto make install ```
* | Merge pull request #4250 from wallabag/fix-twitter-sharingNicolas Lœuillet2020-01-132-2/+2
|\ \ | |/ |/| Fixed URL to share entry via twitter
| * Fixed URL to share entry via twitterNicolas Lœuillet2020-01-132-2/+2
|/
* Merge pull request #4247 from ↵Jérémy Benoist2020-01-131-5/+5
|\ | | | | | | | | wallabag/dependabot/composer/friendsofsymfony/jsrouting-bundle-2.5.3 Bump friendsofsymfony/jsrouting-bundle from 2.5.1 to 2.5.3