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
68bee0b08d
Remove timelinePreview variable from landing page decision, instead change default explore tab
2023-01-18 22:54:01 +01:00
Jeremy Kescher
1d3e9cf492
Remove timelinePreview variable from landing page decision
2023-01-18 22:49:24 +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
Connor Shea
30e895299c
Add listing of followed hashtags ( #21773 )
...
* Add followed_tags route.
This at least gets us to the point where the page can actually be
rendered, although it doesn't display any hashtags (yet?).
Attempting to implement #20763 .
* Fix minor issues.
* I've got the followed tags data partially working
But the Hashtag component errors for some reason. Something about the
value of the history attribute being invalid.
* Fix a mistake in the code
* Minor change.
* Get the followed hashtags list fully working.
Still need to add the Follow/Unfollow buttons, though.
* Resolve JS linter issues.
* Add pagination logic to followed tags list view.
However, it currently loads further pages immediately on page load, so
that's not ideal. Need to figure that one out.
* Appease the linter.
* Apply suggestions from code review
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Fixes and resolve some other feedback.
* Use set/update instead of setIn/updateIn.
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18 16:44:33 +01:00
Claire
3970a6f433
Add option to make the landing page be /about even when trends are enabled ( #20808 )
...
* Add option to make the landing page be /about even when trends are enabled
* Restablish /explore as landing page by default
2023-01-18 16:43:58 +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
c40b063bd4
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# lib/mastodon/version.rb
2022-11-12 14:38:59 +01:00
Cutls
553b169d48
Do not show drag&drop dialog when not logined ( #20400 )
...
* Cannot upload until login
* and do not fire upload
* change username props to context
2022-11-11 21:19:48 +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
5ab1ac972b
Show about tab if explore tab wouldn't show any statuses
2022-11-06 01:41:55 +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
Eugen Rochko
0ca29eaa3f
Change layout of posts in web UI ( #19423 )
2022-10-25 19:02:21 +02:00
Eugen Rochko
5452af2188
Fix redirecting to /publish
when compose form is visible in web UI ( #19427 )
2022-10-23 23:37:58 +02:00
Eugen Rochko
1fd6460b02
Change floating action button to be a button in header in web UI ( #19422 )
...
- Fix theme color
- Fix elephant being too big on error page on small screens
- Remove "Follows and Followers" link from navigation panel
2022-10-23 15:58:24 +02:00
Eugen Rochko
a43a823768
Add error boundary around routes in web UI ( #19412 )
...
* Add error boundary around routes in web UI
* Update app/javascript/mastodon/features/ui/util/react_router_helpers.js
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
* Update app/javascript/mastodon/features/ui/util/react_router_helpers.js
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
* Update app/javascript/mastodon/features/ui/components/bundle_column_error.js
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-10-22 23:18:32 +02:00
Claire
062b3c9090
Change landing page to be /about instead of /explore when trends are disabled ( #19414 )
2022-10-22 18:09:51 +02:00
Eugen Rochko
839f893168
Change public accounts pages to mount the web UI ( #19319 )
...
* Change public accounts pages to mount the web UI
* Fix handling of remote usernames in routes
- When logged in, serve web app
- When logged out, redirect to permalink
- Fix `app-body` class not being set sometimes due to name conflict
* Fix missing `multiColumn` prop
* Fix failing test
* Use `discoverable` attribute to control indexing directives
* Fix `<ColumnLoading />` not using `multiColumn`
* Add `noindex` to accounts in REST API
* Change noindex directive to not be rendered by default before a route is mounted
* Add loading indicator for detailed status in web UI
* Fix missing indicator appearing while account is loading in web UI
2022-10-20 14:35:29 +02:00
Eugen Rochko
aefa9253d6
Change featured hashtags to be displayed in navigation panel ( #19382 )
2022-10-19 11:30:59 +02:00
Takeshi Umeda
4c7b5fb6c1
Add featured tags selector for WebUI ( #19358 )
...
* Add featured tags selector for WebUI
* Add title to tag count
2022-10-16 08:43:59 +02:00