Commit Graph

394 Commits (9a3d91f629ae0e8f722d56b8634bfad299ab9f04)

Author SHA1 Message Date
Claire 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.
1 year ago
Juan Xavier Gomez 21b208afcb
Fix hidden overflow on interaction modal (#21763)
* Fix hidden overflow on interaction modal

* only update overflow y
1 year ago
Claire 76454cc638
Fix UI header overflow on mobile (#21783) 1 year ago
Jed Fox 33f06a4ae7
Fix the top border of verified account fields (#22006) 1 year ago
Claire a2e7997592 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.
1 year ago
Connor Shea 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.
1 year ago
Claire 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.
2 years ago
Eugen Rochko 523e106cbf
Fix style of username in navigation bar above compose form in web UI (#20628)
Regression from #20540
2 years ago
Eugen Rochko 6da9df774e
Fix dropdown menu on profiles not being accessible on narrow screens in web UI (#20620) 2 years ago
Eugen Rochko d0b7bd4250
Fix wrong cut-off point for "Read more" in web UI (#20599) 2 years ago
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.
2 years ago
Eugen Rochko 6774c339b2
Fix domain blocks on about page not working well on small screens in web UI (#20391) 2 years ago
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.
2 years ago
Eugen Rochko 7bdb2433f1
Change larger reblogs/favourites numbers to be shortened in web UI (#20303) 2 years ago
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.
2 years ago
Eugen Rochko ca8d52c2a4
Change design of new list form in web UI (#19801) 2 years ago
Eugen Rochko 7c65f52692
Change design of moved account banner in web UI (#19790) 2 years ago
eai04191 30e786225e
Remove word-break:keep-all from Dismissable banner message (#19799) 2 years ago
Claire 312d616371
Change sign-in banner to reflect disabled or moved account status (#19773) 2 years ago
Jeong Arm f002878c95
Make word-break: keep-all for dismissable banner (#19719) 2 years ago
Eugen Rochko 5825402ed5
Fix design of verified links in web UI (#19709) 2 years ago
Eugen Rochko 2d9a85db6e
Change design of link footer (#19562) 2 years ago
Claire b514998dc1 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Claire 84da970d6b Fix assets compilation
Not too sure why the loader behaves differently than it previously did, though.
2 years ago
Eugen Rochko 923f06a07c
Fix number of uses being shown again on trending hashtags in web UI (#19484) 2 years ago
Robert Laurenz 10922294ff
fix(component): adjust style of counter button to fix overflow issue (#19494) 2 years ago
Eugen Rochko 8dfe5179ee
Fix avatars not using image tags in web UI (#19488)
Fix #19483
2 years ago
Eugen Rochko 0ca29eaa3f
Change layout of posts in web UI (#19423) 2 years ago
Eugen Rochko fcca781aae
Change design of translations in web UI (#19453) 2 years ago
Eugen Rochko 3ad0a2ae3d
Fix language dropdown causing zoom on mobile devices in web UI (#19428) 2 years ago
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
2 years ago
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>
2 years ago
Eugen Rochko 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
2 years ago
Eugen Rochko 7c152acb2c
Change settings area to be separated into categories in admin UI (#19407)
And update all descriptions
2 years ago
Eugen Rochko aefa9253d6
Change featured hashtags to be displayed in navigation panel (#19382) 2 years ago
Takeshi Umeda 4c7b5fb6c1
Add featured tags selector for WebUI (#19358)
* Add featured tags selector for WebUI

* Add title to tag count
2 years ago
Eugen Rochko 1bd00036c2
Change about page to be mounted in the web UI (#19345) 2 years ago
Yamagishi Kazutoshi d787343325
Hide list panel from nav bar in mobile layout (#19337) 2 years ago
Eugen Rochko 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>
2 years ago
Eugen Rochko f41ec9af05
Add dismissable hints to various timelines in web UI (#19315)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Eugen Rochko a2ba011326
Change privacy policy to be rendered in web UI, add REST API (#19310)
Source string no longer localized, Markdown instead of raw HTML
2 years ago
Eugen Rochko 7fb738c837
Add interaction modal to logged-out web UI (#19306) 2 years ago
Eugen Rochko 0e41d360c0
Change font size of active users in server banner to be larger in web UI (#19295) 2 years ago
Eugen Rochko d2528b26b6
Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2 years ago
Eugen Rochko e2b561e3a5
Fix logged-out web UI on smaller screens (#19263) 2 years ago
Eugen Rochko e623c302d5
Add sign-up button to logged-out web UI (#19250) 2 years ago
Eugen Rochko 43b5d5e38d
Add logged-out access to the web UI (#18961) 2 years ago
Claire 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
2 years ago
Rens Groothuijsen e6979aa6d4
Add warning for sensitive audio posts (#17885) 2 years ago
Eugen Rochko f5d8501138
Change hashtag numbers to have clearer labels in web UI (#18864) 2 years ago