1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 05:39:02 +09:00
YuruToot/app/javascript/entrypoints
Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
2024-09-12 20:05:08 +02:00
..
admin.tsx Move JS source from packs to entrypoints (#30037) 2024-04-23 16:45:12 +00:00
application.ts Convert easy entrypoints files to Typescript (#30102) 2024-04-29 08:02:41 +00:00
common.js [Glitch] Remove font-awesome npm package 2024-08-20 18:49:56 +02:00
embed.tsx Change embedded posts to use web UI (#31766) 2024-09-12 09:41:19 +00:00
error.ts Convert easy entrypoints files to Typescript (#30102) 2024-04-29 08:02:41 +00:00
inert.ts Convert easy entrypoints files to Typescript (#30102) 2024-04-29 08:02:41 +00:00
mailer.ts Convert easy entrypoints files to Typescript (#30102) 2024-04-29 08:02:41 +00:00
public-path.ts Convert easy entrypoints files to Typescript (#30102) 2024-04-29 08:02:41 +00:00
public.tsx Change embedded posts to use web UI (#31766) 2024-09-12 09:41:19 +00:00
remote_interaction_helper.ts Enable stricter Typescript options (#30435) 2024-05-27 09:24:59 +00:00
share.tsx Convert easy entrypoints files to Typescript (#30102) 2024-04-29 08:02:41 +00:00
sign_up.ts Convert entrypoints/sign_up to Typescript (#30106) 2024-04-29 08:23:05 +00:00
two_factor_authentication.ts Convert entrypoints/two_factor_authentication to Typescript (#30105) 2024-05-02 12:02:13 +00:00