6753 Commits (62620956d5dc8a74980d0c73054d3ef3aed057d9)

Author	SHA1	Message	Date
Claire	62620956d5	Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	a4e6fe36cb	Add missing ban icons (#27555)	1 year ago
Renaud Chaput	85d4846d8a	[Glitch] Fix `<ColumnBackButtonSlim>` ... Port cb92cdf9af to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	6e9f89e5b6	Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' 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	1 year ago
Claire	ba527c071f	Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' 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.	1 year ago
github-actions[bot]	c85e0a6b04	New Crowdin Translations (automated) (#27544) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Renaud Chaput	cb92cdf9af	Fix `<ColumnBackButtonSlim>` (#27540)	1 year ago
Renaud Chaput	f08ca3f042	Fix missing icon props (#27539)	1 year ago
Matt Jankowski	bc3afb6311	Update `rails/ujs` delegate method usage (#27538)	1 year ago
Claire	8123e86623	[Glitch] Fix double scroll bars in some columns in advanced interface ... Port 37bbd3c106 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	b73e4b59fc	[Glitch] Fix history handling not properly handling states after update to react-router v5 ... Port 15182d1e5e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
たいち ひ	c6f990997d	[Glitch] Rewrite `emoji_unicode_mapping_light` to TS ... Port 9482810703 to glitch-soc Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	4ef66d6538	Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: glitch-soc had extra ignores. Removed them.	1 year ago
Claire	8a131fb7bc	Fix `@rails/ujs` imports	1 year ago
Claire	4b0fb764c3	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream ... Conflicts and ported changes: - updated `@rails/ujs` imports	1 year ago
Eugen Rochko	134de736dc	Change icons in web UI (#27385) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Eugen Rochko	69ea596e55	[Glitch] Fix explore page reloading when you navigate back to it in web UI ... Port d9503a1965 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	e6c3d3c744	Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream	1 year ago
Claire	5323f0eeca	[Glitch] Fix incorrect proptypes from react-router-v5 update ... Port 0ad66175bf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	9325cb5759	[Glitch] Convert `<Button>` to Typescript ... Port 9d45a444f9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Eugen Rochko	1138d44c7d	[Glitch] Fix missing background behind dismissable banner in web UI ... Port 33bd8eccd5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	b0c76eaadd	Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' 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.	1 year ago
Claire	15182d1e5e	Fix history handling not properly handling states after update to react-router v5 (#27526)	1 year ago
github-actions[bot]	50b7ea810e	New Crowdin Translations (automated) (#27523) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
たいち ひ	9482810703	Rewrite `emoji_unicode_mapping_light` to TS (#25444) ... Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>	1 year ago
Matt Jankowski	e93a75f1a1	Rails 7.1 update (#25963)	1 year ago
Eugen Rochko	d9503a1965	Fix explore page reloading when you navigate back to it in web UI (#27489)	1 year ago
Claire	0ad66175bf	Fix incorrect proptypes from react-router-v5 update (#27507)	1 year ago
github-actions[bot]	70fd819935	New Crowdin Translations (automated) (#27490) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Renaud Chaput	9d45a444f9	Convert `<Button>` to Typescript (#27492)	1 year ago
Renaud Chaput	d6eacb79c6	[Glitch] Upgrade to react-router v5 ... Port 1b70d7ed7c to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	245513d630	Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream	1 year ago
github-actions[bot]	284c719f64	New Crowdin Translations (automated) (#27480) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Eugen Rochko	33bd8eccd5	Fix missing background behind dismissable banner in web UI (#27479)	1 year ago
Renaud Chaput	5d9df170cf	[Glitch] Do not display the navigation banner in the logo container ... Port 126cd7705d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	cc000c8859	Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream	1 year ago
Brian Campbell	1a3248dc90	[Glitch] Consider shown and pending status in explore prompt calculation ... Port f76e5111f0 to glitch-soc Co-authored-by: Brian Campbell <brcampbell@beta.team> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	41f58e945c	[Glitch] The `class` props should be `className` ... Port 10df97c542 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	1b70d7ed7c	Upgrade to react-router v5 (#25047) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	126cd7705d	Do not display the navigation banner in the logo container (#27476)	1 year ago
Claire	74fd46d3ab	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	1 year ago
Jeong Arm	68401fc426	[Glitch] Support "in:public" search filter ... Port ad44d832b8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
github-actions[bot]	1ffd5a98a9	New Crowdin Translations (automated) (#27465) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Brian Campbell	f76e5111f0	Consider shown and pending status in explore prompt calculation (#27466) ... Co-authored-by: Brian Campbell <brcampbell@beta.team>	1 year ago
Renaud Chaput	10df97c542	The `class` props should be `className` (#27462)	1 year ago
github-actions[bot]	4612576c68	New Crowdin Translations (automated) (#27454) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Claire	63179f0bf4	Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream	1 year ago
Stanislas Signoud	8bbbd012d4	[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI ... Port 935d54124e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	c10a667ac2	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	1 year ago
Claire	b867d4581e	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/tag_controller_spec.rb`: Glitch-soc had a few extra lines in this file to account for a different default setting. This file got replaced by `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc additions were moved too. Additional changes: - `spec/requests/api/v1/statuses/sources_spec.rb`: Add glitch-soc-only attribute `content_type`.	1 year ago