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
6f85bb754b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
6 years ago
..
account/ components
Improve blocked view of profiles ( #10491 )
6 years ago
account_gallery
Fix glitched out "not found" message for non-existing profiles in web UI ( #10517 )
6 years ago
account_timeline
Fix glitched out "not found" message for non-existing profiles in web UI ( #10517 )
6 years ago
blocks
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
6 years ago
community_timeline
Upgrade Babel to version 7.0.0 ( #5925 )
6 years ago
compose
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
direct_timeline
Remove unused code ( #10426 )
6 years ago
domain_blocks
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
6 years ago
emoji
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 ( #10413 )
6 years ago
favourited_statuses
Upgrade Babel to version 7.0.0 ( #5925 )
6 years ago
favourites
Upgrade Babel to version 7.0.0 ( #5925 )
6 years ago
follow_requests
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
6 years ago
followers
Fix glitched out "not found" message for non-existing profiles in web UI ( #10517 )
6 years ago
following
Fix glitched out "not found" message for non-existing profiles in web UI ( #10517 )
6 years ago
generic_not_found
Replace sprockets/browserify with Webpack ( #2617 )
8 years ago
getting_started
Configrationable repository url ( #10600 )
6 years ago
hashtag_timeline
Fix hashtag column not subscribing to stream on mount ( #10040 )
6 years ago
home_timeline
Fix home timeline perpetually reloading when empty ( #10130 )
6 years ago
introduction
change "finish tutorial" text to "finish toot-orial" ( #9905 )
6 years ago
keyboard_shortcuts
Upgrade Babel to version 7.0.0 ( #5925 )
6 years ago
list_adder
Refactor icons in web UI to use Icon component ( #9951 )
6 years ago
list_editor
Add list title editing ( #9748 )
6 years ago
list_timeline
Refactor icons in web UI to use Icon component ( #9951 )
6 years ago
lists
Upgrade Babel to version 7.0.0 ( #5925 )
6 years ago
mutes
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
6 years ago
notifications
Fix scrollbar styles on compose textarea, small bugs ( #10292 )
6 years ago
pinned_statuses
Revert Font Awesome 5 upgrade ( #8810 )
6 years ago
public_timeline
Rename from instance to server. ( #9938 )
6 years ago
reblogs
Upgrade Babel to version 7.0.0 ( #5925 )
6 years ago
report
Add missing video descriptions ( #8416 )
6 years ago
standalone
Disable real-time updates on public pages to improve readability ( #10260 )
6 years ago
status
tinyfix 2: unrequired arguments ( #10471 )
6 years ago
ui
Fix modal items cannot scroll on touch devices ( #10605 )
6 years ago
video
Fix video player width not being updated to fit container width ( #10069 )
6 years ago