485 commits

Author	SHA1	Message	Date
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
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	92dcc50278	Merge commit 'd3f504245c' into glitch-soc/merge-upstream	2024-07-01 20:45:13 +02:00
Eugen Rochko	20fa9ce484	Add timeline of public posts about a trending link in web UI (#30840)	2024-07-01 14:45:48 +00:00
Claire	d2aea85e6c	Merge commit '5d4dbbcc67' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
Eugen Rochko	096057b845	Change author_account to be authors in REST API (#30846)	2024-06-27 13:17:18 +00:00
Renaud Chaput	863c470a2b	Convert <Directory> to Typescript / function component (#30829)	2024-06-26 18:04:50 +00:00
Claire	6300273664	Merge commit '9e932fa1dd' into glitch-soc/merge-upstream	2024-06-21 12:02:42 +02:00
Renaud Chaput	7d12522ed7	Fix error when deleting a status (#30784)	2024-06-20 22:39:06 +00:00
Claire	fd867adffe	Merge commit 'bb2d77b4a0' into glitch-soc/merge-upstream	2024-06-20 18:36:13 +02:00
Renaud Chaput	1c65932776	Convert disconnectTimeline and timelineDelete actions to Typescript (#30777)	2024-06-20 11:56:52 +00:00
Claire	b0c979af49	Merge commit '58ace2e45e' into glitch-soc/merge-upstream	2024-06-18 18:20:36 +02:00
Renaud Chaput	d558dfd77d	Convert notifications policies frontend code to Typescript (#29868)	2024-06-18 13:23:30 +00:00
Claire	677f73f793	Merge commit '3a191b3797' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
Eugen Rochko	ed6d24330b	Add author links on the explore page in web UI (#30521)	2024-06-13 13:04:16 +00:00
Claire	51631c785f	Merge commit 'b6fd14f0e2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/activitypub/parser/status_parser.rb`: Glitch-soc had changes to adjacent lines. Ported upstream's changes.	2024-05-23 20:30:23 +02:00
Renaud Chaput	b6fd14f0e2	Fix createDataLoadingThunk and related actions (#30408)	2024-05-23 18:22:42 +00:00
Renaud Chaput	10ec421dd4	Proposal: a modern & typed way of writing Redux actions doing API requests (#30270)	2024-05-23 09:50:13 +00:00
Claire	22d12229b2	Merge commit '2c5ab8f647' into glitch-soc/merge-upstream	2024-05-22 21:05:19 +02:00
Renaud Chaput	2c5ab8f647	Remove the access token from Redux & context (#30275)	2024-05-22 14:45:18 +00:00
Claire	2810231180	Merge commit 'b2388be71e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.	2024-05-16 19:30:10 +02:00
Claire	66906a1bc1	Fix Web UI trying to save user settings when logged out (#30324)	2024-05-16 13:01:01 +00:00
Claire	a76980a229	Merge commit 'f0c9cbaf3b' into glitch-soc/merge-upstream	2024-05-04 15:40:07 +02:00
Claire	d6f9c97ae4	Merge commit '7201f99cf8' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +02:00
Claire	0f90e624c5	Merge commit '672c9f5f05' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Conflict due to our theming system being different. Ported upstream's changes.	2024-05-01 16:10:45 +02:00
Claire	3f61981f5d	Merge commit '8a498f4e65' into glitch-soc/merge-upstream	2024-05-01 14:50:16 +02:00
David Beck	4f4b77920e	Remove home marker updates (#22721)	2024-04-29 07:55:58 +00:00
Renaud Chaput	65093c619f	Fix marker thunks to not ignore eslint directives for the whole file (#30089)	2024-04-26 17:11:27 +00:00
Claire	0e76b919b5	Merge commit '0cea7a623b' into glitch-soc/merge-upstream	2024-04-06 21:48:35 +02:00
Renaud Chaput	67442f9039	Remove global boosts state and convert boosts modal to Typescript (#29774)	2024-03-28 15:33:15 +00:00
Renaud Chaput	b9982ce578	Fix notifications marker fetch (#29777)	2024-03-27 15:49:02 +00:00
Renaud Chaput	9fbe8d3a0c	Rewrite PIP state in Typescript (#27645) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-03-27 15:19:33 +00:00
Renaud Chaput	27d014a7fa	Rewrite markers reducer in Typescript (#27644)	2024-03-27 12:47:09 +00: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	b8f476256e	Merge commit 'd702a03a0c' into glitch-soc/merge-upstream	2024-03-15 22:48:04 +01:00
Eugen Rochko	ec19d0a14b	Change mute, block and domain block confirmations in web UI (#29576)	2024-03-15 17:36:41 +00:00
Claire	e91ede5be6	Merge commit 'df6086d402' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
Claire	95a5713ff7	Fix accounts not getting imported into redux store for some filtered notification types (#29588)	2024-03-14 09:34:36 +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
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	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
Eugen Rochko	9cdc60ecc6	Change onboarding prompt to follow suggestions carousel in web UI (#28878)	2024-02-01 13:37:04 +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	92aa6e2ec9	Merge commit 'b7bdcd4f39' into glitch-soc/merge-upstream	2023-12-21 19:42:13 +01:00
Claire	6e56f95285	Merge commit '4a7395d989' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.	2023-12-21 18:17:17 +01:00
Claire	3ad92e8d0d	Merge commit 'bd575a1dd6' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +01:00