Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2724 from Simounet/fix/reading-time | Thomas Citharel | 2016-12-28 | 3 | -10/+9 |
|\ | | | | | Fix entry reading time | ||||
| * | Fix entry reading time | Simounet | 2016-12-27 | 3 | -10/+9 |
| | | |||||
* | | Merge pull request #2723 from wallabag/fix-export-tag-space | Nicolas Lœuillet | 2016-12-28 | 4 | -5/+5 |
|\ \ | |/ |/| | Fixed export by tags with a tag which contains space | ||||
| * | Fixed export by tags with a tag which contains space | Nicolas Lœuillet | 2016-12-27 | 4 | -5/+5 |
|/ | |||||
* | Merge pull request #2696 from wallabag/run-migration | Nicolas Lœuillet | 2016-12-23 | 12 | -30/+299 |
|\ | | | | | Run migration on each test | ||||
| * | Fix bad migration for PostreSQL | Jeremy Benoist | 2016-12-23 | 1 | -8/+68 |
| | | | | | | | | Queries weren’t executed for PostgreSQL, bad syntax. | ||||
| * | Be consistent between migration & schema definition | Jeremy Benoist | 2016-12-19 | 4 | -3/+4 |
| | | |||||
| * | fixup! Run migration in test, ready for MySQL | Jeremy Benoist | 2016-12-19 | 1 | -1/+1 |
| | | |||||
| * | Use actual database name | Jeremy Benoist | 2016-12-19 | 1 | -2/+2 |
| | | | | | | | | | | | | We can't retrieve the environment within the migration. And when we ran migration on Travis, database name isn't `database_name` but `test_database_name`. Retrieve the database name from the connection is more accurate | ||||
| * | pocket_consumer_key can be null | Jeremy Benoist | 2016-12-19 | 1 | -1/+1 |
| | | |||||
| * | fixup! Manually import file for PostgreSQL | Jeremy Benoist | 2016-12-19 | 1 | -6/+6 |
| | | |||||
| * | Remove comment | Jeremy Benoist | 2016-12-19 | 1 | -11/+0 |
| | | | | | | | | "The string "--" is not permitted within comments." | ||||
| * | Add orignal DB schema | Jeremy Benoist | 2016-12-19 | 3 | -0/+120 |
| | | |||||
| * | And of course it doesn't work for SQLite | Jeremy Benoist | 2016-12-19 | 1 | -0/+9 |
| | | |||||
| * | Manually import file for PostgreSQL | Jeremy Benoist | 2016-12-19 | 1 | -8/+13 |
| | | |||||
| * | Run migration in test, ready for MySQL | Jeremy Benoist | 2016-12-19 | 3 | -13/+98 |
| | | |||||
* | | Merge pull request #2714 from Simounet/fix/entry-card-shadow | Jeremy Benoist | 2016-12-20 | 2 | -11/+10 |
|\ \ | |/ |/| | Fix the box shadow on the card entry | ||||
| * | Fix the box shadow on the card entry | Simounet | 2016-12-20 | 2 | -11/+10 |
|/ | |||||
* | Merge pull request #2616 from mathieui/doc-https-links | Jeremy Benoist | 2016-12-19 | 6 | -12/+12 |
|\ | | | | | Change documentation links to HTTPS | ||||
| * | Change documentation links to HTTPS | mathieui | 2016-11-20 | 6 | -12/+12 |
| | | | | | | | | | | | | Even though all the websites used in the commands redirect http to https, a man in the middle can happen with the initial request, leading to arbitrary code execution. | ||||
* | | Merge pull request #2682 from wallabag/migration-config | Jeremy Benoist | 2016-12-18 | 4 | -4/+52 |
|\ \ | | | | | | | Ensure craue_config_setting migration are ok | ||||
| * | | Replaced quotes for Postgres | Nicolas Lœuillet | 2016-12-18 | 4 | -6/+6 |
| | | | |||||
| * | | Ensure craue_config_setting migration are ok | Jeremy Benoist | 2016-12-15 | 4 | -4/+52 |
| | | | | | | | | | | | | We now can run the migration every time, new line from `craue_config_setting` are properly checked. | ||||
* | | | Merge pull request #2690 from wallabag/improve-rmq-config | Nicolas Lœuillet | 2016-12-16 | 5 | -0/+12 |
|\ \ \ | | | | | | | | | Added QoS for RabbitMQ | ||||
| * | | | Moved RabbitMQ QoS to parameters | Nicolas Lœuillet | 2016-12-15 | 5 | -8/+12 |
| | | | | |||||
| * | | | Added QoS for RabbitMQ | Nicolas Lœuillet | 2016-12-15 | 1 | -0/+8 |
| |/ / | |||||
* | | | Merge pull request #2701 from wallabag/disable-outputWalkers | Nicolas Lœuillet | 2016-12-16 | 3 | -6/+4 |
|\ \ \ | |/ / |/| | | Removed outputWalkers for pagination | ||||
| * | | Removed outputWalkers for RSS and API | Nicolas Lœuillet | 2016-12-15 | 2 | -2/+2 |
| | | | |||||
| * | | Removed outputWalkers for pagination | Nicolas Lœuillet | 2016-12-15 | 2 | -4/+2 |
|/ / | | | | | | | Due to overload, we disabled output walkers (see https://github.com/whiteoctober/Pagerfanta/issues/115 | ||||
* | | Merge pull request #2667 from wallabag/upgrade-symfony-32 | Nicolas Lœuillet | 2016-12-15 | 13 | -26/+28 |
|\ \ | | | | | | | Upgrade to Symfony 3.2 | ||||
| * | | Fixed search bug | Nicolas Lœuillet | 2016-12-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fix tests & deprecation notice | Jeremy Benoist | 2016-12-15 | 11 | -21/+25 |
| | | | |||||
| * | | Use simple-phpunit instead of phpunit | Jeremy Benoist | 2016-12-13 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | 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 |
| | | | |||||
* | | | Merge pull request #2699 from wallabag/remove-usertable-query | Jeremy Benoist | 2016-12-13 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | Removed user join in query builder | ||||
| * | | | Removed user join in query builder | Nicolas Lœuillet | 2016-12-12 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge pull request #2697 from wallabag/fix-list-mode | Nicolas Lœuillet | 2016-12-12 | 8 | -2/+25 |
|\ \ \ \ | |/ / / |/| | | | Add default value for list_mode | ||||
| * | | | Add default value for list_mode | Jeremy Benoist | 2016-12-12 | 8 | -2/+25 |
|/ / / | |||||
* | | | Merge pull request #2691 from wallabag/moved-total-import-notif | Nicolas Lœuillet | 2016-12-08 | 2 | -2/+6 |
|\ \ \ | | | | | | | | | Moved total messages from import | ||||
| * | | | Moved total messages from import | Nicolas Lœuillet | 2016-12-08 | 2 | -2/+6 |
|/ / / | |||||
* | | | Merge pull request #2689 from wallabag/change-chmod | Thomas Citharel | 2016-12-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Replaced chmod for download pictures feature | ||||
| * | | | Replaced chmod for download pictures feature | Nicolas Lœuillet | 2016-12-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2688 from wallabag/fix-browsers-import | Nicolas Lœuillet | 2016-12-08 | 3 | -3/+6 |
|\ \ \ | | | | | | | | | Fixed imports with is_starred and is_archived | ||||
| * | | | Fixed imports with is_starred and is_archived | Nicolas Lœuillet | 2016-12-07 | 3 | -3/+6 |
|/ / / | |||||
* | | | Merge pull request #2686 from wallabag/fix-redis-import | Jeremy Benoist | 2016-12-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Casted maxIterations for Redis import | ||||
| * | | | Casted maxIterations for Redis import | Nicolas Lœuillet | 2016-12-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Simpleue\Worker wants an integer, we gave it a string | ||||
* | | | | Merge pull request #2680 from wallabag/taggingrule-255 | Nicolas Lœuillet | 2016-12-06 | 2 | -0/+24 |
|\ \ \ \ | |/ / / |/| | | | Limit rule to 255 | ||||
| * | | | Limit rule to 255 | Jeremy Benoist | 2016-12-03 | 2 | -0/+24 |
| | | | | | | | | | | | | | | | | To avoid database error | ||||
* | | | | Merge pull request #2679 from jcharaoui/fix-2658 | Nicolas Lœuillet | 2016-12-04 | 10 | -35/+40 |
|\ \ \ \ | |/ / / |/| | | | Fix content from imported entried being discarded when URL goes bad | ||||
| * | | | Add some comments | Jeremy Benoist | 2016-12-04 | 1 | -0/+3 |
| | | | |