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 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.		6 years ago
..
admin	Add moderation warnings (#9519)	6 years ago
concerns	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
form	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
web	Do no retry web push workers if the server returns a 4xx response (#9434)	6 years ago
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_conversation.rb	Fix crash when conversations have no valid participants (#10078)	6 years ago
account_domain_block.rb	Add option to overwrite imported data (#9962)	6 years ago
account_filter.rb	Admission-based registrations mode (#10250)	6 years ago
account_moderation_note.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
account_pin.rb	Add API endpoint to list featured accounts (fixes #8315) (#8317)	6 years ago
account_stat.rb	Add profile directory (#9427)	6 years ago
account_tag_stat.rb	Add profile directory (#9427)	6 years ago
account_warning.rb	Add moderation warnings (#9519)	6 years ago
account_warning_preset.rb	Add moderation warnings (#9519)	6 years ago
admin.rb	…
application_record.rb	Validate HTTP response length while receiving (#6891)	7 years ago
backup.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
block.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160)	7 years ago
bookmark.rb	Thread scopes through #matches?. #454.	7 years ago
context.rb	…
conversation.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
conversation_mute.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
custom_emoji.rb	Make custom emoji domains case insensitive #9351 (#9474)	6 years ago
custom_emoji_filter.rb	Make custom emoji domains case insensitive #9351 (#9474)	6 years ago
custom_filter.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	6 years ago
domain_block.rb	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	6 years ago
email_domain_block.rb	Create DomainNormalizable#normalize_domain (#9631)	6 years ago
export.rb	Fix lists export (#10136)	6 years ago
favourite.rb	Fix error when trying to update counters for statuses that are gone (#8251)	6 years ago
featured_tag.rb	Fix featured tag form not failing on failed tag validations (#10167)	6 years ago
feed.rb	Create Redisable#redis (#9633)	6 years ago
follow.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
follow_request.rb	Limit the number of people that can be followed from one account (#8807)	6 years ago
home_feed.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
identity.rb	Change identities id column to a bigint (#9371)	6 years ago
import.rb	Add option to overwrite imported data (#9962)	6 years ago
instance.rb	Redesign admin instances area (#9645)	6 years ago
instance_filter.rb	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	6 years ago
invite.rb	Keyword/phrase filtering (#7905)	7 years ago
invite_filter.rb	…
list.rb	Add database support for list show-reply preferences	6 years ago
list_account.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
list_feed.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mention.rb	Improve support for aspects/circles (#8950)	6 years ago
mute.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
notification.rb	Support pushing and receiving updates to poll tallies (#10209)	6 years ago
poll.rb	Add UI for enabling/disabling poll notifications (#10255)	6 years ago
poll_vote.rb	Add optimistic lock to avoid race conditions when handling votes (#10196)	6 years ago
preview_card.rb	Add WebP support (#9879)	6 years ago
relay.rb	Fix relay enabling/disabling not resetting inbox availability status (#10048)	6 years ago
remote_follow.rb	Add remote interaction dialog for toots (#8202)	6 years ago
remote_profile.rb	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	7 years ago
report.rb	Add preference for report notification e-mails, skip for duplicates (#8559)	6 years ago
report_filter.rb	…
report_note.rb	Fix scope latest of ReportNote (#9630)	6 years ago
scheduled_status.rb	Fix deleting a scheduled status immediately deleting media attachments (#9728)	6 years ago
search.rb	…
session_activation.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
setting.rb	Remove intermediary arrays when creating hash maps from results (#9291)	6 years ago
site_upload.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
status_pin.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
status_stat.rb	Reset status cache when status_stat or media_attachment updates (#9119)	6 years ago
stream_entry.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
subscription.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
tag.rb	Fix `tagged` param not being normalized before querying tags (#10249)	6 years ago
tombstone.rb	Fix missing account association in tombstone model (#9857)	6 years ago
trending_tags.rb	Create Redisable#redis (#9633)	6 years ago
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
web.rb	…