1,683 commits

Author	SHA1	Message	Date
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
Claire	ef3d15554b	Merge commit 'c645490d55' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.	2024-02-24 14:46:14 +01:00
Claire	ab2f0daa10	Merge commit 'aaa58d4807' 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	25ffe0af45	Fix pixel alignment for some composer icons (#29372)	2024-02-23 15:32:13 +00:00
Claire	10a0d76bf0	Merge commit '6936e5aa69' into glitch-soc/merge-upstream-composer ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream completely redesigned this, and glitch-soc had different handling for the character limit. Ported upstream's change to the new version. - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options. Ported glitch-soc's changes to the new version. Additional change: - `app/javascript/styles/components.scss`: Change how the new image is looked up.	2024-02-22 20:58:41 +01:00
Essem	42e86de3b0	Update to mastomodern 1.10.1	2024-02-21 18:03:43 -06:00
Claire	bde4df6be6	Remove CSS definitions for some unused classes (#29279)	2024-02-20 09:18:44 +00:00
Eugen Rochko	63f4ea055a	Change follow suggestions design in web UI (#29272)	2024-02-19 11:09:58 +00:00
Nicolas Hoffmann	476a043fc5	Fix modal container bounds (#29185)	2024-02-13 12:58:21 +00:00
Claire	67ec192d7d	Clean up some unused CSS definitions (#29146)	2024-02-08 11:40:22 +00:00
Eugen Rochko	9cdc60ecc6	Change onboarding prompt to follow suggestions carousel in web UI (#28878)	2024-02-01 13:37:04 +00:00
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
Eugen Rochko	6936e5aa69	Change design of compose form in web UI (#28119) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-25 15:41:31 +00: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