fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-28 07:57:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views
History
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-06-21 08:28:59 +02:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
admin_mailer Fix incorrect link in "new trending tags" email (#18156) 2022-04-28 17:15:29 +02:00
application Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
authorize_interactions Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
directories Merge branch 'main' into glitch-soc/merge-upstream 2022-03-28 16:22:28 +02:00
disputes/strikes Fix ambiguous wording on appeal actions (#18328) 2022-05-06 21:41:34 +02:00
errors
filters Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
follower_accounts Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
following_accounts Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
home
invites
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
media
notification_mailer Refactor account and status formatting (#17877) 2022-03-28 01:17:17 +02:00
oauth Change visual separation of applications in authorized apps list (#17686) 2022-03-02 20:28:25 +01:00
public_timelines
relationships
remote_follow
remote_interaction
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
shared Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
shares
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
statuses_cleanup
tags Merge branch 'main' into glitch-soc/merge-upstream 2022-06-21 08:28:59 +02:00
user_mailer Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
well_known/host_meta