tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/models
History
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
..
admin
…
concerns
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-04 16:37:26 +02:00
form
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-10 17:09:12 +02:00
web
…
account_conversation.rb
Fix crash when conversations have no valid participants (#10078)
2019-02-19 20:00:41 +01:00
account_domain_block.rb
Add option to overwrite imported data (#9962)
2019-02-03 03:59:51 +01:00
account_filter.rb
Admission-based registrations mode (#10250)
2019-03-14 05:28:30 +01:00
account_identity_proof.rb
Fix Keybase verification using wrong domain for remote accounts (#10547)
2019-04-10 20:28:43 +02:00
account_moderation_note.rb
…
account_pin.rb
…
account_stat.rb
…
account_tag_stat.rb
…
account_warning_preset.rb
…
account_warning.rb
…
account.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-08 15:57:56 +02:00
admin.rb
…
application_record.rb
…
backup.rb
…
block.rb
…
bookmark.rb
…
context.rb
…
conversation_mute.rb
…
conversation.rb
…
custom_emoji_filter.rb
…
custom_emoji.rb
…
custom_filter.rb
…
domain_block.rb
Provide a link to existing domain block when trying to block an already-blocked domain (#10663)
2019-05-03 20:36:36 +02:00
email_domain_block.rb
…
export.rb
Export and import show_reblogs together with following list (#10495)
2019-04-08 07:28:27 +02:00
favourite.rb
…
featured_tag.rb
Fix featured tag form not failing on failed tag validations (#10167)
2019-03-05 03:46:24 +01:00
feed.rb
Create Redisable#redis (#9633)
2019-02-02 19:11:38 +01:00
follow_request.rb
Fix MergeWorker being queued for remote users (#10355)
2019-03-24 12:36:26 +01:00
follow.rb
…
home_feed.rb
…
identity.rb
…
import.rb
Add option to overwrite imported data (#9962)
2019-02-03 03:59:51 +01:00
instance_filter.rb
Add domain search/filter to the "Federation" (/admin/instances) page (#10071)
2019-02-18 14:59:19 +01:00
instance.rb
Improve performance of list of blocked domains by caching counts (#10374)
2019-03-26 00:36:35 +01:00
invite_filter.rb
…
invite.rb
…
list_account.rb
…
list_feed.rb
…
list.rb
…
media_attachment.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-04 16:37:26 +02:00
mention.rb
…
mute.rb
…
notification.rb
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)
2019-03-28 04:44:59 +01:00
poll_vote.rb
Add optimistic lock to avoid race conditions when handling votes (#10196)
2019-03-06 19:53:57 +01:00
poll.rb
Add support for custom emojis in poll options (#10322)
2019-03-20 17:29:12 +01:00
preview_card.rb
Add WebP support (#9879)
2019-02-02 12:25:04 +01:00
relay.rb
Fix relay enabling/disabling not resetting inbox availability status (#10048)
2019-02-15 16:08:59 +01:00
remote_follow.rb
…
remote_profile.rb
…
report_filter.rb
…
report_note.rb
Fix scope latest of ReportNote (#9630)
2018-12-26 06:38:59 +01:00
report.rb
Set and store report URIs (#10303)
2019-03-17 15:34:56 +01:00
scheduled_status.rb
Fix deleting a scheduled status immediately deleting media attachments (#9728)
2019-01-06 16:38:40 +01:00
search.rb
…
session_activation.rb
…
setting.rb
…
site_upload.rb
Improvements to image upload validation and creation (#10431)
2019-04-01 07:30:46 +02:00
status_pin.rb
…
status_stat.rb
…
status.rb
Add site-wide options to show reblogs and replies in local/public timelines
2019-05-01 22:33:09 +02:00
stream_entry.rb
…
subscription.rb
…
tag.rb
Fix tagged param not being normalized before querying tags (#10249)
2019-03-13 13:02:13 +01:00
tombstone.rb
Record deleted(by mod) status to prevent re-appear (#10732)
2019-05-09 22:03:02 +02:00
trending_tags.rb
Create Redisable#redis (#9633)
2019-02-02 19:11:38 +01:00
user_invite_request.rb
Add "why do you want to join" field to invite requests (#10524)
2019-04-09 23:06:30 +09:00
user.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-04 16:37:26 +02:00
web.rb
…