aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #3882 from wallabag/fix/corsKevin Decherf2019-02-139-16/+16
|\ \
| * | CSJeremy Benoist2019-02-131-1/+1
| * | CSJeremy Benoist2019-02-119-13/+13
| * | CORS repare for apiRurik192019-02-111-4/+4
|/ /
| * Merge pull request #3868 from Nadrieril/fix-3662Kevin Decherf2019-03-021-0/+147
| |\
| | * Disable down for that migrationJeremy Benoist2019-03-011-6/+1
| | * Test each internal settings before creating themJeremy Benoist2019-03-011-41/+119
| | * Add missing entries in craue_config_setting.Nadrieril2019-03-011-0/+74
| |/
| * Merge pull request #3857 from wallabag/php73Jérémy Benoist2019-02-277-10/+78
| |\
| | * Adding more testsJeremy Benoist2019-02-278-9/+77
| | * CSJeremy Benoist2019-02-276-10/+10
| | * Replace continue; with break; to avoid PHP 7.3 warningsThomas Citharel2019-02-277-9/+9
| |/
| * Merge pull request #3879 from wallabag/fix/url-default-protocolJérémy Benoist2019-02-083-0/+4
| |\
| | * Force default_protocol to generate an url inputJeremy Benoist2019-02-083-0/+4
| |/
| * Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-02-076-6/+14
| |\ | |/ |/|
* | Merge pull request #3869 from itsthejb/fix-2factor-email-imageJérémy Benoist2019-02-011-1/+1
|\ \
| * | Fix broken 2 factor auth logo imageJonathan Crooke2019-01-311-1/+1
|/ /
* | Merge pull request #3819 from stan3/pocket-importJérémy Benoist2019-01-282-3/+10
|\ \
| * | Improve checks & add testsJeremy Benoist2019-01-282-3/+10
| * | status and favourite are actually strings in the import so use ==Tristan Hill2019-01-271-2/+2
|/ /
* | Merge pull request #3861 from wallabag/fix/siteconfig-emailJérémy Benoist2019-01-182-2/+2
|\ \
| * | Add dedicated email for site config issueJeremy Benoist2019-01-182-2/+2
|/ /
* | Merge pull request #3853 from techexo/patch-2Jérémy Benoist2019-01-171-0/+1
|\ \
| * | Update composer.json to add php-tidy (ext-tidy)Eloi Coutant2019-01-161-0/+1
|/ /
| * Merge pull request #3798 from wallabag/update-two-factor-bundleKevin Decherf2019-01-3041-233/+1094
| |\
| | * Hash backup codes in the database using `password_hash`update-two-factor-bundleJeremy Benoist2019-01-234-11/+38
| | * Revert PG on Travis about drop/create the databaseJeremy Benoist2019-01-232-9/+1
| | * CSJeremy Benoist2019-01-231-3/+1
| | * Change the way to enable 2FAJeremy Benoist2019-01-2320-290/+617
| | * Remove secret from adminJeremy Benoist2019-01-231-6/+0
| | * Update translationJeremy Benoist2019-01-2314-14/+14
| | * Fix PG & Travis drop/create databaseJeremy Benoist2019-01-233-5/+13
| | * Add SQLite & PG migrationJeremy Benoist2019-01-231-5/+41
| | * Add backup codesJeremy Benoist2019-01-2321-14/+96
| | * Better translationsJeremy Benoist2019-01-2315-35/+76
| | * CleanupJeremy Benoist2019-01-232-3/+1
| | * Fix testsJeremy Benoist2019-01-234-69/+36
| | * Fix test for custom version of the tidy extensionJeremy Benoist2019-01-231-7/+7
| | * Enable OTP 2FAJeremy Benoist2019-01-2336-177/+553
| | * Create a dedicated tab to reset dataJeremy Benoist2019-01-2315-31/+46
| |/
| * Merge pull request #3627 from craig0990/feature/add-search-api-endpoint2.4Jérémy Benoist2019-01-235-21/+159
| |\
| | * Fix third argument to RouteJeremy Benoist2019-01-222-4/+2
| | * Factorize sendResponse between Api controllersJeremy Benoist2019-01-224-41/+21
| | * [wallabag/wallabag#2611] Fix PHPCS lint errorsCraig Roberts2019-01-222-11/+2
| | * Fixes [wallabag/wallabag#2611] Add a basic Search REST endpointCraig Roberts2019-01-223-0/+169
| * | Merge pull request #3864 from wallabag/fix/database-init-versionJérémy Benoist2019-01-232-3/+0
| |\ \ | | |/ | |/|
| | * Avoid creating PG database on TravisJeremy Benoist2019-01-221-2/+0
| | * Removed hardcoded database versionJeremy Benoist2019-01-221-1/+0
| |/
| * Merge pull request #3526 from wallabag/add-random-articleKevin Decherf2019-01-2224-67/+214
| |\
| | * Update icon to `casino`Jeremy Benoist2019-01-222-2/+2