aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* ContentProxy: swap entry url to origin_url and set new url according to ↵url-3529Kevin Decherf2018-01-142-4/+37
| | | | | | | | graby content Closes #3529 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* ContentProxy: fix a corner case when entry.url is empty in updateEntryKevin Decherf2018-01-141-0/+8
| | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* 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
| |
| * Add missing assertion in testsJeremy Benoist2017-12-181-0/+3
| |
| * Fix countable in testsJeremy Benoist2017-12-181-4/+12
| |
| * Update dama/doctrine-test-bundleJeremy Benoist2017-12-182-2/+2
| | | | | | | | | | | | 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
| * Add missing TestCase namespaceJeremy Benoist2017-12-185-5/+10
| |
| * Fix typoJeremy Benoist2017-12-181-3/+3
| |
| * Add missing parameter for testJeremy Benoist2017-12-181-0/+1
| |
| * Use namespaced PHPUnit classesJeremy Benoist2017-12-1823-23/+46
| |
* | Merge pull request #3348 from pmichelazzo/masterNicolas Lœuillet2017-12-182-4/+16
|\ \ | |/ |/| Update PT translations
| * Removed duplicated lineNicolas Lœuillet2017-12-171-1/+0
| |
| * Update PT translationsPaulino Michelazzo2017-12-172-4/+17
| |
* | Merge pull request #3516 from wallabag/delete-idNicolas Lœuillet2017-12-183-2/+7
|\ \ | |/ |/| api: copy entry object before sending, to keep id
| * api: copy entry object before sending, to keep idKevin Decherf2017-12-173-2/+7
|/ | | | | | Workaround for https://github.com/wallabag/android-app/issues/646 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3504 from aaa2000/fix-initial-migration-with-table-prefixJérémy Benoist2017-12-161-125/+125
|\ | | | | Fix initial migration when using custom table prefix
| * Use getTable() to retrieve prefixed table nameJeremy Benoist2017-12-161-126/+122
| |
| * Fix initial migration when using custom table prefixadev2017-12-141-125/+129
| | | | | | | | Fix #3503
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 20:24:06 +0000