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.
Claire
e2a2bc9021
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
Not really a conflict, upstream change (removing the spam checker) too close
to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
Same.
- `app/services/remove_status_service.rb`:
Same.
- `app/views/admin/settings/edit.html.haml`:
Same.
- `config/settings.yml`:
Same.
- `config/environments/production.rb`:
Not a real conflict, upstream added a default HTTP header, but we have
extra headers in glitch-soc.
Added the header.
4 years ago
..
account
Change custom emoji to be animated when hovering container ( #15637 )
4 years ago
account_gallery
Change "Profile unavailable" string to "Account suspended" in web UI ( #15345 )
4 years ago
account_timeline
Change "Profile unavailable" string to "Account suspended" in web UI ( #15345 )
4 years ago
audio
Add hotkeys for audio/video control ( #15158 )
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 'main' into glitch-soc/merge-upstream
4 years ago
direct_timeline
Change custom emoji to be animated when hovering container ( #15637 )
4 years ago
directory
Change custom emoji to be animated when hovering container ( #15637 )
4 years ago
domain_blocks
Change the string "hidden" to "blocked" in WebUI ( #13221 )
5 years ago
emoji
Add border to 🚲 emoji ( #16035 )
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_recommendations
Fix newlines not being considered sentence separators in account note ( #16079 )
4 years ago
follow_requests
Add “translate” class to other user strings ( #15611 )
4 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
Change custom emoji to be animated when hovering container ( #15637 )
4 years ago
hashtag_timeline
Bump react-select from 3.2.0 to 4.0.2 ( #15624 )
4 years ago
home_timeline
Change how unread announcements are handled ( #13020 )
5 years ago
introduction
Add option to disable swiping motions across the WebUI ( #13885 )
4 years ago
keyboard_shortcuts
Add hotkey for toggling content warning composer field ( #13987 )
5 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
Fix missing key in list timeline policy ( #15494 )
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 option to opt out of unread notification markers ( #15842 )
4 years ago
picture_in_picture
Add dropdown for boost privacy in boost confirmation modal ( #15704 )
4 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 )
6 years ago
standalone
Add local only to hashtag timeline ( #13502 )
5 years ago
status
Slightly reorder three dots menu on toots to make it more intuitive ( #15647 )
4 years ago
ui
Change onboarding by replacing tutorial with follow recommendations in web UI ( #16060 )
4 years ago
video
Fix defaultProps of frameRate to string ( #15493 )
4 years ago