3,047 commits

Author	SHA1	Message	Date
Claire	8b568755ad	Merge commit '89269e4b71' into glitch-soc/merge-upstream ... Conflicts: - `tsconfig.json`: Upstream changed the config to properly process imports. Glitch-soc had previously already done so. Changed the config to better match upstream.	2023-05-09 20:12:33 +02:00
Renaud Chaput	89269e4b71	Mark wheel events on scrollable list as passive (#24914)	2023-05-09 03:07:13 +02:00
Claire	d77fbbed73	Merge commit 'f877aa9d70' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.	2023-05-08 19:28:21 +02:00
Claire	2d029dedd9	Merge commit '0ad2413b35' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.	2023-05-08 15:28:36 +02:00
fusagiko / takayamaki	9818f34273	Rewrite Domain component as function component (#24896)	2023-05-08 15:12:12 +02:00
fusagiko / takayamaki	5bc8e2d1fd	Use LayoutType from is_mobile in actions/app (#24863)	2023-05-08 15:10:21 +02:00
たいち ひ	7c1305b3a4	Add TypeScript support for mastodon alias and image imports (#24895)	2023-05-08 11:28:36 +02:00
たいち ひ	76264e3fe8	Rewrite RadioButton component as FC (#24897)	2023-05-08 11:12:53 +02:00
たいち ひ	a65d2d1045	Rewrite Image component as function component (#24893)	2023-05-08 11:12:44 +02:00
たいち ひ	490ccbf40b	Rewrite <NotSignedInIndicator /> as FC (#24903)	2023-05-08 11:12:13 +02:00
たいち ひ	6fdbee240c	Rewrite <Check /> as FC (#24901)	2023-05-08 08:26:02 +02:00
fusagiko / takayamaki	140aa6b054	Rewrite VerifiedBadge component as function component (#24892)	2023-05-07 09:10:58 +02:00
S.H	5811ccc611	Fix column back button error (#24867)	2023-05-05 15:13:28 +02:00
Nick Schonning	f95125bd04	Fail ESLint for Warnings in CI (#24836)	2023-05-04 09:48:50 +02:00
Florin	27bafabb64	Fix Back button going outside the app (#24835)	2023-05-04 08:14:04 +02:00
Renaud Chaput	45579a26cf	Fixes build errors from some previous TS-related commits (#24811)	2023-05-03 16:28:14 +02:00
fusagiko / takayamaki	0999cb4601	Rewrite actions/app.ts and reducers/missed_updates.ts with createAction (#24801)	2023-05-03 15:28:39 +02:00
fusagiko / takayamaki	e38b391940	Add type annotation for some js files (#24787)	2023-05-03 11:43:29 +02:00
Claire	9c1929efad	Fix incorrect import of redux store (#24805)	2023-05-03 10:29:45 +02:00
fusagiko / takayamaki	8227af8dcc	use configureStore of redux-toolkit instead of createStore of redux (#24790)	2023-05-02 20:39:06 +02:00
Eugen Rochko	8131a5b330	Add ALT badges to media that has alternative text in web UI (#24782)	2023-05-02 14:47:04 +02:00
Claire	598e63dad2	Change media elements to use aspect-ratio rather than compute height themselves (#24686)	2023-05-02 13:58:48 +02:00
fusagiko / takayamaki	f50105779b	Add type annotation for Blurhash component (#24750)	2023-05-02 12:54:00 +02:00
fusagiko / takayamaki	5a5975d7f7	Add type annotation for IconButton component (#24753)	2023-05-02 12:53:32 +02:00
fusagiko / takayamaki	15fd712464	Add type annotation for RelativeTimestamp component (#24749)	2023-05-01 00:51:31 +02:00
fusagiko / takayamaki	81f75b1e0e	Rewrite Icon and IconWithBadge with typescript (#24747)	2023-05-01 00:51:00 +02:00
Eugen Rochko	0a08e9d3d3	New Crowdin updates (#24678) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2023-04-30 17:02:11 +09:00
Claire	cf1bc4bb93	Fix audio player width in thread view (#24713)	2023-04-30 06:42:22 +02:00
Nick Schonning	f22b4e556c	Add eslint-plugin-jsdoc (#24719)	2023-04-30 02:29:54 +02:00
Christian Schmidt	bfeccf6748	Fix media description not being cleared (#24720)	2023-04-30 02:29:24 +02:00
Claire	12b935fadf	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.	2023-04-29 10:44:56 +02:00
Eugen Rochko	8979b70975	Add default post text to onboarding flow in web UI (#24705)	2023-04-28 10:05:34 +02:00
Eugen Rochko	6028d047b9	Change logo version in header based on screen size in web UI (#24707)	2023-04-28 10:00:33 +02:00
Eugen Rochko	7cf963eec2	Change label from "For you" to "People" on explore screen in web UI (#24706)	2023-04-28 08:54:20 +02:00
Eugen Rochko	d4511f2a76	New Crowdin updates (#24617) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2023-04-27 04:55:06 +09:00
Plastikmensch	1565af1caf	[Glitch] [Proposal] Make able to write React in Typescript (#2190) ... Port 4520e6473a to glitch-soc Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>	2023-04-26 21:30:41 +02:00
Eugen Rochko	c35e3cb6ac	Add more tips to onboarding flow in web UI (#24646)	2023-04-25 11:12:37 +02:00
Eugen Rochko	8099ba04be	Change hashtags and mentions in bios to open in-app in web UI (#24643)	2023-04-25 06:33:21 +02:00
Eugen Rochko	804aa8d501	Fix cutting off first letter of hashtag links sometimes in web UI (#24623)	2023-04-24 09:53:54 +02:00
Nick Schonning	2daa5a1549	Enable formatjs/prefer-pound-in-plural (#24622)	2023-04-24 08:07:19 +02:00
Eugen Rochko	290e4aba31	Add lines to threads in web UI (#24549)	2023-04-24 08:07:03 +02:00
Nick Schonning	ef3675d688	Remove empty Kushubian (csb) local files (#24151)	2023-04-23 22:43:12 +02:00
Christian Schmidt	e713c545b8	Use CSS to trim long card descriptions (#24265)	2023-04-23 22:32:47 +02:00
Eugen Rochko	0461f83320	Add new onboarding flow to web UI (#24619)	2023-04-23 22:24:53 +02:00
Eugen Rochko	9d75b03ba4	New Crowdin updates (#24517) ... Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2023-04-22 19:37:41 +09:00
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.	2023-04-22 10:06:11 +02:00
Claire	fbb4de3dbc	Fix infinite loop in emoji replacement code (#24615)	2023-04-21 18:08:28 +02:00
Claire	37886c28da	Fix characters being emojified even when using Variation Selector 15 (text) (#20949)	2023-04-20 16:43:55 +02:00
fusagiko / takayamaki	c1a7e38d2b	Allow == when null checking (#24593)	2023-04-19 17:46:46 +02:00
fusagiko / takayamaki	ab740f464a	Rewrite AnimatedNumber component with React hooks (#24559)	2023-04-17 13:25:15 +02:00