monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views
History
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
 		2021-12-16 16:20:44 +01:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
admin_mailer Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
application Add trending links (#16917) 2021-11-25 13:07:38 +01:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2021-06-23 10:46:24 +02:00
authorize_interactions
…
directories Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
errors
…
filters Fix not being able to change world filter expiration back to “Never” (#15858) 2021-03-12 05:25:50 +01:00
follower_accounts
…
following_accounts
…
home Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
invites
…
kaminari
…
layouts Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
media Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
notification_mailer Stop setting a shortcode to newly-created media attachments (#16730) 2021-09-13 18:59:37 +02:00
oauth
…
public_timelines Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
relationships Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
remote_follow
…
remote_interaction
…
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
shared Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
shares
…
statuses Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
statuses_cleanup Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
user_mailer Fix missing source strings and inconsistent lead text style in admin UI (#16052) 2021-04-17 11:12:49 +02:00
well_known/host_meta
…