Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3568 from wallabag/prepare-2.3.2 | Nicolas Lœuillet | 2018-01-22 | 2 | -1/+14 |
|\ | | | | | Prepare 2.3.2 release | ||||
| * | Prepare 2.3.2 release | Jeremy Benoist | 2018-01-22 | 2 | -1/+14 |
|/ | |||||
* | Merge pull request #3541 from Simounet/feature/nav-label-replaced-by-buttons | Nicolas Lœuillet | 2018-01-12 | 12 | -101/+100 |
|\ | | | | | Nav actions updated | ||||
| * | Fixed tests | Nicolas Lœuillet | 2018-01-12 | 3 | -6/+6 |
| | | |||||
| * | Close add entry and search nav JS action improved | Simounet | 2018-01-12 | 2 | -12/+12 |
| | | |||||
| * | Nav close button alignment and nav boxes improved | Simounet | 2018-01-12 | 8 | -83/+71 |
| | | |||||
| * | Fix nav new entry and search form alignment | Simounet | 2018-01-12 | 2 | -2/+3 |
| | | |||||
| * | Label replaced by a button on the nav search form | Simounet | 2018-01-12 | 6 | -13/+13 |
| | | |||||
| * | Label replaced by a button on the nav new entry form | Simounet | 2018-01-12 | 5 | -3/+13 |
|/ | |||||
* | Merge pull request #3546 from Strubbl/fix-2957-abort-update-on-error | Kevin Decherf | 2018-01-03 | 1 | -0/+3 |
|\ | | | | | add `set -eu` to update.sh | ||||
| * | add `set -eu` to update.sh | Sven Fischer | 2018-01-03 | 1 | -0/+3 |
| | | | | | | | | fixes #2957 | ||||
* | | Merge pull request #3536 from wallabag/tag-link-3534 | Nicolas Lœuillet | 2018-01-03 | 4 | -3/+23 |
|\ \ | |/ |/| | Fix broken link to remove tags from entries | ||||
| * | php-cs | Kevin Decherf | 2017-12-31 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Add test to prevent regression for #3534 | Kevin Decherf | 2017-12-31 | 1 | -0/+20 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Fix broken link to remove tags from entries | Kevin Decherf | 2017-12-27 | 3 | -3/+3 |
| | | | | | | | | | | | | Fixes #3534 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3539 from wallabag/wallabag/new-client-button | Nicolas Lœuillet | 2017-12-28 | 1 | -1/+1 |
|\ \ | |/ |/| | Replaced Create new client link with a button | ||||
| * | Replaced Create new client link with a button | Nicolas Lœuillet | 2017-12-28 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3525 from Simounet/fix/empty-card-title-link | Nicolas Lœuillet | 2017-12-26 | 25 | -85/+58 |
|\ | | | | | Fix empty card title link | ||||
| * | Added default value for title on entry view | Nicolas Lœuillet | 2017-12-26 | 2 | -4/+4 |
| | | |||||
| * | Updated baggy theme for the no-title fix | Nicolas Lœuillet | 2017-12-26 | 1 | -1/+1 |
| | | |||||
| * | Using new 'entry.default_title' as translation key | Simounet | 2017-12-26 | 15 | -1/+15 |
| | | |||||
| * | Card tags template shared | Simounet | 2017-12-26 | 5 | -17/+22 |
| | | |||||
| * | Useless span removed from the card's title | Simounet | 2017-12-26 | 3 | -7/+4 |
| | | |||||
| * | Default card title | Simounet | 2017-12-26 | 1 | -1/+1 |
| | | |||||
| * | Content card template shared | Simounet | 2017-12-26 | 5 | -68/+25 |
| | | |||||
* | | Merge pull request #3532 from wallabag/prepare-231 | Nicolas Lœuillet | 2017-12-26 | 2 | -7/+16 |
|\ \ | |/ |/| | Prepared wallabag 2.3.1 | ||||
| * | Prepared wallabag 2.3.1 | Nicolas Lœuillet | 2017-12-26 | 2 | -7/+16 |
|/ | |||||
* | Merge pull request #3524 from wallabag/fix-assets-sub | Nicolas Lœuillet | 2017-12-26 | 8 | -7/+13 |
|\ | | | | | Fix assets for subfolder install | ||||
| * | cs-fixer | Kevin Decherf | 2017-12-20 | 1 | -4/+2 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Update prod assets | Kevin Decherf | 2017-12-20 | 6 | -6/+6 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Remove fixed relative path for assets | Kevin Decherf | 2017-12-20 | 2 | -1/+9 |
|/ | |||||
* | Merge pull request #3521 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2017-12-19 | 1 | -2/+2 |
|\ | | | | | Update messages.pl.yml | ||||
| * | Update messages.pl.yml | Mateusz Rumiński | 2017-12-18 | 1 | -2/+2 |
|/ | | | add polish translation for 'provided by' and 'origin url' | ||||
* | 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 |