1993 commits

Author	SHA1	Message	Date
Essem	eda4ee9136	Remove duplicate "others" settings page	2024-02-24 11:14:32 +01:00
丈槍由紀	026da980e7	Fix blurhash for GlitchSoc	2024-02-24 11:14:32 +01:00
noellabo	d518f06eae	Add reject blurhash to Admin setting	2024-02-24 11:14:32 +01:00
noellabo	833b6e40b8	Add reject pattern to Admin setting	2024-02-24 11:14:31 +01:00
Jeremy Kescher	a4e12a484d	Merge branch 'glitch-soc' into develop	2024-02-24 11:11:24 +01:00
Claire	d23f445527	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
丈槍由紀	60a3ad4916	Fix formatting of the filtering settings	2024-02-17 18:55:57 +01:00
丈槍由紀	d9eb7ee676	Add Reject Pattern to Other Page on GlitchSoc	2024-02-17 18:55:57 +01:00
Jeremy Kescher	40ef7b3849	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/serializers/initial_state_serializer.rb	2024-02-06 22:58:23 +01:00
Eugen Rochko	65eb943b9d	Fix confirmation e-mails when signing up through an app (#29064)	2024-02-06 21:00:33 +01:00
Jeremy Kescher	c2c2afc294	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +01:00
Essem	ae854b8027	Port three new emoji reaction PR commits to Catstodon: ... "Update reaction emails Reaction icon made by @t3rminus@calamity.world" "Simplify reactions API controller" "Refactor status reactions query This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too."	2024-01-28 02:22:43 +01: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
Jeremy Kescher	93ae46fa14	Merge branch 'glitch-soc' into develop	2024-01-18 22:59:27 +01:00
Jeremy Kescher	5d4cfe4cd8	Merge branch 'glitch-soc' into develop	2024-01-17 22:37:29 +01: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
Jeremy Kescher	c677b8de19	v4.3.0-alpha.0+glitch+cat+1.0.5	2024-01-12 22:03:50 +01: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
Jeremy Kescher	42520e72c5	Remove duplicate "Number of visible reactions" setting	2024-01-03 17:55:12 +01:00
Jeremy Kescher	5be3fb3d66	Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions	2024-01-02 12:16:35 +01:00
Essem	01b6cbe577	Linting fixes	2023-12-29 12:39:01 -06:00
Essem	08a21c1af6	Add notification emails for reactions	2023-12-29 12:33:13 -06:00
Essem	6ae86f40d1	Add support for emoji reactions ... Squashed, modified, and rebased from glitch-soc/mastodon#2221. Co-authored-by: fef <owo@fef.moe> Co-authored-by: Jeremy Kescher <jeremy@kescher.at> Co-authored-by: neatchee <neatchee@gmail.com> Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com> Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>	2023-12-29 12:33:13 -06:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00