Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Some cleanup | Jeremy Benoist | 2019-04-01 | 5 | -15/+23 |
| | | | | Also, do not run the hashed_url migration into a Doctrine migration | ||||
* | Use a better index for hashed_url | Jeremy Benoist | 2019-04-01 | 7 | -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 endpoint | Jeremy Benoist | 2019-04-01 | 8 | -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 exist | Thomas Citharel | 2019-04-01 | 7 | -14/+306 |
| | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-04-01 | 14 | -66/+185 |
|\ | |||||
| * | Merge pull request #3909 from wallabag/fix/html-not-defined | Jérémy Benoist | 2019-03-18 | 1 | -7/+6 |
| |\ | | | | | | | Fix PHP warning | ||||
| | * | Fix PHP warning | Jeremy Benoist | 2019-03-18 | 1 | -7/+6 |
| | | | | | | | | | | | | Looks like sometimes (usually from import) the `html` key isn’t available. | ||||
| * | | Merge pull request #3908 from wallabag/epub-issue-3642 | Jérémy Benoist | 2019-03-18 | 1 | -1/+1 |
| |\ \ | | | | | | | | | epub: fix exception when articles have the same title | ||||
| | * | | epub: fix exception when articles have the same title | Kevin Decherf | 2019-03-17 | 1 | -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_compatibility | Jérémy Benoist | 2019-03-18 | 3 | -9/+21 |
| |\ \ | | |/ | |/| | Make dev/install/update script posix compatible | ||||
| | * | Properly source require.sh | Matthias Baur | 2019-03-12 | 3 | -9/+21 |
| |/ | | | | | | | Fixes #3571. | ||||
| * | Merge pull request #3901 from wallabag/fix-pr-3893 | Kevin Decherf | 2019-03-09 | 2 | -2/+2 |
| |\ | | | | | | | material: fix left padding on non-entry pages introduced by #3893 | ||||
| | * | material: fix left padding on non-entry pages introduced by #3893 | Kevin Decherf | 2019-03-09 | 2 | -2/+2 |
| |/ | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Merge pull request #3897 from wallabag/2.3.8-dev | Jérémy Benoist | 2019-03-04 | 1 | -1/+1 |
| |\ | | | | | | | Jump to 2.3.8-dev | ||||
| | * | Jump to 2.3.8-dev | Jeremy Benoist | 2019-03-04 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3895 from wallabag/prepare-2.3.7 | Jérémy Benoist | 2019-03-04 | 2 | -1/+19 |
| |\ | | | | | | | Prepare 2.3.7 release | ||||
| | * | Prepare 2.3.7 release | Jeremy Benoist | 2019-03-04 | 2 | -1/+19 |
| |/ | |||||
| * | Merge pull request #3894 from wallabag/issue-3851 | Kevin Decherf | 2019-03-03 | 4 | -6/+22 |
| |\ | | | | | | | material: hide creation date from card actions on specific sizes | ||||
| | * | material: update prod assets | Kevin Decherf | 2019-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| | * | material: add media queries to hide creation date from card actions | Kevin Decherf | 2019-03-03 | 1 | -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 date | Kevin Decherf | 2019-03-03 | 2 | -5/+12 |
| |/ | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Merge pull request #3893 from wallabag/issue-3877 | Kevin Decherf | 2019-03-03 | 2 | -6/+10 |
| |\ | | | | | | | material: fix left padding of content on medium screens | ||||
| | * | material: fix left padding of content on medium screens | Kevin Decherf | 2019-03-02 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | Fixes #3877 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| | * | material: move a media query from cards to dedicated scss file | Kevin Decherf | 2019-03-02 | 2 | -6/+4 |
| |/ | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Merge pull request #3885 from mart-e/script-ignore-root | Jérémy Benoist | 2019-03-01 | 2 | -9/+22 |
| |\ | | | | | | | Allow optional --ignore-root-warning | ||||
| | * | Allow optional --ignore-root-warning | Martin Trigaux | 2019-02-14 | 2 | -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-3602 | Jérémy Benoist | 2019-02-25 | 1 | -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 article | Kevin Decherf | 2019-02-18 | 1 | -7/+9 |
| | |/ | | | | | | | | | | | | | | | | Fixes #3602 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Merge pull request #3887 from wallabag/issue-3711 | Jérémy Benoist | 2019-02-25 | 2 | -17/+72 |
| |\ \ | | |/ | |/| | Add support of expect parameter to change return object when deleting entry | ||||
| | * | tests: fix broken session clients for rest entry deletion tests | Kevin Decherf | 2019-02-20 | 1 | -4/+13 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| | * | EntryRestController: add support of expect parameter to delete action | Kevin Decherf | 2019-02-20 | 2 | -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 id | Kevin Decherf | 2019-02-17 | 1 | -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/cors | Kevin Decherf | 2019-02-13 | 9 | -16/+16 |
| |\ | | | | | | | Fix CORS for API | ||||
| | * | CS | Jeremy Benoist | 2019-02-13 | 1 | -1/+1 |
| | | | |||||
| | * | CS | Jeremy Benoist | 2019-02-11 | 9 | -13/+13 |
| | | | |||||
| | * | CORS repare for api | Rurik19 | 2019-02-11 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #3868 from Nadrieril/fix-3662 | Kevin Decherf | 2019-03-02 | 1 | -0/+147 |
|\ \ | | | | | | | Add missing entries in craue_config_setting. | ||||
| * | | Disable down for that migration | Jeremy Benoist | 2019-03-01 | 1 | -6/+1 |
| | | | |||||
| * | | Test each internal settings before creating them | Jeremy Benoist | 2019-03-01 | 1 | -41/+119 |
| | | | |||||
| * | | Add missing entries in craue_config_setting. | Nadrieril | 2019-03-01 | 1 | -0/+74 |
|/ / | | | | | | | Should fix https://github.com/wallabag/wallabag/issues/3662 | ||||
* | | Merge pull request #3857 from wallabag/php73 | Jérémy Benoist | 2019-02-27 | 7 | -10/+78 |
|\ \ | | | | | | | Replace continue; with break; to avoid PHP 7.3 warnings | ||||
| * | | Adding more tests | Jeremy Benoist | 2019-02-27 | 8 | -9/+77 |
| | | | |||||
| * | | CS | Jeremy Benoist | 2019-02-27 | 6 | -10/+10 |
| | | | |||||
| * | | Replace continue; with break; to avoid PHP 7.3 warnings | Thomas Citharel | 2019-02-27 | 7 | -9/+9 |
|/ / | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Merge pull request #3879 from wallabag/fix/url-default-protocol | Jérémy Benoist | 2019-02-08 | 3 | -0/+4 |
|\ \ | | | | | | | Force default_protocol to generate an url input | ||||
| * | | Force default_protocol to generate an url input | Jeremy Benoist | 2019-02-08 | 3 | -0/+4 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-02-07 | 6 | -6/+14 |
|\| | |||||
| * | Merge pull request #3869 from itsthejb/fix-2factor-email-image | Jérémy Benoist | 2019-02-01 | 1 | -1/+1 |
| |\ | | | | | | | Fix broken 2 factor auth logo image | ||||
| | * | Fix broken 2 factor auth logo image | Jonathan Crooke | 2019-01-31 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3819 from stan3/pocket-import | Jérémy Benoist | 2019-01-28 | 2 | -3/+10 |
| |\ | | | | | | | Fix read & starred status in Pocket import |