514 commits

Author	SHA1	Message	Date
Kopper	911833f860	Merge branch 'main' into standalone	2024-08-04 09:03:46 +03:00
Claire	fb411b6d0f	Merge commit 'dd53792714' into glitch-soc/merge-upstream	2024-07-27 13:19:38 +02:00
Eugen Rochko	8818748b90	Change design of confirmation modals in web UI (#30884) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2024-07-25 17:05:54 +00:00
Claire	f7598b267b	Merge commit '0397df9bef' into glitch-soc/merge-upstream	2024-07-19 17:45:19 +02:00
Claire	e768b23aa9	Remove routerHistory parameters from composer actions (#31077)	2024-07-19 15:26:44 +00:00
Claire	c75fe09e2b	Merge commit '82344342c1' into glitch-soc/merge-upstream	2024-07-18 17:56:25 +02:00
Renaud Chaput	f587ff643f	Grouped Notifications UI (#30440) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-07-18 14:36:09 +00:00
Kopper	29f89db19d	Merge remote-tracking branch 'upstream/main' into standalone	2024-07-15 20:18:54 +03:00
Claire	6a55232988	Merge commit 'fa8e972722' into glitch-soc/merge-upstream	2024-07-08 19:41:14 +02:00
Tianwei Dong	36d819bef3	Change to use an unified constant for max media attachments per status (#29073) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2024-07-08 08:10:57 +00:00
Claire	8089fa6935	Merge commit 'a7264a2b42' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's different theming system. Ported upstream's change.	2024-06-17 18:14:14 +02:00
Marcin Mikołajczak	a243963e93	LanguageDropdown: remove unused function (#30346) ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2024-06-13 19:46:45 +00:00
Claire	e46321e63d	Merge commit 'de4815afda' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
Renaud Chaput	a178ba7cd5	Use a modern React context for identity in the app (#30098)	2024-05-19 17:07:32 +00:00
ShittyKopper	d0946224d6	LOUDER PUBLIC	2024-05-06 05:19:10 +03:00
Claire	f09f5b35f2	Merge commit 'd97d31cce6' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`	2024-05-04 16:12:51 +02:00
Claire	7d3fe2b4c3	Add loading indicator and empty result message to advanced interface search (#30085)	2024-04-29 09:55:41 +00:00
Claire	0e76b919b5	Merge commit '0cea7a623b' into glitch-soc/merge-upstream	2024-04-06 21:48:35 +02:00
Eugen Rochko	8e7e86ee35	Add ability to reorder uploaded media before posting in web UI (#28456)	2024-03-25 10:29:55 +00: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	94f7ae192b	Fix emoji picker placement on limited-height viewports (#29651)	2024-03-20 11:07:02 +00:00
Claire	e91ede5be6	Merge commit 'df6086d402' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
Eugen Rochko	1e1d97a787	Fix wrong background color on search results in web UI (#29584)	2024-03-14 09:07:29 +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
Renaud Chaput	b9722dfe2b	Use the server setting to get the max number of poll options in UI (#29490)	2024-03-11 09:13:35 +00:00
Claire	442a5cb66c	Merge commit '653ce43abe' into glitch-soc/merge-upstream	2024-03-07 12:59:51 +01:00
Mashiro	b8bd94ca8e	Fix unhandled nullable attachments limitation counter (#29183)	2024-03-06 12:53:54 +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
Claire	90573c3abb	Change behavior of privacy dropdown to only change value on validation (#29406)	2024-02-27 11:41:19 +00:00
Claire	2dc244784c	Merge commit 'cfa71a4d16' into glitch-soc/merge-upstream	2024-02-24 15:43:15 +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	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
Claire	ca8fbda5d0	Add end-to-end test for OCR in media uploads (#29148)	2024-02-08 19:13:44 +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	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
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
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	6bbcd9348e	Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064)	2024-01-12 20:16:48 +00:00