aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
| * Fix broken link to remove tags from entriesKevin Decherf2017-12-273-3/+3
| | | | | | | | | | | | Fixes #3534 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3539 from wallabag/wallabag/new-client-buttonNicolas Lœuillet2017-12-281-1/+1
|\ \ | |/ |/| Replaced Create new client link with a button
| * Replaced Create new client link with a buttonNicolas Lœuillet2017-12-281-1/+1
|/
* Merge pull request #3525 from Simounet/fix/empty-card-title-linkNicolas Lœuillet2017-12-2625-85/+58
|\ | | | | Fix empty card title link
| * Added default value for title on entry viewNicolas Lœuillet2017-12-262-4/+4
| |
| * Updated baggy theme for the no-title fixNicolas Lœuillet2017-12-261-1/+1
| |
| * Using new 'entry.default_title' as translation keySimounet2017-12-2615-1/+15
| |
| * Card tags template sharedSimounet2017-12-265-17/+22
| |
| * Useless span removed from the card's titleSimounet2017-12-263-7/+4
| |
| * Default card titleSimounet2017-12-261-1/+1
| |
| * Content card template sharedSimounet2017-12-265-68/+25
| |
* | Merge pull request #3532 from wallabag/prepare-231Nicolas Lœuillet2017-12-262-7/+16
|\ \ | |/ |/| Prepared wallabag 2.3.1
| * Prepared wallabag 2.3.1Nicolas Lœuillet2017-12-262-7/+16
|/
* Merge pull request #3524 from wallabag/fix-assets-subNicolas Lœuillet2017-12-268-7/+13
|\ | | | | Fix assets for subfolder install
| * cs-fixerKevin Decherf2017-12-201-4/+2
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Update prod assetsKevin Decherf2017-12-206-6/+6
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Remove fixed relative path for assetsKevin Decherf2017-12-202-1/+9
|/
* Merge pull request #3521 from wallabag/mruminski-patch-1Nicolas Lœuillet2017-12-191-2/+2
|\ | | | | Update messages.pl.yml
| * Update messages.pl.ymlMateusz Rumiński2017-12-181-2/+2
|/ | | add polish translation for 'provided by' and 'origin url'
* Merge pull request #3515 from wallabag/php-7.2Nicolas Lœuillet2017-12-1834-40/+81
|\ | | | | Add PHP 7.2 compatibility
| * Update CHANGELOGJeremy Benoist2017-12-181-3/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 09:46:51 +0000