Jeremy Kescher
5b797a34df
Merge remote-tracking branch 'upstream/main' into develop
2022-11-08 23:30:01 +01:00
Claire
a8c854b3ea
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-08 15:44:57 +01:00
Jeremy Kescher
ffa93fa157
Merge remote-tracking branch 'upstream/main' into develop
2022-11-08 07:26:59 +01:00
Claire
608343c135
Fix opening the language picker scrolling the single-column view to the top ( #19983 )
...
Fixes #19915
2022-11-08 03:52:52 +01:00
Claire
be7032b9cf
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-07 19:53:30 +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
Claire
6c0a6097ff
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-07 07:50:47 +01:00
Sunny Ripert
34c269310d
Fix console log error on column settings load ( #19886 )
2022-11-07 03:39:48 +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
996267fc8b
Fix vanilla flavor being broken due to incorrect imports
2022-11-06 13:03:02 +01:00
Claire
0ad919b192
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
glitch-soc change because of having changed the default number of
available poll options.
Applied upstream's changes while keeping glitch-soc's default number of
poll options.
- `public/oops.png`:
We had a minor graphics change, probably not worth diverging from upstream.
Took upstream version.
2022-11-06 09:50:41 +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
ca8d52c2a4
Change design of new list form in web UI ( #19801 )
2022-11-05 23:06:32 +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
Eugen Rochko
7c65f52692
Change design of moved account banner in web UI ( #19790 )
2022-11-05 21:11:24 +01:00
Claire
312d616371
Change sign-in banner to reflect disabled or moved account status ( #19773 )
2022-11-05 18:28:13 +01:00
Sunny Ripert
887976814a
Fix JavaScript console warning when loading notifications ( #19772 )
2022-11-05 13:45:06 +01:00
Sunny Ripert
c95d9aab56
Fix JavaScript console error on upload editing status ( #19769 )
2022-11-05 13:43:47 +01:00
Claire
9616f5bb22
Fix compose form submission reloading web interface ( #19762 )
...
* Fix compose form submission reloading web interface
Fix regression introduced by #19742
* Fix various compose form buttons being handled like submit buttons
* Fix coding style issue
* Fix missing onClick prop check
2022-11-05 13:43:37 +01:00
Sunny Ripert
0165449e3a
A11y: Explicit <form> element around compose area ( #19742 )
2022-11-04 17:08:08 +01:00
Eugen Rochko
e02812d5b6
Add assets from Twemoji 14.0 ( #19733 )
2022-11-04 16:08:41 +01:00
Eugen Rochko
139ea4c981
Fix limited account hint referencing "your" server when logged out ( #19711 )
2022-11-04 02:28:37 +01:00
Eugen Rochko
5825402ed5
Fix design of verified links in web UI ( #19709 )
2022-11-04 02:28:00 +01:00
Claire
cbb440bbc2
Fix being unable to withdraw follow request when confirmation modal is disabled ( #19687 )
...
* Fix being unable to withdraw follow request when unfollow confirmation modal is disabled
Fixes #19569
* Fix “unfollow” being inadequately used for withdrawing follow requests from account card
2022-11-03 16:05:39 +01:00
Jeremy Kescher
c3bffb95b6
Vanilla flavor: Reduce amount of data stored in initial state for min_options on polls
2022-11-02 21:16:10 +01:00
Jeremy Kescher
9c8fb2d475
Improve min poll options, expose value in API
2022-11-01 10:29:44 +01:00
Jeremy Kescher
7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-10-31 21:37:48 +01:00
Eugen Rochko
2d9a85db6e
Change design of link footer ( #19562 )
2022-10-31 13:06:17 +01:00
Claire
eee36267d6
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
Upstream change too close to a glitch-soc-specific string.
The glitch-soc-specific string should not have been in this file, so it
has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
Upstream refactored a part, that as usual is split and duplicated in various
pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
Upstream fixed custom.css path in a different way than we did, went with
upstream's change.
2022-10-30 18:15:28 +01:00
Eugen Rochko
30ef110224
Fix upload progress not communicating processing phase in web UI ( #19530 )
2022-10-29 20:05:53 +02:00
Eugen Rochko
55af04b253
Fix logged out search and changed logged-in search placeholder ( #19514 )
2022-10-29 13:32:49 +02:00
Claire
b514998dc1
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-28 19:49:42 +02:00
Eugen Rochko
5fa340931e
Fix closed registrations message not appearing in web UI ( #19508 )
...
Regression from #19486
2022-10-28 19:34:22 +02:00
Claire
cb19be67d1
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-28 19:23:58 +02:00
Eugen Rochko
371d969403
Fix missing delete and redraft link in web UI ( #19485 )
2022-10-27 19:17:15 +02:00
Eugen Rochko
d2eb726962
Fix notifications about deleted reports not being also deleted ( #19475 )
...
* Fix notifications about deleted reports not being also deleted
* Fix notification with empty report crashing web UI
Fix #18909
2022-10-27 02:10:54 +02:00
Claire
2277913f3f
Add closed registrations modal ( #19437 )
2022-10-26 19:35:55 +02:00
Eugen Rochko
8ebff0efcb
Change post editing to be enabled in web UI ( #19103 )
2022-10-26 15:23:00 +02:00
Eugen Rochko
f8ca3bb2a1
Add ability to view previous edits of a status in admin UI ( #19462 )
...
* Add ability to view previous edits of a status in admin UI
* Change moderator access to posts to be controlled by a separate policy
2022-10-26 13:42:29 +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
Claire
dd76bbf8b7
Fix WebUI notification settings for new user and new report notifications ( #19436 )
...
Due to an error in operator priority, those settings would only show up if the
user role included the all-encompassing `administrator` permission and would
display `0` otherwise.
2022-10-24 17:37:46 +02:00
Eugen Rochko
73de39e632
Fix media, following and followers tabs in web UI ( #19426 )
2022-10-23 23:38:08 +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
5e908c5a95
Fix case-sensitive look-up for profiles in web UI ( #19397 )
2022-10-21 10:06:03 +02:00