332 commits

Author	SHA1	Message	Date
Jeremy Kescher	1e866e57ac	Merge remote-tracking branch 'upstream/main' into develop	2023-04-10 08:14:20 +02:00
Nick Schonning	927b2fd138	Set marginRight as string (#24422)	2023-04-05 10:57:36 +02:00
Nick Schonning	ec0c104bf2	Ensure tabIndex is number instead of string (#24409)	2023-04-04 16:33:44 +02:00
Jeremy Kescher	68101baae1	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/javascript/mastodon/utils/resize_image.js # app/lib/user_settings_decorator.rb # app/models/media_attachment.rb # app/models/user.rb # app/views/settings/preferences/appearance/show.html.haml # app/workers/scheduler/indexing_scheduler.rb # config/settings.yml # db/schema.rb	2023-04-03 21:50:15 +02:00
Eugen Rochko	68a192e718	Change "direct message" nomenclature to "private mention" in web UI (#24248)	2023-03-30 15:16:20 +02:00
Jeremy Kescher	722b6697d7	Merge remote-tracking branch 'upstream/main' into develop	2023-03-28 17:31:34 +02:00
Yamagishi Kazutoshi	6e8711ff91	Add missing parenthesis (#24238)	2023-03-24 04:35:43 +01:00
Yamagishi Kazutoshi	d1b057a0ac	Remove legacy decorators syntax (#18357)	2023-03-24 03:17:53 +01:00
Jeremy Kescher	ddc4022845	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js # app/lib/feed_manager.rb # app/services/batched_remove_status_service.rb # lib/mastodon/feeds_cli.rb	2023-03-15 14:13:29 +01:00
Jeremy Kescher	047286d54e	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock	2023-03-06 16:33:21 +01:00
Jeremy Kescher	7318b74ebf	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml	2023-03-05 12:34:16 +01:00
Terry Garcia	a1347f456e	Switched bookmark and favourites around (#23701)	2023-03-03 20:37:49 +01:00
Claire	b55fc883b6	Fix duplicate “Publish” button on mobile (#23804)	2023-03-03 20:25:36 +01:00
Christian Schmidt	d3eefead30	Add lang attribute to media and poll options (#23891)	2023-02-26 20:13:27 +01:00
Renaud Chaput	44a7d87cb1	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
Jeremy Kescher	4a6cc45f9d	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile # Gemfile.lock # config/sidekiq.yml	2023-02-18 22:38:53 +01:00
Jeremy Kescher	8de39432a9	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock # app/javascript/flavours/glitch/actions/interactions.js # config/initializers/rack_attack.rb # config/locales/en_GB.yml	2023-02-17 00:26:21 +01:00
Nick Schonning	db2c58d47a	Enable ESLint no-useless-escape (#23311)	2023-02-13 15:12:14 +01:00
Eugen Rochko	8f590b0a21	Add setting for status page URL (#23390)	2023-02-04 04:56:06 +01:00
Nick Schonning	c49213f0ea	Upgrade ESlint to v8 (#23305)	2023-01-30 01:45:35 +01:00
Christian Schmidt	2a4f2216d6	Add lang attribute to image description textarea and poll option field (#23293)	2023-01-29 19:00:19 +01:00
Jeremy Kescher	0d829dadea	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/features/ui/index.js # app/javascript/mastodon/features/ui/index.js	2023-01-18 22:29:27 +01:00
Claire	3588fbc766	Fix confusing wording in the sign in banner (#22490) ... * Fix confusing wording in the sign in banner * Split into two sentences	2023-01-18 17:15:23 +01:00
Claire	4b92e59f4f	Add support for editing media description and focus point of already-posted statuses (#20878) ... * Add backend support for editing media attachments of existing posts * Allow editing media attachments of already-posted toots * Add tests	2023-01-18 16:33:55 +01:00
Jeremy Kescher	09b826eaa7	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js	2023-01-11 23:49:36 +01:00
Holden Foreman	2bcb081ce8	Fix footer link circle dividers' screen reader accessibility by adding aria-hidden (#22576) ... * Fix footer link circle dividers' screen reader accessibility by adding aria-hidden * Remove a circle erroneously added in prev commit, and make code more DRY	2023-01-09 03:54:03 +01:00
Akira Ouchi	2195f21524	Add variable autoFocus to video (#15281) (#22778) ... * add variable autoFocus to video * set autoFocus in video_modal.js	2023-01-09 03:52:37 +01:00
Jeremy Kescher	1661561640	Merge branch 'reactions' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/es.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/flavours/glitch/locales/ja.js # app/javascript/flavours/glitch/locales/ko.js # app/javascript/flavours/glitch/locales/pl.js # app/javascript/flavours/glitch/locales/zh-CN.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # db/migrate/20221124114030_create_status_reactions.rb	2022-12-22 00:18:36 +01:00
Nick Schonning	06b68490d1	Enable eslint:recommended ruleset (#22433) ... * Enable ESLint recommended ruleset * Disable failing ESLint recommended rules * Remove rules shadowed by eslint:recommended	2022-12-19 00:51:37 +09:00
Jeremy Kescher	a1a1d08890	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock	2022-12-16 17:53:33 +01:00
Holden Foreman	c761e7a5ef	Fix language surrounding disability in prompts for alt text and other media descriptions (#20923)	2022-12-15 18:46:13 +01:00
Nick Schonning	72a8af8088	Fix typo in handler function call name (#21829)	2022-12-15 16:37:17 +01:00
Jeremy Kescher	7e19321520	Merge remote-tracking branch 'upstream/main' into develop	2022-12-07 17:49:14 +01:00
Claire	51098035ed	Fix “Sign up” button with closed registrations not opening modal on mobile (#22060) ... Fixes #20840	2022-12-07 00:25:40 +01:00
Jeremy Kescher	b221a857f7	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml	2022-11-17 23:38:08 +01:00
Levi Bard	654d348aac	Make the button that expands the publish form differentiable from the button that publishes a post (#20864)	2022-11-17 10:53:38 +01:00
Jeremy Kescher	122870cb6b	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb	2022-11-14 22:18:48 +01:00
trwnh	07229089a6	Change in-app links to keep you in-app (#20540) ... * Change in-app links to keep you in-app * refactor Permalink into Link * rewrite link hrefs in status content * please linter * please linter again	2022-11-13 21:10:20 +01:00
Jeremy Kescher	4886f1955b	Merge remote-tracking branch 'upstream/main' into develop	2022-11-10 21:11:05 +01:00
Eugen Rochko	ef582dc4f2	Add option to open original page in dropdowns of remote content in web UI (#20299) ... Change profile picture click to open profile picture in modal in web UI	2022-11-10 08:49:35 +01:00
Jeremy Kescher	ffa93fa157	Merge remote-tracking branch 'upstream/main' into develop	2022-11-08 07:26:59 +01:00
Sunny Ripert	8515bc7962	Add form element on focal point modal (#19834) ... * Add form element on focal point modal * Add type="button" for detection button	2022-11-07 15:41:42 +01:00
Jeremy Kescher	03f50f2f00	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # lib/mastodon/version.rb # public/avatars/original/missing.png	2022-11-06 20:59:47 +01:00
Jeremy Kescher	b0be4764b4	Keep showing explore tab, only statuses are hidden	2022-11-06 01:30:46 +01:00
Jeremy Kescher	da8c3bed5c	Don't show trending statuses in public web UI	2022-11-06 01:13:19 +01:00
Eugen Rochko	a442f481f8	Fix missing interpolation of domain in disabled account banner in web UI (#19788)	2022-11-05 21:11:35 +01:00
Claire	312d616371	Change sign-in banner to reflect disabled or moved account status (#19773)	2022-11-05 18:28:13 +01:00
Eugen Rochko	2d9a85db6e	Change design of link footer (#19562)	2022-10-31 13:06:17 +01:00
Claire	2277913f3f	Add closed registrations modal (#19437)	2022-10-26 19:35:55 +02:00
Claire	267978d4fe	Remove navigation links to /explore when trends are disabled (#19415) ... * Remove navigation links to /explore when trends are disabled * Do not display trends interface when trends are disabled	2022-10-25 19:03:16 +02:00