Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ / / | |||||
* | | | Merge pull request #3690 from Simounet/fix/srcset-attribute | Jérémy Benoist | 2018-07-23 | 2 | -3/+33 |
|\ \ \ | | | | | | | | | More robust srcset image attribute handling | ||||
| * | | | More robust srcset image attribute handling | Simounet | 2018-07-12 | 2 | -3/+33 |
|/ / / | | | | | | | | | | Linked to HTMLawed PR https://github.com/kesar/HTMLawed/pull/17 | ||||
* | | | Merge pull request #3692 from Simounet/feature/svg-logo | Jérémy Benoist | 2018-07-12 | 15 | -606/+14 |
|\ \ \ | | | | | | | | | Feature/svg logo | ||||
| * | | | wallabag logo (side-nav) replaced by an SVG one | Simounet | 2018-07-11 | 5 | -1/+3 |
| | | | | |||||
| * | | | wallabag logo with typo replaced by an SVG one | Simounet | 2018-07-11 | 8 | -5/+9 |
| | | | | |||||
| * | | | Fake wallabag logo data image replaced by real SVG | Simounet | 2018-07-11 | 2 | -600/+2 |
|/ / / | |||||
* | | | Merge pull request #3691 from Simounet/feature/login-username-autofocus | Jérémy Benoist | 2018-07-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Autofocus the username field on the login page |