FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views
History
Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
 		2023-03-05 20:46:56 +01: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 branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
admin_mailer Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
application Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
auth Fix incorrect translation string in glitch-soc captcha feature 2023-02-19 11:02:27 +01: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 incorrectly formatted datetime in account moderation note timestamp (#22555) 2023-01-05 13:35:28 +01:00
errors
…
filters Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 2022-08-31 11:55:27 +02: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
…
kaminari
…
layouts Merge branch 'main' into glitch-soc/merge-upstream 2023-01-14 22:34:09 +01:00
media Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
notification_mailer Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
oauth Change visual separation of applications in authorized apps list (#17686) 2022-03-02 20:28:25 +01: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 branch 'main' into glitch-soc/merge-upstream 2023-01-25 17:26:38 +01:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
shares
…
statuses Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +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 User mailer spec coverage improvements (#23905) 2023-03-04 17:16:11 +01:00
well_known/host_meta Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00