zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 12 Releases Wiki Activity
18,202 Commits 128 Branches 272 Tags 1.8 GiB
Commit Graph

1643 Commits

Author SHA1 Message Date
Leni Kadali d4d85ccbee Rename error class, add ::Mcaptcha 
Renamed the error class and added a new
include line ending with ::Mcaptcha to see
if that solves the unitialized constant error
Auth::CaptchaConcern::Mcaptcha since we've *definitely*
included the Mcaptcha::Adapters::ViewMethods
 2025-02-04 15:42:33 +03:00
Leni Kadali 0d1b62d35d Merge branch 'main' into feature/add-mcaptcha-support 2025-02-04 15:15:01 +03:00
Claire 5553941666
Drop custom `scopes` conversion code from `/settings/applications` controller (#33819) 2025-02-04 09:31:42 +00:00
Claire cf820b2eca
Fix `/settings/applications` rejecting scopes parameter (#33798) 2025-02-02 21:11:32 +00:00
Leni Kadali 2a1abaef51 Merge branch 'main' into feature/add-mcaptcha-support 2025-02-01 17:49:22 +03:00
Claire 5b291fcbe4
Fix incorrect signature after HTTP redirect (#33757) 2025-01-28 14:44:27 +00:00
Leni Kadali 194b9dfb27
Merge branch 'main' into feature/add-mcaptcha-support 2025-01-28 12:43:27 +03:00
Matt Jankowski 93f3c724ae
Use `expect` in remaining controller locations (#33748) 2025-01-27 16:32:06 +00:00
Matt Jankowski d3b637c757
Use `expect` in `Admin::ExportControllerConcern` import params (#33745) 2025-01-27 14:29:25 +00:00
Matt Jankowski 65d9171c7d
Use `expect` for `admin/` controllers (#33686) 2025-01-27 14:05:16 +00:00
Matt Jankowski a1d9c3fb99
Use `expect` params wrapper for more "auth" and "2FA" "controllers" (#33717) 2025-01-24 14:40:20 +00:00
Matt Jankowski 8eee7ae4c3
Fix issue with saving empty fields values on filter keyword updates (#33691) 2025-01-23 09:04:12 +00:00
Matt Jankowski 4a9c49ee43
Fix issue with saving empty fields values on profile update (#33689) 2025-01-22 18:50:15 +00:00
Matt Jankowski 607f65a0a5
Use `expect` for api/v1 and api/web push subs controllers (#33682) 2025-01-22 14:55:44 +00:00
Matt Jankowski e155aab39e
Use `expect` for nested params in `settings/*` controllers (#33673) 2025-01-22 08:49:52 +00:00
Matt Jankowski d2cc28813f
Use `expect` for nested params in more controllers (#33675) 2025-01-22 08:35:34 +00:00
Leni Kadali bc05768751 Remove unneeded true/false, add missing module 
Added the missing ViewMethods module and removed
the true/false statements from the Auth::CaptchaConcern
which weren't needed
 2025-01-21 20:42:26 +03:00
Leni Kadali 8cadb6d983 Add missing end keyword 2025-01-21 14:41:32 +03:00
Leni Kadali aabac9badf Merge branch 'main' into feature/add-mcaptcha-support 2025-01-21 13:28:22 +03:00
Matt Jankowski 45149cd5e1
Use `expect` for nested params in `auth/setup#update` (#33657) 2025-01-21 08:16:40 +00:00
Christian Schmidt a3baae0b99
API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Matt Jankowski 998cf0dd53
Convert `auth/setup` spec controller->system/request (#33604) 2025-01-16 09:03:46 +00:00
S1m 4a2813158d
Add support for standard webpush (#33528) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-14 09:14:00 +00:00
Claire d517fa5ab7
Change ActivityPub path generation to all happen in `ActivityPub::TagManager` (#33527) 2025-01-13 09:39:05 +00:00
Leni Kadali f995efb501 Update confirm_captcha check to use either method 
Updated confirm_captcha check to use either method
available depending on whether it is mCaptcha or hCaptcha
enabled.

Currently doesn't work since we need to change it
to be compatible with an if/elsif statement. Adding it now
so that we don't forget update it during cleanup/changes
related to feedback from testing.
 2025-01-09 17:25:33 +03:00
Claire c6c8e7e6ab
Fix last paginated notification group only including data on a single notification (#33271) 2025-01-09 13:47:12 +00:00
Leni Kadali 22340a8035 Initial commit for adding mCaptcha support 
Initial commit for adding mCaptcha support

The implementation will need cleaning up
as verification of the behaviour being what we want
requires testing in a staging environment as
the development environment doesn't provide a user
sign up flow where a user would solve a CAPTCHA
(if it is enabled on the server) like it would
on production
 2025-01-09 15:46:16 +03:00
Matt Jankowski c0264c8013
Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
Matt Jankowski 7ad44e22ed
Remove role color highlighting from custom css (#33493) 2025-01-07 16:28:35 +00:00
Matt Jankowski ef39398b82
Add `urgent` scope and `by_version` method to `SoftwareUpdate` (#33470) 2025-01-06 18:23:57 +00:00
Claire ea9b10d112
Fix error 500 when passing an invalid `lang` parameter (#33467) 2025-01-06 10:16:42 +00:00
Matt Jankowski f35de1ed0d
Remove un-needed `Poll.attached` scope (#33368) 2024-12-20 15:15:11 +00:00
Renaud Chaput 2a369a8977
Use a system setting for the Referer policy (#33239) 2024-12-10 13:16:52 +00:00
Eugen Rochko 425311e1d9
Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
Eugen Rochko 30aa0df88c
Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
Eugen Rochko 796dd57e1b
Change ability to navigate of unconfirmed users (#33209) 2024-12-09 08:31:56 +00:00
Eugen Rochko ca45f896dd
Fix various visual sign-up flow issues (#33206) 2024-12-09 08:23:19 +00:00
Eugen Rochko 48ea7552dd
Change hashtag trends to be stored in the database instead of redis (#32837) 
Co-authored-by: David Roetzel <david@roetzel.de>
 2024-12-04 11:59:17 +00:00
Matt Jankowski 6efa320feb
Fix `Style/SafeNavigation` cop (#32970) 2024-11-26 08:09:04 +00:00
Matt Jankowski 0ea9d8164b
Remove `body_class_string` helper (#33072) 2024-11-26 07:19:20 +00:00
Eugen Rochko 2b5faa2ba3
Change lists to reflect added and removed users retroactively (#32930) 2024-11-19 10:04:12 +00:00
Matt Jankowski 477412d62a
Use hash arguments to `select` when possible (Rails 7.2) (#32917) 2024-11-18 14:58:45 +00:00
Matt Jankowski c511cbcd6c
Extract constants for controller `LIMIT` queries (#32921) 2024-11-18 09:23:38 +00:00
Matt Jankowski 319109029d
Fix logic in "last used at per application" oauth token list (#32912) 2024-11-15 15:52:37 +00:00
Matt Jankowski 297ce9ef44
Move body class to shared partial for web app controller concern views (#31797) 2024-11-15 15:49:26 +00:00
Emelia Smith ddfb3d123b
Improve display of statuses in admin panel (#30813) 2024-11-15 09:38:01 +00:00
Matt Jankowski 62d65504f6
Add `DomainResource` class to wrap MX lookup/normalize (#32864) 2024-11-14 13:47:29 +00:00
Emelia Smith a34edc211f
Add audit logging to Relays (#32819) 2024-11-12 08:35:08 +00:00
Matt Jankowski df54196a14
Use `touch_all` with batches (#32799) 2024-11-08 10:00:15 +00:00
Matt Jankowski 697947116e
Add `EmailDomainBlock.parents` scope (#31968) 2024-11-07 13:46:20 +00:00