aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* Merge pull request #3716 from wallabag/csfixerJérémy Benoist2018-09-0548-89/+89
|\ | | | | php-cs-fixer: native_function_invocation
| * php-cs-fixerKevin Decherf2018-09-0548-89/+89
|/ | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3707 from wallabag/fix-test-de-atJérémy Benoist2018-08-192-14/+3
|\ | | | | Removing failing test from Travis
| * Removing failing test from TravisJeremy Benoist2018-08-192-14/+3
|/
* Merge pull request #3705 from wallabag/update-releaseJérémy Benoist2018-08-191-4/+4
|\ | | | | Update release script
| * Update release scriptJeremy Benoist2018-08-171-4/+4
| |
* | Merge pull request #3702 from aleksandar-todorovic/patch-1Jérémy Benoist2018-08-162-3/+3
|\ \ | | | | | | Fixes a typo
| * | Fixes another typoAleksandar Todorović (r3bl)2018-08-101-2/+2
| | |
| * | Fixes a typoAleksandar Todorović (r3bl)2018-08-101-1/+1
|/ /
* | Merge pull request #3690 from Simounet/fix/srcset-attributeJérémy Benoist2018-07-232-3/+33
|\ \ | | | | | | More robust srcset image attribute handling
| * | More robust srcset image attribute handlingSimounet2018-07-122-3/+33
|/ / | | | | | | Linked to HTMLawed PR https://github.com/kesar/HTMLawed/pull/17
* | Merge pull request #3692 from Simounet/feature/svg-logoJérémy Benoist2018-07-1215-606/+14
|\ \ | | | | | | Feature/svg logo
| * | wallabag logo (side-nav) replaced by an SVG oneSimounet2018-07-115-1/+3
| | |
| * | wallabag logo with typo replaced by an SVG oneSimounet2018-07-118-5/+9
| | |
| * | Fake wallabag logo data image replaced by real SVGSimounet2018-07-112-600/+2
|/ /
* | Merge pull request #3691 from Simounet/feature/login-username-autofocusJérémy Benoist2018-07-111-1/+1
|\ \ | | | | | | Autofocus the username field on the login page
| * | Autofocus the username field on the login pageSimounet2018-07-111-1/+1
|/ /
* | Merge pull request #3678 from anmol26s/patch-1Jérémy Benoist2018-07-061-0/+5
|\ \ | | | | | | Propose YunoHost badge for installing
| * | Propose YunoHost badge for installinganmol26s2018-06-221-0/+5
| | | | | | | | | The YunoHost have working Wallabag package with working install,remove,update,backup and restore scripts. YunoHost makes self -hosting easy for the end users. Please add the this badge so that people can find this solution.
* | | Merge pull request #3683 from Simounet/fix/iframe-video-width-sharedJérémy Benoist2018-07-062-1/+7
|\ \ \ | | | | | | | | Fix mobile viewport on big iframe and video elements
| * | | Fix mobile viewport on big iframe and video elementsSimounet2018-06-282-1/+7
| |/ /
* | | Merge pull request #3686 from wallabag/remove-trusted-proxiesJérémy Benoist2018-07-061-1/+0
|\ \ \ | |_|/ |/| | Remove remaining deprecation notices