You cannot 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.		5 years ago
..
admin	Add ability to filter audit log in admin UI (#13381)	5 years ago
concerns	Make Array-creation behavior of Paginable more predictable (#14687)	5 years ago
form	Merge branch 'master' into glitch-soc/master	5 years ago
web	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	5 years ago
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_alias.rb	Fix confusing error when failing to add an alias to an unknown account (#13480)	5 years ago
account_conversation.rb	Make Array-creation behavior of Paginable more predictable (#14687)	5 years ago
account_domain_block.rb	Fix crash when saving invalid domain name (#11528)	6 years ago
account_filter.rb	Add sorting by username, creation and last activity in moderation view (#13076)	5 years ago
account_identity_proof.rb	Fix Keybase verification using wrong domain for remote accounts (#10547)	6 years ago
account_migration.rb	Add (back) option to set redirect notice on account without moving followers (#11994)	6 years ago
account_moderation_note.rb	…
account_note.rb	Add user notes on accounts (#14148)	5 years ago
account_pin.rb	…
account_stat.rb	Fix account counters being overwritten by parallel writes (#12045)	6 years ago
account_tag_stat.rb	…
account_warning.rb	Add moderation warnings (#9519)	7 years ago
account_warning_preset.rb	Add titles to warning presets in admin UI (#13252)	5 years ago
admin.rb	…
announcement.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
announcement_filter.rb	Add announcements (#12662)	6 years ago
announcement_mute.rb	Add announcements (#12662)	6 years ago
announcement_reaction.rb	Add announcements (#12662)	6 years ago
application_record.rb	Fix records not being indexed sometimes (#12024)	6 years ago
backup.rb	Add announcements (#12662)	6 years ago
block.rb	…
bookmark.rb	Add announcements (#12662)	6 years ago
context.rb	…
conversation.rb	Revert "Remove conversation URI (#11423)" (#11424)	6 years ago
conversation_mute.rb	…
custom_emoji.rb	Add separate cache directory for non-local uploads (#12821)	5 years ago
custom_emoji_category.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	6 years ago
custom_emoji_filter.rb	Various fixes and improvements (#12878)	6 years ago
custom_filter.rb	Add “account timeline” filter category (#12918)	6 years ago
device.rb	Add E2EE API (#13820)	5 years ago
direct_feed.rb	Use a redis-cached feed for the DM timeline	6 years ago
domain_allow.rb	Fix crash when saving invalid domain name (#11528)	6 years ago
domain_block.rb	Fix admin page crashing when trying to block an invalid domain name (#13884)	5 years ago
email_domain_block.rb	Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)	5 years ago
encrypted_message.rb	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	5 years ago
export.rb	Export and import show_reblogs together with following list (#10495)	6 years ago
favourite.rb	Fix records not being indexed sometimes (#12024)	6 years ago
featured_tag.rb	Fix featured tags not finding the right tag on save (#11504)	6 years ago
feed.rb	Fix non-numbers being passed to Redis and causing an error (#11697)	6 years ago
follow.rb	Add specific rate limits for posting and following (#13172)	5 years ago
follow_request.rb	Add specific rate limits for posting and following (#13172)	5 years ago
home_feed.rb	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	5 years ago
identity.rb	…
import.rb	Fix csv upload (#13835)	5 years ago
instance.rb	Add whitelist mode (#11291)	6 years ago
instance_filter.rb	Various fixes and improvements (#12878)	6 years ago
invite.rb	Add invite comments (#10465)	6 years ago
invite_filter.rb	Various fixes and improvements (#12878)	6 years ago
list.rb	Add configuration option to filter replies in lists (#9205)	5 years ago
list_account.rb	Add abilityto add oneself to lists (#12271)	6 years ago
list_feed.rb	…
marker.rb	Add timeline read markers API (#11762)	6 years ago
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mention.rb	…
message_franking.rb	Add E2EE API (#13820)	5 years ago
mute.rb	…
notification.rb	Add follow_request notification type (#12198)	6 years ago
one_time_key.rb	Add E2EE API (#13820)	5 years ago
poll.rb	Only normalize local polls (#12515)	6 years ago
poll_vote.rb	Add optimistic lock to avoid race conditions when handling votes (#10196)	6 years ago
preview_card.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	5 years ago
relationship_filter.rb	Fix followings list order | Issue #13538 (#13676)	5 years ago
relay.rb	Fix enable/disable relay failures (#13535)	5 years ago
remote_follow.rb	Refactor monkey-patching of Goldfinger (#12561)	5 years ago
report.rb	Add rate limit for reporting (#13390)	5 years ago
report_filter.rb	Various fixes and improvements (#12878)	6 years ago
report_note.rb	Fix scope latest of ReportNote (#9630)	7 years ago
scheduled_status.rb	Fix deleting a scheduled status immediately deleting media attachments (#9728)	7 years ago
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	Improvements to image upload validation and creation (#10431)	6 years ago
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
status_pin.rb	…
status_stat.rb	…
system_key.rb	Add E2EE API (#13820)	5 years ago
tag.rb	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	6 years ago
tag_filter.rb	Various fixes and improvements (#12878)	6 years ago
tombstone.rb	Record deleted(by mod) status to prevent re-appear (#10732)	6 years ago
trending_tags.rb	Fix admin setting to auto-approve hashtags not affecting query (#12130)	6 years ago
unavailable_domain.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
user_invite_request.rb	Add "why do you want to join" field to invite requests (#10524)	6 years ago
web.rb	…
webauthn_credential.rb	Add WebAuthn as an alternative 2FA method (#14466)	5 years ago