aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| |
| * Bump ocramius/proxy-managerThomas Citharel2019-01-171-3/+8
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #3859 from wallabag/phpstanJérémy Benoist2019-01-1827-43/+118
|\ \ | | | | | | Enable PHPStan
| * | Enable PHPStanJeremy Benoist2019-01-1827-43/+118
|/ / | | | | | | | | - Fix error for level 0 & 1 (level 7 has 699 errors...) - Add `updated_at` to site_credential (so the `timestamps()` method applies correctly)
* | Merge pull request #3845 from wallabag/feature/api-info-endpointKevin Decherf2019-01-153-3/+38
|\ \ | | | | | | Add a new endpoint to retrieve information from the wallabag instance
| * | Add a new endpoint to retrieve information from the wallabag instanceJeremy Benoist2019-01-153-3/+38
|/ / | | | | | | | | | | | | Useful for api client which required some information. We might add more inside them in the future. The endpoint /api/version should be avoided now as it contains not so much information rather the version.
* | CSJeremy Benoist2019-01-153-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-01-1561-1519/+3823
|\ \ | |/ |/|
| * Merge pull request #3841 from wallabag/fix/bad-order-apiJérémy Benoist2019-01-144-15/+33
| |\ | | | | | | Fix bad order parameter in the API
| | * Avoid error when a bad `order` parameter is givenJeremy Benoist2019-01-143-14/+32
| | | | | | | | | | | | Only allowed parameter are asc & desc
| | * Come back to stable versionJeremy Benoist2019-01-141-1/+1
| |/ | | | | | | Previous one was used because some PHPUnit version where deleted and tests can't be run anymore.
| * Merge pull request #3837 from wallabag/2.3.7-devKevin Decherf2019-01-121-1/+1
| |\ | | | | | | Jump to 2.3.7-dev
| | * Jump to 2.3.7-devJérémy Benoist2019-01-111-1/+1
| |/
| * Merge pull request #3835 from wallabag/prepare-2.3.6Jérémy Benoist2019-01-112-1/+15
| |\ | | | | | | Prepare 2.3.6 release
| | * Prepare 2.3.6 releaseJeremy Benoist2019-01-112-1/+15
| |/
| * Merge pull request #3826 from wallabag/epub-tocJérémy Benoist2019-01-1117-32/+165
| |\ | | | | | | Rework of EPUB/PDF exports
| | * EntriesExport: avoid else on $authorsKevin Decherf2019-01-091-4/+2
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * EntriesExport: sanitize filename and fix testsKevin Decherf2019-01-082-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | Filename will now only use a-zA-Z0-9-' and space. Fixes remaining filename issue on #3811 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * EntriesExport/pdf: move notice to the end, add metadata coverKevin Decherf2019-01-071-8/+25
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * Add translationsKevin Decherf2019-01-0714-1/+88
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * EntriesExport/epub: add metadata to each entry's coverKevin Decherf2019-01-071-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add metadata to the cover of each entry: - Publishers - Estimated reading time - Date of creation ("Added on") - Address (URL) Related to #2821 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * EntriesExport: change authors and title when not single entry exportKevin Decherf2019-01-072-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change '{method} authors' (which gives 'Tag_entries authors' when exporting a tag) to 'Various authors'. When exporting a tag (tag_entries), change the title from 'Tag_entries articles' to 'Tag {tag} articles'. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * EntriesExport/epub: revert c779373f, move exportinfo to the end of the bookKevin Decherf2019-01-071-1/+3
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * EntriesExport/epub: use sha1 sums for filenames, fix and rename title chaptersKevin Decherf2019-01-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | This commit renames entry chapters file using a sha1 sum of their title for simplicity. Also we fix the 'Title' chapter duplicate issue by using the hash of the related entry and the suffix '_title'. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * EntriesExport/epub: remove TOC pageKevin Decherf2019-01-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change only remove the rendered page of the TOC at the end of the book, the TOC remains available to readers. Fixes #3603 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Merge pull request #3831 from wallabag/fix/api-bad-client-idJérémy Benoist2019-01-103-1/+34
| |\ \ | | | | | | | | Cast client id to avoid PG error
| | * | Cast client id to avoid PG errorJeremy Benoist2019-01-093-1/+34
| | | | | | | | | | | | | | | | If someone send a malformated client_id when trying to authenticate using the API we got a 500 if wallabag use postgres because the request send a string instead of an integer.
| * | | Merge pull request #3833 from techexo/patch-1Jérémy Benoist2019-01-102-4/+4
| |\ \ \ | | |_|/ | |/| | Fix settings field inverted
| | * | Update entries.html.twigEloi Coutant2019-01-101-2/+2
| | | | | | | | | | | | Should fix https://github.com/wallabag/wallabag/issues/3832
| | * | Update entries.html.twigEloi Coutant2019-01-101-2/+2
| |/ / | | | | | | Should fix https://github.com/wallabag/wallabag/issues/3832
| * | Merge pull request #3827 from wallabag/epub-quoteKevin Decherf2019-01-071-2/+8
| |\ \ | | | | | | | | EntriesExport/epub: replace epub identifier with unique urn
| | * | EntriesExport/epub: replace epub identifier with unique urnKevin Decherf2019-01-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We replace the title used as the unique identifier of the epub file with a urn following the format: urn:wallabag:{sha1("wallabagUrl:listOfEntryIdsSeparatedByComma")} This format is repeatable: it always gives the same uid for the same list of entries. Fixes #3811 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Merge pull request #3820 from ↵Jérémy Benoist2019-01-079-10/+63
| |\ \ \ | | |/ / | |/| | | | | | | | | | lizyn/bugfix/incorrect-calculation-of-CJK-characters-in-reading-time-estimation Fix incorrect reading time calculation for entries with CJK characters
| | * | Counting two characters together as a word in CJKlizyn2019-01-064-5/+5
| | | |
| | * | Improve reading time testsJeremy Benoist2019-01-049-9/+41
| | | |
| | * | fix incorrect reading time calculation for entries with CJK characterslizyn2018-12-254-1/+22
| | |/
| * | Merge pull request #3816 from wallabag/validate-import-entryJérémy Benoist2019-01-0410-4/+108
| |\ \ | | | | | | | | Validate imported entry to avoid error on import