Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3630 from sviande/archived_at | Jérémy Benoist | 2018-09-21 | 15 | -19/+136 |
|\ | | | | | Entry: add archived_at property and updateArchived method | ||||
| * | Sort archive page by archived at | Jeremy Benoist | 2018-09-21 | 2 | -3/+1 |
| | | |||||
| * | Code Style | Sébastien Viande | 2018-09-21 | 1 | -1/+1 |
| | | |||||
| * | Entry: add sort parameter archived | Sébastien Viande | 2018-09-21 | 2 | -1/+3 |
| | | |||||
| * | Entry: add archived_at property and updateArchived method | Sébastien Viande | 2018-09-21 | 13 | -15/+132 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2018-09-21 | 5 | -11/+14 |
|\ | |||||
| * | 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 remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2018-09-16 | 5 | -7/+26 |
|\| | |||||
| * | 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 remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2018-09-07 | 76 | -744/+246 |
|\| | |||||
| * | 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 | ||||
| | * | | Autofocus the username field on the login page | Simounet | 2018-07-11 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #3678 from anmol26s/patch-1 | Jérémy Benoist | 2018-07-06 | 1 | -0/+5 |
| |\ \ | | | | | | | | | Propose YunoHost badge for installing | ||||
| | * | | Propose YunoHost badge for installing | anmol26s | 2018-06-22 | 1 | -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-shared | Jérémy Benoist | 2018-07-06 | 2 | -1/+7 |
| |\ \ \ | | | | | | | | | | | Fix mobile viewport on big iframe and video elements | ||||
| | * | | | Fix mobile viewport on big iframe and video elements | Simounet | 2018-06-28 | 2 | -1/+7 |
| | |/ / | |||||
| * | | | Merge pull request #3686 from wallabag/remove-trusted-proxies | Jérémy Benoist | 2018-07-06 | 1 | -1/+0 |
| |\ \ \ | | |_|/ | |/| | | Remove remaining deprecation notices | ||||
| | * | | The 'framework.trusted_proxies' configuration key has been deprecated in ↵ | Jeremy Benoist | 2018-07-05 | 1 | -1/+0 |
| |/ / | | | | | | | | | | Symfony 3.3 | ||||
| * | | Merge pull request #3685 from wallabag/fix-random-failing-test | Jérémy Benoist | 2018-07-05 | 2 | -6/+6 |
| |\ \ | | | | | | | | | Replace SO url by lemonde.fr to avoid random failing test | ||||
| | * | | Replace SO url by lemonde | Jeremy Benoist | 2018-07-05 | 2 | -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-error | Jérémy Benoist | 2018-07-05 | 2 | -0/+27 |
| |\ \ | | |/ | |/| | Fix image downloading on null image path | ||||
| | * | Fix image downloading on null image path | Simounet | 2018-07-05 | 2 | -0/+27 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2018-07-03 | 64 | -764/+298 |
|\| |