mastodon/app/helpers
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2022-10-30 18:15:28 +01:00
..
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
accounts_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
application_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
branding_helper.rb Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
context_helper.rb Compact JSON-LD signed incoming activities (#17426) 2022-02-03 14:07:29 +01:00
domain_control_helper.rb
email_helper.rb
flashes_helper.rb
formatting_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-26 23:30:10 +02:00
home_helper.rb Fix wrong size of avatars in admin UI (#19457) 2022-10-25 21:43:33 +02:00
instance_helper.rb
jsonld_helper.rb Fix not updating a status when newer version is fetched manually (#17745) 2022-03-12 09:11:36 +01:00
languages_helper.rb fix name of Lao language (#19520) 2022-10-29 13:34:56 +02:00
mascot_helper.rb
routing_helper.rb Fix CDN_HOST not affected on full_asset_url (#18662) 2022-06-23 23:09:32 +02:00
settings_helper.rb Remove language detection through cld3 (#17478) 2022-02-08 02:41:17 +01:00
statuses_helper.rb Replace leftover envelope icons with at icons (#18305) 2022-05-06 00:41:56 +02:00
webfinger_helper.rb