mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 05:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/javascript/core
History
Claire 1cd7f5ff17 Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
2023-05-28 15:54:31 +02:00
..
admin.js Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02: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.js [Glitch] Run eslint --fix 2023-02-03 20:52:07 +01:00
mailer.js Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream 2023-05-09 22:12:05 +02:00
public.js [Glitch] Dont use CommonJS (require, module.exports) anywhere 2023-05-09 22:28:53 +02:00
settings.js Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
theme.yml [Glitch] Add polling and automatic redirection to /start on email confirmation 2023-05-25 22:37:14 +02:00
two_factor_authentication.js Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00