tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-14 11:43:05 -05:00

History

Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.

2023-07-13 13:35:15 +02:00

account_actions

Fix more haml-lint Rubocop (#24107 )

2023-03-15 20:07:43 +01:00

account_warnings

Fix IDN domains not being rendered correctly in a few left-over places (#17848 )

2022-03-22 10:07:11 +01:00

accounts

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-16 23:12:59 +01:00

action_logs

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-16 23:12:59 +01:00

announcements

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-15 09:16:10 +01:00

change_emails

Fix more haml-lint Rubocop (#24107 )

2023-03-15 20:07:43 +01:00

custom_emojis

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-16 23:12:59 +01:00

dashboard

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-16 23:12:59 +01:00

disputes/appeals

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-15 09:16:10 +01:00

domain_allows

Add subresource integrity for JS and CSS assets (#15096 )

2020-11-06 11:56:31 +01:00

domain_blocks

Merge branch 'main' into glitch-soc/merge-upstream

2023-06-27 13:15:41 +02:00

email_domain_blocks

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

export_domain_allows

Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597 )

2022-11-17 11:05:09 +01:00

export_domain_blocks

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

follow_recommendations

Merge branch 'main' into glitch-soc/merge-upstream

2022-02-26 09:29:23 +01:00

instances

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

invites

Fix maxed-out invites not showing up as expired in UI (#10274 )

2019-03-15 05:35:17 +01:00

ip_blocks

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

relationships

Fix IDN domains not being rendered correctly in a few left-over places (#17848 )

2022-03-22 10:07:11 +01:00

relays

Display pending message on admin relays UI (#8494 )

2018-08-28 05:39:43 +02:00

report_notes

Change account moderation notes to make links clickable (#22553 )

2023-01-18 16:32:23 +01:00

reports

Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

2023-05-25 20:43:25 +02:00

roles

Consistently use middle dot (·) instead of bullet (•) to separate items (#25248 )

2023-06-02 19:58:18 +02:00

rules

Setup haml-lint CI with todo config (#23524 )

2023-03-15 04:15:36 +01:00

settings

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

status_edits

Add ability to view previous edits of a status in admin UI (#19462 )

2022-10-26 13:42:29 +02:00

statuses

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-05 20:46:56 +01:00