aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Replace continue; with break; to avoid PHP 7.3 warningsThomas Citharel2019-02-277-9/+9
| | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Merge pull request #3879 from wallabag/fix/url-default-protocolJérémy Benoist2019-02-083-0/+4
|\ | | | | Force default_protocol to generate an url input
| * 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 image
| | * 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
| |\ | | | | | | Fix read & starred status in Pocket import
| | * 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 issue
| | * Add dedicated email for site config issueJeremy Benoist2019-01-182-2/+2
| |/ | | | | | | | | Instead of sending an email to the devs, it now creates an issue on GitHub using a zap from zapier.
| * Merge pull request #3853 from techexo/patch-2Jérémy Benoist2019-01-171-0/+1
| |\ | | | | | | Update composer.json to add php-tidy (ext-tidy)
| | * Update composer.json to add php-tidy (ext-tidy)Eloi Coutant2019-01-161-0/+1
| |/ | | | | Should fix https://github.com/wallabag/wallabag/issues/3844 for milestone https://github.com/wallabag/wallabag/milestone/63.
* | Merge pull request #3798 from wallabag/update-two-factor-bundleKevin Decherf2019-01-3041-233/+1094
|\ \ | | | | | | Enable OTP 2FA
| * | 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
| | | | | | | | | | | | And add a step to validate a generated code from the OTP app
| * | 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
| | | | | | | | | | | | | | | Also remove the forced `server_version` from dbal config to avoid an hard overriding across all database.
| * | Add backup codesJeremy Benoist2019-01-2321-14/+96
| | |
| * | Better translationsJeremy Benoist2019-01-2315-35/+76
| | | | | | | | | | | | | | | | | | Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text. Translate how to use the code / qr code.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Update SchebTwoFactorBundle to version 3 - Enable Google 2fa on the bundle - Disallow ability to use both email and google as 2fa - Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7) - use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add` - update admin to be able to create/reset the 2fa
| * | 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
|\ \ | | | | | | Add a basic Search REST endpoint
| * | Fix third argument to RouteJeremy Benoist2019-01-222-4/+2
| | |
| * | Factorize sendResponse between Api controllersJeremy Benoist2019-01-224-41/+21
| | | | | | | | | | | | And run newer cs fixer
| * | [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
| | | | | | | | | | | | | | | | | | | | | - Adds a new `search` key to `src/Wallabag/ApiBundle/Resources/config/routing_rest.yml` - Reuses the `getBuilderForSearchByUser` method from the EntryRepository - Supports, `term`, `page`, and `perPage` query parameters - Some very basic tests
* | | Merge pull request #3864 from wallabag/fix/database-init-versionJérémy Benoist2019-01-232-3/+0
|\ \ \ | |/ / |/| | Removed hardcoded database version
| * | Avoid creating PG database on TravisJeremy Benoist2019-01-221-2/+0
| | | | | | | | | | | | And Travis build on PHP 7.3 should not fail.
| * | Removed hardcoded database versionJeremy Benoist2019-01-221-1/+0
|/ /
* | Merge pull request #3526 from wallabag/add-random-articleKevin Decherf2019-01-2224-67/+214
|\ \ | | | | | | Add random feature
| * | Update icon to `casino`Jeremy Benoist2019-01-222-2/+2
| | |
| * | Handle no random result foundJeremy Benoist2019-01-191-1/+6
| | |
| * | Fix status from InstapaperJeremy Benoist2019-01-191-1/+0
| | | | | | | | | | | | That status was used as `http_status` in ContentProxy->stockEntry
| * | Move icon into the top menu barJeremy Benoist2019-01-1922-28/+57
| | | | | | | | | | | | | | | | | | | | | Change the way to select a random entry: - select all ids from the given user (with filters) - choose randomly one in php - find that entry
| * | Redirect to the current view instead of homepageJeremy Benoist2019-01-192-19/+18
| | |
| * | Better iconJeremy Benoist2019-01-191-1/+1
| | |
| * | Better random functionJeremy Benoist2019-01-191-9/+13
| | |
| * | Use only one method to randomizeJeremy Benoist2019-01-194-85/+42
| | | | | | | | | | | | Instead of one per type, one for all is ok.
| * | Fix testsJeremy Benoist2019-01-192-99/+94
| | |
| * | Added random featureNicolas Lœuillet2019-01-1918-10/+169
|/ /
* | Merge pull request #3858 from wallabag/bump-ocramiusJérémy Benoist2019-01-181-3/+8
|\ \ | | | | | | Bump ocramius/proxy-manager
| * | CSJeremy Benoist2019-01-183-3/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 04:52:22 +0000