mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-26 07:53:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/javascript/core
History
Claire 1b06e4e1b7 Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  In glitch-soc, this file was split across the following files:
  - `app/javascript/packs/public.jsx`
  - `app/javascript/core/embed.js`
  - `app/javascript/core/settings.js`
  Update all those files accordingly, as well as the related `theme.yml` files.
2024-03-15 22:37:55 +01:00
..
admin.ts Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream 2024-03-01 13:02:59 +01:00
auth.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 2020-10-21 21:28:47 +02:00
common.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 2020-10-21 21:28:47 +02:00
embed.ts Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 2024-03-15 22:37:55 +01:00
inert.js Remove bypass and use use glitch-soc's theming system for inert.css 2024-01-15 22:16:26 +01:00
mailer.js Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream 2023-05-09 22:12:05 +02:00
remote_interaction_helper.ts Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
settings.ts Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 2024-03-15 22:37:55 +01:00
theme.yml Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 2024-03-15 22:37:55 +01:00
two_factor_authentication.js Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00