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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
2018-10-01 12:43:20 +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
Clean up admin UI for accounts (#6004)
2017-12-13 12:15:10 +01: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-09-19 21:46:01 +02:00
admin.rb
Add logging of admin actions (#5757)
2017-11-24 02:05:53 +01:00
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
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
2017-07-07 04:02:06 +02:00
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
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
2018-05-04 21:14:34 +02:00
follow.rb
Implement Undo { Accept { Follow } } (fixes #8234) (#8245)
2018-08-17 16:24:56 +02:00
home_feed.rb
Support min_id-based pagination in REST API (#8736)
2018-09-28 02:23:45 +02:00
identity.rb
CAS + SAML authentication feature (#6425)
2018-02-04 05:42:13 +01:00
import.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
instance_filter.rb
Add instance search feature (#4925)
2017-09-13 12:30:07 +02:00
instance.rb
Add Instance class to list admin records (#3443)
2017-05-31 20:38:44 +02:00
invite_filter.rb
Add invite filter (#5862)
2017-12-01 16:40:02 +01:00
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
Lists (#5703)
2017-11-18 00:16:48 +01:00
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
Admin reports with accounts (#2092)
2017-04-18 19:36:18 +02:00
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
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
2017-07-07 04:02:06 +02:00
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
Add extended about page stub
2017-01-13 03:24:41 +01:00