1,657 commits

Author	SHA1	Message	Date
Essem	3add1ded91	Merge remote-tracking branch 'upstream/main'	2024-01-27 15:31:24 -06:00
Claire	5fa2821853	Merge commit '3205a654ca' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
Essem	69e4361a1d	Merge remote-tracking branch 'upstream/main'	2024-01-24 21:09:39 -06: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	0700eb58bc	Merge commit '163db814c2' into glitch-soc/merge-upstream	2024-01-22 19:12:05 +01:00
HTeuMeuLeu	86cc88c216	Fix banner image not showing in follow emails (#28814)	2024-01-19 09:23:59 +00:00
Essem	adfa7877c3	Merge remote-tracking branch 'upstream/main'	2024-01-18 18:15:06 -06:00
Claire	c59fb65ddc	Merge commit '127503eb2c' 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
Santiago Kozak	30b193b856	Improve display of lock icon in account headers (#28780)	2024-01-17 16:32:30 +00:00
Claire	e817fe4c35	Change media “ALT” label to a specific class (#28777)	2024-01-17 15:32:56 +00: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
Claire	baab58c80b	Fix various icon alignment issues (#28775)	2024-01-17 10:42:47 +00:00
Essem	d96fd9f28f	Merge remote-tracking branch 'upstream/main'	2024-01-16 13:04:33 -06:00
Claire	34c9f77b3e	Merge commit '7f471e70c0' 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	2f521bc84a	Merge commit 'a2f02a0775' into glitch-soc/merge-upstream	2024-01-15 20:27:41 +01:00
Claire	60298af3c4	Merge commit 'c6684aa1e3' 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
HTeuMeuLeu	7f471e70c0	Update new email templates (#28416) ... Co-authored-by: Matt Jankowski <matt@jankowski.online>	2024-01-15 18:18:59 +00:00
Essem	16839a6398	Update to mastomodern 1.9.1	2024-01-14 16:40:51 -06:00
Claire	6bbcd9348e	Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064)	2024-01-12 20:16:48 +00:00
Renaud Chaput	c6684aa1e3	Use the assets pipeline to load inert.css (#28701)	2024-01-12 09:32:45 +00:00
Essem	174f1e7c2c	Merge remote-tracking branch 'upstream/main'	2023-12-30 13:56:14 -06:00
Claire	35b6583371	Merge commit '6374358357' into glitch-soc/merge-upstream	2023-12-29 17:40:57 +01:00
Cal Moody	3599622b5b	Fix destructive actions in dropdowns not using error color in light theme (#28484)	2023-12-29 11:32:40 +00:00
Essem	8860d937ce	Merge remote-tracking branch 'upstream/main'	2023-12-22 16:07:42 -06:00
Claire	a60b9acf3c	Merge commit 'b2f915b31a' into glitch-soc/merge-upstream	2023-12-21 19:04:20 +01:00
Essem	5fdd18ead1	Merge remote-tracking branch 'upstream/main'	2023-12-20 15:01:05 -06:00
Claire	8a5f2442cc	Merge commit '0530ce5e95' into glitch-soc/merge-upstream	2023-12-20 21:58:18 +01:00
Essem	cc676636f4	Merge remote-tracking branch 'upstream/main'	2023-12-19 15:24:52 -06:00
Claire	d288a6162a	Merge commit '12c22ee5e7' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +01:00
Claire	b24f676cf1	Merge commit '1526e54ac6' into glitch-soc/merge-upstream	2023-12-19 20:24:57 +01:00
Claire	3ad92e8d0d	Merge commit 'bd575a1dd6' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +01:00
Essem	f84f397807	Remove post reactions from vanilla flavor ... This is mainly for cleanup and parity with the current PR. Not much reason to modify something that should be "vanilla" anyways.	2023-12-18 19:42:35 -06:00
Essem	f628ebad02	Merge remote-tracking branch 'upstream/main'	2023-12-18 18:05:23 -06:00
Claire	d6ad9d351e	Merge commit 'a36b59be8a' into glitch-soc/merge-upstream	2023-12-18 19:10:43 +01:00
Claire	4113fbf6e8	Merge commit 'f476d9dab2' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules.	2023-12-17 23:04:16 +01:00
Essem	00dae881c5	Merge remote-tracking branch 'upstream/main'	2023-12-12 20:30:34 -06:00
Claire	3f1ec16377	Fix empty column explainer getting cropped under certain conditions (#28337)	2023-12-12 14:31:37 +00:00
Claire	9f92b05bd2	Merge commit '2e6bf60f15' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`	2023-12-10 18:05:02 +01:00
Claire	b20af17a2c	Fix onboarding step descriptions being truncated on narrow screens (#28021)	2023-11-30 13:47:07 +00:00
Essem	570a8c00a2	Vertical status buttons fix	2023-11-27 10:31:51 -06:00
Essem	7a638e3225	Update mastomodern	2023-11-25 20:27:38 -06:00
Eugen Rochko	0e9801443f	Change to single opt-in during profile setup in onboarding in web UI (#27876)	2023-11-17 10:37:04 +00:00
Claire	0a6ec048a8	Fix upper border radius of onboarding columns (#27890)	2023-11-16 13:43:02 +00:00
Claire	c94bedf4e6	Use container queries to hide profile share button (#27889)	2023-11-16 11:59:45 +00:00
Eugen Rochko	87696ea26e	Add prominent share/copy button on profiles in web UI (#27865)	2023-11-16 10:23:14 +00:00
Eugen Rochko	d67bd44ca1	Add profile setup to onboarding in web UI (#27829)	2023-11-15 11:13:53 +00:00
pajowu	ed79713f3a	Fix modal content not being selectable (#27813)	2023-11-13 13:27:50 +00:00
zunda	e4e752c26e	Adjust transform origin for favorite star (#27700)	2023-11-06 11:14:46 +00:00
Essem	1483b2b13d	More cleanup	2023-11-05 22:29:44 -06:00
Essem	759ab62c7b	Quick hotfix for mastomodern buttons?	2023-11-05 19:37:47 -06:00