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
4aa6aba6ee
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/services/remove_status_service.rb
Conflict because we still handle the direct timeline.
Took upstream changes, with that one extra function call.
- config/locales/ca.yml
Conflict because theme names were updated.
Decided to *keep* the theme names even if they are useless
to avoid future conflicts.
- config/locales/oc.yml
Decided to *keep* the theme names even if they are useless
to avoid future conflicts.
- config/locales/pl.yml
Decided to *keep* the theme names even if they are useless
to avoid future conflicts.
6 years ago
..
account/ components
Refactor icons in web UI to use Icon component ( #9951 )
6 years ago
account_gallery
Refactor icons in web UI to use Icon component ( #9951 )
6 years ago
account_timeline
Refactor icons in web UI to use Icon component ( #9951 )
6 years ago
blocks
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
6 years ago
community_timeline
…
compose
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
direct_timeline
…
domain_blocks
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
6 years ago
emoji
fix: update to emoji-mart 2.10.0 ( #10281 )
6 years ago
favourited_statuses
…
favourites
…
follow_requests
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
6 years ago
followers
…
following
…
generic_not_found
…
getting_started
Rename from instance to server. ( #9938 )
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
…
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
…
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
…
public_timeline
Rename from instance to server. ( #9938 )
6 years ago
reblogs
…
report
…
standalone
Fix public timeline page not paginating correctly ( #10245 )
6 years ago
status
Redesign landing page ( #10232 )
6 years ago
ui
Show disappointed elephant if web UI crashes ( #10275 )
6 years ago
video
Fix video player width not being updated to fit container width ( #10069 )
6 years ago