9a3d91f629
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
Fixed a code style issue upstream in a PR that got merged in glitch-soc
earlier.
Changed the code to match upstream's.
2022-12-07 09:03:42 +01:00
21b208afcb
Fix hidden overflow on interaction modal ( #21763 )
...
* Fix hidden overflow on interaction modal
* only update overflow y
2022-12-07 00:40:37 +01:00
76454cc638
Fix UI header overflow on mobile ( #21783 )
2022-12-07 00:40:18 +01:00
33f06a4ae7
Fix the top border of verified account fields ( #22006 )
2022-12-06 23:54:02 +01:00
a2e7997592
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README is completely different.
Discarded upstream changes.
2022-11-28 11:33:34 +01:00
cec1e902e0
Make the 'Trending now' header a link to Explore. ( #21759 )
...
This keeps the same design that exists currently, but makes "Trending
now" into a link to the Hashtags section of "Explore".
Resolves #21758 .
2022-11-27 23:49:32 +01:00
32c70d2f09
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
2022-11-14 08:35:55 +01:00
523e106cbf
Fix style of username in navigation bar above compose form in web UI ( #20628 )
...
Regression from #20540
2022-11-14 08:06:17 +01:00
6da9df774e
Fix dropdown menu on profiles not being accessible on narrow screens in web UI ( #20620 )
2022-11-14 06:05:10 +01:00
d0b7bd4250
Fix wrong cut-off point for "Read more" in web UI ( #20599 )
2022-11-14 00:43:24 +01:00
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
6774c339b2
Fix domain blocks on about page not working well on small screens in web UI ( #20391 )
2022-11-11 08:26:58 +01:00
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
7bdb2433f1
Change larger reblogs/favourites numbers to be shortened in web UI ( #20303 )
2022-11-10 08:49:59 +01:00
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
ca8d52c2a4
Change design of new list form in web UI ( #19801 )
2022-11-05 23:06:32 +01:00
7c65f52692
Change design of moved account banner in web UI ( #19790 )
2022-11-05 21:11:24 +01:00
30e786225e
Remove word-break:keep-all from Dismissable banner message ( #19799 )
2022-11-05 21:03:58 +01:00
312d616371
Change sign-in banner to reflect disabled or moved account status ( #19773 )
2022-11-05 18:28:13 +01:00
f002878c95
Make word-break: keep-all for dismissable banner ( #19719 )
2022-11-04 16:04:25 +01:00
5825402ed5
Fix design of verified links in web UI ( #19709 )
2022-11-04 02:28:00 +01:00
2d9a85db6e
Change design of link footer ( #19562 )
2022-10-31 13:06:17 +01:00
b514998dc1
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-28 19:49:42 +02:00
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
923f06a07c
Fix number of uses being shown again on trending hashtags in web UI ( #19484 )
2022-10-28 12:56:51 +02:00
10922294ff
fix(component): adjust style of counter button to fix overflow issue ( #19494 )
2022-10-28 12:46:41 +02:00
8dfe5179ee
Fix avatars not using image tags in web UI ( #19488 )
...
Fix #19483
2022-10-28 00:48:45 +02:00
0ca29eaa3f
Change layout of posts in web UI ( #19423 )
2022-10-25 19:02:21 +02:00
fcca781aae
Change design of translations in web UI ( #19453 )
2022-10-25 18:47:21 +02:00
3ad0a2ae3d
Fix language dropdown causing zoom on mobile devices in web UI ( #19428 )
2022-10-23 23:38:20 +02:00
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
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
56efa8d22f
Fix reply not opening compose page on certain screen sizes in web UI ( #19417 )
...
Fix ellipsis next to icons on navigation panel on some browsers
2022-10-22 23:15:14 +02:00
7c152acb2c
Change settings area to be separated into categories in admin UI ( #19407 )
...
And update all descriptions
2022-10-22 11:44:41 +02:00
aefa9253d6
Change featured hashtags to be displayed in navigation panel ( #19382 )
2022-10-19 11:30:59 +02:00
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
1bd00036c2
Change about page to be mounted in the web UI ( #19345 )
2022-10-13 14:42:37 +02:00
d787343325
Hide list panel from nav bar in mobile layout ( #19337 )
2022-10-10 21:41:25 +02:00
0765324622
Fix intermediary responsive layout, accessibility on navigation in web UI ( #19324 )
...
* 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
f41ec9af05
Add dismissable hints to various timelines in web UI ( #19315 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-10-09 06:08:37 +02:00
a2ba011326
Change privacy policy to be rendered in web UI, add REST API ( #19310 )
...
Source string no longer localized, Markdown instead of raw HTML
2022-10-08 06:01:11 +02:00
7fb738c837
Add interaction modal to logged-out web UI ( #19306 )
2022-10-07 10:14:31 +02:00
0e41d360c0
Change font size of active users in server banner to be larger in web UI ( #19295 )
2022-10-05 07:02:09 +02:00
d2528b26b6
Add server banner to web app, add `GET /api/v2/instance` to REST API ( #19294 )
2022-10-05 03:47:56 +02:00
e2b561e3a5
Fix logged-out web UI on smaller screens ( #19263 )
2022-10-04 20:13:23 +02:00
e623c302d5
Add sign-up button to logged-out web UI ( #19250 )
2022-09-29 06:21:51 +02:00
43b5d5e38d
Add logged-out access to the web UI ( #18961 )
2022-09-29 04:39:33 +02:00
50487db122
Add ability to filter individual posts ( #18945 )
...
* Add database table for status-specific filters
* Add REST endpoints, entities and attributes
* Show status filters in /filters interface
* Perform server-side filtering for individual posts filters
* Fix filtering on context mismatch
* Refactor `toServerSideType` by moving it to its own module
* Move loupe and delete icons to their own module
* Add ability to filter individual posts from WebUI
* Replace keyword list by warnings (expired, context mismatch)
* Refactor server-side filtering code
* Add tests
2022-08-25 04:27:47 +02:00
e6979aa6d4
Add warning for sensitive audio posts ( #17885 )
2022-08-13 15:39:05 +02:00
f5d8501138
Change hashtag numbers to have clearer labels in web UI ( #18864 )
2022-07-22 03:17:41 +02:00
Claire