aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-09-165-7/+26
|\
| * 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 remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-09-0776-744/+246
|\|
| * 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
| | * | The 'framework.trusted_proxies' configuration key has been deprecated in ↵Jeremy Benoist2018-07-051-1/+0
| |/ / | | | | | | | | | Symfony 3.3
| * | Merge pull request #3685 from wallabag/fix-random-failing-testJérémy Benoist2018-07-052-6/+6
| |\ \ | | | | | | | | Replace SO url by lemonde.fr to avoid random failing test
| | * | Replace SO url by lemondeJeremy Benoist2018-07-052-6/+6
| |/ / | | | | | | | | | Looks like we got a lot of random failing while grabing SO content, replacing it might fix the problem.
| * | Merge pull request #3684 from Simounet/fix/empty-image-download-errorJérémy Benoist2018-07-052-0/+27
| |\ \ | | |/ | |/| Fix image downloading on null image path
| | * Fix image downloading on null image pathSimounet2018-07-052-0/+27
| |/
* | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-07-0364-764/+298
|\|
| * Merge pull request #3675 from wallabag/prepare-2.3.3Jérémy Benoist2018-06-192-1/+25
| |\ | | | | | | Prepare 2.3.3 release
| | * Prepare 2.3.3 releaseJeremy Benoist2018-06-192-1/+25
| |/
| * Merge pull request #3538 from wallabag/fix-migrations-dashJérémy Benoist2018-06-1537-709/+146
| |\ | | | | | | Fixed migrations with dash into db names
| | * We should able to get the table name unescapedJeremy Benoist2018-06-142-5/+11
| | | | | | | | | | | | When we want to perform complex queries to retrieve metadata from the database
| | * Fixed migrations with dash into db nameJeremy Benoist2018-06-1437-705/+136
| |/
| * Merge pull request #3636 from flozz/syntax-highlightJérémy Benoist2018-06-073-1/+12
| |\ | | | | | | Highlight code in articles using highlight.js
| | * Highlight code in articles using highlight.jsFabien LOISON2018-04-233-1/+12
| |/ |/|
| * Merge pull request #3668 from wallabag/fix-testsJérémy Benoist2018-06-079-32/+30
| |\ | | | | | | Fix tests
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:31:08 +0000