monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript/entrypoints
History
Claire bceb45adda Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.

Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
 		2024-05-04 14:59:00 +02:00
..
admin.tsx Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
application.js Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
common.js Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 2024-05-04 14:59:00 +02:00
error.js Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
inert.js Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
mailer.js Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
public-path.js Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
public.tsx Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
remote_interaction_helper.ts Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
share.jsx Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
sign_up.js Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
two_factor_authentication.js Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00