tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/app/models
History
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
2020-11-20 13:27:48 +01:00
..
admin
Add support for reversible suspensions through ActivityPub (#14989)
2020-11-08 00:28:39 +01:00
concerns
Add follower synchronization mechanism (#14510)
2020-10-21 18:04:09 +02:00
form
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-12 22:13:57 +01:00
web
Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)
2020-05-12 15:25:33 +02:00
account_alias.rb
Remove dependency on goldfinger gem (#14919)
2020-10-08 00:34:57 +02:00
account_conversation.rb
allow pagination by min_id and max_id (#14776)
2020-09-12 17:09:49 +02:00
account_deletion_request.rb
Change account suspensions to be reversible by default (#14726)
2020-09-15 14:37:58 +02:00
account_domain_block.rb
Fix crash when saving invalid domain name (#11528)
2019-08-08 23:04:19 +02:00
account_filter.rb
Add sorting by username, creation and last activity in moderation view (#13076)
2020-03-08 15:39:13 +01:00
account_identity_proof.rb
…
account_migration.rb
Remove dependency on goldfinger gem (#14919)
2020-10-08 00:34:57 +02:00
account_moderation_note.rb
…
account_note.rb
Add user notes on accounts (#14148)
2020-06-30 19:19:50 +02:00
account_pin.rb
…
account_stat.rb
Fix updating account counters when account_stat is not yet created (#15108)
2020-11-09 16:00:23 +01:00
account_tag_stat.rb
…
account_warning_preset.rb
Add titles to warning presets in admin UI (#13252)
2020-03-12 17:57:59 +01:00
account_warning.rb
Add account sensitized (#14361)
2020-11-04 20:45:01 +01:00
account.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-08 14:20:35 +01:00
admin.rb
…
announcement_filter.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
announcement_mute.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
announcement_reaction.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
announcement.rb
Change order of announcements in admin page to sort them newest-first (#15091)
2020-11-04 21:15:22 +01:00
application_record.rb
Fix records not being indexed sometimes (#12024)
2019-10-01 01:19:11 +02:00
backup.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
block.rb
…
bookmark.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
context.rb
…
conversation_mute.rb
…
conversation.rb
…
custom_emoji_category.rb
Add batch actions and categories to admin UI for custom emojis (#11793)
2019-09-09 22:44:17 +02:00
custom_emoji_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
custom_emoji.rb
Add separate cache directory for non-local uploads (#12821)
2020-04-26 23:29:08 +02:00
custom_filter.rb
Add “account timeline” filter category (#12918)
2020-01-23 21:32:00 +01:00
device.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
direct_feed.rb
…
domain_allow.rb
Fix crash when saving invalid domain name (#11528)
2019-08-08 23:04:19 +02:00
domain_block.rb
Fix admin page crashing when trying to block an invalid domain name (#13884)
2020-06-01 03:47:20 +02:00
email_domain_block.rb
Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)
2020-03-12 22:35:20 +01:00
encrypted_message.rb
Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)
2020-07-01 19:05:21 +02:00
export.rb
Add import/export feature for bookmarks (#14956)
2020-11-19 17:48:13 +01:00
favourite.rb
Fix records not being indexed sometimes (#12024)
2019-10-01 01:19:11 +02:00
featured_tag.rb
…
feed.rb
allow pagination by min_id and max_id (#14776)
2020-09-12 17:09:49 +02:00
follow_request.rb
Add option to be notified when a followed user posts (#13546)
2020-09-18 17:26:45 +02:00
follow.rb
Add follower synchronization mechanism (#14510)
2020-10-21 18:04:09 +02:00
home_feed.rb
Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)
2020-07-01 19:05:21 +02:00
identity.rb
…
import.rb
Add import/export feature for bookmarks (#14956)
2020-11-19 17:48:13 +01:00
instance_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
instance.rb
…
invite_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
invite.rb
Change account suspensions to be reversible by default (#14726)
2020-09-15 14:37:58 +02:00
ip_block.rb
Add IP-based rules (#14963)
2020-10-12 16:33:49 +02:00
list_account.rb
Add abilityto add oneself to lists (#12271)
2019-11-04 13:02:01 +01:00
list_feed.rb
…
list.rb
Add configuration option to filter replies in lists (#9205)
2020-09-01 13:31:28 +02:00
marker.rb
Add timeline read markers API (#11762)
2019-09-06 13:55:51 +02:00
media_attachment.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-30 16:13:08 +02:00
mention.rb
…
message_franking.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
mute.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-10-21 19:10:50 +02:00
notification.rb
Add option to be notified when a followed user posts (#13546)
2020-09-18 17:26:45 +02:00
one_time_key.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
poll_vote.rb
…
poll.rb
Only normalize local polls (#12515)
2019-12-01 17:24:33 +01:00
preview_card.rb
Bump rubocop from 0.86.0 to 0.88.0 (#14412)
2020-09-01 03:04:00 +02:00
public_feed.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-08 16:26:47 +02:00
relationship_filter.rb
Fix followings list order | Issue #13538 (#13676)
2020-05-08 20:17:16 +02:00
relay.rb
Fix enable/disable relay failures (#13535)
2020-04-23 22:04:18 +02:00
remote_follow.rb
Remove dependency on goldfinger gem (#14919)
2020-10-08 00:34:57 +02:00
report_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
report_note.rb
…
report.rb
Add rate limit for reporting (#13390)
2020-04-05 14:40:08 +02:00
scheduled_status.rb
…
search.rb
…
session_activation.rb
Fix streaming API allowing connections to persist after access token invalidation (#15111)
2020-11-12 23:05:24 +01:00
setting.rb
…
site_upload.rb
…
status_pin.rb
…
status_stat.rb
…
status.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-28 14:13:30 +02:00
system_key.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
tag_feed.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-28 14:13:30 +02:00
tag_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
tag.rb
Fix possible inconsistencies in tag search (#14906)
2020-11-12 18:35:23 +01:00
tombstone.rb
…
trending_tags.rb
Fix admin setting to auto-approve hashtags not affecting query (#12130)
2019-10-10 02:22:04 +02:00
unavailable_domain.rb
Change delivery failure tracking to work with hostnames instead of URLs (#13437)
2020-04-15 20:33:24 +02:00
user_invite_request.rb
…
user.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-14 00:30:36 +01:00
web.rb
…
webauthn_credential.rb
Fix validates :sign_count of WebauthnCredential (#14806)
2020-09-16 20:16:46 +02:00