2053 commits

Author	SHA1	Message	Date
Claire	15f6d2d038	Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Conflict due to glitch-soc having a different default site name. Updated the tests as upstream did, keeping glitch-soc's default name.	2024-05-01 17:22:02 +02:00
Claire	0f90e624c5	Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Conflict due to our theming system being different. Ported upstream's changes.	2024-05-01 16:10:45 +02:00
Claire	3f61981f5d	Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream	2024-05-01 14:50:16 +02:00
Claire	7b46517c38	Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream	2024-05-01 14:31:14 +02:00
Claire	a6147a831f	Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/themes.rb` - `app/views/layouts/application.html.haml` - `app/views/layouts/embedded.html.haml` - `app/views/layouts/error.html.haml` - `config/settings.yml` All these conflicts are because glitch-soc and upstream have different theming systems and upstream changed a few things to have dynamic theme selection based on system settings. Conflicts were solved to take that into account, and `current_theme` has been changed in the process to return a tuple of `[flavour, skin]` to be used in the `theme_style_tags` helper.	2024-05-01 14:25:47 +02:00
Matt Jankowski	e336466894	Use shared form partial for admin/rules views (#30067)	2024-04-29 09:33:27 +00:00
Matt Jankowski	a9816f051d	Use shared form partial for admin/warning_presets views (#30069)	2024-04-29 09:33:06 +00:00
Matt Jankowski	2739d8d5a4	Use shorter render call in admin/webhooks view (#30071)	2024-04-29 09:10:23 +00:00
Matt Jankowski	f0c9cbaf3b	Use EXPIRATION_DURATIONS constant in CustomFilter class (#30088)	2024-04-29 09:01:46 +00:00
Claire	e0a3662d7b	Drop hardcoded reliance on vanilla flavor	2024-04-28 22:38:11 +02:00
Claire	7208edbd37	Replace use_pack, layouts/theme and @theme by new helpers ... Packs are now loaded from views, just like upstream, and are identified by their filenames. The definition of `theme.yml` has changed as such: - `pack_directory` is now required - `pack` is now unused - `signed_in_preload` has been introduced	2024-04-28 15:45:42 +02:00
Claire	c3e12a4dfa	Change how theme style packs are loaded ... Load the `common` style pack, and then charge the style pack for the current skin, independent from any selected JS pack.	2024-04-28 15:45:41 +02:00
Claire	62bc36416f	Get rid of app/javascript/core ... Have all flavors implement everything they need instead.	2024-04-28 15:04:52 +02:00
Michael Stanclift	bb8c6346fb	Reword and rearrange Content Retention page (#27733)	2024-04-26 15:17:41 +00:00
Matt Jankowski	32ead51e5a	Add material design icons to admin/settings views (#27780) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-04-23 16:43:49 +00:00
Claire	a2399046ca	Fix string interpolation for software updates admin mailer (#30035)	2024-04-23 12:54:52 +00:00
Matt Jankowski	33e829763d	Use shared form partial for admin/domain_blocks views (#29609)	2024-04-22 12:22:16 +00:00
Matt Jankowski	4837bfcc6a	Use shared form partial for admin/announcements views (#29608)	2024-04-19 13:57:32 +00:00
Matt Jankowski	11e0049b08	Use enum-generated scopes/queries for BulkImport (#29975)	2024-04-18 10:13:35 +00:00
Renaud Chaput	ee4ea83a87	Remove image_pack_tag usage (#29925)	2024-04-15 09:05:19 +00:00
Claire	f3430eebbb	Fix hashtag string interpolation in welcome email (#29879)	2024-04-08 13:45:25 +00:00
Claire	1d1c3a808a	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed.	2024-04-06 21:01:40 +02:00
Claire	777984faeb	Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
Claire	903dc53522	Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream	2024-04-06 20:01:25 +02:00
Claire	f2b23aa5f3	Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream ... Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes.	2024-04-06 19:35:21 +02:00
Matt Jankowski	b61ae28f8d	Separate methods for theme style and meta color tags (#29802)	2024-04-05 09:52:43 +00:00
Matt Jankowski	601834d746	Use partial collection render for welcome mailer features (#29843)	2024-04-04 16:13:10 +00:00
Jeong Arm	4045c069f8	Use public_visibility (#29847)	2024-04-04 07:31:30 +00:00
Matt Jankowski	cde3206478	Simplify feature loop in welcome mailer (#29760)	2024-04-03 20:10:59 +00:00
Matt Jankowski	f56309f5f0	Add by_latest_used scope, move admin area recent IPs to partial (#29497)	2024-04-02 13:51:34 +00:00
Renaud Chaput	672c9f5f05	Change the theme-color value automatically when using a built-in theme (#29795)	2024-03-29 13:32:07 +00:00
Matt Jankowski	e85f24174e	Simplify checklist step loop in welcome mailer (#29761)	2024-03-28 10:56:33 +00:00
Matt Jankowski	c4feba4347	Use existing MascotHelper#instance_presenter instead of local var in welcome email template (#29759)	2024-03-26 15:58:48 +00:00
Claire	7508472d84	Fix admin interface repeating rule title instead of showing hint text (#29758)	2024-03-26 14:46:05 +00:00
Claire	cfea9cc172	Add list of pending releases directly in mail notifications for version updates (#29436)	2024-03-26 14:45:19 +00:00
Renaud Chaput	02ea161506	Support "system" theme setting (light/dark theme depending on user system preference) (#29748) ... Co-authored-by: Nishiki Liu <hello@nshki.com>	2024-03-26 09:25:49 +00:00
Claire	37ca59815c	Remove setting for unfollow confirmation modal, and make it unconditional (#29373)	2024-03-22 16:24:04 +00:00
Claire	dfa43707eb	Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately (#29714)	2024-03-22 15:44:31 +00:00
Matt Jankowski	77897cd24c	Use existing SeveredRelationship.about_local_account scope in more places (#29673)	2024-03-21 08:36:49 +00:00
Claire	c0aade79b0	Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream	2024-03-20 18:31:09 +01:00
Claire	44bf7b8128	Add notifications of severed relationships (#27511)	2024-03-20 15:37:21 +00:00
Claire	8a1423a474	Allow unblocking email addresses from any matching account (#29305)	2024-03-20 14:38:00 +00:00
Matt Jankowski	0a33be39c1	Reduce LineLength for react_admin_component helpers (#29650)	2024-03-20 13:45:34 +00:00
Claire	eb3aed9545	Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Upstream touched a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2024-03-20 12:27:52 +01:00
Claire	876aa35350	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2024-03-19 19:21:12 +01:00
Matt Jankowski	4c84891453	Pull out full li element into admin/status_edits/status_edit partial (#29499)	2024-03-19 16:11:10 +00:00
Matt Jankowski	d7ab5655ef	Replace render_symbol method with inline_svg_tag usage (#29647)	2024-03-19 14:17:18 +00:00
Claire	cf08a438e7	Add badge on account card in report moderation interface when account is already suspended (#29592)	2024-03-19 08:20:53 +00:00
Claire	82c2af0356	Fix user_mailer.welcome.hashtags_recent_count not having plural form (#29607)	2024-03-16 16:38:20 +00:00
Claire	2d4ff8f6ed	Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Upstream split some `simple_form` arguments across multiple lines. One of the arguments in glitch-soc was different. Split as upstream's did, keeping our different limit argument. - `app/views/admin/settings/appearance/show.html.haml`: Upstream split some `simple_form` arguments across multiple lines. Glitch-soc had a different field because of the different theming system. Kept glitch-soc's definition of that form field.	2024-03-15 12:43:59 +01:00
Matt Jankowski	f445d33fd6	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
Claire	a5127d0ef8	Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.	2024-03-11 17:29:07 +01:00
Eugen Rochko	5b3a8737d6	Add hints for rules (#29539)	2024-03-11 08:57:07 +00:00
Eugen Rochko	50b17f7e10	Add notification policies and notification requests (#29366)	2024-03-07 14:53:37 +00:00
Claire	159e500749	Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream	2024-03-01 18:34:48 +01:00
Claire	1d721b21e1	Add attribution to Tabler.io icons used in the new mailer designs (#29470)	2024-03-01 14:51:01 +00:00
HTeuMeuLeu	934cab7508	New welcome email (#28883) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2024-03-01 12:16:53 +00:00
Claire	ccdf56085d	Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream	2024-02-28 20:37:38 +01:00
Jeong Arm	deffb8ecb6	Show comments in the admin/instances page (#29240) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-02-28 12:07:06 +00:00
Claire	67ca8bb56a	Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Change applied to `app/javascript/core/admin.js` instead.	2024-02-26 17:43:16 +01:00
Jason Punyon	1ad3cffaea	Missed a .to_date (#29390)	2024-02-26 12:42:09 +00:00
Claire	1ad91dece8	Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Changes applied to `app/javascript/core/admin.js` instead.	2024-02-24 15:35:56 +01:00
Claire	ab2f0daa10	Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version.	2024-02-24 14:27:43 +01:00
Claire	d23f445527	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
Claire	b71904816a	Change registrations to be disabled by default for new servers (#29280)	2024-02-22 13:28:19 +00:00
Claire	2751acb6cd	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-21 17:45:06 +00:00
Eugen Rochko	65eb943b9d	Fix confirmation e-mails when signing up through an app (#29064)	2024-02-06 21:00:33 +01:00
Matt Jankowski	69e61fff38	Move direct serializer usage out of admin view partial (#29028)	2024-02-06 13:18:37 +00:00
Eugen Rochko	1666b19559	Fix confirmation e-mails when signing up through an app (#29064)	2024-02-02 15:51:26 +00:00
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
Eugen Rochko	b19ae521b7	Add confirmation when redirecting logged-out requests to permalink (#27792) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-24 10:49:19 +00:00
Claire	102eff7c05	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	2024-01-22 19:19:40 +01:00
Claire	e2d9635074	Add notification email on invalid second authenticator (#28822)	2024-01-22 13:55:43 +00:00
Claire	c59fb65ddc	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.	2024-01-17 18:32:15 +01:00
HTeuMeuLeu	1a3859d8e2	Update follow and follow_request emails (#28755) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-17 14:37:04 +00:00
Renaud Chaput	cb5ac15923	Use a helper to avoid using media/ asset prefixes (#28756)	2024-01-17 12:19:51 +00:00
Claire	01df34b9db	Remove bypass and use use glitch-soc's theming system for inert.css	2024-01-15 22:16:26 +01:00
Claire	34c9f77b3e	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.	2024-01-15 21:30:00 +01:00
Claire	60298af3c4	Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack.	2024-01-15 20:01:36 +01:00
Claire	1323dfac80	Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream	2024-01-15 19:19:04 +01:00
HTeuMeuLeu	7f471e70c0	Update new email templates (#28416) ... Co-authored-by: Matt Jankowski <matt@jankowski.online>	2024-01-15 18:18:59 +00:00
Renaud Chaput	c6684aa1e3	Use the assets pipeline to load inert.css (#28701)	2024-01-12 09:32:45 +00:00
Matt Jankowski	a90696011e	Add coverage/bugfix for invalid appeal submission (#28703)	2024-01-12 09:21:00 +00:00
Matt Jankowski	7801db7ba4	Spec coverage for custom css endpoint (#28706)	2024-01-12 09:19:25 +00:00
Claire	15bc13c65b	Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +01:00
Matt Jankowski	b68f185573	Reduce LineLength for react_component helper in views/admin (#28694)	2024-01-11 13:14:24 +00:00
Claire	5dcb8d92c3	Fix lint issue in glitch-soc-only setting form	2024-01-11 13:22:39 +01:00
Claire	63acdebc5d	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because of a code style fix, while some changed lines are absent from glitch-soc. Ignored the deleted lines.	2024-01-11 13:17:13 +01:00
Matt Jankowski	87097a227c	Clean up settings/featured_tags/index view (#28688)	2024-01-11 10:45:26 +00:00
Matt Jankowski	55802242ce	Refactor login activity partial (remove inline ruby) (#28687)	2024-01-11 10:36:27 +00:00
Matt Jankowski	6daa69327b	Fix LineLength haml-lint in t usage (#28686)	2024-01-11 09:32:32 +00:00
Claire	47d213e701	Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream	2024-01-10 18:41:04 +01:00
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.	2024-01-10 17:51:12 +01:00
Matt Jankowski	a71e918e95	Fix LineLength haml-lint in media/player view (#28667)	2024-01-10 09:35:01 +00:00
Matt Jankowski	eed4eef39a	Fix LineLength haml-lint in app/views/auth area (#28664)	2024-01-09 16:03:16 +00:00
Matt Jankowski	09ab073f0c	Fix LineLength haml-lint in app/views/settings area (#28663)	2024-01-09 15:28:56 +00:00
Matt Jankowski	68f06f1fd4	Fix haml-lint LineLength cop for settings/preferences/notifications/show (#28655)	2024-01-09 09:31:32 +00:00
Claire	dfdadb92e8	Add ability to require approval when users sign up using specific email domains (#28468)	2024-01-04 09:07:05 +00:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Claire	30ee7339d3	Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.	2023-12-21 19:31:12 +01:00