Commit graph

4653 commits

Author SHA1 Message Date
Jérémy Benoist
2b6380f5ac
Merge pull request #3630 from sviande/archived_at
Entry: add archived_at property and updateArchived method
2018-09-21 09:46:58 +00:00
Jeremy Benoist
9007fe0062
Sort archive page by archived at 2018-09-21 11:18:29 +02:00
Sébastien Viande
7c0d682687
Code Style 2018-09-21 10:33:33 +02:00
Sébastien Viande
0e70e81227
Entry: add sort parameter archived 2018-09-21 10:33:33 +02:00
Sébastien Viande
7975395d10
Entry: add archived_at property and updateArchived method 2018-09-21 10:33:33 +02:00
Jeremy Benoist
2f3af70e1a
Merge remote-tracking branch 'origin/master' into 2.4 2018-09-21 10:17:38 +02:00
Jérémy Benoist
759c91940b
Merge pull request #3726 from wallabag/fix-tests
Liberation goes https
2018-09-21 08:16:27 +00:00
Jeremy Benoist
84b3bdaac0
Liberation goes https 2018-09-21 09:07:40 +02:00
Jeremy Benoist
b6d72e0c91
Merge remote-tracking branch 'origin/master' into 2.4 2018-09-16 19:45:37 +02:00
Kevin Decherf
8013f35d96
Merge pull request #3719 from wallabag/fix-sort-parameters
Fix sort parameters
2018-09-07 17:02:39 +02:00
Jeremy Benoist
c0b65ad1c9
Updating node to 6.10
Same as defined in .travis.yml
2018-09-07 15:18:00 +02:00
Jeremy Benoist
4408ebd40a
Fix tests 2018-09-07 15:18:00 +02:00
Jeremy Benoist
8d109df851
Jump to the new Scrutinizer PHP analysis engine 2018-09-07 15:18:00 +02:00
Jeremy Benoist
17476f4d8d
Add missing parameters
Parameters weren’t passed to the sub function.
2018-09-07 13:56:14 +02:00
Jeremy Benoist
7083c0a21d
Merge remote-tracking branch 'origin/master' into 2.4 2018-09-07 13:46:30 +02:00
Jérémy Benoist
495f83c925
Merge pull request #3712 from wallabag/refactor-entry-queries
Rename getBuilderByUser and refactor query for untagged entries
2018-09-07 11:43:07 +00:00
Kevin Decherf
eb5e3f1d1d
Merge pull request #3717 from wallabag/php-72
PHP 7.2 shouldn't fail
2018-09-06 11:28:57 +02:00
Jérémy Benoist
04f85fd9a8
PHP 7.2 shouldn't fail 2018-09-06 07:58:26 +02:00
Kevin Decherf
b8115ff46b php-cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
Kevin Decherf
0636697289 EntryRepository: refactor getBuilderForUntaggedByUser
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>
2018-09-05 18:44:08 +02:00
Kevin Decherf
b7c5fda512 EntryRepository: refactor getBuilderByUser
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>
2018-09-05 18:44:08 +02:00
Kevin Decherf
69b563948d AnnotationRepository: rename getBuilderByUser
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>
2018-09-05 18:44:08 +02:00
Jérémy Benoist
ada5d5b269
Merge pull request #3716 from wallabag/csfixer
php-cs-fixer: native_function_invocation
2018-09-05 16:38:20 +00:00
Kevin Decherf
2a1ceb67b4 php-cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 14:25:32 +02:00
Jérémy Benoist
685a5d745e
Merge pull request #3707 from wallabag/fix-test-de-at
Removing failing test from Travis
2018-08-19 18:15:11 +02:00
Jeremy Benoist
72efc80fdc
Removing failing test from Travis 2018-08-19 16:38:48 +02:00
Jérémy Benoist
fea06d19f3
Merge pull request #3705 from wallabag/update-release
Update release script
2018-08-19 09:17:40 +02:00
Olivier Mehani
681e04b060
Makefile fixes for non GNU systems
* 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>
2018-08-18 18:50:18 +10:00
Jeremy Benoist
2bf568ff46
Update release script 2018-08-17 14:40:06 +02:00
Jérémy Benoist
1421236800
Merge pull request #3702 from aleksandar-todorovic/patch-1
Fixes a typo
2018-08-16 14:45:23 +02:00
Aleksandar Todorović (r3bl)
e0a9791412
Fixes another typo 2018-08-10 20:28:48 +02:00
Aleksandar Todorović (r3bl)
7fd4ad6564
Fixes a typo 2018-08-10 20:15:46 +02:00
Jérémy Benoist
d29b18e82e
Merge pull request #3690 from Simounet/fix/srcset-attribute
More robust srcset image attribute handling
2018-07-23 16:24:20 +00:00
Simounet
e6f12c0734 More robust srcset image attribute handling
Linked to HTMLawed PR https://github.com/kesar/HTMLawed/pull/17
2018-07-12 14:29:30 +02:00
Jérémy Benoist
0f36a88e16
Merge pull request #3692 from Simounet/feature/svg-logo
Feature/svg logo
2018-07-12 11:31:30 +00:00
Simounet
e93f37206a wallabag logo (side-nav) replaced by an SVG one 2018-07-11 21:57:53 +02:00
Simounet
4c78612eb4 wallabag logo with typo replaced by an SVG one 2018-07-11 21:51:52 +02:00
Simounet
2fdd512488 Fake wallabag logo data image replaced by real SVG 2018-07-11 21:25:46 +02:00
Jérémy Benoist
9b12f822e1
Merge pull request #3691 from Simounet/feature/login-username-autofocus
Autofocus the username field on the login page
2018-07-11 18:49:38 +00:00
Simounet
d02e6850c2 Autofocus the username field on the login page 2018-07-11 20:10:51 +02:00
Jérémy Benoist
6337b46e80
Merge pull request #3678 from anmol26s/patch-1
Propose YunoHost badge for installing
2018-07-06 05:40:03 +00:00
Jérémy Benoist
9216bab8c9
Merge pull request #3683 from Simounet/fix/iframe-video-width-shared
Fix mobile viewport on big iframe and video elements
2018-07-06 05:38:39 +00:00
Jérémy Benoist
9bc086071a
Merge pull request #3686 from wallabag/remove-trusted-proxies
Remove remaining deprecation notices
2018-07-06 05:38:02 +00:00
Jeremy Benoist
80336f77fd
The 'framework.trusted_proxies' configuration key has been deprecated in Symfony 3.3 2018-07-05 21:01:45 +02:00
Jérémy Benoist
200392b462
Merge pull request #3685 from wallabag/fix-random-failing-test
Replace SO url by lemonde.fr to avoid random failing test
2018-07-05 13:37:28 +00:00
Jeremy Benoist
9c48053b14
Replace SO url by lemonde
Looks like we got a lot of random failing while grabing SO content, replacing it might fix the problem.
2018-07-05 14:50:27 +02:00
Jérémy Benoist
18167b9a24
Merge pull request #3684 from Simounet/fix/empty-image-download-error
Fix image downloading on null image path
2018-07-05 12:15:50 +00:00
Simounet
3fbbe0d9f1 Fix image downloading on null image path 2018-07-05 11:40:51 +02:00
Jeremy Benoist
44043ebe82
Merge remote-tracking branch 'origin/master' into 2.4 2018-07-03 13:55:25 +02:00
Simounet
6cf7f21dcb Fix mobile viewport on big iframe and video elements 2018-06-28 15:22:51 +02:00