mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-27 08:11:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views
History
Claire 6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
..
about Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00
admin Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
admin_mailer Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
application Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
auth Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
authorize_interactions Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
custom_css Fix badge color not affected (#18826) 2022-07-19 01:06:11 +02:00
disputes/strikes Fix incorrect post links in strikes when the account is remote (#23611) 2023-03-15 04:14:47 +01:00
errors Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
filters Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
follower_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
invites Remove invite comments from UI (#12068) 2019-10-03 22:37:13 +02:00
kaminari Fix missing translation in pagination gap tags (#24262) 2023-03-29 13:54:33 +02:00
layouts Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
mail_subscriptions Add unsubscribe link to e-mails (#25378) 2023-06-12 14:22:46 +02:00
media Switch to using a common runtime chunk rather than locales 2023-06-10 17:43:13 +02:00
notification_mailer Add time zone preference (#25342) 2023-06-10 03:29:37 +02:00
oauth Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
privacy Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
settings Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 2023-06-18 13:41:33 +02:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
statuses_cleanup Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
tags Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00
user_mailer Add time zone preference (#25342) 2023-06-10 03:29:37 +02:00
well_known/host_meta Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00