1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 14:49:01 +09:00
Commit Graph

24 Commits

Author SHA1 Message Date
Renaud Chaput
7fe848b161 [Glitch] Convert packs/public.jsx to Typescript
Port c76ae7a5c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-15 22:43:36 +01:00
Claire
6ee7a64465
Reduce differences with upstream in “public” pack (#2680)
* Reduce differences with upstream

* Further reduce pack differences with upstream
2024-03-15 22:21:57 +01:00
Claire
3f239facff
Update flavor screenshots (#2664) 2024-03-07 12:59:00 +01:00
Claire
f6654e0842 Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.jsx`:
  This file was split between `app/javascript/core/admin.js`,
  `app/javascript/pack/admin.jsx`, and
  `app/javascript/flavours/glitch/packs/admin.jsx`.
  Ported upstream's change, splitting the new file to
  `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`,
  and `app/javascript/flavours/glitch/packs/admin.tsx`
2024-02-29 19:02:31 +01:00
Plastikmensch
5b0382abc5
Remove redundant asset preload (#2488)
* Remove redundant asset preload

preloading these is already handled by glitch-soc theming system, meaning glitch packs get preloaded and if the user is signed in, vanilla packs.

The theming system preloads these unconditionally though.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Remove preload of getting started

This matches upstreams preloads

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-12-02 14:54:26 +01:00
Claire
ba73f0ea3a [Glitch] Add polling and automatic redirection to /start on email confirmation
Port e60414792d to glitch-soc
2023-05-25 22:37:14 +02:00
Renaud Chaput
81ef21a0c8 [Glitch] Rename JSX files with proper .jsx extension
Port 44a7d87cb1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:35:31 +01:00
Claire
cba7158085
Fix prettifier/lint issues (#2066)
* Add glitch-soc locale files to prettierignore

* Run prettier on theme.yml

* Add glitch-soc emoji_map.json to .prettierignore

* Run prettier on config/i18n-tasks.yml
2023-01-04 18:38:45 +01:00
Claire
a5e446a4a0
Change locales file generation to use JSON sources (#2028)
* Change locales file generation to use JSON sources

Instead of inheriting in JS files, set locale inheritance in the
theme's YML file, and inherit in the generated locale file, rather
than the source file.

* Convert glitch-soc JS translation files to JSON

Obtained running the following:

```sh
sed -i -z "s/import inherited from '.*';\s*\nconst messages = //" *.js
sed -i "s/\s*\/\/.*//" *.js
sed -i -z "s/;\s*export default .*/\n/" *.js
for i in *.js; do
  json5 $i | json_pp > ${i}on;
done
```

* Change `yarn manage:translations` to exclude any translation already defined upstream

* Run yarn manage:translations
2022-12-21 22:13:14 +01:00
Eugen Rochko
14ddb85c3b [Glitch] Remove code for rendering public and hashtag timelines outside the web UI
Port 02ba9cfa35 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Claire
28ec7def58 Fix missing javascript in some admin pages 2022-02-12 00:10:28 +01:00
Eugen Rochko
7aec1bc308 [Glitch] Add graphs and retention metrics to admin dashboard (#16829)
Port 07341e7aa6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-14 21:45:01 +02:00
Claire
4acb5c90a2 Use “public.js” pack for auth pages for form validation helpers 2020-12-10 13:01:51 +01:00
Thibaut Girka
14f797873d Fix menu in settings/admin pages 2019-09-30 17:01:16 +02:00
Thibaut Girka
eed2c9dd44 Rename flavours/glitch/features/drawer to flavours/glitch/features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka
0fbe90e2d3 Fix settings/flavours
Update theming system to use new paths for media files
2019-03-16 16:21:20 +01:00
Thibaut Girka
9a47f2cbdf Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
kibi!
cda845ae0e Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00
Gô Shoemake
9b9b7fa005
Load packs/public.js for glitch#admin 2018-01-12 18:51:52 -08:00
kibigo!
42f50049ff WIP <Compose> Refactor; 1000 tiny edits 2018-01-04 18:33:13 -08:00
kibigo!
bdca1614d5 Screenshot support for themes 2017-12-10 20:32:28 -08:00
kibigo!
b28cd6769c Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
kibigo!
9cdd81e9dd Glitch doesn't have a home stylesheet anymore 2017-12-07 14:32:52 -08:00
kibigo!
bc4fa6b198 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00