1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-27 16:36:00 +00:00
Commit graph

8648 commits

Author SHA1 Message Date
Nicolas Lœuillet
4f34cfa6fc
Merge pull request #8251 from wallabag/change-version
Change version in wallabag.yml
2025-06-04 18:48:59 +02:00
Nicolas Lœuillet
8e90c0f320
Change version in wallabag.yml 2025-06-04 17:41:09 +02:00
Nicolas Lœuillet
6ffd7382c7
Merge pull request #8229 from wallabag/prepare-2613
Prepare 2.6.13 release
2025-06-04 17:29:19 +02:00
Nicolas Lœuillet
46d6e4d923 Update CHANGELOG 2025-06-04 13:59:00 +02:00
Jeremy Benoist
09af127446 Unlock php-readability 2025-06-04 13:59:00 +02:00
Nicolas Lœuillet
4c23196304 Prepare 2.6.13 release 2025-06-04 13:59:00 +02:00
Kevin Decherf
42746f418e
Merge pull request #8250 from wallabag/update-site-config
Update joker/graby-site-config
2025-06-04 13:54:23 +02:00
Nicolas Lœuillet
35c4feedd8
Update joker/graby-site-config 2025-06-04 13:42:08 +02:00
Kevin Decherf
c451cc96e5
Merge pull request #8240 from wallabag/import/pocket-csv
Add support of Pocket CSV import
2025-06-03 13:32:51 +02:00
Kevin Decherf
c4240c866b PocketCsvImport: rework test to ensure we import all entries
This also adds a test for #8217

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2025-06-03 13:24:27 +02:00
Nicolas Lœuillet
27d66d9e1d Add 'application/vnd.ms-excel' to allowed MIME types config
Backport #8036
2025-06-03 13:24:27 +02:00
Nicolas Lœuillet
c1397f43ac Add Pocket CSV import 2025-06-03 13:24:27 +02:00
Kevin Decherf
52a16bb75f
Merge pull request #8193 from wallabag/add-pocket-shaarli-import
Backport Pocket and Shaarli imports from master
2025-06-02 14:23:33 +02:00
Kevin Decherf
f82c87b520 import: fix some tests
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2025-06-02 13:42:44 +02:00
Kevin Decherf
772a802596
Merge pull request #8194 from wallabag/fix-8158
Add j0k3r/php-readability:1.2.10 as a dependency
2025-06-01 16:51:35 +02:00
Nicolas Lœuillet
29162bde9d Pin j0k3r/php-readability to 1.2.10
We pin php-readability to 1.2.10 because of a regression in 1.2.12

Workaround for #8151

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2025-06-01 16:37:22 +02:00
Nicolas Lœuillet
b1614e9267 Add Pocket and Shaarli imports 2025-05-24 16:25:48 +02:00
Jérémy Benoist
70999075a6
Merge pull request #8139 from wallabag/fix/otp-wrongly-enabled
Avoid non-validated OTP to be enabled
2025-04-14 09:46:17 +02:00
Jeremy Benoist
262f674245
Avoid non-validated OTP to be enabled
The OTP code must be required when enabling OTP. If the provided code is wrong, disable OTP, redirect and notice the user.
2025-04-14 09:18:37 +02:00
Yassine Guedidi
01ffc6c3d5
Merge pull request #8137 from wallabag/prepare-2.6.12-release
Prepare 2.6.12 release
2025-04-10 11:59:57 +02:00
Yassine Guedidi
5586930376 Prepare 2.6.12 release 2025-04-10 11:39:50 +02:00
Yassine Guedidi
b45116b73e
Merge pull request #8136 from wallabag/update-dependencies
Update dependencies
2025-04-10 11:32:25 +02:00
Yassine Guedidi
c2e38cedac Update dependencies 2025-04-10 11:22:33 +02:00
Yassine Guedidi
35dcc43366
Merge pull request #8135 from wallabag/fix-changelog
Fix changelog
2025-04-10 11:10:58 +02:00
Yassine Guedidi
de8f859536 Fix changelog 2025-04-10 10:59:31 +02:00
Yassine Guedidi
5cdac6c0bb
Merge pull request #8133 from wallabag/prepare-2.6.11-release
Prepare 2.6.11 release
2025-04-08 22:42:32 +02:00
Yassine Guedidi
466cd17d5b Prepare 2.6.11 release 2025-04-08 21:23:58 +02:00
Yassine Guedidi
14cdd123ce Update generated assets 2025-04-08 21:23:58 +02:00
Yassine Guedidi
bdb420b13f Use ubuntu latest in all jobs 2025-04-08 21:16:07 +02:00
Yassine Guedidi
99c8a06594
Merge commit from fork
Protect actions with a CSRF token
2025-04-08 21:00:14 +02:00
Yassine Guedidi
4c52f71895 Add SameSite=lax to session cookie 2025-03-30 06:18:32 +02:00
Yassine Guedidi
677b2986bc Use 400 Bad Request errors for invalid CSRF everywhere 2025-03-30 06:18:32 +02:00
Yassine Guedidi
5ea5115a72 Protect mass_action with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
27f0d94db7 Protect tag_delete with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
cf49be6940 Protect tag_this_search with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
ddf2e80842 Protect remove_tag with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
d1e128900a Protect delete_share with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
0d8429dfc7 Protect share with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
eb8408b22f Protect delete_entry with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
00d0e6f951 Protect star_entry with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
edffef8375 Protect archive_entry with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
3817010e29 Protect reload_entry with a CSRF token 2025-03-30 06:18:32 +02:00
Yassine Guedidi
ed1acf59e1 Protect changeLocale with a CSRF token 2025-03-30 06:18:29 +02:00
Yassine Guedidi
e162408139 Protect switch_view_mode with a CSRF token 2025-03-23 19:13:21 +01:00
Yassine Guedidi
6fa61c0f9c Protect delete_ignore_origin_rule with a CSRF token 2025-03-23 19:13:17 +01:00
Yassine Guedidi
264f91126e Protect delete_tagging_rule with a CSRF token 2025-03-23 19:13:14 +01:00
Yassine Guedidi
ac5b5fb379 Protect revoke_token with a CSRF token 2025-03-23 19:13:09 +01:00
Yassine Guedidi
d703fa6a3a Protect generate_token with a CSRF token 2025-03-23 19:13:06 +01:00
Kevin Decherf
f71d8332e0
Merge pull request #7999 from wallabag/fix/menu-entry-with-annotations
Fix entries counter for annotated entries in the menu
2025-02-10 10:12:45 +01:00
Jeremy Benoist
3dffcadc03
Fix entries counter for annotated entries in the menu
The query were badly made and return all annotations for the current user instead of the total of entries with annotation(s).
2025-02-10 08:42:06 +01:00