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/controllers
History
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
activitypub
Improve status pin query (#11972)
2019-09-27 15:23:30 +02:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
api
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-10 17:26:08 +02:00
auth
Ensure pack is set when rendering OTP prompt
2019-10-10 17:08:00 +02:00
concerns
Add account migration UI (#11846)
2019-09-19 20:58:19 +02:00
oauth
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-23 10:51:07 +02:00
settings
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
well_known
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
about_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
account_follow_controller.rb
Restful refactor of accounts/ routes (#2133)
2017-04-19 13:52:37 +02:00
account_unfollow_controller.rb
Restful refactor of accounts/ routes (#2133)
2017-04-19 13:52:37 +02:00
accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-03 11:10:12 +02:00
application_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-13 18:13:43 +02:00
authorize_interactions_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-18 18:04:49 +02:00
custom_css_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
directories_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
emojis_controller.rb
Add (back) rails-level JSON caching (#11333)
2019-07-21 22:32:16 +02:00
filters_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
following_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
home_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
instance_actors_controller.rb
Fix reverse-proxy caching of instance actor object (#11561)
2019-08-13 15:30:37 +02:00
intents_controller.rb
Refactor controllers for statuses, accounts, and more (#11249)
2019-07-08 12:03:45 +02:00
invites_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
manifests_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
media_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
media_proxy_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
public_timelines_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
relationships_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-28 13:01:33 +01:00
remote_follow_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
remote_interaction_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
shares_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
statuses_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
tags_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00