You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Thibaut Girka
3fefb7909b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/shared.js`:
Upstream has changed how Tesseract.js gets included and dropped a dependency.
The conflict is caused by glitch-soc having different code due to its
theming system.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream refactor/code style change in a place we replaced upstream's
repo URL with ours.
Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
Upstream dropped dependencies, one of which was textually too close to
a glitch-soc-specific dependency. Not a real conflict.
4 years ago
..
account
Fix wrong proptypes for onEditAccountNote ( #14481 )
4 years ago
account_gallery
Fix audio and video items in account gallery in web UI ( #14282 )
4 years ago
account_timeline
Fix wrong proptypes for onEditAccountNote ( #14481 )
4 years ago
audio
Fix audio player on Safari ( #14485 )
4 years ago
blocks
Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists ( #13445 )
5 years ago
bookmarked_statuses
Add bookmarks ( #7107 )
5 years ago
community_timeline
Fix unread toot indicator not honoring onlyMedia in public and community timelines ( #12330 )
5 years ago
compose
Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
direct_timeline
Freeze scroll position when a dropdown menu is open in the TL ( #14271 )
4 years ago
directory
Replace shortNumberFormat with <ShortNumber> ( #14061 )
4 years ago
domain_blocks
Change the string "hidden" to "blocked" in WebUI ( #13221 )
5 years ago
emoji
Add border around 🐞 emoji ( #14712 )
4 years ago
favourited_statuses
Fix scroll to top in single column UI ( #11463 )
5 years ago
favourites
Code style improvements in JavaScript ( #13159 )
5 years ago
follow_requests
Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists ( #13445 )
5 years ago
followers
Fix the conditions for incomplete remote content ( #14195 )
4 years ago
following
Fix the conditions for incomplete remote content ( #14195 )
4 years ago
generic_not_found
Fix performance of home feed regeneration ( #12084 )
5 years ago
getting_started
Add back “Home” link to the “Getting Started” column when the “Home” column isn't mounted ( #14707 )
4 years ago
hashtag_timeline
Fix hashtag column options styling ( #14247 )
4 years ago
home_timeline
Change how unread announcements are handled ( #13020 )
5 years ago
introduction
change "finish tutorial" text to "finish toot-orial" ( #9905 )
6 years ago
keyboard_shortcuts
Add hotkey for toggling content warning composer field ( #13987 )
4 years ago
list_adder
Refactor icons in web UI to use Icon component ( #9951 )
6 years ago
list_editor
Disable list title validation button when list title is empty ( #11475 )
5 years ago
list_timeline
Add configuration option to filter replies in lists ( #9205 )
4 years ago
lists
Code style improvements in JavaScript ( #13159 )
5 years ago
mutes
Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists ( #13445 )
5 years ago
notifications
Add follow_request notification type ( #12198 )
5 years ago
pinned_statuses
Fix scroll to top in single column UI ( #11463 )
5 years ago
public_timeline
Add remote only to public timeline ( #13504 )
5 years ago
reblogs
Code style improvements in JavaScript ( #13159 )
5 years ago
report
Add blurhash ( #10630 )
6 years ago
search
Add responsive panels to the single-column layout ( #10820 )
5 years ago
standalone
Add local only to hashtag timeline ( #13502 )
5 years ago
status
Fix: also use custom private boost icon for detailed status ( #14471 )
4 years ago
ui
Update Tesseract.js ( #14708 )
4 years ago
video
Fix error when closing a playing audio or video modal ( #14310 )
4 years ago