1,736 commits

Author	SHA1	Message	Date
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	5b9ddfcfcc	Merge commit 'fa0ba67753' into glitch-soc/merge-upstream	2024-02-24 14:18:16 +01:00
Claire	dfd74f0dae	Merge commit '1467f1e1e1' into glitch-soc/merge-upstream	2024-02-24 14:15:49 +01:00
Claire	20615a516d	Merge commit '805dba7f8d' into glitch-soc/merge-upstream	2024-02-24 13:53:59 +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
Eugen Rochko	b8b2f20b16	Change explore icon from hashtag to compass in web UI (#29294)	2024-02-20 09:10:44 +00:00
Eugen Rochko	63f4ea055a	Change follow suggestions design in web UI (#29272)	2024-02-19 11:09:58 +00:00
Claire	ca8fbda5d0	Add end-to-end test for OCR in media uploads (#29148)	2024-02-08 19:13:44 +00:00
Claire	7ee93b7431	Change source attribute of Suggestion entity in /api/v2/suggestions back to a string (#29108)	2024-02-06 17:10:17 +00:00
y.takahashi	3c315a68af	Fix 'focus the compose textarea' shortcut is not working (#29059)	2024-02-02 06:33:53 +00:00
Eugen Rochko	9cdc60ecc6	Change onboarding prompt to follow suggestions carousel in web UI (#28878)	2024-02-01 13:37:04 +00:00
Yamagishi Kazutoshi	b3075a9993	Remove unused l18n messages (#28964)	2024-01-30 15:34:07 +00:00
J H	1467f1e1e1	Fixed the toggle emoji dropdown bug (#29012)	2024-01-30 13:38:49 +00:00
Claire	5fa2821853	Merge commit '3205a654ca' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
Claire	805dba7f8d	Change compose form to use server-provided post character limit (#28928)	2024-01-26 14:09:45 +00: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
Eugen Rochko	3205a654ca	Refactor conversations components in web UI (#28833) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-25 14:34:26 +00:00
Claire	22cfab0ebf	Merge commit '01ce9df880' into glitch-soc/merge-upstream ... Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.	2024-01-24 20:42:53 +01:00
Claire	5a838ceaa9	Use active variants for boost icons and increase icon size (#27924)	2024-01-24 12:37:43 +00:00
Eugen Rochko	01ce9df880	Fix search form re-rendering spuriously in web UI (#28876)	2024-01-24 07:03:30 +00:00
Claire	102eff7c05	Merge commit 'e2d9635074' into glitch-soc/merge-upstream	2024-01-22 19:19:40 +01:00
Eugen Rochko	9f8e3cca9a	Fix duplicate and missing keys in search popout component in web UI (#28834)	2024-01-21 07:44:46 +00:00
Claire	e4d07c7bcc	Merge commit '01b6c83c36' into glitch-soc/merge-upstream	2024-01-16 12:04:11 +01:00
Renaud Chaput	01b6c83c36	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
Claire	2f521bc84a	Merge commit 'a2f02a0775' into glitch-soc/merge-upstream	2024-01-15 20:27:41 +01:00
Claire	464051c2d2	Merge commit '1070804a1a' into glitch-soc/merge-upstream	2024-01-15 20:06:31 +01:00
Claire	a3b6a85521	Merge commit 'cd37048439' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.	2024-01-13 12:11:29 +01: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	608f66f978	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
Renaud Chaput	383be173af	Add a version comment to the emoji preval-ed file so it is regenerated (#28700)	2024-01-12 03:39:11 +00:00
Essem	b6e353537b	Add new emojis from jdecked/twemoji 15.0 (#28404)	2024-01-11 16:15:08 +00:00
Claire	51d2d98174	Merge commit 'a0e237a96f' into glitch-soc/merge-upstream	2024-01-10 18:26:47 +01:00
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d' 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
Renaud Chaput	a0e237a96f	Upgrade Redux packages (#28585)	2024-01-08 10:57:40 +00:00
Claire	d0fd14f851	Fix scrolling to detailed status not always working (#28577)	2024-01-04 14:17:38 +00:00
Claire	b3542ac57b	Merge commit '1184887b01' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our README.	2024-01-02 13:35:11 +01:00
Michael Stanclift	fdec8d7ffb	Fix OCR when using S3/CDN for assets (#28551)	2024-01-02 09:09:54 +00:00
Claire	35b6583371	Merge commit '6374358357' into glitch-soc/merge-upstream	2023-12-29 17:40:57 +01:00
Claire	6374358357	Change media to be hidden/blurred by default in report modal (#28522)	2023-12-29 16:34:13 +00:00
Santiago Kozak	1cba91d6d1	Fix reply icon display in picture-in-picture footer (#28519)	2023-12-29 09:48:27 +00:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Renaud Chaput	1c041356a1	Fix error on viewing a profile when unlogged (#28465)	2023-12-21 20:19:18 +00:00
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f39' into glitch-soc/merge-upstream	2023-12-21 19:42:13 +01:00
Eugen Rochko	5976d3702f	Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452)	2023-12-21 09:44:09 +00:00
Eugen Rochko	01f0a6ca4f	Fix profile setup showing default avatar in web UI (#28453)	2023-12-21 08:32:25 +00:00
Claire	077e0c6812	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.	2023-12-20 22:16:50 +01:00