aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #3513 from wallabag/icons-3437Nicolas Lœuillet2017-12-164-9/+13
|\ \ | | | | | | material: replace exit_to_app, redo and autorenew icons
| * | material: replace exit_to_app, redo and autorenew iconsKevin Decherf2017-12-164-9/+13
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3511 from wallabag/install-command-noteNicolas Lœuillet2017-12-161-1/+1
|\ \ \ | |/ / |/| | command: replace note regarding server:run --env=prod
| * | command: replace note regarding server:run --env=prodKevin Decherf2017-12-161-1/+1
|/ / | | | | | | | | server:run --env=prod does not exist anymore Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3507 from wallabag/fix-lowercase-migrationNicolas Lœuillet2017-12-161-1/+1
|\ \ | | | | | | Fixed lower case tags migration
| * | Fixed lower case tags migrationNicolas Lœuillet2017-12-151-1/+1
| |/
* | Merge pull request #3510 from wallabag/update-robotstxtNicolas Lœuillet2017-12-161-3/+1
|\ \ | |/ |/| Updated robots.txt to prevent crawling
| * Updated robots.txt to prevent crawlingNicolas Lœuillet2017-12-151-3/+1
|/
* Merge pull request #3442 from wallabag/empty-entryJérémy Benoist2017-12-147-5/+121
|\ | | | | Fix empty title and domain_name when exception is thrown during fetch
| * Update CHANGELOGKevin Decherf2017-12-131-1/+8
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Add test on EntryControllerTest for #3442Kevin Decherf2017-12-132-0/+54
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Fix empty title and domain_name when exception is thrown during fetchKevin Decherf2017-12-134-4/+59
|/ | | | | | | | | | Add a new helper to set a default title when it's empty: 1/ use basename part of entry's path, if any 2/ or use domain name Fixes #2053 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3488 from wallabag/pg-10Jérémy Benoist2017-12-138-0/+70
|\ | | | | Add custom driver & schema manager for PostgreSQL 10
| * Fix testsJeremy Benoist2017-12-121-4/+4
| |
| * Add custom driver & schema manager for PostgreSQL 10Jeremy Benoist2017-12-128-0/+70
| |
* | Merge pull request #3495 from wallabag/wallabag/remove-make-run-readmeNicolas Lœuillet2017-12-131-2/+3
|\ \ | | | | | | Removed "make run" in the README
| * | Removed "make run" in the READMENicolas Lœuillet2017-12-121-2/+3
|/ /
* | Merge pull request #3492 from bdunogier/fix-3484-disable_share_linkNicolas Lœuillet2017-12-121-0/+10
|\ \ | | | | | | Fix 3484: hide the share toggle button if no service is enabled
| * | Fix #3484: hide the share toggle button if no service is enabledBertrand Dunogier2017-12-121-0/+10
| |/
* | Merge pull request #3490 from wallabag/fix-rss-unread-iconNicolas Lœuillet2017-12-121-3/+8
|\ \ | | | | | | Displayed the RSS icon on homepage route
| * | Displayed the RSS icon on homepage routeNicolas Lœuillet2017-12-121-3/+8
| |/
* | Merge pull request #3487 from wallabag/initial-migrationNicolas Lœuillet2017-12-121-6/+20
|\ \ | |/ |/| Change the way to check for initial migration
| * CSJeremy Benoist2017-12-121-1/+0
| |
| * Use hasTable instead of try/catchJeremy Benoist2017-12-121-7/+1
| |
| * Change the way to check for initial migrationJeremy Benoist2017-12-121-4/+25
|/