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 c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
account_moderation_note_policy.rb	…
account_policy.rb	Add moderation warnings (#9519)	6 years ago
account_warning_preset_policy.rb	Add moderation warnings (#9519)	6 years ago
announcement_policy.rb	Add announcements (#12662)	5 years ago
application_policy.rb	Account archive download (#6460)	7 years ago
backup_policy.rb	Account archive download (#6460)	7 years ago
custom_emoji_policy.rb	…
domain_allow_policy.rb	Add whitelist mode (#11291)	5 years ago
domain_block_policy.rb	…
email_domain_block_policy.rb	…
instance_policy.rb	Redesign admin instances area (#9645)	6 years ago
invite_policy.rb	Add admin function to deactivate all invites (#8279)	6 years ago
poll_policy.rb	Ensure only people allowed to see the poll can actually vote (#10161)	6 years ago
relay_policy.rb	Add federation relay support (#7998)	6 years ago
report_note_policy.rb	Feature: Report improvements (#6967) (#7000)	7 years ago
report_policy.rb	…
settings_policy.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	5 years ago
status_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tag_policy.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
user_policy.rb	Admission-based registrations mode (#10250)	6 years ago