aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2724 from Simounet/fix/reading-timeThomas Citharel2016-12-283-10/+9
|\ | | | | Fix entry reading time
| * Fix entry reading timeSimounet2016-12-273-10/+9
| |
* | Merge pull request #2723 from wallabag/fix-export-tag-spaceNicolas Lœuillet2016-12-284-5/+5
|\ \ | |/ |/| Fixed export by tags with a tag which contains space
| * Fixed export by tags with a tag which contains spaceNicolas Lœuillet2016-12-274-5/+5
|/
* Merge pull request #2696 from wallabag/run-migrationNicolas Lœuillet2016-12-2312-30/+299
|\ | | | | Run migration on each test
| * Fix bad migration for PostreSQLJeremy Benoist2016-12-231-8/+68
| | | | | | | | Queries weren’t executed for PostgreSQL, bad syntax.
| * Be consistent between migration & schema definitionJeremy Benoist2016-12-194-3/+4
| |
| * fixup! Run migration in test, ready for MySQLJeremy Benoist2016-12-191-1/+1
| |
| * Use actual database nameJeremy Benoist2016-12-191-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 nullJeremy Benoist2016-12-191-1/+1
| |
| * fixup! Manually import file for PostgreSQLJeremy Benoist2016-12-191-6/+6
| |
| * Remove commentJeremy Benoist2016-12-191-11/+0
| | | | | | | | "The string "--" is not permitted within comments."
| * Add orignal DB schemaJeremy Benoist2016-12-193-0/+120
| |
| * And of course it doesn't work for SQLiteJeremy Benoist2016-12-191-0/+9
| |
| * Manually import file for PostgreSQLJeremy Benoist2016-12-191-8/+13
| |
| * Run migration in test, ready for MySQLJeremy Benoist2016-12-193-13/+98
| |
* | Merge pull request #2714 from Simounet/fix/entry-card-shadowJeremy Benoist2016-12-202-11/+10
|\ \ | |/ |/| Fix the box shadow on the card entry
| * Fix the box shadow on the card entrySimounet2016-12-202-11/+10
|/
* Merge pull request #2616 from mathieui/doc-https-linksJeremy Benoist2016-12-196-12/+12
|\ | | | | Change documentation links to HTTPS
| * Change documentation links to HTTPSmathieui2016-11-206-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-configJeremy Benoist2016-12-184-4/+52
|\ \ | | | | | | Ensure craue_config_setting migration are ok
| * | Replaced quotes for PostgresNicolas Lœuillet2016-12-184-6/+6
| | |
| * | Ensure craue_config_setting migration are okJeremy Benoist2016-12-154-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-configNicolas Lœuillet2016-12-165-0/+12
|\ \ \ | | | | | | | | Added QoS for RabbitMQ
| * | | Moved RabbitMQ QoS to parametersNicolas Lœuillet2016-12-155-8/+12
| | | |
| * | | Added QoS for RabbitMQNicolas Lœuillet2016-12-151-0/+8
| |/ /
* | | Merge pull request #2701 from wallabag/disable-outputWalkersNicolas Lœuillet2016-12-163-6/+4
|\ \ \ | |/ / |/| | Removed outputWalkers for pagination
| * | Removed outputWalkers for RSS and APINicolas Lœuillet2016-12-152-2/+2
| | |
| * | Removed outputWalkers for paginationNicolas Lœuillet2016-12-152-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-32Nicolas Lœuillet2016-12-1513-26/+28
|\ \ | | | | | | Upgrade to Symfony 3.2
| * | Fixed search bugNicolas Lœuillet2016-12-151-1/+1
| | |
| * | Fix tests & deprecation noticeJeremy Benoist2016-12-1511-21/+25
| | |
| * | Use simple-phpunit instead of phpunitJeremy Benoist2016-12-132-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.2Nicolas Lœuillet2016-11-301-1/+1
| | |
* | | Merge pull request #2699 from wallabag/remove-usertable-queryJeremy Benoist2016-12-131-2/+1
|\ \ \ | | | | | | | | Removed user join in query builder
| * | | Removed user join in query builderNicolas Lœuillet2016-12-121-2/+1
| | | |
* | | | Merge pull request #2697 from wallabag/fix-list-modeNicolas Lœuillet2016-12-128-2/+25
|\ \ \ \ | |/ / / |/| | | Add default value for list_mode
| * | | Add default value for list_modeJeremy Benoist2016-12-128-2/+25
|/ / /
* | | Merge pull request #2691 from wallabag/moved-total-import-notifNicolas Lœuillet2016-12-082-2/+6
|\ \ \ | | | | | | | | Moved total messages from import
| * | | Moved total messages from importNicolas Lœuillet2016-12-082-2/+6
|/ / /
* | | Merge pull request #2689 from wallabag/change-chmodThomas Citharel2016-12-081-1/+1
|\ \ \ | | | | | | | | Replaced chmod for download pictures feature
| * | | Replaced chmod for download pictures featureNicolas Lœuillet2016-12-081-1/+1
|/ / /
* | | Merge pull request #2688 from wallabag/fix-browsers-importNicolas Lœuillet2016-12-083-3/+6
|\ \ \ | | | | | | | | Fixed imports with is_starred and is_archived
| * | | Fixed imports with is_starred and is_archivedNicolas Lœuillet2016-12-073-3/+6
|/ / /
* | | Merge pull request #2686 from wallabag/fix-redis-importJeremy Benoist2016-12-061-1/+1
|\ \ \ | | | | | | | | Casted maxIterations for Redis import
| * | | Casted maxIterations for Redis importNicolas Lœuillet2016-12-061-1/+1
| | | | | | | | | | | | | | | | Simpleue\Worker wants an integer, we gave it a string
* | | | Merge pull request #2680 from wallabag/taggingrule-255Nicolas Lœuillet2016-12-062-0/+24
|\ \ \ \ | |/ / / |/| | | Limit rule to 255
| * | | Limit rule to 255Jeremy Benoist2016-12-032-0/+24
| | | | | | | | | | | | | | | | To avoid database error
* | | | Merge pull request #2679 from jcharaoui/fix-2658Nicolas Lœuillet2016-12-0410-35/+40
|\ \ \ \ | |/ / / |/| | | Fix content from imported entried being discarded when URL goes bad
| * | | Add some commentsJeremy Benoist2016-12-041-0/+3
| | | |