tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/models
History
David Yip f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	README.md
2018-03-12 17:52:19 -05:00
..
admin
…
concerns
Rescue when there's no extension in the remotable (#6358)
2018-03-08 02:25:10 +01:00
form
…
glitch
Use Html2Text to generate plaintext for keyword mutes. #236.
2018-02-10 10:36:16 -06:00
web
…
account_domain_block.rb
Cache relationships in API (#6482)
2018-02-18 03:14:46 +01:00
account_filter.rb
…
account_moderation_note.rb
…
account.rb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
admin.rb
…
application_record.rb
…
backup.rb
Account archive download (#6460)
2018-02-21 23:21:32 +01:00
block.rb
Cache relationships in API (#6482)
2018-02-18 03:14:46 +01:00
context.rb
…
conversation_mute.rb
…
conversation.rb
…
custom_emoji_filter.rb
…
custom_emoji.rb
…
domain_block.rb
…
email_domain_block.rb
…
export.rb
…
favourite.rb
…
feed.rb
…
follow_request.rb
Cache relationships in API (#6482)
2018-02-18 03:14:46 +01:00
follow.rb
Cache relationships in API (#6482)
2018-02-18 03:14:46 +01:00
glitch.rb
…
home_feed.rb
…
identity.rb
…
import.rb
Ensure the app does not even start if OTP_SECRET is not set (#6557)
2018-02-26 01:31:44 +01:00
instance_filter.rb
…
instance.rb
…
invite_filter.rb
…
invite.rb
…
list_account.rb
…
list_feed.rb
…
list.rb
…
media_attachment.rb
Merge branch 'master' of https://github.com/tootsuite/mastodon
2018-02-23 23:28:31 +09:00
mention.rb
…
mute.rb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-19 15:17:14 +00:00
notification.rb
…
preview_card.rb
Fix avatar and header issues by using custom geometry detector (#6515)
2018-02-21 03:40:12 +01:00
remote_follow.rb
…
remote_profile.rb
…
report_filter.rb
…
report.rb
Federated reports (#6570)
2018-02-28 06:54:55 +01:00
search.rb
…
session_activation.rb
…
setting.rb
…
site_upload.rb
Fix avatar and header issues by using custom geometry detector (#6515)
2018-02-21 03:40:12 +01:00
status_pin.rb
…
status.rb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
stream_entry.rb
…
subscription.rb
…
tag.rb
Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)
2018-03-11 14:55:49 +01:00
user.rb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
web.rb
…