Commit graph

4514 commits

Author SHA1 Message Date
Jérémy Benoist
2ff26deaf8
Merge pull request #3592 from Simounet/fix/html-entities-on-default-title
Fix title card HTML parsing
2018-02-24 22:24:24 +01:00
Jeremy Benoist
ad77c3451f
Looked UserBundle again.
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.
2018-02-24 22:12:48 +01:00
Jeremy Benoist
bf283db8e6
20 Minutes is now https 2018-02-24 22:02:52 +01:00
Jérémy Benoist
228d317204
Merge pull request #3573 from shulard/fix/unknown-withremove-variable
Fix error when withRemove variable is not defined.
2018-02-24 21:52:56 +01:00
Simounet
4d9128ded9 Fix title card HTML parsing 2018-02-12 22:19:15 +01:00
Stéphane HULARD
cc09434ea4
Fix error when withRemove variable is not defined.
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.
2018-01-23 18:51:52 +01:00
Nicolas Lœuillet
f24e9bfab0
Merge pull request #3568 from wallabag/prepare-2.3.2
Prepare 2.3.2 release
2018-01-22 11:10:12 +01:00
Jeremy Benoist
ac1811f83e
Prepare 2.3.2 release 2018-01-22 10:06:31 +01:00
Nicolas Lœuillet
fd637b9a5a
Merge pull request #3541 from Simounet/feature/nav-label-replaced-by-buttons
Nav actions updated
2018-01-12 23:10:21 +01:00
Nicolas Lœuillet
5614df19cf Fixed tests 2018-01-12 11:19:11 +01:00
Simounet
91f5992423 Close add entry and search nav JS action improved 2018-01-12 10:07:46 +01:00
Simounet
2831e77cce Nav close button alignment and nav boxes improved 2018-01-12 10:07:46 +01:00
Simounet
63771b9ae3 Fix nav new entry and search form alignment 2018-01-12 10:07:46 +01:00
Simounet
f86c2b5fa6 Label replaced by a button on the nav search form 2018-01-12 10:07:46 +01:00
Simounet
e9e3f93805 Label replaced by a button on the nav new entry form 2018-01-12 10:07:46 +01:00
Kevin Decherf
99e8c2785b
Merge pull request #3546 from Strubbl/fix-2957-abort-update-on-error
add `set -eu` to update.sh
2018-01-03 21:00:43 +01:00
Nicolas Lœuillet
410216f435
Merge pull request #3536 from wallabag/tag-link-3534
Fix broken link to remove tags from entries
2018-01-03 20:37:57 +01:00
Sven Fischer
f3e71b5dd5 add set -eu to update.sh
fixes #2957
2018-01-03 05:34:29 +01:00
Kevin Decherf
b8568662bd php-cs
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-31 13:19:26 +01:00
Kevin Decherf
e0a862b626 Add test to prevent regression for #3534
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-31 00:56:40 +01:00
Nicolas Lœuillet
2679eb9d84
Merge pull request #3539 from wallabag/wallabag/new-client-button
Replaced Create new client link with a button
2017-12-28 11:12:06 +01:00
Nicolas Lœuillet
8fa6d62197
Replaced Create new client link with a button 2017-12-28 10:21:28 +01:00
Kevin Decherf
8e15ece7df Fix broken link to remove tags from entries
Fixes #3534

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-27 22:53:03 +01:00
Nicolas Lœuillet
3473e600b1
Merge pull request #3525 from Simounet/fix/empty-card-title-link
Fix empty card title link
2017-12-26 16:00:58 +01:00
Nicolas Lœuillet
c04bde29a3
Added default value for title on entry view 2017-12-26 15:40:38 +01:00
Nicolas Lœuillet
11ed735c09
Merge pull request #3532 from wallabag/prepare-231
Prepared wallabag 2.3.1
2017-12-26 10:13:11 +01:00
Nicolas Lœuillet
f83e9e32fc
Prepared wallabag 2.3.1 2017-12-26 09:15:39 +01:00
Nicolas Lœuillet
8ffcee8aff
Updated baggy theme for the no-title fix 2017-12-26 09:07:28 +01:00
Simounet
5e0c44a2ac Using new 'entry.default_title' as translation key 2017-12-26 09:02:00 +01:00
Simounet
49fb9e7cab Card tags template shared 2017-12-26 09:02:00 +01:00
Simounet
a8541089be Useless span removed from the card's title 2017-12-26 09:00:33 +01:00
Simounet
ac8489f5f7 Default card title 2017-12-26 08:55:23 +01:00
Simounet
3c9548257c Content card template shared 2017-12-26 08:55:23 +01:00
Nicolas Lœuillet
726e2cf3c6
Merge pull request #3524 from wallabag/fix-assets-sub
Fix assets for subfolder install
2017-12-26 08:49:59 +01:00
Kevin Decherf
0d9c8081fe cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-20 22:18:26 +01:00
Kevin Decherf
575d1d03d9 Update prod assets
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-20 21:55:34 +01:00
Kevin Decherf
e8694faad6 Remove fixed relative path for assets 2017-12-20 21:53:48 +01:00
Nicolas Lœuillet
887073dedc
Merge pull request #3521 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-12-19 10:02:52 +01:00
Mateusz Rumiński
a9d274424f
Update messages.pl.yml
add polish translation for 'provided by' and 'origin url'
2017-12-18 21:01:22 +01:00
Nicolas Lœuillet
ef5c8a7d01
Merge pull request #3515 from wallabag/php-7.2
Add PHP 7.2 compatibility
2017-12-18 14:32:21 +01:00
Nicolas Lœuillet
01ea7f5855
Merge pull request #3348 from pmichelazzo/master
Update PT translations
2017-12-18 13:34:01 +01:00
Jeremy Benoist
ad880894a8
Update CHANGELOG 2017-12-18 13:30:03 +01:00
Jeremy Benoist
acc0a80179
Add missing assertion in tests 2017-12-18 13:29:34 +01:00
Jeremy Benoist
5661e8d42a
Fix countable in tests 2017-12-18 13:29:34 +01:00
Jeremy Benoist
7185fbff62
Update dama/doctrine-test-bundle
Because:

PHP Fatal error:  Class 'PHPUnit_Framework_BaseTestListener' not found in /home/travis/build/wallabag/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/LegacyPHPUnitListener.php on line 7
2017-12-18 13:29:34 +01:00
Jeremy Benoist
4b6942d2d8
Add missing TestCase namespace 2017-12-18 13:29:33 +01:00
Jeremy Benoist
26e2f07419
Fix typo 2017-12-18 13:29:33 +01:00
Jeremy Benoist
eb3754509d
Add missing parameter for test 2017-12-18 13:29:33 +01:00
Jeremy Benoist
bd91bd5c32
Use namespaced PHPUnit classes 2017-12-18 13:29:33 +01:00
Nicolas Lœuillet
3ccf086391
Merge pull request #3516 from wallabag/delete-id
api: copy entry object before sending, to keep id
2017-12-18 12:33:05 +01:00