f23d971cd8
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
Port upstream's minor refactoring
2 years ago
cfeb01b17f
Add follow request banner on account header ( #20785 )
...
* Add requested_by to relationship maps
* Display whether an account has requested to follow you on their profile
2 years ago
520a0c8ea7
Fix margin for search field on medium window size ( #21606 )
2 years ago
8985a8d7ec
Fix the top action bar appearing in multi-column layout ( #20943 )
2 years ago
5475089960
Increase the width of the unread notification border. ( #21692 )
...
The smaller border is difficult to see for some users, especially
when the browser window was thinner, and so the unread border is at the
very left edge of the window.
2 years ago
b80d7c9f00
Fix profile avatar being slightly offset into left border ( fixes #20822 ) ( #20994 )
...
* hotfix for #20822
I don't know why it was shifted in the first place or why the width is specified twice, but this fixes the problem, so it looks fine to me.
* realigned pfp with content below
* fixed formatting
my bad
* added comment to explain the negative margin
before I forget - comments are *important* !
Co-authored-by: Riedler <riedler@gelse.eu>
2 years ago
52d6c1540b
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
40bf70b802
Make handle more easily selectable on profile page ( #21479 )
...
* Make handle more easily selectable on profile page
* Wrap handle in a span
* Add `user-select: all` to span
* remove whitespace
2 years ago
1e6e6426ea
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.
2 years ago
6414c28368
Fix hidden overflow on interaction modal ( #21763 )
...
* Fix hidden overflow on interaction modal
* only update overflow y
2 years ago
fe85b0b686
Fix UI header overflow on mobile ( #21783 )
2 years ago
1f371be744
Fix the top border of verified account fields ( #22006 )
2 years ago
02992b262a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README is completely different.
Discarded upstream changes.
2 years ago
2821d7aaa7
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 .
2 years ago
997553a99e
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
0cfead6483
Fix style of username in navigation bar above compose form in web UI ( #20628 )
...
Regression from #20540
2 years ago
ca6df7a68c
Fix dropdown menu on profiles not being accessible on narrow screens in web UI ( #20620 )
2 years ago
72de8402bd
Fix wrong cut-off point for "Read more" in web UI ( #20599 )
2 years ago
81d24609e5
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
609cb69251
Fix domain blocks on about page not working well on small screens in web UI ( #20391 )
2 years ago
09f987bce1
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
40a2ab1dfe
Change larger reblogs/favourites numbers to be shortened in web UI ( #20303 )
2 years ago
20fb459dee
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
786b5a7c49
Change design of new list form in web UI ( #19801 )
2 years ago
716696cd80
Change design of moved account banner in web UI ( #19790 )
2 years ago
afb6763712
Remove word-break:keep-all from Dismissable banner message ( #19799 )
2 years ago
3d24ef2967
Change sign-in banner to reflect disabled or moved account status ( #19773 )
2 years ago
79106199df
Make word-break: keep-all for dismissable banner ( #19719 )
2 years ago
27f63cba4e
Fix design of verified links in web UI ( #19709 )
2 years ago
0b91816814
Change design of link footer ( #19562 )
2 years ago
d192bdf6f6
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
52a5a4f058
Fix assets compilation
...
Not too sure why the loader behaves differently than it previously did, though.
2 years ago
c7f1ae40b5
Fix number of uses being shown again on trending hashtags in web UI ( #19484 )
2 years ago
21aa2217de
fix(component): adjust style of counter button to fix overflow issue ( #19494 )
2 years ago
87c34be5bd
Fix avatars not using image tags in web UI ( #19488 )
...
Fix #19483
2 years ago
7cbab3e7fd
Change layout of posts in web UI ( #19423 )
2 years ago
3a2f9a8c53
Change design of translations in web UI ( #19453 )
2 years ago
aa2d04e53e
Fix language dropdown causing zoom on mobile devices in web UI ( #19428 )
2 years ago
370f2609b8
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
daaa66a2c2
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
01980c975b
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
2130895196
Change settings area to be separated into categories in admin UI ( #19407 )
...
And update all descriptions
2 years ago
6ab724918b
Change featured hashtags to be displayed in navigation panel ( #19382 )
2 years ago
3e88e7ba20
Add featured tags selector for WebUI ( #19358 )
...
* Add featured tags selector for WebUI
* Add title to tag count
2 years ago
e376f33207
Change about page to be mounted in the web UI ( #19345 )
2 years ago
bccb0db26b
Hide list panel from nav bar in mobile layout ( #19337 )
2 years ago
e13d9e178c
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
aa2b4d5c4c
Add dismissable hints to various timelines in web UI ( #19315 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
378e00b59c
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
9b05f5b2bb
Add interaction modal to logged-out web UI ( #19306 )
2 years ago
Claire
Mina Her
Connor Shea
Riedler
cadars
Juan Xavier Gomez
Jed Fox
Eugen Rochko
eai04191
Jeong Arm
Robert Laurenz
Takeshi Umeda
Yamagishi Kazutoshi