Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ContentProxy: swap entry url to origin_url and set new url according to ↵ | Kevin Decherf | 2018-10-21 | 2 | -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 updateEntry | Kevin Decherf | 2018-10-21 | 1 | -0/+8 |
| | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3733 from Deuchnord/root-abort-update | Kevin Decherf | 2018-10-17 | 2 | -0/+28 |
|\ | | | | | Abort running install and update script if root | ||||
| * | Added argument to ignore the warning. | Jérôme Deuchnord | 2018-10-16 | 2 | -2/+18 |
| | | |||||
| * | Abort running install and update script if root (closes #3590) | Jérôme Deuchnord | 2018-10-06 | 2 | -0/+12 |
| | | |||||
* | | Merge pull request #3745 from burkemw3/patch-3 | Jérémy Benoist | 2018-10-16 | 5 | -18/+12 |
|\ \ | | | | | | | Add placeholder image to card-based gallery entries page | ||||
| * | | Add placeholder image to card-based gallery entries page for #3651 | Matt Burke | 2018-10-15 | 5 | -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/master | Jérémy Benoist | 2018-10-15 | 3 | -0/+50 |
|\ \ \ | | | | | | | | | add manifest.json for android pwa | ||||
| * | | | add 512x512 appicon | mritzmann | 2018-03-20 | 2 | -0/+5 |
| | | | | |||||
| * | | | change href link for manifest.json | Markus Ritzmann | 2018-03-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | add manifest.json for android pwa | mritzmann | 2018-03-18 | 2 | -0/+45 |
| | | | | |||||
* | | | | Merge pull request #3706 from shtrom/fix/gnu-make-bash | Kevin Decherf | 2018-10-14 | 7 | -52/+55 |
|\ \ \ \ | |_|/ / |/| | | | Makefile fixes for non GNU systems | ||||
| * | | | Makefile fixes for non GNU systems | Olivier Mehani | 2018-08-18 | 7 | -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-1 | Jérémy Benoist | 2018-10-13 | 1 | -0/+7 |
|\ \ \ \ | | | | | | | | | | | Show tags on non-image gallery preview card | ||||
| * | | | | Show tags on non-image gallery preview card | Matt Burke | 2018-10-11 | 1 | -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-php72 | Jérémy Benoist | 2018-10-13 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Fix dockerfile php72 | ||||
| * | | | libpng12-dev was rename as libpng-dev | David MOHAMED | 2018-10-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove mcrypt since openssl is included in php 7.2 | David MOHAMED | 2018-10-06 | 1 | -1/+1 |
|/ / / | | | | | | | mcrypt extension doesn't exist anymore | ||||
* | | | Merge pull request #3725 from Tobi823/master | Kevin Decherf | 2018-09-24 | 2 | -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) | Tobi823 | 2018-09-23 | 1 | -11/+19 |
| | | | | |||||
| * | | | Run php-cs-fixer for fixing coding standard issues | Tobi823 | 2018-09-23 | 1 | -41/+53 |
| | | | | |||||
| * | | | Make helper methods strToHex and hexToStr in ContentProxyTest.php private | Tobi823 | 2018-09-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | to prevent misusage (from outside this class) | ||||
| * | | | Override the value of the given parameter ($title) with the (hopefully) | Tobi823 | 2018-09-21 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | correct (to UTF-8) converted PDF title | ||||
| * | | | Add tests for logic | Tobi823 | 2018-09-21 | 2 | -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 translate | Tobi823 | 2018-09-21 | 1 | -13/+33 |
| | | | | | | | | | | | | | | | | the title from the PDF to UTF-8 | ||||
| * | | | Remove type declaration for PHP 5 compatibility | Tobi823 | 2018-09-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters | Tobi823 | 2018-09-21 | 1 | -0/+23 |
|/ / / | |||||
* | | | Merge pull request #3726 from wallabag/fix-tests | Jérémy Benoist | 2018-09-21 | 5 | -11/+14 |
|\ \ \ | | | | | | | | | Liberation goes https | ||||
| * | | | Liberation goes https | Jeremy Benoist | 2018-09-21 | 5 | -11/+14 |
|/ / / | |||||
* | | | Merge pull request #3719 from wallabag/fix-sort-parameters | Kevin Decherf | 2018-09-07 | 5 | -7/+26 |
|\ \ \ | | | | | | | | | Fix sort parameters | ||||
| * | | | Updating node to 6.10 | Jeremy Benoist | 2018-09-07 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | Same as defined in .travis.yml | ||||
| * | | | Fix tests | Jeremy Benoist | 2018-09-07 | 1 | -4/+4 |
| | | | | |||||
| * | | | Jump to the new Scrutinizer PHP analysis engine | Jeremy Benoist | 2018-09-07 | 1 | -0/+15 |
| | | | | |||||
| * | | | Add missing parameters | Jeremy Benoist | 2018-09-07 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Parameters weren’t passed to the sub function. | ||||
* | | | Merge pull request #3712 from wallabag/refactor-entry-queries | Jérémy Benoist | 2018-09-07 | 2 | -16/+55 |
|\ \ \ | | | | | | | | | Rename getBuilderByUser and refactor query for untagged entries | ||||
| * | | | php-cs-fixer | Kevin Decherf | 2018-09-05 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | EntryRepository: refactor getBuilderForUntaggedByUser | Kevin Decherf | 2018-09-05 | 1 | -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 getBuilderByUser | Kevin Decherf | 2018-09-05 | 1 | -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 getBuilderByUser | Kevin Decherf | 2018-09-05 | 1 | -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-72 | Kevin Decherf | 2018-09-06 | 1 | -1/+0 |
|\ \ \ \ | |/ / / |/| | | | PHP 7.2 shouldn't fail | ||||
| * | | | PHP 7.2 shouldn't fail | Jérémy Benoist | 2018-09-06 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge pull request #3716 from wallabag/csfixer | Jérémy Benoist | 2018-09-05 | 48 | -89/+89 |
|\ \ \ | | | | | | | | | php-cs-fixer: native_function_invocation | ||||
| * | | | php-cs-fixer | Kevin Decherf | 2018-09-05 | 48 | -89/+89 |
|/ / / | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | | Merge pull request #3707 from wallabag/fix-test-de-at | Jérémy Benoist | 2018-08-19 | 2 | -14/+3 |
|\ \ \ | | | | | | | | | Removing failing test from Travis | ||||
| * | | | Removing failing test from Travis | Jeremy Benoist | 2018-08-19 | 2 | -14/+3 |
|/ / / | |||||
* | | | Merge pull request #3705 from wallabag/update-release | Jérémy Benoist | 2018-08-19 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | Update release script | ||||
| * | | Update release script | Jeremy Benoist | 2018-08-17 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #3702 from aleksandar-todorovic/patch-1 | Jérémy Benoist | 2018-08-16 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | Fixes a typo | ||||
| * | | | Fixes another typo | Aleksandar Todorović (r3bl) | 2018-08-10 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixes a typo | Aleksandar Todorović (r3bl) | 2018-08-10 | 1 | -1/+1 |
|/ / / |