Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #3652 from Simounet/fix/overflow-wrap | Jérémy Benoist | 2018-05-24 | 3 | -1/+12 | |
|\ \ \ | |/ / |/| | | Fix overflow wrap issue | |||||
| * | | Fix overflow wrap issue | Simounet | 2018-05-21 | 3 | -1/+12 | |
|/ / | ||||||
* | | Merge pull request #3615 from notFloran/3612-login-by-email | Jérémy Benoist | 2018-04-03 | 2 | -2/+12 | |
|\ \ | | | | | | | Allow login by email | |||||
| * | | Allow login by email | Floran Brutel | 2018-04-01 | 2 | -2/+12 | |
| | | | ||||||
* | | | Merge pull request #3616 from notFloran/3404-bookmarklet-encoding | Jérémy Benoist | 2018-04-03 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Better encoding of the URI for the bookmarklet | |||||
| * | | Better encoding of the URI for the bookmarklet | Floran Brutel | 2018-04-01 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3619 from notFloran/fix-tests | Jérémy Benoist | 2018-04-01 | 4 | -11/+11 | |
|\ \ | |/ |/| | Fix tests | |||||
| * | Fix CS in UtilsTest.php | Floran Brutel | 2018-03-31 | 1 | -1/+1 | |
| | | ||||||
| * | Replace zataz url | Floran Brutel | 2018-03-30 | 3 | -9/+9 | |
| | | ||||||
| * | Use https instead of http for bild.de to fix tests | Floran Brutel | 2018-03-29 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #3597 from wallabag/fix-tests | Jérémy Benoist | 2018-03-17 | 3 | -3/+3 | |
|\ | | | | | Fix tests | |||||
| * | Looked UserBundle again. | Jeremy Benoist | 2018-02-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | See https://github.com/FriendsOfSymfony/FOSUserBundle/compare/v2.0.2...v2.1.0#diff-8a79d0e62995dd549be4e463c35a8cc3 It generate an error about a variable called `registration_enabled` which can not be found. So I guess we are in the case of “such usage” about BC in UserBundle. Don’t want to loose time finding how to fix it. Rollback to the working version. | |||||
| * | 20 Minutes is now https | Jeremy Benoist | 2018-02-24 | 2 | -2/+2 | |
| | | ||||||
* | | Merge pull request #3592 from Simounet/fix/html-entities-on-default-title | Jérémy Benoist | 2018-02-24 | 4 | -6/+6 | |
|\ \ | |/ |/| | Fix title card HTML parsing | |||||
| * | Fix title card HTML parsing | Simounet | 2018-02-12 | 4 | -6/+6 | |
| | | ||||||
* | | Merge pull request #3573 from shulard/fix/unknown-withremove-variable | Jérémy Benoist | 2018-02-24 | 1 | -1/+1 | |
|\ \ | |/ |/| | Fix error when withRemove variable is not defined. | |||||
| * | Fix error when withRemove variable is not defined. | Stéphane HULARD | 2018-01-23 | 1 | -1/+1 | |
|/ | | | | | | Since the withRemove variable is a template flag, it can be undefined. In the Entry\Card\_content.html.twig template for example, the withRemove variable is not defined. | |||||
* | 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' |