Commit graph

2753 commits

Author SHA1 Message Date
Simounet
a46fd5fc9f
Fix deprecated null parameter passed to explode() 2023-09-26 18:02:46 +02:00
Kevin Decherf
2910fb6da4 Merge branch '2.6' into port/2.6.4-2.6.6
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2023-09-18 16:50:07 +02:00
Rotzbua
51c68655fb Fix some typos 2023-09-18 11:16:19 +02:00
Jérémy Benoist
8ac80e934e
Merge pull request #6912 from Simounet/feat/tag-mass-action-improved
Mass action layout improved
2023-09-04 13:25:05 +02:00
Simounet
4b04cd5746
Mass action tag layout updated 2023-09-04 12:00:16 +02:00
Simounet
137c8ab756
Count queries simplified 2023-09-01 11:53:44 +02:00
Simounet
2d7d16ee6c
Tag mass action layout updated 2023-09-01 14:16:27 +02:00
Simounet
18615738c0
Title removed from footer's stats element 2023-08-31 12:34:36 +02:00
Simounet
452362c17a
Untagged entries number removed from the filter's sidebar 2023-08-31 12:34:36 +02:00
Simounet
13b2752e8d Autocapitalize disabled for domain input filter 2023-08-28 09:54:51 +02:00
Simounet
634997c9b5 Good HTML type for HTTP status input filter 2023-08-28 09:54:45 +02:00
Jeremy Benoist
c6ff0bc691
Remove remaining MOBI stuff 2023-08-23 08:49:56 +02:00
Nicolas Lœuillet
b1752b619d Add display article configurator (font family, font size, line height and max width) 2023-08-22 13:02:50 +02:00
Nicolas Lœuillet
0e44035b67
Merge pull request #6768 from wallabag/remove-mobi
Remove mobi export
2023-08-22 10:18:29 +02:00
Nicolas Lœuillet
741db06447
Merge pull request #6761 from wallabag/add-shaarli-import
Add Shaarli and Pocket HTML imports
2023-08-22 10:18:17 +02:00
Nicolas Lœuillet
2af48b8174 Add Shaarli and Pocket HTML imports 2023-08-22 08:02:07 +02:00
Nicolas Lœuillet
a1aac10bd5 Remove mobi export
Fix #6746
2023-08-22 08:01:39 +02:00
Yassine Guedidi
8ef6a14652 Resolve self depreciation 2023-08-22 01:43:00 +02:00
Yassine Guedidi
1ce5164e70 Make testSaveIsArchivedAfterPatch and testSaveIsStarredAfterPatch consistent 2023-08-22 00:03:36 +02:00
Yassine Guedidi
a3b64611f8 Fix testSaveIsStarredAfterPatch 2023-08-22 00:03:36 +02:00
Nicolas Lœuillet
981d6a47da
Merge pull request #6793 from wallabag/fix-4414
Fix search when search term has useless space
2023-08-21 20:19:16 +02:00
Nicolas Lœuillet
4b338afa40
Merge pull request #6771 from wallabag/add-annotations-in-search
Add articles which have annotations with search term in results
2023-08-21 20:19:00 +02:00
Nicolas Lœuillet
1c2190fd68
Merge pull request #6769 from wallabag/add-not-parsed-boolean
Add `isNotParsed` field on Entry entity
2023-08-21 20:18:44 +02:00
Nicolas Lœuillet
407dd48ed0
Merge pull request #6767 from wallabag/remove-demo
Remove (useless) demo mode
2023-08-21 20:18:18 +02:00
Nicolas Lœuillet
397ad455e6
Merge pull request #6655 from wallabag/add-command-to-update-picture-url
Add command to clean pictures path when changing instance URL
2023-08-21 20:17:40 +02:00
Nicolas Lœuillet
88c9df9b80 Add command to clean pictures path when changing instance URL 2023-08-21 13:17:13 +02:00
Nicolas Lœuillet
cbcfa69c05 Remove (useless) demo mode
Fix #6671
2023-08-21 13:16:56 +02:00
Nicolas Lœuillet
20578f0b8e Add isNotParsed field on Entry entity
Fix #4350
2023-08-21 13:16:42 +02:00
Nicolas Lœuillet
18e1106f76 Add articles which have annotations with search term in results
Fix #3635
2023-08-21 13:16:36 +02:00
Nicolas Lœuillet
6ff00315d0 Fix search when search term has useless space 2023-08-21 13:16:14 +02:00
Yassine Guedidi
0f17a8cf8a PHPStan level 3 2023-08-21 12:03:38 +02:00
Nicolas Lœuillet
ca879c36de Prepare wallabag 2.6.3 2023-08-21 11:52:16 +02:00
Nicolas Lœuillet
ffcc5c9062
Merge pull request from GHSA-gjvc-55fw-v6vq
Replace GET way to POST way to delete API client
2023-08-21 11:08:47 +02:00
Nicolas Lœuillet
78b0b55c40
Merge pull request from GHSA-p8gp-899c-jvq9
Replace GET way to POST way to reset data user
2023-08-21 11:08:24 +02:00
Nicolas Lœuillet
383dcc5c45
Merge pull request #6119 from Spoons/feat_referer_to_session_redirect
Fix: Use Session instead of Referrer for Redirection
2023-08-21 10:32:03 +02:00
Yassine Guedidi
cc33fcb4ba Replace kernel.root_dir by kernel.project_dir 2023-08-09 22:46:18 +01:00
Nicolas Lœuillet
c3d1f92278 Replace GET way to POST way to delete API client 2023-08-09 21:54:40 +02:00
Nicolas Lœuillet
a9893d754f Replace GET way to POST way to reset data user
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2023-08-09 21:39:03 +02:00
Kevin Decherf
f4fd8e4675
Merge pull request #6778 from wallabag/add-confirmation-before-reload
Add confirmation before reload entry
2023-08-09 19:40:49 +02:00
Kevin Decherf
ac1c1ff571
Merge pull request #6816 from yguedidi/use-psr-17-and-psr-18
Use PSR-17 and PSR-18
2023-08-08 23:56:10 +02:00
Kevin Decherf
65915004e0
Merge pull request #6808 from yguedidi/make-importcontroller-extends-abstractcontroller
Make ImportController extends AbstractController
2023-08-08 23:26:37 +02:00
Kevin Decherf
60cb8c0294
Merge pull request #6797 from yguedidi/use-twig-instead-of-templating
Use Twig instead of templating
2023-08-08 23:18:16 +02:00
Kevin Decherf
f6e85e88af
Merge pull request #6799 from yguedidi/identify-platforms-by-their-class
Identify platforms by their class
2023-08-08 23:04:42 +02:00
Kevin Decherf
a4b0a01b6d
Merge pull request #6798 from yguedidi/add-mandatory-$class-parameter
Add mandatory $class parameter
2023-08-08 22:59:16 +02:00
Kevin Decherf
1bed15fd9b
Merge pull request #6800 from yguedidi/move-from-transchoice-to-trans
Move from transchoice to trans
2023-08-08 22:57:48 +02:00
Yassine Guedidi
bf176121c4 Use PSR-17 and PSR-18 2023-08-08 03:25:27 +01:00
Yassine Guedidi
58a0ca2622 Replace GetResponseEvent by RequestEvent 2023-08-07 22:34:47 +01:00
Yassine Guedidi
7beb535b7a Make ImportController extends AbstractController 2023-08-07 22:04:13 +01:00
Michael Ciociola
8d3d916d4a Remove extraneous blank lines from EntryController.php 2023-08-06 15:48:28 -05:00
Michael Ciociola
e90daf0690
Update TagController.php 2023-08-06 20:20:35 +00:00
Michael Ciociola
9729db75de
Update EntryController.php 2023-08-06 20:19:49 +00:00
Michael Ciociola
ced2ea4015
Merge branch 'master' into feat_referer_to_session_redirect 2023-08-06 20:14:44 +00:00
Yassine Guedidi
f43d8fa947 Move from transchoice to trans 2023-08-05 23:39:13 +01:00
Yassine Guedidi
f48f982025 Identify platforms by their class 2023-08-05 18:35:09 +01:00
Yassine Guedidi
667ea14d42 Add mandatory $class parameter 2023-08-05 17:25:03 +01:00
Yassine Guedidi
e93fdca2d3 Use Twig instead of templating 2023-08-05 16:43:36 +01:00
Nicolas Lœuillet
d6f63d5d51
Add confirmation before reload entry 2023-07-30 20:07:24 +02:00
Nicolas Lœuillet
c1cba72a19 Replace hardcoded url by current wallabag url 2023-07-30 10:09:54 +02:00
Viktorius Suwandi
e80a169435
Remove external dependencies on src/Wallabag/CoreBundle/Resources/views/Developer/howto_app.html.twig 2023-07-30 14:07:45 +07:00
Nicolas Lœuillet
c75d3e6961 Remove twofactor_auth parameter
Fix #6649
2023-07-15 16:18:01 +02:00
Jérémy Benoist
24887f4ad6
Merge pull request #6684 from caspermeijn/apidoc
ApiDoc: Add response description to UserRestController
2023-07-04 16:05:40 +02:00
Nicolas Lœuillet
5b1230a909
Merge pull request #6680 from wallabag/fix-export-same-domain
Fix export for same domain entries
2023-07-03 22:31:23 +02:00
Casper Meijn
4c797162bf ApiDoc: Add response description to UserRestController 2023-07-02 08:31:11 +02:00
Nicolas Lœuillet
84bbeed4f0
Remove empty file 2023-06-29 21:27:45 +02:00
Nicolas Lœuillet
6639f7da6d Fix export for same domain entries 2023-06-29 19:59:08 +02:00
Casper Meijn
0fff56ea68 ApiDoc: Add response description to WallabagRestController 2023-06-27 20:59:43 +02:00
Nicolas Lœuillet
74848a4794
Fix undefined variable 2023-06-26 17:41:55 +02:00
Nicolas Lœuillet
f511af6fda
Add confirmation alert when deleting articles from list view 2023-06-20 17:30:31 +02:00
Nicolas Lœuillet
708bb261d0
Update quickstart content 2023-06-19 13:59:34 +02:00
Nicolas Lœuillet
fedd6c9eda
Remove hardcoded string 2023-06-19 10:08:51 +02:00
Nicolas Lœuillet
28db6c22eb
Fix duplicate tags creation when assigning search results to tag
Fixes #6330
2023-06-17 15:19:59 +02:00
Simounet
619499d455
[Boyscout] Settings: Reduced width for the default mark as read container 2023-06-16 14:28:57 +02:00
Simounet
97a87235a1
Setting to show / hide articles thumbnails styling 2023-06-16 14:28:57 +02:00
Nicolas Lœuillet
7eddea6ff7
Added test 2023-06-16 14:27:27 +02:00
Nicolas Lœuillet
19322142c3
Fixed testsuite 2023-06-16 14:27:26 +02:00
Nicolas Lœuillet
46521e48e5
PHP CS fix 2023-06-16 14:27:26 +02:00
Nicolas Lœuillet
a94d7503c2
Added new setting to show / hide articles thumbnails 2023-06-16 14:27:15 +02:00
Nicolas Lœuillet
54b3977a3c Update main contributors 2023-06-16 11:40:33 +02:00
Simounet
78f66c72fc
Remove annotation text on entry without any 2023-06-15 23:17:30 +02:00
Simounet
18943d191f
[Boyscout] Useless title on tags removed 2023-06-15 23:14:02 +02:00
Simounet
5d1abde36d
Entry view tags styled udpated 2023-06-15 23:13:45 +02:00
Nicolas Lœuillet
ae975fdba0
Update translation key 2023-06-15 17:06:31 +02:00
Nicolas Lœuillet
439e906c44
Merge pull request #6619 from Simounet/fix/6618-mass-action-not-submitting
Fix #6618 mass action buttons not submitting anything
2023-06-15 15:00:42 +02:00
Simounet
09af754a33
Fix #6618 mass action buttons not submitting anything 2023-06-15 14:52:59 +02:00
Simounet
fcb880fbd1
Empty space on the top bar used for more add url toggle clickable target 2023-06-14 21:54:57 +02:00
Nicolas Lœuillet
96cf34f730 Added flash message when we try to add to much tags 2023-06-13 13:06:35 +02:00
Simounet
fe740f4a69
Fix RSS feed_route not set 2023-06-12 19:05:38 +02:00
Simounet
3c7457801f
index class added to body 2023-06-12 18:15:39 +02:00
Simounet
e5b72f3123
Fix Stylelint errors 2023-06-12 18:15:38 +02:00
Kevin Decherf
3e02a8aaf5
Merge pull request #6547 from Simounet/feat/mass-action-ui
Feat/mass action UI
2023-06-01 22:20:05 +02:00
Jérémy Benoist
bea10aacbe
Merge pull request #6562 from Simounet/fix/downloadimages-redirect-following
Fix DownloadImages not following redirections
2023-05-31 15:04:02 +02:00
Simounet
548b610a17
Fix images downloading with numeric HTML entity 2023-05-30 13:38:50 +02:00
Simounet
2f944aa74a
Fix DownloadImages not following redirections 2023-05-30 12:41:00 +02:00
Simounet
81f58df7b8
Mass action tag layout updated 2023-05-26 21:14:32 +02:00
Simounet
f9143c4255
[Boyscout] Elements in need of entries hidden if no entry available 2023-05-25 22:22:48 +02:00
Simounet
d0aad7b96d
Mass actions available on cards view
fixup! Mass action toggle button added
2023-05-25 22:04:44 +02:00
Simounet
384918cda9
Mass action toggle button added 2023-05-25 21:56:09 +02:00
Simounet
eae4d5a142
[Boyscout] Feed link HTML facto 2023-05-25 21:56:08 +02:00
Martin Trigaux
26a4030e87 [FIX] round reading time in export
Before this commit, the exported entry (pdf, epub,...) could look like:

Estimated reading time:
2.6666666666667 min

Now it will be:
Estimated reading time
3 min
2023-05-24 17:07:44 +02:00
Jeremy Benoist
4dd380b7dd
Fix test following 2.5 merge into master 2023-04-24 14:46:40 +02:00
Jeremy Benoist
66b7bdd07c
Merge remote-tracking branch 'origin/2.5.x' 2023-04-24 14:36:32 +02:00
Casper Meijn
5a5148707c Fix API allowed_registration
Two configuration options need to be enabled to allow user registration via the API:
1) fosuser_registration, which indicates whether registration is allowed at all (frontend and API)
2) api_user_registration, which indicates whether registration is allowed via the API
2023-03-28 20:12:55 +02:00
Jérémy
1003e8f074
Deleted translation using Weblate (English (United States)) 2023-03-27 12:10:09 +02:00
Jérémy Benoist
268372dbbd
Merge pull request #6289 from wallabag/2.5/fix-csrf-user-deletion
Fix CSRF on user deletion
2023-02-07 21:52:51 +01:00
Jérémy Benoist
4e023bddc3
Merge pull request #6288 from wallabag/2.5/xss-username-share-page
Fix XSS on username on share page
2023-02-07 21:43:04 +01:00
Jeremy Benoist
f1b3d5cdd7
Fix CSRF on user deletion 2023-02-07 21:41:52 +01:00
Jeremy Benoist
242e3feac9
Fix adding tag to entries from other people
I've also limited tag length to 20 chars (and limit adding more than 5 tags at once)
2023-02-07 21:25:57 +01:00
Jeremy Benoist
bd4c71682e
Fix XSS on username on share page 2023-02-07 19:58:06 +01:00
Jeremy Benoist
b795622f06
Prepare 2.5.3 2023-02-01 09:51:02 +01:00
Jérémy Benoist
5ac6b6bff9
Merge pull request from GHSA-mrqx-mjc4-vfh3
AnnotationController: fix improper authorization vulnerability
2023-02-01 09:32:22 +01:00
Kevin Decherf
3ed7f2b751 AnnotationController: fix improper authorization vulnerability
This PR is based on 2.5.x branch.

We fix the improper authorization by retrieving the annotation using id
and user id.

We also replace the ParamConverter used to get the requested Annotation
on put and delete actions with an explicit call to AnnotationRepository
in order to prevent a resource enumeration through response discrepancy.

Fixes GHSA-mrqx-mjc4-vfh3

Co-authored-by: Jeremy Benoist <jeremy.benoist@gmail.com>
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2023-01-27 23:34:14 +01:00
Wynton Franklin
baddc525bb fix for config links 2023-01-23 18:19:49 -04:00
Kevin Decherf
0fdd9aa991 ExportController: fix improper authorization vulnerability
We fix the improper authorization by duplicating the check done by
the private method EntryController::checkUserAction().

We also replace the ParamConverter used to get the requested Entry with
an explicit call to EntryRepository in order to prevent a resource
enumeration through response discrepancy. Thus, we get the same
exception whether the requested resource does not exist or is not owned
by the requester.

Fixes GHSA-qwx8-mxxx-mg96

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2023-01-20 15:09:38 +01:00
Kevin Decherf
2f2cfa2c2a Add prefix for tag slugs
This should be considered as a temporary fix, we may deprecate tag
slugs in the future.

Fixes #6048

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2023-01-11 23:20:13 +01:00
Jérémy Benoist
7625e36b5a
Merge pull request #6182 from caspermeijn/openapi3
Update annotations to OpenApi 3
2023-01-02 10:39:56 +01:00
Michael Ciociola
97fee36fa6
Update src/Wallabag/CoreBundle/Controller/TagController.php
Co-authored-by: Jérémy Benoist <j0k3r@users.noreply.github.com>
2022-12-23 11:03:25 -06:00
Casper Meijn
4f9c7a92a1 Update annotations to OpenApi 3
Most of the API annotations are directly converted. The changes in meaning are:
- Parameters "in body" is not supported anymore. These are changed to "in query" or to a request body (depending on the code).
2022-12-23 14:54:55 +01:00
Jérémy Benoist
f04e48fc23
Merge pull request #6171 from wallabag/fix/json-array-dbal-type
Properly handle `json_array` type removal
2022-12-22 16:29:53 +01:00
Jeremy Benoist
cdd2185063
Properly handle json_array type removal
The `json_array` type was removed from DBAL v3, we should handle it using a migration to avoid error.
I've also added the remove type because we need it during migration.
2022-12-21 11:02:51 +01:00
Jeremy Benoist
0a6e6abdc4
Add RabbitMQConsumerTotalProxy to lazy RabbitMQ services for messages
This is just a simple proxy because we can't lazy load RabbitMQ service just to count number of messages in the queue.
As they are automatically injected in the controller now, we can't lazy load them.

Also forgot to use `AbstractController` in previous PR about _controller as a service_.
2022-12-19 13:23:56 +01:00
Jeremy Benoist
6aca334d53
Move to controller as a service
Mostly using autowiring to inject deps.
The only tricky part was for import because all producer use the same class and have a different alias. So we must write them down in the service definition, autowiring doesn't work in that case.

Usually:
- if a controller has a constructor, it means injected services are at least re-used once in actions
- otherwise, service are injected per action
2022-12-19 10:38:08 +01:00
Jeremy Benoist
67a344c2c6
Update PagerFanta 2022-12-16 12:22:56 +01:00
Jeremy Benoist
b3099f68c5
Update all Doctrine deps
Also update these deps to be compatible with latest Doctrine version:
- `friendsofsymfony/oauth-server-bundle`
- `lexik/form-filter-bundle`
- `dama/doctrine-test-bundle`
2022-12-16 10:29:42 +01:00
Jérémy Benoist
8f473ecf5c
Merge pull request #6152 from wallabag/fix/container-aware-command
Remove `ContainerAwareCommand` from commands
2022-12-16 10:25:26 +01:00
Jeremy Benoist
32661f380c
Replace SwiftMailer by Symfony Mailer 2022-12-16 10:03:34 +01:00
Jeremy Benoist
5832482a10
Remove ContainerAwareCommand from commands
And use DI to retrieve services in commands (except for `RedisWorkerCommand` where the container is injected, hard to find a better way, at least for now).
2022-12-16 10:02:15 +01:00
Nicolas Lœuillet
9c16dd7bd1
Merge pull request #6154 from wallabag/fix/event-dispatcher
Fix EventDispatcher & events
2022-12-16 08:08:53 +01:00
Jeremy Benoist
d47c208743
Fix EventDispatcer & events
Looks like parameter for the `->dispatch(` have been flipped (event first then event name).
Define events should now extends `Symfony\Contracts\EventDispatcher\Event`
2022-12-15 21:47:31 +01:00
Jeremy Benoist
5e2ad5f8db
Move translations files to /translations
This is a recommendation for Symfony 5
2022-12-15 21:19:41 +01:00
Jeremy Benoist
28abfe264a
Upgrade to Twig 3 2022-12-15 13:44:21 +01:00
Jeremy Benoist
33267f0736
Update to FOSUserBundle 3.1
Also remove some deprecation from Symfony.
Use `LegacyEventDispatcherProxy` to handle Symfony 4 dispatch from FOSUser
2022-12-14 09:42:17 +01:00
Jérémy Benoist
a57c815ddc
Merge pull request #6113 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-3.4.0
Bump friendsofphp/php-cs-fixer from 2.19.3 to 3.4.0
2022-12-13 10:30:58 +01:00
Jeremy Benoist
de5b138a59
Fix CS 2022-12-13 10:26:51 +01:00
Diego Heras
519e9db94b
Translated using Weblate (Spanish)
Currently translated at 100.0% (576 of 576 strings)
2022-12-12 04:16:51 +01:00
Michael Ciociola
13bd448e01 feat: use session instead of referer for redirects 2022-12-04 16:20:11 -06:00
Jeremy Benoist
aa5c7f05b8
Upgrade to Symfony 4.4
- disable autowiring for Event (because the Entry entity was injected)
- rename `getClient()` for test to `getTestClient()` to avoid error while overriding (from `BrowserKitAssertionsTrait`)
2022-11-29 18:01:46 -08:00
Jeremy Benoist
b7dba18cb2
Cleanup 2022-11-23 15:51:33 +01:00
Jeremy Benoist
1d3935fbd3
Remove LiipThemeBundle
As baggy theme was removed and material is the only remaining theme, we don't need a theme switched anymore.
So:
- move all `*.twig` files from the material theme folder to the root
- remove useless translations
2022-11-23 14:52:06 +01:00
Jeremy Benoist
27e788d0be
Re-create all API routes 2022-11-23 12:44:55 +01:00
Jeremy Benoist
b41696fd1c Remove some deprecation 2022-11-22 21:39:34 +01:00
Jérémy Benoist
d1cdae9967
Merge pull request #6062 from caspermeijn/openapi
Switch to Swagger for api documentation
2022-11-16 16:42:11 +01:00
Casper Meijn
470a8575c0 Update to nelmio/api-doc 3.0
Convert ApiDoc to Swagger
2022-11-16 16:10:33 +01:00
Xosé M
a5047aff98
Translated using Weblate (Galician)
Currently translated at 100.0% (579 of 579 strings)
2022-11-10 06:47:01 +01:00
retiolus
e7464867ae
Translated using Weblate (Catalan)
Currently translated at 3.1% (18 of 579 strings)
2022-11-07 04:33:43 +01:00
Milo Ivir
acfbe92640
Translated using Weblate (Croatian)
Currently translated at 100.0% (579 of 579 strings)
2022-11-07 04:33:43 +01:00
Eric
6d9d3f9fd4
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (579 of 579 strings)
2022-11-04 17:00:57 +01:00
Oğuz Ersen
d4d57b4d22
Translated using Weblate (Turkish)
Currently translated at 100.0% (579 of 579 strings)
2022-11-04 17:00:57 +01:00
Matthaiks
bfd6614b2f
Translated using Weblate (Polish)
Currently translated at 100.0% (579 of 579 strings)
2022-11-04 17:00:56 +01:00
retiolus
849e39ec80
Translated using Weblate (Catalan)
Currently translated at 1.3% (8 of 578 strings)
2022-11-03 10:53:21 +01:00
Jeremy Benoist
48803b68d6
Cleanup baggy 2022-11-03 10:35:33 +01:00