djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-15 20:22:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/views/admin
History
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +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
Fix upstream changes breaking because of glitch-soc's theming engine
2019-09-13 20:28:22 +02:00
domain_blocks
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
email_domain_blocks
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
2023-06-10 16:22:14 +02:00
export_domain_allows
Allow import/export of instance-level domain blocks/allows (#1754)
2022-05-16 09:29:01 +02: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
tags
Merge branch 'main' into glitch-soc/merge-upstream
2022-07-17 22:07:20 +02:00
trends
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
2023-06-10 16:22:14 +02:00
users/roles
Add customizable user roles (#18641)
2022-07-05 02:41:40 +02:00
warning_presets
Setup haml-lint CI with todo config (#23524)
2023-03-15 04:15:36 +01:00
webhooks
Add webhook templating (#23289)
2023-06-06 10:42:47 +02:00