bceb45adda
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` |
||
|---|---|---|
| .. | ||
| actions | ||
| api_types | ||
| components | ||
| containers | ||
| entrypoints | ||
| features | ||
| hooks | ||
| images | ||
| locales | ||
| models | ||
| polyfills | ||
| reducers | ||
| selectors | ||
| store | ||
| styles | ||
| types | ||
| utils | ||
| api.ts | ||
| blurhash.ts | ||
| common.js | ||
| compare_id.ts | ||
| initial_state.js | ||
| is_mobile.ts | ||
| load_keyboard_extensions.js | ||
| main.jsx | ||
| names.yml | ||
| performance.js | ||
| permissions.ts | ||
| ready.js | ||
| scroll.ts | ||
| settings.js | ||
| stream.js | ||
| test_helpers.tsx | ||
| theme.yml | ||
| uuid.ts | ||