Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3515 from wallabag/php-7.2 | Nicolas Lœuillet | 2017-12-18 | 34 | -40/+81 |
|\ | | | | | Add PHP 7.2 compatibility | ||||
| * | Update CHANGELOG | Jeremy Benoist | 2017-12-18 | 1 | -3/+4 |
| | | |||||
| * | Add missing assertion in tests | Jeremy Benoist | 2017-12-18 | 1 | -0/+3 |
| | | |||||
| * | Fix countable in tests | Jeremy Benoist | 2017-12-18 | 1 | -4/+12 |
| | | |||||
| * | Update dama/doctrine-test-bundle | Jeremy Benoist | 2017-12-18 | 2 | -2/+2 |
| | | | | | | | | | | | | Because: PHP Fatal error: Class 'PHPUnit_Framework_BaseTestListener' not found in /home/travis/build/wallabag/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/LegacyPHPUnitListener.php on line 7 | ||||
| * | Add missing TestCase namespace | Jeremy Benoist | 2017-12-18 | 5 | -5/+10 |
| | | |||||
| * | Fix typo | Jeremy Benoist | 2017-12-18 | 1 | -3/+3 |
| | | |||||
| * | Add missing parameter for test | Jeremy Benoist | 2017-12-18 | 1 | -0/+1 |
| | | |||||
| * | Use namespaced PHPUnit classes | Jeremy Benoist | 2017-12-18 | 23 | -23/+46 |
| | | |||||
* | | Merge pull request #3348 from pmichelazzo/master | Nicolas Lœuillet | 2017-12-18 | 2 | -4/+16 |
|\ \ | |/ |/| | Update PT translations | ||||
| * | Removed duplicated line | Nicolas Lœuillet | 2017-12-17 | 1 | -1/+0 |
| | | |||||
| * | Update PT translations | Paulino Michelazzo | 2017-12-17 | 2 | -4/+17 |
| | | |||||
* | | Merge pull request #3516 from wallabag/delete-id | Nicolas Lœuillet | 2017-12-18 | 3 | -2/+7 |
|\ \ | |/ |/| | api: copy entry object before sending, to keep id | ||||
| * | api: copy entry object before sending, to keep id | Kevin Decherf | 2017-12-17 | 3 | -2/+7 |
|/ | | | | | | Workaround for https://github.com/wallabag/android-app/issues/646 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3504 from aaa2000/fix-initial-migration-with-table-prefix | Jérémy Benoist | 2017-12-16 | 1 | -125/+125 |
|\ | | | | | Fix initial migration when using custom table prefix | ||||
| * | Use getTable() to retrieve prefixed table name | Jeremy Benoist | 2017-12-16 | 1 | -126/+122 |
| | | |||||
| * | Fix initial migration when using custom table prefix | adev | 2017-12-14 | 1 | -125/+129 |
| | | | | | | | | Fix #3503 | ||||
* | | Merge pull request #3513 from wallabag/icons-3437 | Nicolas Lœuillet | 2017-12-16 | 4 | -9/+13 |
|\ \ | | | | | | | material: replace exit_to_app, redo and autorenew icons | ||||
| * | | material: replace exit_to_app, redo and autorenew icons | Kevin Decherf | 2017-12-16 | 4 | -9/+13 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | | Merge pull request #3511 from wallabag/install-command-note | Nicolas Lœuillet | 2017-12-16 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | command: replace note regarding server:run --env=prod | ||||
| * | | command: replace note regarding server:run --env=prod | Kevin Decherf | 2017-12-16 | 1 | -1/+1 |
|/ / | | | | | | | | | server:run --env=prod does not exist anymore Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3507 from wallabag/fix-lowercase-migration | Nicolas Lœuillet | 2017-12-16 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed lower case tags migration | ||||
| * | | Fixed lower case tags migration | Nicolas Lœuillet | 2017-12-15 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #3510 from wallabag/update-robotstxt | Nicolas Lœuillet | 2017-12-16 | 1 | -3/+1 |
|\ \ | |/ |/| | Updated robots.txt to prevent crawling | ||||
| * | Updated robots.txt to prevent crawling | Nicolas Lœuillet | 2017-12-15 | 1 | -3/+1 |
|/ | |||||
* | Merge pull request #3442 from wallabag/empty-entry | Jérémy Benoist | 2017-12-14 | 7 | -5/+121 |
|\ | | | | | Fix empty title and domain_name when exception is thrown during fetch | ||||
| * | Update CHANGELOG | Kevin Decherf | 2017-12-13 | 1 | -1/+8 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Add test on EntryControllerTest for #3442 | Kevin Decherf | 2017-12-13 | 2 | -0/+54 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Fix empty title and domain_name when exception is thrown during fetch | Kevin Decherf | 2017-12-13 | 4 | -4/+59 |
|/ | | | | | | | | | | Add a new helper to set a default title when it's empty: 1/ use basename part of entry's path, if any 2/ or use domain name Fixes #2053 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3488 from wallabag/pg-10 | Jérémy Benoist | 2017-12-13 | 8 | -0/+70 |
|\ | | | | | Add custom driver & schema manager for PostgreSQL 10 | ||||
| * | Fix tests | Jeremy Benoist | 2017-12-12 | 1 | -4/+4 |
| | | |||||
| * | Add custom driver & schema manager for PostgreSQL 10 | Jeremy Benoist | 2017-12-12 | 8 | -0/+70 |
| | | |||||
* | | Merge pull request #3495 from wallabag/wallabag/remove-make-run-readme | Nicolas Lœuillet | 2017-12-13 | 1 | -2/+3 |
|\ \ | | | | | | | Removed "make run" in the README | ||||
| * | | Removed "make run" in the README | Nicolas Lœuillet | 2017-12-12 | 1 | -2/+3 |
|/ / | |||||
* | | Merge pull request #3492 from bdunogier/fix-3484-disable_share_link | Nicolas Lœuillet | 2017-12-12 | 1 | -0/+10 |
|\ \ | | | | | | | Fix 3484: hide the share toggle button if no service is enabled | ||||
| * | | Fix #3484: hide the share toggle button if no service is enabled | Bertrand Dunogier | 2017-12-12 | 1 | -0/+10 |
| |/ | |||||
* | | Merge pull request #3490 from wallabag/fix-rss-unread-icon | Nicolas Lœuillet | 2017-12-12 | 1 | -3/+8 |
|\ \ | | | | | | | Displayed the RSS icon on homepage route | ||||
| * | | Displayed the RSS icon on homepage route | Nicolas Lœuillet | 2017-12-12 | 1 | -3/+8 |
| |/ | |||||
* | | Merge pull request #3487 from wallabag/initial-migration | Nicolas Lœuillet | 2017-12-12 | 1 | -6/+20 |
|\ \ | |/ |/| | Change the way to check for initial migration | ||||
| * | CS | Jeremy Benoist | 2017-12-12 | 1 | -1/+0 |
| | | |||||
| * | Use hasTable instead of try/catch | Jeremy Benoist | 2017-12-12 | 1 | -7/+1 |
| | | |||||
| * | Change the way to check for initial migration | Jeremy Benoist | 2017-12-12 | 1 | -4/+25 |
|/ | |||||
* | Merge pull request #3481 from wallabag/fix-make-run | Nicolas Lœuillet | 2017-12-12 | 1 | -1/+1 |
|\ | | | | | Replaced env by dev for make run | ||||
| * | Replaced env by dev for make run | Nicolas Lœuillet | 2017-12-12 | 1 | -1/+1 |
|/ | | | | The symfony server:run command can only be used in dev environment | ||||
* | Merge pull request #3478 from odolbeau/patch-1 | Nicolas Lœuillet | 2017-12-12 | 1 | -1/+1 |
|\ | | | | | Update README.md | ||||
| * | Update README.md | Olivier Dolbeau | 2017-12-11 | 1 | -1/+1 |
|/ | | | Be ready for next year! | ||||
* | Merge pull request #3474 from wallabag/update-changelog | Nicolas Lœuillet | 2017-12-11 | 3 | -2/+7 |
|\ | | | | | Updated changelog for 2.3 | ||||
| * | Updated changelog for 2.3 | Nicolas Lœuillet | 2017-12-11 | 3 | -2/+7 |
|/ | |||||
* | Merge pull request #3468 from wallabag/fix-migration-3139 | Nicolas Lœuillet | 2017-12-11 | 1 | -8/+21 |
|\ | | | | | Fix migration from #3139 | ||||
| * | migrations: fix duplicate violation during lowercase tag migration | Kevin Decherf | 2017-12-10 | 1 | -8/+20 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> |