aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* misc: add note on GitHub PR template to auto-close issuesKevin Decherf2018-10-261-1/+7
| | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3553 from wallabag/url-3529Kevin Decherf2018-10-262-1/+244
|\ | | | | Swap entry url with origin url if graby provides an updated one
| * phpcsKevin Decherf2018-10-241-1/+2
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * updateOriginUrl: remove 'query string' case from ignore listKevin Decherf2018-10-242-12/+2
| | | | | | | | | | | | | | Two urls with a different query string may refer to two different pages so keep them both. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * updateOriginUrl: add comment blocks for the parse_url diff checkKevin Decherf2018-10-241-0/+23
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * updateOriginUrl: rewrite some if, resolving feedbacks from PRKevin Decherf2018-10-241-32/+35
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * ignoreOriginUrl: add initial support of ignore listsKevin Decherf2018-10-222-21/+92
| | | | | | | | | | | | | | | | | | | | | | Add the ability to specify hosts and patterns lists to ignore the given entry url and replace it with the fetched content url without touching to origin_url. This initial support should be reworked in the following months to move the hardcoded ignore lists in the database. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * updateOriginUrl: add behavior when diff is fragment and queryKevin Decherf2018-10-222-0/+9
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Refactor updateOriginUrl to include new behaviors behaviorsKevin Decherf2018-10-222-35/+140
| | | | | | | | | | | | | | | | - Leave origin_url unchanged if difference is an ending slash - Leave origin_url unchanged if difference is scheme - Ignore (noop) if difference is query string or fragment Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * ContentProxy: swap entry url to origin_url and set new url according to ↵Kevin Decherf2018-10-212-4/+37
| | | | | | | | | | | | | | | | graby content Closes #3529 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * ContentProxy: fix a corner case when entry.url is empty in updateEntryKevin Decherf2018-10-211-0/+8
|/ | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3733 from Deuchnord/root-abort-updateKevin Decherf2018-10-172-0/+28
|\ | | | | Abort running install and update script if root
| * Added argument to ignore the warning.Jérôme Deuchnord2018-10-162-2/+18
| |
| * Abort running install and update script if root (closes #3590)Jérôme Deuchnord2018-10-062-0/+12
| |
* | Merge pull request #3745 from burkemw3/patch-3Jérémy Benoist2018-10-165-18/+12
|\ \ | | | | | | Add placeholder image to card-based gallery entries page
| * | Add placeholder image to card-based gallery entries page for #3651Matt Burke2018-10-155-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I referenced https://css-tricks.com/using-svg/ for using the SVG icon. The icon has a black foreground and white background, which doesn't look very good as a placeholder. So, using the background-image style to show the svg and the inversion filter to make it white on gray. With the image always present, there isn't much difference between the with and without image preview templates, so I merged them. Tested on Chrome, Firefox, and Safari on OSX.
* | | Merge pull request #3606 from mritzmann/masterJérémy Benoist2018-10-153-0/+50
|\ \ \ | | | | | | | | add manifest.json for android pwa
| * | | add 512x512 appiconmritzmann2018-03-202-0/+5
| | | |
| * | | change href link for manifest.jsonMarkus Ritzmann2018-03-191-1/+1
| | | |
| * | | add manifest.json for android pwamritzmann2018-03-182-0/+45
| | | |
* | | | Merge pull request #3706 from shtrom/fix/gnu-make-bashKevin Decherf2018-10-147-52/+55
|\ \ \ \ | |_|/ / |/| | | Makefile fixes for non GNU systems
| * | | Makefile fixes for non GNU systemsOlivier Mehani2018-08-187-52/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move `Makefile` to `GNUmakefile`, which GNU `make` picks first * Add `Makefile` so other `make`s forward to `gmake` * Set the `SHELL` variable and let `make` handle the shell Signed-off-by: Olivier Mehani <shtrom@ssji.net>
* | | | Merge pull request #3743 from burkemw3/patch-1Jérémy Benoist2018-10-131-0/+7
|\ \ \ \ | | | | | | | | | | Show tags on non-image gallery preview card
| * | | | Show tags on non-image gallery preview cardMatt Burke2018-10-111-0/+7
| | |_|/ | |/| | | | | | | | | | | | | | Tags and images aren't coupled, so they shouldn't be coupled in the UI, either. This also makes the titles and source domains show up consistently for image and non-image entry cards.
* | | | Merge pull request #3734 from davidmohamedfr/fix-dockerfile-php72Jérémy Benoist2018-10-131-2/+2
|\ \ \ \ | |/ / / |/| | | Fix dockerfile php72
| * | | libpng12-dev was rename as libpng-devDavid MOHAMED2018-10-061-1/+1
| | | |
| * | | remove mcrypt since openssl is included in php 7.2David MOHAMED2018-10-061-1/+1
|/ / / | | | | | | mcrypt extension doesn't exist anymore
* | | Merge pull request #3725 from Tobi823/masterKevin Decherf2018-09-242-0/+298
|\ \ \ | | | | | | | | Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters.
| * | | Run php-cs-fixer for fixing coding standard issues (on ContentProxyTest)Tobi8232018-09-231-11/+19
| | | |
| * | | Run php-cs-fixer for fixing coding standard issuesTobi8232018-09-231-41/+53
| | | |
| * | | Make helper methods strToHex and hexToStr in ContentProxyTest.php privateTobi8232018-09-211-2/+2
| | | | | | | | | | | | | | | | to prevent misusage (from outside this class)
| * | | Override the value of the given parameter ($title) with the (hopefully)Tobi8232018-09-211-2/+1
| | | | | | | | | | | | | | | | correct (to UTF-8) converted PDF title
| * | | Add tests for logicTobi8232018-09-212-2/+238
| | | | | | | | | | | | | | | | Try to translate the title of a PDF from UTF-8 (then UTF-16BE, then WINDOWS-1252) to UTF-8
| * | | Try to detect the character encoding in PDFs and try to translateTobi8232018-09-211-13/+33
| | | | | | | | | | | | | | | | the title from the PDF to UTF-8
| * | | Remove type declaration for PHP 5 compatibilityTobi8232018-09-211-1/+1
| | | |
| * | | Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 charactersTobi8232018-09-211-0/+23
|/ / /
* | | Merge pull request #3726 from wallabag/fix-testsJérémy Benoist2018-09-215-11/+14
|\ \ \ | | | | | | | | Liberation goes https
| * | | Liberation goes httpsJeremy Benoist2018-09-215-11/+14
|/ / /
* | | Merge pull request #3719 from wallabag/fix-sort-parametersKevin Decherf2018-09-075-7/+26
|\ \ \ | | | | | | | | Fix sort parameters
| * | | Updating node to 6.10Jeremy Benoist2018-09-072-2/+6
| | | | | | | | | | | | | | | | Same as defined in .travis.yml
| * | | Fix testsJeremy Benoist2018-09-071-4/+4
| | | |
| * | | Jump to the new Scrutinizer PHP analysis engineJeremy Benoist2018-09-071-0/+15
| | | |
| * | | Add missing parametersJeremy Benoist2018-09-071-1/+1
|/ / / | | | | | | | | | Parameters weren’t passed to the sub function.
* | | Merge pull request #3712 from wallabag/refactor-entry-queriesJérémy Benoist2018-09-072-16/+55
|\ \ \ | | | | | | | | Rename getBuilderByUser and refactor query for untagged entries
| * | | php-cs-fixerKevin Decherf2018-09-051-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | EntryRepository: refactor getBuilderForUntaggedByUserKevin Decherf2018-09-051-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve SQL performance by replacing size(e.tags) with a left join and a null condition Move the QueryBuilder logic into getRawBuilderForUntaggedByUser Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | EntryRepository: refactor getBuilderByUserKevin Decherf2018-09-051-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We refactor getBuilderByUser to separate QueryBuilder getter and the orderBy(). The previous code of getBuilderByUser() has been moved to getSortedQueryBuilderByUser(). getBuildByUser() now returns a QueryBuilder without the call to orderBy(). A new method named sortQueryBuilder() returns a given QueryBuilder with an orderBy() call using given sort parameters. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | AnnotationRepository: rename getBuilderByUserKevin Decherf2018-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We rename getBuilderByUser to getSortedQueryBuilderByUser as long as the method currently returns a QueryBuilder with an orderBy() Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | | Merge pull request #3717 from wallabag/php-72Kevin Decherf2018-09-061-1/+0
|\ \ \ \ | |/ / / |/| | | PHP 7.2 shouldn't fail
| * | | PHP 7.2 shouldn't failJérémy Benoist2018-09-061-1/+0
|/ / /