aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Prepare 2.3.3 releaseJeremy Benoist2018-06-192-1/+25
* Merge pull request #3538 from wallabag/fix-migrations-dashJérémy Benoist2018-06-1537-709/+146
|\
| * We should able to get the table name unescapedJeremy Benoist2018-06-142-5/+11
| * Fixed migrations with dash into db nameJeremy Benoist2018-06-1437-705/+136
|/
* Merge pull request #3636 from flozz/syntax-highlightJérémy Benoist2018-06-073-1/+12
|\
| * 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 testsJeremy Benoist2018-06-069-32/+30
* | | Merge pull request #3614 from comradekingu/patch-3Jérémy Benoist2018-06-061-3/+3
|\ \ \ | |/ / |/| |
| * | 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 displaySimounet2018-06-041-2/+2
|/ / /
* | | Merge pull request #3646 from Quenty31/masterJérémy Benoist2018-06-013-7/+7
|\ \ \
| * | | 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
| * | | 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 downloadedSimounet2018-06-012-3/+54
|/ / /
* | | Merge pull request #3653 from Simounet/fix/firefox-mobile-unneeded-resizeJérémy Benoist2018-05-245-6/+8
|\ \ \
| * | | Fix missing generated CSSSimounet2018-05-241-1/+1
| * | | Fix Firefox mobile unneeded resizeSimounet2018-05-244-5/+7
|/ / /
* | | Merge pull request #3652 from Simounet/fix/overflow-wrapJérémy Benoist2018-05-243-1/+12
|\ \ \ | |/ / |/| |
| * | 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 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 bookmarkletFloran Brutel2018-04-011-1/+1
|/ /
* | Merge pull request #3619 from notFloran/fix-testsJérémy Benoist2018-04-014-11/+11
|\ \ | |/ |/|
| * 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
|\
| * Looked UserBundle again.Jeremy Benoist2018-02-241-1/+1
| * 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 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.Stéphane HULARD2018-01-231-1/+1
|/
* Merge pull request #3568 from wallabag/prepare-2.3.2Nicolas Lœuillet2018-01-222-1/+14
|\
| * 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
|\
| * 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
|\