glitchier-soc

History

Thibaut Girka 83dc54c487 Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		5 years ago
..
admin	Add ability to filter audit log in admin UI (#13381 )	5 years ago
concerns	Add E2EE API (#13820 )	5 years ago
form	Add support for setting Content Warning for CW-less outgoing toots	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	Fix crash when conversations have no valid participants (#10078 )	6 years ago
account_domain_block.rb	Fix crash when saving invalid domain name (#11528 )	5 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 )	5 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	Fix account counters being overwritten by parallel writes (#12045 )	5 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 titles to warning presets in admin UI (#13252 )	5 years ago
admin.rb	Add logging of admin actions (#5757 )	7 years ago
announcement.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437 )	5 years ago
announcement_filter.rb	Add announcements (#12662 )	5 years ago
announcement_mute.rb	Add announcements (#12662 )	5 years ago
announcement_reaction.rb	Add announcements (#12662 )	5 years ago
application_record.rb	Fix records not being indexed sometimes (#12024 )	5 years ago
backup.rb	Add announcements (#12662 )	5 years ago
block.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160 )	7 years ago
bookmark.rb	Add announcements (#12662 )	5 years ago
context.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090 )	7 years ago
conversation.rb	Revert "Remove conversation URI (#11423 )" (#11424 )	5 years ago
conversation_mute.rb	Update dependencies for Ruby (2018-04-23) (#7237 )	7 years ago
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 )	5 years ago
custom_emoji_filter.rb	Various fixes and improvements (#12878 )	5 years ago
custom_filter.rb	Add “account timeline” filter category (#12918 )	5 years ago
device.rb	Add E2EE API (#13820 )	5 years ago
direct_feed.rb	Use a redis-cached feed for the DM timeline	5 years ago
domain_allow.rb	Fix crash when saving invalid domain name (#11528 )	5 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	Add E2EE API (#13820 )	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 )	5 years ago
featured_tag.rb	Fix featured tags not finding the right tag on save (#11504 )	5 years ago
feed.rb	Fix non-numbers being passed to Redis and causing an error (#11697 )	5 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	Fix performance of home feed regeneration (#12084 )	5 years ago
identity.rb	Change identities id column to a bigint (#9371 )	6 years ago
import.rb	Fix csv upload (#13835 )	5 years ago
instance.rb	Add whitelist mode (#11291 )	5 years ago
instance_filter.rb	Various fixes and improvements (#12878 )	5 years ago
invite.rb	Add invite comments (#10465 )	5 years ago
invite_filter.rb	Various fixes and improvements (#12878 )	5 years ago
list.rb	Add database support for list show-reply preferences	6 years ago
list_account.rb	Add abilityto add oneself to lists (#12271 )	5 years ago
list_feed.rb	Lists (#5703 )	7 years ago
marker.rb	Add timeline read markers API (#11762 )	5 years ago
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mention.rb	Improve support for aspects/circles (#8950 )	6 years ago
message_franking.rb	Add E2EE API (#13820 )	5 years ago
mute.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
notification.rb	Add follow_request notification type (#12198 )	5 years ago
one_time_key.rb	Add E2EE API (#13820 )	5 years ago
poll.rb	Only normalize local polls (#12515 )	5 years ago
poll_vote.rb	Add optimistic lock to avoid race conditions when handling votes (#10196 )	6 years ago
preview_card.rb	Add blurhash to preview cards (#13984 )	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 )	5 years ago
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	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090 )	7 years ago
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	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	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
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 )	5 years ago
tag_filter.rb	Various fixes and improvements (#12878 )	5 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 )	5 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	Add extended about page stub	8 years ago