6107 Commits (8e806b6e88503739ddba03a19d66b60b6d0f3f2a)

Author	SHA1	Message	Date
Nick Schonning	ef3675d688	Remove empty Kushubian (csb) local files (#24151)	2 years ago
Chike Nwaenie	e1b4eeb636	Change styling of the recommended accounts to allow bio to be more visible (#24480)	2 years ago
Christian Schmidt	e713c545b8	Use CSS to trim long card descriptions (#24265)	2 years ago
Eugen Rochko	0461f83320	Add new onboarding flow to web UI (#24619)	2 years ago
Claire	5b58ebb04f	Fix JS crashing if initial-state is not set (#2193) ... Fixes issues with the JS for at least sign-up pages not working	2 years ago
Eugen Rochko	9d75b03ba4	New Crowdin updates (#24517) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
fusagiko / takayamaki	9ef32ea570	[Glitch] Rewrite AnimatedNumber component with React hooks ... Port ab740f464a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
fusagiko / takayamaki	799e9917e4	[Glitch] Rewrite GIFV component with React hooks ... Port cf3fa1e814 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Eugen Rochko	6ea9137233	[Glitch] Add client-side validation for taken username in sign-up form ... Port 955ec252a4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	bc7b3399fb	[Glitch] Fix crash when trying to open the filter modal ... Port bc4745f482 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Eugen Rochko	2f3dffb057	[Glitch] Add progress indicator to sign-up flow ... Port e5c0b16735 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Ivan Rodriguez	a21a875dba	[Glitch] Fix status title for statuses without text ... Port f05fb51ecb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	f2797276b2	[Glitch] typo: collapsable -> collapsible ... Port d02aa274be to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	abfdafef1e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.	2 years ago
Claire	fbb4de3dbc	Fix infinite loop in emoji replacement code (#24615)	2 years ago
Claire	37886c28da	Fix characters being emojified even when using Variation Selector 15 (text) (#20949)	2 years ago
fusagiko / takayamaki	c1a7e38d2b	Allow `==` when null checking (#24593)	2 years ago
fusagiko / takayamaki	ab740f464a	Rewrite AnimatedNumber component with React hooks (#24559)	2 years ago
Claire	bc4745f482	Fix crash when trying to open the filter modal (#24556)	2 years ago
fusagiko / takayamaki	9f8d34620b	Rewrite AvatarOverlay component with React hooks (#24543)	2 years ago
Eugen Rochko	34f8e696e2	[Glitch] Change all components to use the same error page in web UI ... Port cee357d538 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	a3c05640f7	[Glitch] Add “In Memoriam” banner back to profiles ... Port 86ad43173f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	cb0562f32c	[Glitch] Fix tab arrows on RTL layouts ... Port af49d93fd6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	f9a9f9344b	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Plastikmensch	f28942cef9	[Glitch] Refactor styles to use logical properties for positioning (#2156) ... Port babd86e594 and 45848d6547 to glitch-soc Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>	2 years ago
Claire	0cbd579ef0	New Crowdin updates (#2172) ... * New translations en.json (Spanish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Afrikaans) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Belarusian) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Frisian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Punjabi) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (English, United Kingdom) [ci skip] * New translations en.json (Burmese) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Faroese) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Uyghur) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Tatar) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Latin) [ci skip] * New translations en.json (Bosnian) [ci skip] * New translations en.json (French, Quebec) [ci skip] * New translations en.json (Sinhala) [ci skip] * New translations en.json (Cornish) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.json (Scottish Gaelic) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Aragonese) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Kurmanji (Kurdish)) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * New translations en.json (Scots) [ci skip] * New translations en.json (Igbo) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Sanskrit) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Chinese Simplified) [ci skip]	2 years ago
fusagiko / takayamaki	cf3fa1e814	Rewrite GIFV component with React hooks (#24552)	2 years ago
Eugen Rochko	e5c0b16735	Add progress indicator to sign-up flow (#24545)	2 years ago
Eugen Rochko	955ec252a4	Add client-side validation for taken username in sign-up form (#24546)	2 years ago
Ivan Rodriguez	f05fb51ecb	Fix status title for statuses without text (#24359)	2 years ago
Nick Schonning	d02aa274be	typo: collapsable -> collapsible (#24521)	2 years ago
Claire	af49d93fd6	Fix tab arrows on RTL layouts (#24520)	2 years ago
Claire	8f0b0435ab	Fix missing translation strings in en.json and defaultMessages.json (#24518)	2 years ago
Claire	86ad43173f	Add “In Memoriam” banner back to profiles (#23614)	2 years ago
Eugen Rochko	c5eba06d8c	New Crowdin updates (#24447) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Eugen Rochko	cee357d538	Change all components to use the same error page in web UI (#24512)	2 years ago
Claire	63a39ae2fa	Run `yarn manage:translations`	2 years ago
Claire	c11e69f33a	Move glitch-soc-only translation strings out of `app/javascript/mastodono/locales`	2 years ago
Nick Schonning	bfe46d08f9	[Glitch] Ensure tabIndex is number instead of string ... Port ec0c104bf2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Christian Schmidt	53cdcce3d1	[Glitch] Fix loading spinner + infinite scroll for private mentions ... Port 9ef9974ff2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	b756e49cf1	[Glitch] Enable Stylelint property-no-unknown ... Port cd14f712ad to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Christian Schmidt	7b04c2fb71	[Glitch] Fix tooltip for dates without time ... Port aa136cf2fa to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	5b88b7e81a	[Glitch] Remove Array.prototype.includes polyfill ... Port c0886dee14 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Christian Schmidt	df6602ede1	[Glitch] Fix account header image missing in low-res ... Port d7b8c6db7e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Christian Schmidt	74c61b05ae	[Glitch] Fix height of announcements not being updated when using reduced animations ... Port ffd5b2eea4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	791e712a80	[Glitch] Update display_media typing to string ... Port 17b2fd2177 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	f3f7ef2d13	[Glitch] Set marginRight as string ... Port 927b2fd138 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	358e4067bb	[Glitch] SUBMIT doesn't exist on XMLHttpRequest ... Port ab3f23da91 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	0f62451424	[Glitch] HTML string attributes set as booleans ... Port a425915ce7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	ce12934f5b	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.	2 years ago
Claire	10469a0b85	Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169) ... This reduces differences with upstream and fixes a bunch of locale-data files having been forgotten.	2 years ago
Christian Schmidt	aa136cf2fa	Fix tooltip for dates without time (#24244)	2 years ago
Christian Schmidt	9ef9974ff2	Fix loading spinner + infinite scroll for private mentions (#24446)	2 years ago
Nick Schonning	c0886dee14	Remove Array.prototype.includes polyfill (#24234)	2 years ago
Christian Schmidt	d7b8c6db7e	Fix account header image missing in low-res (#24433)	2 years ago
Eugen Rochko	c9f3438efe	New Crowdin updates (#24378) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	02d5c69404	New Crowdin updates (#2126) ... * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.json (French, Quebec) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * Fix Crowdin YAML export issue * Fix i18n YAML normalization	2 years ago
Christian Schmidt	ffd5b2eea4	Fix height of announcements not being updated when using reduced animations (#24354)	2 years ago
Nick Schonning	17b2fd2177	Update display_media typing to string (#24416)	2 years ago
Nick Schonning	927b2fd138	Set marginRight as string (#24422)	2 years ago
Nick Schonning	ab3f23da91	SUBMIT doesn't exist on XMLHttpRequest (#24423)	2 years ago
Nick Schonning	cd14f712ad	Enable Stylelint property-no-unknown (#24404)	2 years ago
Claire	45848d6547	Fix styling regressions from RTL layout refactor (#24415)	2 years ago
Nick Schonning	ec0c104bf2	Ensure tabIndex is number instead of string (#24409)	2 years ago
Nick Schonning	a425915ce7	HTML string attributes set as booleans (#24408)	2 years ago
Rubicon Rowe	69ca6316ec	[Glitch] Fix inconsistent radius in drawer ... Port fa98363a27 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	d13ef49b15	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Rubicon Rowe	fa98363a27	Fix inconsistent radius in drawer (#24407)	2 years ago
Nick Schonning	8e19c44b2c	Align typings with installed versions (#24410)	2 years ago
Christian Schmidt	d29cf8a044	[Glitch] Add colour to follow button when hashtag is being followed ... Port 77bd32a26a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	4d5b4dacd6	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Christian Schmidt	77bd32a26a	Add colour to follow button when hashtag is being followed (#24361)	2 years ago
Eugen Rochko	4909c2e718	New Crowdin updates (#24276) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Nick Schonning	373e4a8ff0	Move ESLint configs to overrides (#24370)	2 years ago
fusagiko / takayamaki	4520e6473a	[Proposal] Make able to write React in Typescript (#16210) ... Co-authored-by: berlysia <berlysia@gmail.com> Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>	2 years ago
Claire	7b15f4006a	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	2b11376411	Change search pop-out in web UI (#24305)	2 years ago
Eugen Rochko	46483ae849	Fix regressions from change in account row design in web UI (#24343)	2 years ago
Tdxdxoz	d874a7a10f	[Glitch] Fix: set multiColumn value for /explore Statuses ... Port 74f56c64fc to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	a8f0592b72	[Glitch] Move marky to devDependency ... Port ddb769f0b8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	01d6f7529f	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.	2 years ago
Eugen Rochko	68a192e718	Change "direct message" nomenclature to "private mention" in web UI (#24248)	2 years ago
Tdxdxoz	74f56c64fc	Fix: set multiColumn value for /explore Statuses (#24314)	2 years ago
Nick Schonning	ddb769f0b8	Move marky to devDependency (#24258)	2 years ago
Eugen Rochko	cf12621e37	New Crowdin updates (#24130) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Eugen Rochko	babd86e594	Refactor styles to use logical properties for positioning (#23944)	2 years ago
neatchee	8215df76c0	[Glitch] Remove legacy decorators syntax ... Port d1b057a0ac to glitch-soc	2 years ago
Nick Schonning	00c839b9a9	[Glitch] Remove isNaN polyfill ... Port b46125224c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	14b0311029	Merge branch 'main' into glitch-soc/main	2 years ago
Eugen Rochko	9bda933740	Change media upload limits and remove client-side resizing (#23726)	2 years ago
Eugen Rochko	ef127c964a	Change design of account rows in web UI (#24247)	2 years ago
Yamagishi Kazutoshi	6e8711ff91	Add missing parenthesis (#24238)	2 years ago
Yamagishi Kazutoshi	d1b057a0ac	Remove legacy decorators syntax (#18357)	2 years ago
Nick Schonning	b46125224c	Remove isNaN polyfill (#24224)	2 years ago
Christian Schmidt	16da4a09e8	Fix broken links in account gallery (#24218)	2 years ago
mogamin	b4f60bc6de	[Glitch] Fit the max-width of media in .prose to parent box ... Port 0a9def5498 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	5ac380c122	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.	2 years ago
mogamin	0a9def5498	Fit the max-width of media in .prose to parent box (#24180)	2 years ago
Plastikmensch	02ac94490a	Add getting-started-misc to route (#2141) ... * Add getting-started-misc to web_app_paths Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add signed in check to navigation entries Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors. Also fixed the keys as these were literally "i++". Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Remove "Extended information" from getting-started-misc I couldn't find any reference to this translation string, so I removed it too. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>	2 years ago
Christian Schmidt	8f97ffe91e	[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint ... Port bd047acc35 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	193250556c	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.	2 years ago
Eugen Rochko	a085901108	New Crowdin updates (#23904) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Christian Schmidt	bd047acc35	Replace `Status#translatable?` with language matrix in separate endpoint (#24037)	2 years ago
Rodion Borisov	32418f0ff3	[Glitch] Center the text itself in upload area ... Port a52ccd7ad9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
PauloVilarinho	17fb58bff3	[Glitch] add modal message when editing toot ... Port 8770473dbb to glitch-soc Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	3ef5f62abf	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.	2 years ago
Rodion Borisov	a52ccd7ad9	Center the text itself in upload area (#24029)	2 years ago
PauloVilarinho	8770473dbb	add modal message when editing toot (#23936) ... Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>	2 years ago
Claire	7f3b0dedeb	Refactor glitch-soc rich text SCSS	2 years ago
Christian Schmidt	1317553f3a	[Glitch] Only offer translation for supported languages ... Port 5a8c651e8f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Terry Garcia	9a1bd1c3e9	[Glitch] Switched bookmark and favourites around ... Port a1347f456e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	03ac84b0f4	[Glitch] Fix duplicate “Publish” button on mobile ... Port b55fc883b6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	7623e18124	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.	2 years ago
Claire	bb4e211c86	New Crowdin updates (#2118) ... * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip]	2 years ago
Christian Schmidt	0e476f3c4f	[Glitch] Add `lang` attribute to media and poll options ... Port d3eefead30 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Christian Schmidt	cb868228bd	Do not leave Mastodon when clicking “Back” (#23953)	2 years ago
Christian Schmidt	5a8c651e8f	Only offer translation for supported languages (#23879)	2 years ago
Terry Garcia	a1347f456e	Switched bookmark and favourites around (#23701)	2 years ago
Claire	b55fc883b6	Fix duplicate “Publish” button on mobile (#23804)	2 years ago
Claire	3a6451c867	Add support for incoming rich text (#23913)	2 years ago
Claire	276c1d32d6	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	cb97ba7a2f	New Crowdin updates (#23802) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Christian Schmidt	d3eefead30	Add `lang` attribute to media and poll options (#23891)	2 years ago
Claire	b91756fd4d	Move misc rules from components/index.scss to components/misc.scss	2 years ago
Claire	cc94cc86ae	Fix glitch-soc SCSS code style and refactor closer to upstream	2 years ago
Christian Schmidt	b632c5a55a	[Glitch] Add `lang` attribute to preview card ... Port 8000a8f230 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Tim Lucas	28cb77bd07	[Glitch] Increase contrast of upload progress background ... Port f4f91bc295 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Botao Wang	56bec60f25	[Glitch] Fix sidebar cut-off on small screens in admin UI ... Port 7adde24a95 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	31455f05fb	[Glitch] Add `lang` tag to native language names in language picker ... Port 7207a98d39 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Renaud Chaput	81ef21a0c8	[Glitch] Rename JSX files with proper `.jsx` extension ... Port 44a7d87cb1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	859eb01aac	Fix building vanilla flavor after JSX change	2 years ago
Claire	4ed09276d5	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.	2 years ago
Christian Schmidt	8000a8f230	Add `lang` attribute to preview card (#23869)	2 years ago
Tim Lucas	f4f91bc295	Increase contrast of upload progress background (#23836)	2 years ago
Eugen Rochko	2564117131	New Crowdin updates (#23625) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Botao Wang	7adde24a95	Fix sidebar cut-off on small screens in admin UI (#23764)	2 years ago
Claire	7207a98d39	Add `lang` tag to native language names in language picker (#23749)	2 years ago
Claire	d3b4d4d4f3	Change compose form checkbox to native input with `appearance: none` (#22949)	2 years ago
Christian Schmidt	62c4aecf8f	Make larger part of status clickable (#23621)	2 years ago
Renaud Chaput	44a7d87cb1	Rename JSX files with proper `.jsx` extension (#23733)	2 years ago
Claire	8c8358b3cf	[Glitch] Fix focus point of already-attached media not saving after edit ... Port b2283b6838 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Christian Schmidt	229ab559dc	[Glitch] Fix bad type for spellCheck attribute ... Port cde13349cb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	6fdd596cc8	[Glitch] Enable ESLint Promise plugin defaults ... Port 5e1c0c3d94 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	7452a95998	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.	2 years ago
Claire	b2283b6838	Fix focus point of already-attached media not saving after edit (#23566)	2 years ago
Claire	4c68189d2b	Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream ... Merge upstream changes	2 years ago
Nick Schonning	ea9a1d79df	[Glitch] Upgrade to Stylelint 15 with Prettier ... Port 0c9d455ea5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Nick Schonning	7e64eef73b	[Glitch] Enable ESLint no-useless-escape ... Port db2c58d47a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	587f6b3b06	[Glitch] Enable ESLint import recommended rules ... Port eddfb33dfe to glitch-soc	2 years ago
Claire	2be88d1930	New Crowdin updates (#2111) ... * New translations en.json (Korean) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese) [ci skip] * Fix root key name in pt-PT translation file * Fix normalization issue with ES translation * Fix issue with `no` locale in glitch-soc	2 years ago