Commit graph

1325 commits

Author SHA1 Message Date
Claire
93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
Claire
fdfacb0ec0 Revert "Revert "Change "Allow trends without prior review" setting to include statuses ()""
This reverts commit bfc539cfb4.
2022-11-12 10:17:22 +01:00
Eugen Rochko
6774c339b2
Fix domain blocks on about page not working well on small screens in web UI () 2022-11-11 08:26:58 +01:00
Connor Shea
cf4992c918
Only remove padding when listing applications ()
This prevents styling issues on the Authorization page.
2022-11-11 02:55:20 +01:00
Claire
89a6b76f99
Fix color of the “No description added“ media upload warning on light theme () 2022-11-10 14:21:31 +01:00
Claire
c118918520 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.
2022-11-10 09:36:47 +01:00
Eugen Rochko
7bdb2433f1
Change larger reblogs/favourites numbers to be shortened in web UI () 2022-11-10 08:49:59 +01:00
Eugen Rochko
e37e8deb0f
Fix profile header being cut off in light theme in web UI () 2022-11-10 07:32:37 +01:00
Claire
a8c854b3ea Merge branch 'main' into glitch-soc/merge-upstream 2022-11-08 15:44:57 +01:00
Zach Flanders
0beb095a4b
Fix spoiler buttons css not rendering correct color in light theme ()
* Updating status__content__spoiler-link css for mastodon-light theme to ensure correct rendering precedence

* Adding focus css selector to status__content__spoiler-link mastodon-light theme

* reformatting code to match convention of having css selectors on separate lines

* fixing code format for  scss linting issue
2022-11-07 22:37:36 +01:00
Claire
6c0a6097ff Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 07:50:47 +01:00
Sunny Ripert
4b7f32a2a6
Fix double button to clear emoji search input () 2022-11-07 03:40:54 +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
Eugen Rochko
ca8d52c2a4
Change design of new list form in web UI () 2022-11-05 23:06:32 +01:00
Eugen Rochko
7c65f52692
Change design of moved account banner in web UI () 2022-11-05 21:11:24 +01:00
eai04191
30e786225e
Remove word-break:keep-all from Dismissable banner message () 2022-11-05 21:03:58 +01:00
Claire
312d616371
Change sign-in banner to reflect disabled or moved account status () 2022-11-05 18:28:13 +01:00
Jeong Arm
f002878c95
Make word-break: keep-all for dismissable banner () 2022-11-04 16:04:25 +01:00
Eugen Rochko
20aa8881dc
Fix colors in light theme () 2022-11-04 02:32:26 +01:00
Eugen Rochko
1c3192df6b
Fix wrong colors in the high-contrast theme () 2022-11-04 02:28:14 +01:00
Eugen Rochko
5825402ed5
Fix design of verified links in web UI () 2022-11-04 02:28:00 +01:00
Eugen Rochko
2d9a85db6e
Change design of link footer () 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
ad83e64795
Fix sidebar and tabs on settings on small screens in admin UI () 2022-10-30 02:43:15 +02:00
Claire
b514998dc1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:49:42 +02:00
Claire
84da970d6b Fix assets compilation
Not too sure why the loader behaves differently than it previously did, though.
2022-10-28 19:24:02 +02:00
Claire
cb19be67d1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
Eugen Rochko
923f06a07c
Fix number of uses being shown again on trending hashtags in web UI () 2022-10-28 12:56:51 +02:00
Claire
d9d722d74b
Change admin announcement edition interface to use datetime-local ()
* Change admin announcement edition interface to use datetime-local

* Dynamically set announcement stop date as required if start date is set, set minimum date for stop date

* Change `all_day` to not be bound to presence of time-range

* Add pattern and placeholder as minimal fallback for browsers not supporting datetime-local

* Display datetime-local inputs as local time

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-10-28 12:56:32 +02:00
Robert Laurenz
10922294ff
fix(component): adjust style of counter button to fix overflow issue () 2022-10-28 12:46:41 +02:00
Eugen Rochko
8dfe5179ee
Fix avatars not using image tags in web UI ()
Fix 
2022-10-28 00:48:45 +02:00
Eugen Rochko
f8ca3bb2a1
Add ability to view previous edits of a status in admin UI ()
* 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
Eugen Rochko
6f01111863
Fix wrong size of avatars in admin UI () 2022-10-25 21:43:33 +02:00
Eugen Rochko
0ca29eaa3f
Change layout of posts in web UI () 2022-10-25 19:02:21 +02:00
Eugen Rochko
fcca781aae
Change design of translations in web UI () 2022-10-25 18:47:21 +02:00
Eugen Rochko
3ad0a2ae3d
Fix language dropdown causing zoom on mobile devices in web UI () 2022-10-23 23:38:20 +02:00
Eugen Rochko
1fd6460b02
Change floating action button to be a button in header in web UI ()
- 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 ()
* 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
Eugen Rochko
56efa8d22f
Fix reply not opening compose page on certain screen sizes in web UI ()
Fix ellipsis next to icons on navigation panel on some browsers
2022-10-22 23:15:14 +02:00
Eugen Rochko
7c152acb2c
Change settings area to be separated into categories in admin UI ()
And update all descriptions
2022-10-22 11:44:41 +02:00
Eugen Rochko
839f893168
Change public accounts pages to mount the web UI ()
* 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 () 2022-10-19 11:30:59 +02:00
Takeshi Umeda
4c7b5fb6c1
Add featured tags selector for WebUI ()
* Add featured tags selector for WebUI

* Add title to tag count
2022-10-16 08:43:59 +02:00
Eugen Rochko
1bd00036c2
Change about page to be mounted in the web UI () 2022-10-13 14:42:37 +02:00
Yamagishi Kazutoshi
d787343325
Hide list panel from nav bar in mobile layout () 2022-10-10 21:41:25 +02:00
Eugen Rochko
bf3cb42da7 Add server banner to web app, add GET /api/v2/instance to REST API ()
Cherry-picked d2528b26b6

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream changed stuff, we had extra attributes.
  Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
  Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
  so updated that file by keeping our extra attributes, and took upstream's
  version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
  Took upstream's version.
2022-10-09 19:51:39 +02:00
Eugen Rochko
0765324622
Fix intermediary responsive layout, accessibility on navigation in web UI ()
* Fix intermediary responsive layout, accessibility on navigation in web UI

* `yarn test:jest -u`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-10-09 15:55:32 +02:00
Eugen Rochko
f41ec9af05
Add dismissable hints to various timelines in web UI ()
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-10-09 06:08:37 +02:00
Eugen Rochko
a2ba011326
Change privacy policy to be rendered in web UI, add REST API ()
Source string no longer localized, Markdown instead of raw HTML
2022-10-08 06:01:11 +02:00
Eugen Rochko
7fb738c837
Add interaction modal to logged-out web UI () 2022-10-07 10:14:31 +02:00