aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3636 from flozz/syntax-highlightJérémy Benoist2018-06-073-1/+12
|\ | | | | Highlight code in articles using highlight.js
| * Highlight code in articles using highlight.jsFabien LOISON2018-04-233-1/+12
| |
* | Merge pull request #3668 from wallabag/fix-testsJérémy Benoist2018-06-079-32/+30
|\ \ | | | | | | Fix tests
| * | Fix testsJeremy Benoist2018-06-069-32/+30
| | |
* | | Merge pull request #3614 from comradekingu/patch-3Jérémy Benoist2018-06-061-3/+3
|\ \ \ | |/ / |/| | Spelling: GitHub, Log out, of the dev
| * | GitHub, Log out, of the devAllan Nordhøy2018-03-251-3/+3
| | |
* | | Merge pull request #3664 from Simounet/fix/entry-attributes-encodingJérémy Benoist2018-06-051-2/+2
|\ \ \ | | | | | | | | Fix authors and preview alt encoding display
| * | | Fix authors and preview alt encoding displaySimounet2018-06-041-2/+2
|/ / /
* | | Merge pull request #3646 from Quenty31/masterJérémy Benoist2018-06-013-7/+7
|\ \ \ | | | | | | | | [i18n] Occitan update
| * | | Update wallabag_user.oc.ymlQuentí2018-05-061-1/+1
| | | |
| * | | Update CraueConfigBundle.oc.ymlQuentí2018-05-051-1/+1
| | | |
| * | | Update wallabag_user.oc.ymlQuentí2018-05-051-1/+1
| | | | | | | | | | | | Mens dialectal, mai estandard
| * | | Update messages.oc.ymlQuentí2018-05-051-4/+4
| | | |
| * | | Update CraueConfigBundle.oc.ymlQuentí2018-05-051-2/+2
| | |/ | |/|
* | | Merge pull request #3661 from Simounet/fix/2981-srcset-imageJérémy Benoist2018-06-012-3/+54
|\ \ \ | | | | | | | | Fix srcset attribute on images downloaded
| * | | Fix srcset attribute on images downloadedSimounet2018-06-012-3/+54
|/ / /
* | | Merge pull request #3653 from Simounet/fix/firefox-mobile-unneeded-resizeJérémy Benoist2018-05-245-6/+8
|\ \ \ | | | | | | | | Fix/firefox mobile unneeded resize
| * | | Fix missing generated CSSSimounet2018-05-241-1/+1
| | | |
| * | | Fix Firefox mobile unneeded resizeSimounet2018-05-244-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-wrapJérémy Benoist2018-05-243-1/+12
|\ \ \ | |/ / |/| | Fix overflow wrap issue
| * | Fix overflow wrap issueSimounet2018-05-213-1/+12
|/ /
* | Merge pull request #3615 from notFloran/3612-login-by-emailJérémy Benoist2018-04-032-2/+12
|\ \ | | | | | | Allow login by email
| * | Allow login by emailFloran Brutel2018-04-012-2/+12
| | |
* | | Merge pull request #3616 from notFloran/3404-bookmarklet-encodingJérémy Benoist2018-04-031-1/+1
|\ \ \ | |/ / |/| | Better encoding of the URI for the bookmarklet
| * | Better encoding of the URI for the bookmarkletFloran Brutel2018-04-011-1/+1
|/ /
* | Merge pull request #3619 from notFloran/fix-testsJérémy Benoist2018-04-014-11/+11
|\ \ | |/ |/| Fix tests
| * Fix CS in UtilsTest.phpFloran Brutel2018-03-311-1/+1
| |
| * Replace zataz urlFloran Brutel2018-03-303-9/+9
| |
| * Use https instead of http for bild.de to fix testsFloran Brutel2018-03-291-1/+1
|/
* Merge pull request #3597 from wallabag/fix-testsJérémy Benoist2018-03-173-3/+3
|\ | | | | Fix tests
| * Looked UserBundle again.Jeremy Benoist2018-02-241-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 httpsJeremy Benoist2018-02-242-2/+2
| |
* | Merge pull request #3592 from Simounet/fix/html-entities-on-default-titleJérémy Benoist2018-02-244-6/+6
|\ \ | |/ |/| Fix title card HTML parsing
| * Fix title card HTML parsingSimounet2018-02-124-6/+6
| |
* | Merge pull request #3573 from shulard/fix/unknown-withremove-variableJérémy Benoist2018-02-241-1/+1
|\ \ | |/ |/| Fix error when withRemove variable is not defined.
| * Fix error when withRemove variable is not defined.Stéphane HULARD2018-01-231-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.2Nicolas Lœuillet2018-01-222-1/+14
|\ | | | | Prepare 2.3.2 release
| * Prepare 2.3.2 releaseJeremy Benoist2018-01-222-1/+14
|/
* Merge pull request #3541 from Simounet/feature/nav-label-replaced-by-buttonsNicolas Lœuillet2018-01-1212-101/+100
|\ | | | | Nav actions updated
| * Fixed testsNicolas Lœuillet2018-01-123-6/+6
| |
| * Close add entry and search nav JS action improvedSimounet2018-01-122-12/+12
| |
| * Nav close button alignment and nav boxes improvedSimounet2018-01-128-83/+71
| |
| * Fix nav new entry and search form alignmentSimounet2018-01-122-2/+3
| |
| * Label replaced by a button on the nav search formSimounet2018-01-126-13/+13
| |
| * Label replaced by a button on the nav new entry formSimounet2018-01-125-3/+13
|/
* Merge pull request #3546 from Strubbl/fix-2957-abort-update-on-errorKevin Decherf2018-01-031-0/+3
|\ | | | | add `set -eu` to update.sh
| * add `set -eu` to update.shSven Fischer2018-01-031-0/+3
| | | | | | | | fixes #2957
* | Merge pull request #3536 from wallabag/tag-link-3534Nicolas Lœuillet2018-01-034-3/+23
|\ \ | |/ |/| Fix broken link to remove tags from entries
| * php-csKevin Decherf2017-12-311-1/+1
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Add test to prevent regression for #3534Kevin Decherf2017-12-311-0/+20
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>