aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add ability to match many domains for credentialsJeremy Benoist2019-04-2315-26/+36
|/ / / | | | | | | | | | | | | Instead of fetching one domain, we use the same method as in site config (to retrieve the matching file) and handle api.example.org, example.org, .org (yes the last one isn’t useful). If one of these match, we got it and use it.
| * | Merge pull request #3956 from wallabag/fix/delete-cascade-oauth2Jérémy Benoist2019-05-134-0/+99
| |\ \ | | |/ | |/| Cascade delete on oauth2 table when deleting a user
| | * Fix SQLite constraintJeremy Benoist2019-05-101-3/+3
| | |
| | * Fix SQLite migrationJeremy Benoist2019-05-101-16/+17
| | |
| | * Cascade delete on oauth2 table when deleting a userJeremy Benoist2019-05-104-0/+98
| |/
| * Merge pull request #3955 from wallabag/fix/gif-animation-imagickJérémy Benoist2019-05-106-21/+42
| |\ | | | | | | Use Imagick to keep GIF animation
| | * Fallback to default solution if Imagick failsJeremy Benoist2019-05-101-4/+9
| | |
| | * CSJeremy Benoist2019-05-103-20/+20
| | |
| | * Setup Imagick for TravisJeremy Benoist2019-05-101-0/+4
| | | | | | | | | | | | To avoid error from phpstan about class not found
| | * Use Imagick to keep GIF animationJeremy Benoist2019-05-102-1/+13
| |/ | | | | | | | | If Imagick is available, GIF will be saved using it to keep animation. Otherwise the previous method will be used and the animation won't be kept.
| * Merge pull request #3223 from wallabag/rss2atomJérémy Benoist2019-05-0963-590/+787
| |\ | | | | | | Changed RSS to Atom feed and improve paging
| | * Handle redirection from previous feedsJeremy Benoist2019-04-262-0/+69
| | |
| | * Fix tests & cs & migrationJeremy Benoist2019-04-2614-69/+126
| | |
| | * Changed RSS to Atom feed and improve pagingThomas Citharel2019-04-2557-564/+635
| |/
| * Merge pull request #3158 from wallabag/hash-exist-urlJérémy Benoist2019-04-257-23/+398
| |\ | | | | | | Hash exist url
| | * Fix ApiDoc about md5/sha1Jérémy Benoist2019-04-021-2/+2
| | |
| | * Fix index on MySQLJeremy Benoist2019-04-012-2/+2
| | |
| | * Some cleanupJeremy Benoist2019-04-015-15/+23
| | | | | | | | | | | | Also, do not run the hashed_url migration into a Doctrine migration
| | * Use a better index for hashed_urlJeremy Benoist2019-04-017-23/+21
| | | | | | | | | | | | | | | | | | It'll most often be used in addition to the `user_id`. Also, automatically generate the hash when saving the url. Switch from `md5` to `sha1`.
| | * Keep url in exists endpointJeremy Benoist2019-04-018-77/+154
| | | | | | | | | | | | | | | | | | - Add migration - Use md5 instead of sha512 (we don't need security here, just a hash) - Update tests
| | * Hash the urls to check if they existThomas Citharel2019-04-017-14/+306
| |/ | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-04-0114-66/+185
| |\ | |/ |/|
* | Merge pull request #3909 from wallabag/fix/html-not-definedJérémy Benoist2019-03-181-7/+6
|\ \ | | | | | | Fix PHP warning
| * | Fix PHP warningJeremy Benoist2019-03-181-7/+6
| | | | | | | | | | | | Looks like sometimes (usually from import) the `html` key isn’t available.
* | | Merge pull request #3908 from wallabag/epub-issue-3642Jérémy Benoist2019-03-181-1/+1
|\ \ \ | | | | | | | | epub: fix exception when articles have the same title
| * | | epub: fix exception when articles have the same titleKevin Decherf2019-03-171-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes an exception occuring when exporting as epub several articles with the same title. The chapter filename is now derived from title and url. Fixes #3642 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3860 from baurmatt/fix/posix_compatibilityJérémy Benoist2019-03-183-9/+21
|\ \ \ | |/ / |/| | Make dev/install/update script posix compatible
| * | Properly source require.shMatthias Baur2019-03-123-9/+21
|/ / | | | | | | Fixes #3571.
* | Merge pull request #3901 from wallabag/fix-pr-3893Kevin Decherf2019-03-092-2/+2
|\ \ | | | | | | material: fix left padding on non-entry pages introduced by #3893
| * | material: fix left padding on non-entry pages introduced by #3893Kevin Decherf2019-03-092-2/+2
|/ / | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3897 from wallabag/2.3.8-devJérémy Benoist2019-03-041-1/+1
|\ \ | | | | | | Jump to 2.3.8-dev
| * | Jump to 2.3.8-devJeremy Benoist2019-03-041-1/+1
|/ /
* | Merge pull request #3895 from wallabag/prepare-2.3.7Jérémy Benoist2019-03-042-1/+19
|\ \ | | | | | | Prepare 2.3.7 release
| * | Prepare 2.3.7 releaseJeremy Benoist2019-03-042-1/+19
|/ /
* | Merge pull request #3894 from wallabag/issue-3851Kevin Decherf2019-03-034-6/+22
|\ \ | | | | | | material: hide creation date from card actions on specific sizes
| * | material: update prod assetsKevin Decherf2019-03-031-1/+1
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | material: add media queries to hide creation date from card actionsKevin Decherf2019-03-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Hide the creation date from card actions on specific sizes when there's not enough space for all parts. Fixes #3851 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | material: wrap card actions, remove class hiding of creation dateKevin Decherf2019-03-032-5/+12
|/ / | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3893 from wallabag/issue-3877Kevin Decherf2019-03-032-6/+10
|\ \ | | | | | | material: fix left padding of content on medium screens
| * | material: fix left padding of content on medium screensKevin Decherf2019-03-021-1/+7
| | | | | | | | | | | | | | | | | | Fixes #3877 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | material: move a media query from cards to dedicated scss fileKevin Decherf2019-03-022-6/+4
|/ / | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3885 from mart-e/script-ignore-rootJérémy Benoist2019-03-012-9/+22
|\ \ | | | | | | Allow optional --ignore-root-warning
| * | Allow optional --ignore-root-warningMartin Trigaux2019-02-142-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now both ./install prod --ignore-root-warning ./install --ignore-root-warning prod will work $1 was both used for the environment and the root flag Fixes wallabag/wallabag#3884
* | | Merge pull request #3886 from wallabag/issue-3602Jérémy Benoist2019-02-251-7/+9
|\ \ \ | | | | | | | | epub export: fix missing cover image, only for exports of one article
| * | | epub export: fix missing cover image, only for exports of one articleKevin Decherf2019-02-181-7/+9
| |/ / | | | | | | | | | | | | | | | Fixes #3602 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3887 from wallabag/issue-3711Jérémy Benoist2019-02-252-17/+72
|\ \ \ | |/ / |/| | Add support of expect parameter to change return object when deleting entry
| * | tests: fix broken session clients for rest entry deletion testsKevin Decherf2019-02-201-4/+13
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | EntryRestController: add support of expect parameter to delete actionKevin Decherf2019-02-202-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expect parameter enables an application to request the whole entry or only the id when requesting its deletion. `expects` defaults to `entry` to prevent any API breakage. Fixes #3711 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | tests: create entry for testDeleteEntry, fix missing idKevin Decherf2019-02-171-7/+29
|/ / | | | | | | | | | | | | | | | | | | | | When using the entity manager to retrieve an already stored entry, the id disapears from $entry after the first delete call. This leads to testing a nonexistent endpoint (api/entries/.json) during the second delete call. This change now creates an entry specifically for the test. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3882 from wallabag/fix/corsKevin Decherf2019-02-139-16/+16
|\ \ | | | | | | Fix CORS for API