1,651 commits

Author	SHA1	Message	Date
Claire	62620956d5	Merge commit '9a3d047f3e' into glitch-soc/merge-upstream	2023-10-25 19:59:17 +02:00
Renaud Chaput	a4e6fe36cb	Add missing ban icons (#27555)	2023-10-25 12:47:37 +00:00
Claire	6e9f89e5b6	Merge commit 'c85e0a6b04' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc - `app/javascript/packs/public.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc	2023-10-25 12:18:45 +02:00
Claire	ba527c071f	Merge commit '134de736dc' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream changed how icons are handled, including on a line modified by glitch-soc to bump the number of poll options. Applied upstream's change, while keeping the increased number of poll options.	2023-10-25 12:14:24 +02:00
Renaud Chaput	f08ca3f042	Fix missing icon props (#27539)	2023-10-24 20:43:06 +00:00
Claire	4ef66d6538	Merge commit '15182d1e5e' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: glitch-soc had extra ignores. Removed them.	2023-10-24 20:31:20 +02:00
Eugen Rochko	134de736dc	Change icons in web UI (#27385) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2023-10-24 17:45:08 +00:00
Claire	e6c3d3c744	Merge commit 'd9503a1965' into glitch-soc/merge-upstream	2023-10-24 19:21:01 +02:00
Claire	b0c76eaadd	Merge commit '0ad66175bf' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream changed one import, close to a glitch-soc-only import to handle different max character counts. Ported upstream's change.	2023-10-24 18:41:20 +02:00
たいち ひ	9482810703	Rewrite emoji_unicode_mapping_light to TS (#25444) ... Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>	2023-10-24 08:06:14 +00:00
Eugen Rochko	d9503a1965	Fix explore page reloading when you navigate back to it in web UI (#27489)	2023-10-23 17:07:13 +02:00
Renaud Chaput	9d45a444f9	Convert <Button> to Typescript (#27492)	2023-10-23 09:43:00 +02:00
Claire	245513d630	Merge commit '1b70d7ed7c' into glitch-soc/merge-upstream	2023-10-21 14:33:33 +02:00
Eugen Rochko	33bd8eccd5	Fix missing background behind dismissable banner in web UI (#27479)	2023-10-20 04:08:13 +02:00
Claire	cc000c8859	Merge commit '126cd7705d' into glitch-soc/merge-upstream	2023-10-19 20:48:22 +02:00
Renaud Chaput	1b70d7ed7c	Upgrade to react-router v5 (#25047) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-10-19 19:44:55 +02:00
Renaud Chaput	126cd7705d	Do not display the navigation banner in the logo container (#27476)	2023-10-19 19:36:08 +02:00
Claire	74fd46d3ab	Merge commit '9f218c9924' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
Brian Campbell	f76e5111f0	Consider shown and pending status in explore prompt calculation (#27466) ... Co-authored-by: Brian Campbell <brcampbell@beta.team>	2023-10-19 14:25:57 +02:00
Renaud Chaput	10df97c542	The class props should be className (#27462)	2023-10-19 13:22:44 +02:00
Claire	63179f0bf4	Merge commit '5ef26d8fd5' into glitch-soc/merge-upstream	2023-10-17 21:59:58 +02:00
Claire	c10a667ac2	Merge commit '935d54124e' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
Jeong Arm	ad44d832b8	Support "in:public" search filter (#26976)	2023-10-17 16:12:03 +02:00
Stanislas Signoud	935d54124e	Fix missing redirections to make sure /home redirect to the advanced UI (#27378)	2023-10-17 14:59:07 +02:00
Claire	3735e6f79d	Merge commit '27e84c0691' into glitch-soc/merge-upstream	2023-10-10 19:53:41 +02:00
Claire	9d1c3d0678	Fix scroll position in thread view reseting when closing a modal (#27350)	2023-10-10 11:35:32 +02:00
Claire	8ef1a95b1c	Merge commit '4c2aca777f' into glitch-soc/merge-upstream	2023-10-09 21:14:57 +02:00
Claire	4a9cdfb928	Merge commit '774e1189d2' into glitch-soc/merge-upstream	2023-10-09 21:12:28 +02:00
Claire	3da7afdeed	Merge commit 'c310374a2f' into glitch-soc/merge-upstream	2023-10-09 21:10:47 +02:00
Claire	4c2aca777f	Fix clicking on already-loaded thread scrolling to the top of the thread (#27338)	2023-10-09 16:46:09 +02:00
Renaud Chaput	774e1189d2	Change eslint config to autofix missing comma and indentation in JS files (#26711)	2023-10-09 13:38:29 +02:00
Claire	c310374a2f	Fix clicking on already-opened thread post scrolling to the top of the thread (#27331)	2023-10-09 12:21:02 +02:00
Claire	74c27e33e3	Merge commit '37bbd3c106' into glitch-soc/merge-upstream	2023-10-08 17:10:39 +02:00
Claire	a5dbb1ee5a	Merge commit '5a437edc7f' into glitch-soc/merge-upstream	2023-10-08 17:05:40 +02:00
Claire	e9a181c52c	Merge commit 'e95d25e101' into glitch-soc/merge-upstream	2023-10-08 16:53:05 +02:00
Claire	37bbd3c106	Fix double scroll bars in some columns in advanced interface (#27187)	2023-10-03 13:12:39 +02:00
Michael Stanclift	5a437edc7f	Keep version string displayed without breakpoints in UI (#26986)	2023-10-03 11:52:21 +02:00
Claire	d80a819fc6	Fix explore prompt appearing because of posts being received out of order (#27211)	2023-09-29 15:51:36 +02:00
Claire	abdb58840a	Merge commit '57f592fed5' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
Claire	a001ae2f39	Fix explore prompt sometimes showing up when the home TL is loading (#27062)	2023-09-25 17:07:01 +02:00
Claire	38753acaa5	Fix width of large text icon buttons (#27127)	2023-09-25 15:06:57 +02:00
Renaud Chaput	4b7bc1f07c	Convert dropdown_menu state to Typescript (#25585)	2023-09-22 18:18:46 +02:00
Claire	f05985f8ec	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our version.	2023-09-21 15:12:00 +02:00
Claire	5356ddbcca	Fix search results temporarily disappearing while scrolling and loading more results (#27014)	2023-09-21 13:51:21 +02:00
Claire	22ee4e057d	Merge commit 'a83615edc9' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Upstream has added a parameter to `streamFrom`, while glitch-soc had an extra parameter. Ported upstream changes.	2023-09-19 12:59:23 +02:00
Claire	70cae19b6b	Fix hashtag bar being sometimes incorrectly hidden (#26960)	2023-09-19 12:25:39 +02:00
Claire	9688c5fcc4	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-18 12:09:37 +02:00
Claire	893755f4cb	Fix error in Web UI when server rules cannot be fetched (#26957)	2023-09-18 09:51:52 +02:00
Claire	e193c848fe	Merge commit '97e4011c3c' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream added some code to add the Identity Provider's sign-in endpoint to the `form-action` Content Security Policy directive but our version of the file is pretty different. Ported the change.	2023-09-15 21:25:05 +02:00
Claire	08b495d95c	Merge commit 'b1d8907138' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00