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 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
2018-10-05 15:23:57 +02:00
..
admin
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
concerns
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-01 12:43:20 +02:00
form
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-24 15:10:34 +02:00
web
Fix has_one association on Web::PushSubscription (#7767)
2018-06-09 21:11:14 +02:00
account_domain_block.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
account_filter.rb
Change admin accounts default sort to most recent (#8813)
2018-10-04 16:05:38 +02:00
account_moderation_note.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
account_pin.rb
Add API endpoint to list featured accounts (fixes #8315) (#8317)
2018-08-20 18:46:04 +02:00
account.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-05 15:23:57 +02:00
admin.rb
…
application_record.rb
Validate HTTP response length while receiving (#6891)
2018-03-26 14:02:10 +02:00
backup.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
block.rb
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
2018-05-04 21:14:34 +02:00
bookmark.rb
Thread scopes through #matches?. #454.
2018-06-03 23:00:50 -05:00
context.rb
…
conversation_mute.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
conversation.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
custom_emoji_filter.rb
Change custom emoji search to ILIKE instead of = (#7099)
2018-04-10 15:46:27 +02:00
custom_emoji.rb
Add entity cache (#7271)
2018-04-27 01:38:10 +02:00
custom_filter.rb
Add option to not consider word boundaries when processing keyword filtering (#7975)
2018-07-09 02:22:09 +02:00
domain_block.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
email_domain_block.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
export.rb
Show exact number of followers/statuses on export page/in tooltip (#8199)
2018-08-14 21:56:17 +02:00
favourite.rb
Fix error when trying to update counters for statuses that are gone (#8251)
2018-08-18 03:03:23 +02:00
feed.rb
Support min_id-based pagination in REST API (#8736)
2018-09-28 02:23:45 +02:00
follow_request.rb
Limit the number of people that can be followed from one account (#8807)
2018-10-04 17:36:11 +02:00
follow.rb
Limit the number of people that can be followed from one account (#8807)
2018-10-04 17:36:11 +02:00
home_feed.rb
Support min_id-based pagination in REST API (#8736)
2018-09-28 02:23:45 +02:00
identity.rb
…
import.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
instance_filter.rb
…
instance.rb
…
invite_filter.rb
…
invite.rb
Keyword/phrase filtering (#7905)
2018-06-29 15:34:36 +02:00
list_account.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
list_feed.rb
…
list.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
media_attachment.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-01 00:18:13 +02:00
mention.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
mute.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
notification.rb
Remove annoying Notification#cache_ids scope warning (#8333)
2018-08-21 02:49:51 +02:00
preview_card.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
relay.rb
Expect relays to answer with accept/reject (#8179)
2018-08-13 18:17:20 +02:00
remote_follow.rb
Add remote interaction dialog for toots (#8202)
2018-08-18 03:03:12 +02:00
remote_profile.rb
[WIP] Enable custom emoji on account pages and in the sidebar (#6124)
2018-04-01 23:55:42 +02:00
report_filter.rb
…
report_note.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
report.rb
Add preference for report notification e-mails, skip for duplicates (#8559)
2018-09-02 00:11:58 +02:00
search.rb
…
session_activation.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
setting.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
site_upload.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
status_pin.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
status_stat.rb
Move status counters to separate table, count replies (#8104)
2018-08-14 19:19:32 +02:00
status.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-09-19 21:46:01 +02:00
stream_entry.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
subscription.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
tag.rb
Track trending tags (#7638)
2018-05-27 21:45:30 +02:00
trending_tags.rb
Fix number of results returned from TrendingTags.get
2018-07-16 19:54:14 +02:00
user.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-01 12:43:20 +02:00
web.rb
…