tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/models
History
Thibaut Girka 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
..
admin
Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)
2020-03-21 03:08:09 +01:00
concerns
Change local media attachments to perform heavy processing asynchronously (#13210)
2020-03-08 23:56:18 +01:00
form
Merge branch 'master' into glitch-soc/master
2019-12-19 13:52:54 +01:00
web
Validate Web::PushSubscription (#11971)
2019-09-27 15:24:13 +02:00
account_alias.rb
Addition of update activity distribution by alias, minor correction (#11905)
2019-09-21 09:11:21 +02:00
account_conversation.rb
…
account_domain_block.rb
…
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
Add (back) option to set redirect notice on account without moving followers (#11994)
2019-09-29 05:03:19 +02:00
account_moderation_note.rb
…
account_pin.rb
…
account_stat.rb
Fix account counters being overwritten by parallel writes (#12045)
2019-10-02 04:59:37 +02: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
…
account.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-03-22 16:10:44 +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
Add support for links to statuses in announcements to be opened in web UI (#13212)
2020-03-08 16:10:48 +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 announcements (#12662)
2020-01-23 22:00:13 +01:00
custom_filter.rb
Add “account timeline” filter category (#12918)
2020-01-23 21:32:00 +01:00
direct_feed.rb
…
domain_allow.rb
…
domain_block.rb
Allow blocking TLDs, and fix TLD blocks not being editable (#12805)
2020-01-08 22:42:05 +01: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
export.rb
…
favourite.rb
Fix records not being indexed sometimes (#12024)
2019-10-01 01:19:11 +02:00
featured_tag.rb
…
feed.rb
Fix non-numbers being passed to Redis and causing an error (#11697)
2019-08-30 02:49:54 +02:00
follow_request.rb
Add specific rate limits for posting and following (#13172)
2020-03-08 15:17:39 +01:00
follow.rb
Add specific rate limits for posting and following (#13172)
2020-03-08 15:17:39 +01:00
home_feed.rb
Fix performance of home feed regeneration (#12084)
2019-10-06 22:11:17 +02:00
identity.rb
…
import.rb
…
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
…
list_account.rb
Add abilityto add oneself to lists (#12271)
2019-11-04 13:02:01 +01:00
list_feed.rb
…
list.rb
…
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-03-27 21:54:44 +01:00
mention.rb
…
mute.rb
…
notification.rb
Add follow_request notification type (#12198)
2019-12-01 17:25:29 +01:00
poll_vote.rb
…
poll.rb
Only normalize local polls (#12515)
2019-12-01 17:24:33 +01:00
preview_card.rb
Fix preview card image not being re-fetched even if link is re-posted (#11981)
2019-09-28 01:33:16 +02:00
relationship_filter.rb
Fix relationships page not showing results in admin UI (#12934)
2020-01-24 00:20:23 +01:00
relay.rb
Fix relays UI being available in whitelist/secure mode (#11963)
2019-09-27 02:13:34 +02:00
remote_follow.rb
Add account migration UI (#11846)
2019-09-19 20:58:19 +02:00
report_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
report_note.rb
…
report.rb
Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)
2020-03-21 03:08:09 +01:00
scheduled_status.rb
…
search.rb
…
session_activation.rb
…
setting.rb
…
site_upload.rb
…
status_pin.rb
…
status_stat.rb
…
status.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-03-22 16:10:44 +01:00
tag_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
tag.rb
Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)
2019-12-17 13:31:56 +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
user_invite_request.rb
…
user.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-25 10:04:41 +01:00
web.rb
…