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/views
History
Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
2020-12-05 17:33:37 +01:00
..
about
Add subresource integrity for JS and CSS assets (#15096)
2020-11-06 11:56:31 +01:00
accounts
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
admin_mailer
Fixed not being able to display review pending hashtags in the admin UI. (#11875)
2019-09-17 16:59:16 +02:00
application
Fix lock icon not being shown when locking account in profile settings (#14190)
2020-07-01 13:51:50 +02:00
auth
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-05 17:33:37 +01:00
authorize_interactions
Fix misleading error when attempting to re-send a pending follow request (#13133)
2020-02-24 21:19:19 +01:00
directories
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-13 22:11:49 +02:00
errors
Add specific rate limits for posting and following (#13172)
2020-03-08 15:17:39 +01:00
filters
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
follower_accounts
Improve blocked view of profiles (#10491)
2019-04-07 04:59:13 +02:00
following_accounts
Improve blocked view of profiles (#10491)
2019-04-07 04:59:13 +02:00
home
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
invites
Remove invite comments from UI (#12068)
2019-10-03 22:37:13 +02:00
kaminari
Pagination improvements (#1445)
2017-04-11 01:11:41 +02:00
layouts
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
media
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
notification_mailer
Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)
2019-09-05 06:14:30 +02:00
oauth
Refactor settings controllers (#14767)
2020-09-11 20:56:35 +02:00
public_timelines
Add subresource integrity for JS and CSS assets (#15096)
2020-11-06 11:56:31 +01:00
relationships
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-12 22:13:57 +01:00
remote_follow
Admission-based registrations mode (#10250)
2019-03-14 05:28:30 +01:00
remote_interaction
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)
2019-07-07 16:16:51 +02:00
settings
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-20 13:27:48 +01:00
shared
Remove fallback to long description on sidebar and meta description (#12119)
2019-10-08 22:08:55 +02:00
shares
Add subresource integrity for JS and CSS assets (#15096)
2020-11-06 11:56:31 +01:00
statuses
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-05 17:33:37 +01:00
tags
Add subresource integrity for JS and CSS assets (#15096)
2020-11-06 11:56:31 +01:00
user_mailer
Add WebAuthn as an alternative 2FA method (#14466)
2020-08-24 16:46:27 +02:00
well_known/host_meta
Remove dependency on goldfinger gem (#14919)
2020-10-08 00:34:57 +02:00