Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3684 from Simounet/fix/empty-image-download-error | Jérémy Benoist | 2018-07-05 | 2 | -0/+27 |
|\ | | | | | Fix image downloading on null image path | ||||
| * | Fix image downloading on null image path | Simounet | 2018-07-05 | 2 | -0/+27 |
|/ | |||||
* | Merge pull request #3675 from wallabag/prepare-2.3.3 | Jérémy Benoist | 2018-06-19 | 2 | -1/+25 |
|\ | | | | | Prepare 2.3.3 release | ||||
| * | Prepare 2.3.3 release | Jeremy Benoist | 2018-06-19 | 2 | -1/+25 |
|/ | |||||
* | Merge pull request #3538 from wallabag/fix-migrations-dash | Jérémy Benoist | 2018-06-15 | 37 | -709/+146 |
|\ | | | | | Fixed migrations with dash into db names | ||||
| * | We should able to get the table name unescaped | Jeremy Benoist | 2018-06-14 | 2 | -5/+11 |
| | | | | | | | | When we want to perform complex queries to retrieve metadata from the database | ||||
| * | Fixed migrations with dash into db name | Jeremy Benoist | 2018-06-14 | 37 | -705/+136 |
|/ | |||||
* | Merge pull request #3636 from flozz/syntax-highlight | Jérémy Benoist | 2018-06-07 | 3 | -1/+12 |
|\ | | | | | Highlight code in articles using highlight.js | ||||
| * | Highlight code in articles using highlight.js | Fabien LOISON | 2018-04-23 | 3 | -1/+12 |
| | | |||||
* | | Merge pull request #3668 from wallabag/fix-tests | Jérémy Benoist | 2018-06-07 | 9 | -32/+30 |
|\ \ | | | | | | | Fix tests | ||||
| * | | Fix tests | Jeremy Benoist | 2018-06-06 | 9 | -32/+30 |
| | | | |||||
* | | | Merge pull request #3614 from comradekingu/patch-3 | Jérémy Benoist | 2018-06-06 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | Spelling: GitHub, Log out, of the dev | ||||
| * | | GitHub, Log out, of the dev | Allan Nordhøy | 2018-03-25 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #3664 from Simounet/fix/entry-attributes-encoding | Jérémy Benoist | 2018-06-05 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fix authors and preview alt encoding display | ||||
| * | | | Fix authors and preview alt encoding display | Simounet | 2018-06-04 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #3646 from Quenty31/master | Jérémy Benoist | 2018-06-01 | 3 | -7/+7 |
|\ \ \ | | | | | | | | | [i18n] Occitan update | ||||
| * | | | Update wallabag_user.oc.yml | Quentí | 2018-05-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update CraueConfigBundle.oc.yml | Quentí | 2018-05-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update wallabag_user.oc.yml | Quentí | 2018-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Mens dialectal, mai estandard | ||||
| * | | | Update messages.oc.yml | Quentí | 2018-05-05 | 1 | -4/+4 |
| | | | | |||||
| * | | | Update CraueConfigBundle.oc.yml | Quentí | 2018-05-05 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #3661 from Simounet/fix/2981-srcset-image | Jérémy Benoist | 2018-06-01 | 2 | -3/+54 |
|\ \ \ | | | | | | | | | Fix srcset attribute on images downloaded | ||||
| * | | | Fix srcset attribute on images downloaded | Simounet | 2018-06-01 | 2 | -3/+54 |
|/ / / | |||||
* | | | Merge pull request #3653 from Simounet/fix/firefox-mobile-unneeded-resize | Jérémy Benoist | 2018-05-24 | 5 | -6/+8 |
|\ \ \ | | | | | | | | | Fix/firefox mobile unneeded resize | ||||
| * | | | Fix missing generated CSS | Simounet | 2018-05-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix Firefox mobile unneeded resize | Simounet | 2018-05-24 | 4 | -5/+7 |
|/ / / | | | | | | | | | | | | | | | | Before that, on Firefox Mobile, when you were moving to the top or to the bottom of the page, you were stopped before to go to the opposite side. | ||||
* | | | 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 |
| | |