aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Bump nelmio/cors-bundle from 1.5.5 to 1.5.6dependabot-preview[bot]2019-06-181-5/+5
| | | | | | | | Bumps [nelmio/cors-bundle](https://github.com/nelmio/NelmioCorsBundle) from 1.5.5 to 1.5.6. - [Release notes](https://github.com/nelmio/NelmioCorsBundle/releases) - [Changelog](https://github.com/nelmio/NelmioCorsBundle/blob/master/CHANGELOG.md) - [Commits](https://github.com/nelmio/NelmioCorsBundle/compare/1.5.5...1.5.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #4009 from wallabag/fix/check-git-directoryJérémy Benoist2019-06-172-1/+7
|\ | | | | Check if .git directory exist before making the update
| * Return a different code when git isn't installedJeremy Benoist2019-06-141-1/+1
| |
| * Check if .git directory existJeremy Benoist2019-06-142-1/+7
| | | | | | | | If that folder doesn’t exist, it means the udpate script won’t be able to run because it uses git to retrieve the update.
* | Merge pull request #4010 from ↵Jérémy Benoist2019-06-141-5/+5
|\ \ | |/ |/| | | | | wallabag/dependabot/composer/doctrine/doctrine-fixtures-bundle-3.2.2 Bump doctrine/doctrine-fixtures-bundle from 3.2.0 to 3.2.2
| * Bump doctrine/doctrine-fixtures-bundle from 3.2.0 to 3.2.2dependabot-preview[bot]2019-06-141-5/+5
|/ | | | | | | | Bumps [doctrine/doctrine-fixtures-bundle](https://github.com/doctrine/DoctrineFixturesBundle) from 3.2.0 to 3.2.2. - [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.0...3.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #4008 from wallabag/travis-xenialJérémy Benoist2019-06-141-0/+2
|\ | | | | Fix Travis build on Xenial dist
| * Fix Travis build on Xenial distJeremy Benoist2019-06-121-0/+2
| |
* | Merge pull request #3995 from wallabag/feature/config-display-loginJérémy Benoist2019-06-1216-8/+36
|\ \ | |/ |/| Display login in config / user
| * TypoJérémy Benoist2019-06-121-1/+1
| |
| * Update translationsJeremy Benoist2019-06-0614-14/+14
| |
| * Display login in config / userJeremy Benoist2019-06-0616-8/+36
| | | | | | | | Just so the user can see its login
* | Update FUNDING.ymlJérémy Benoist2019-06-121-1/+1
| | | | | | "Some users provided are not enrolled in GitHub Sponsors."
* | Merge pull request #4006 from wallabag/add-sponsor-badgeJérémy Benoist2019-06-121-0/+2
|\ \ | | | | | | Create FUNDING.yml
| * | Create FUNDING.ymlJérémy Benoist2019-06-121-0/+2
|/ /
* | Merge pull request #4004 from ↵Jérémy Benoist2019-06-121-20/+21
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/php-http/httplug-bundle-1.16.0 Bump php-http/httplug-bundle from 1.15.2 to 1.16.0
| * | Bump php-http/httplug-bundle from 1.15.2 to 1.16.0dependabot-preview[bot]2019-06-121-20/+21
|/ / | | | | | | | | | | | | | | Bumps [php-http/httplug-bundle](https://github.com/php-http/HttplugBundle) from 1.15.2 to 1.16.0. - [Release notes](https://github.com/php-http/HttplugBundle/releases) - [Changelog](https://github.com/php-http/HttplugBundle/blob/master/CHANGELOG.md) - [Commits](https://github.com/php-http/HttplugBundle/compare/1.15.2...1.16.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #3999 from ↵Jérémy Benoist2019-06-111-5/+5
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.1 Bump symfony/phpunit-bridge from 4.3.0 to 4.3.1
| * | Bump symfony/phpunit-bridge from 4.3.0 to 4.3.1dependabot-preview[bot]2019-06-111-5/+5
|/ / | | | | | | | | | | | | | | Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.0 to 4.3.1. - [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.0...v4.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #3998 from ↵Jérémy Benoist2019-06-111-23/+30
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/doctrine/doctrine-fixtures-bundle-3.2.0 Bump doctrine/doctrine-fixtures-bundle from 3.1.0 to 3.2.0
| * | Bump doctrine/doctrine-fixtures-bundle from 3.1.0 to 3.2.0dependabot-preview[bot]2019-06-111-23/+30
|/ / | | | | | | | | | | | | | | Bumps [doctrine/doctrine-fixtures-bundle](https://github.com/doctrine/DoctrineFixturesBundle) from 3.1.0 to 3.2.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.1.0...3.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Show untagged entries count on tag list (#3993)Thomas Citharel2019-06-0618-2/+42
|\ \ | |/ |/| Show untagged entries count on tag list
| * Remove link when there are no untagged articlesJeremy Benoist2019-06-0617-4/+26
| |
| * Fix typo & CSJeremy Benoist2019-06-052-4/+5
| |
| * Show untagged entries count on tag listKevin Decherf2019-06-054-2/+19
| | | | | | | | | | | | Closes #3235 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3959 from wallabag/mig-tag-collationJérémy Benoist2019-06-063-1/+80
|\ \ | | | | | | mysql: change collation of tag label
| * | mysql: change collation of tag tableKevin Decherf2019-05-193-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | utf8mb4_unicode_ci considers that 'caché' is equal to 'cache' which can lead to attaching incorrect tags to entries. This issue is due to some unicode normalization done by MySQL. utf8mb4_bin makes no unicode normalization, letting wallabag to consider 'cache' and 'caché' as two different tags. We change the collation of the whole table as Doctrine does not support setting a collation on a column for a specific platform (it tries to apply utf8mb4_bin even for pgsql and sqlite). Fixes #3302 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3994 from wallabag/feature/revoke-feed-tokenKevin Decherf2019-06-0518-13/+85
|\ \ \ | | | | | | | | Add ability to revoke feed token
| * | | Add ability to revoke feed tokenJeremy Benoist2019-06-0518-13/+85
| | |/ | |/|
* | | Merge pull request #3992 from wallabag/feature/menu-quickstartJérémy Benoist2019-06-0516-0/+19
|\ \ \ | |/ / |/| | Add quickstart into the menu
| * | Add quickstart into the menuJeremy Benoist2019-06-0516-0/+19
|/ / | | | | | | Just in case people want to see that page again.
* | Merge pull request #3990 from wallabag/feature/sentryJérémy Benoist2019-06-055-88/+589
|\ \ | | | | | | Add Sentry support
| * | Add Sentry supportJeremy Benoist2019-06-055-88/+589
| | | | | | | | | | | | Only enable in production
* | | Merge pull request #3991 from wallabag/fix/secretJérémy Benoist2019-06-051-1/+1
|\ \ \ | | | | | | | | Try to force people to update the secret
| * | | Try to force people to update the secretJérémy Benoist2019-06-051-1/+1
|/ / /
* | | Merge pull request #3271 from wallabag/store-resolved-urlJérémy Benoist2019-06-055-11/+164
|\ \ \ | |/ / |/| | Add `given_url` in Entry table to check if a redirected url has already added
| * | TyposJeremy Benoist2019-06-051-2/+2
| | |
| * | Use two indexes instead of one for hashed urlsJeremy Benoist2019-06-054-25/+20
| | | | | | | | | | | | | | | When using `OR` in a where clause, a composite index can't be used. We should use a `UNION` to take advantages of it. Instead, create 2 indexes on each hashed urls and make 2 queries to find an url. It'll be faster than the previous solution.
| * | Use hash given url to avoid duplicateJeremy Benoist2019-05-296-131/+133
| | | | | | | | | | | | Using hashed url we can ensure an index on them to ensure it's fast.
| * | Added given_url in entry tableNicolas Lœuillet2019-05-296-2/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added index on entry table for given_url field - Fix tests: The previous `bit.ly` url redirected to doc.wallabag but that url doesn't exist in the fixtures. I used our own internal "redirector" to create a redirect to an url which exist in the fixtures. Also, updating current migration to use the new `WallabagMigration`.
* | | Merge pull request #3987 from wallabag/fix/drop-simplepieJérémy Benoist2019-05-293-18/+16
|\ \ \ | | | | | | | | Drop SimplePie
| * | | Drop SimplePieJeremy Benoist2019-05-293-18/+16
|/ / / | | | | | | | | | | | | It was only used to make an absolute url when downloading images. The deps is still there (in the `composer.lock`) because Graby use it (not for absolute but for encoding).
* | | Merge pull request #3986 from wallabag/fix/scrutinizer-issuesJérémy Benoist2019-05-295-7/+7
|\ \ \ | |/ / |/| | Fix some Scrutinizer issues
| * | Fix some Scrutinizer issuesJeremy Benoist2019-05-295-7/+7
|/ /
* | Merge pull request #3985 from wallabag/update-composerJérémy Benoist2019-05-295-31/+10446
|\ \ | | | | | | Keep composer.lock
| * | TyposJeremy Benoist2019-05-291-2/+17
| | |
| * | Keep composer.lockJeremy Benoist2019-05-295-43/+10443
|/ / | | | | | | | | | | | | | | We initially ignored the `composer.lock` because it generated a lock of rebase on PR when someone updated it and the master updated it too. Now we have less contributions (sadly) so I think we won't run against that problem. Also, it'll solve issue about people cloning the master and got angry because composer eat all the available memory to determine packages to install. It'll also be much easier to make release. Scrutinizer & Travis will be faster too.
* | Merge pull request #3984 from wallabag/2.4Jérémy Benoist2019-05-29206-1871/+4701
|\ \ | | | | | | Merge 2.4 into master
| * \ Merge pull request #3944 from shtrom/always-hash-exists-urlJérémy Benoist2019-05-285-47/+80
| |\ \ | | | | | | | | Always hash exists url
| | * | Remove useless methodsJeremy Benoist2019-05-242-28/+2
| | | | | | | | | | | | | | | | Also fix a phpdoc block