1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 22:29:07 +09:00
YuruToot/app/models/concerns
Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
..
account_associations.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
account_avatar.rb Remove WebP support () 2019-08-17 22:04:15 +02:00
account_counters.rb Add tootctl cache recount command () 2019-08-18 14:55:03 +02:00
account_finder_concern.rb Add ActivityPub actor representing the entire server () 2019-07-19 01:44:42 +02:00
account_header.rb Remove WebP support () 2019-08-17 22:04:15 +02:00
account_interactions.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
attachmentable.rb Include max image dimensions in error () 2019-08-15 20:20:20 +02:00
cacheable.rb Fix cache_associated no longer working () 2018-05-03 10:41:41 +02:00
domain_normalizable.rb Fix crash when saving invalid domain name () 2019-08-08 23:04:19 +02:00
expireable.rb Fix poll update handler calling method was that was not available () 2019-03-12 22:58:59 +01:00
ldap_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly () 2019-04-25 02:49:25 +02:00
omniauthable.rb Change unconfirmed user login behaviour () 2019-07-22 10:48:50 +02:00
paginable.rb Fix timeline pagination () 2018-09-29 19:03:33 +02:00
pam_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly () 2019-04-25 02:49:25 +02:00
redisable.rb Create Redisable#redis () 2019-02-02 19:11:38 +01:00
relationship_cacheable.rb Cache relationships in API () 2018-02-18 03:14:46 +01:00
remotable.rb Fix nil host in remotable () 2018-08-29 21:13:49 +02:00
status_threading_concern.rb Improved remote thread fetching () 2019-02-28 15:22:21 +01:00
user_roles.rb Add moderation API () 2019-06-20 02:52:34 +02:00