mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 11:23:42 +01:00
85722a918d
Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file. |
||
|---|---|---|
| .. | ||
| actions | ||
| components | ||
| containers | ||
| features | ||
| locales | ||
| polyfills | ||
| reducers | ||
| selectors | ||
| service_worker | ||
| store | ||
| utils | ||
| api.js | ||
| blurhash.ts | ||
| common.js | ||
| compare_id.ts | ||
| initial_state.js | ||
| is_mobile.ts | ||
| load_keyboard_extensions.js | ||
| load_locale.js | ||
| main.jsx | ||
| performance.js | ||
| permissions.ts | ||
| ready.js | ||
| scroll.ts | ||
| settings.js | ||
| stream.js | ||
| test_setup.js | ||
| uuid.ts | ||