1,718 commits

Author	SHA1	Message	Date
Essem	1a1ff228b3	Update to mastomodern 1.10.5	2024-03-25 23:35:10 -05:00
Essem	aaf54c6395	Merge remote-tracking branch 'upstream/main'	2024-03-20 16:41:33 -05:00
Claire	eb3aed9545	Merge commit '50fd94f481' 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	50fd94f481	Fix blockquote color in reply indicator (#29659)	2024-03-20 11:20:23 +00:00
Claire	e36e7ea243	Fix emoji picker dropdown background and borders (#29653)	2024-03-20 11:06:50 +00:00
Claire	a583317df6	Fix icon and styling in browser notifications banner (#29658)	2024-03-20 11:06:44 +00:00
Claire	d0dfcc9f3a	Fix build issue with glitch-soc's theming system	2024-03-19 19:58:04 +01:00
Claire	876aa35350	Merge commit 'ffc5be4820' 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
Claire	bd06963c16	Slightly increase font weight of favorite/boost numbers in detailed statuses (#29648)	2024-03-19 13:39:30 +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
Essem	2d07a29632	Merge remote-tracking branch 'upstream/main'	2024-03-17 00:13:58 -05:00
Claire	b8f476256e	Merge commit 'd702a03a0c' into glitch-soc/merge-upstream	2024-03-15 22:48:04 +01:00
Claire	d702a03a0c	Add “Learn more” on block modal to inform of federation caveats (#29614)	2024-03-15 19:09:21 +00:00
Claire	2c622497c2	Merge commit '407287573c' into glitch-soc/merge-upstream	2024-03-15 18:48:39 +01:00
Eugen Rochko	ec19d0a14b	Change mute, block and domain block confirmations in web UI (#29576)	2024-03-15 17:36:41 +00:00
Eugen Rochko	407287573c	Add domain information to profiles in web UI (#29602) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-03-15 13:08:38 +00:00
Essem	fd1f0891d9	Merge remote-tracking branch 'upstream/main'	2024-03-14 20:36:26 -05:00
Claire	e91ede5be6	Merge commit 'df6086d402' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
Eugen Rochko	4991198b70	Change design of metadata underneath posts in web UI (#29585)	2024-03-14 09:18:24 +00:00
Eugen Rochko	1e1d97a787	Fix wrong background color on search results in web UI (#29584)	2024-03-14 09:07:29 +00:00
Claire	48134bcd10	Merge commit 'acf3f410ae' into glitch-soc/merge-upstream	2024-03-13 20:13:29 +01:00
Claire	c6dbb33944	Merge commit 'd4ed7e466c' into glitch-soc/merge-upstream	2024-03-13 18:58:47 +01:00
Erik Uden	268856d5d9	Fix toggle button color for light (and dark/default) theme (#29553)	2024-03-13 11:45:20 +00:00
Eugen Rochko	5b60d4b696	Change background color in web UI (#29522)	2024-03-12 09:51:30 +00:00
Claire	a5127d0ef8	Merge commit '24319836de' 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	c10bbf5fe3	Add notification policies and notification requests in web UI (#29433)	2024-03-11 15:02:21 +00:00
Eugen Rochko	19efa1b9f1	Change action button to be last on profiles in web UI (#29533)	2024-03-11 14:33:48 +00:00
Eugen Rochko	5b3a8737d6	Add hints for rules (#29539)	2024-03-11 08:57:07 +00:00
Essem	4fb9a34830	Merge remote-tracking branch 'upstream/main'	2024-03-04 22:55:35 -06:00
Claire	159e500749	Merge commit '18945f62e0' into glitch-soc/merge-upstream	2024-03-01 18:34:48 +01:00
HTeuMeuLeu	934cab7508	New welcome email (#28883) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2024-03-01 12:16:53 +00:00
Essem	9a4b0c8365	mastomodern 1.10.3	2024-02-29 16:43:39 -06:00
Essem	c609845d47	Merge remote-tracking branch 'upstream/main'	2024-02-29 16:35:17 -06:00
Claire	4d7e7cc562	Merge commit '6dfe318f34' into glitch-soc/merge-upstream	2024-02-29 18:24:47 +01:00
Claire	edd6aa70e1	Fix regression with search bar icon position (#29456)	2024-02-29 13:54:06 +00:00
Essem	54a3fc3ac5	Merge remote-tracking branch 'upstream/main'	2024-02-28 22:36:41 -06:00
Claire	ccdf56085d	Merge commit '7f84bbfd92' 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
Roni Laukkarinen	edfc53856f	Fix the regression with the search icon position (#29417)	2024-02-28 12:01:18 +00:00
Claire	a482932649	Merge commit '6f7615ba86' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.	2024-02-27 19:20:57 +01:00
Evan Paterakis	213c87ae59	Fix filters title and keywords overflow (#29396)	2024-02-27 10:46:58 +00:00
Essem	1aff1b9f4c	Merge remote-tracking branch 'upstream/main'	2024-02-26 14:51:36 -06:00
Claire	67ca8bb56a	Merge commit '8156113d58' 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
Matt Jankowski	c7555271a6	Remove unused media-spoiler-* JS/CSS (#29407)	2024-02-26 15:30:58 +00:00
Roni Laukkarinen	1cb74eeec0	Fix search icon position on mobile (#29384)	2024-02-26 00:57:48 +00:00
Roni Laukkarinen	bbf6cb66f6	Improve alt text form accessibility with long texts (#27095)	2024-02-26 00:57:13 +00:00
Essem	a5308ac5b6	Update to mastomodern 1.10.2	2024-02-25 18:56:49 -06:00
Essem	fd6bd9c87b	Merge remote-tracking branch 'upstream/main'	2024-02-25 12:15:38 -06:00
Claire	2dc244784c	Merge commit 'cfa71a4d16' into glitch-soc/merge-upstream	2024-02-24 15:43:15 +01:00
Claire	d2cfc6e5e2	Merge commit '08342ad40c' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00