kouhai dev
a2e6a7d963
th: Merge remote-tracking branch 'glitch/main'
2023-05-22 00:10:53 -07:00
0206081e40
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
Ariadne Conill
bc202f4bc6
th: Merge gitea.treehouse.systems:mirrors/mastodon-glitch into chore/merge-20230511-1
2023-05-11 17:42:39 -07:00
abb99eca95
Remove our copy of image.d.ts as tsconfig already uses upstream's
2023-05-10 00:00:28 +02:00
e63a08bafd
Run prettier on Typescript files
...
Port 0886856bd2
2023-05-09 23:41:18 +02:00
710151baf4
Merge commit '0886856bd2adecedcad6fad9dcb86ed8069c46c0' into glitch-soc/merge-upstream
2023-05-09 23:37:38 +02:00
487715a3e3
[Glitch] Type Redux store and middleware
...
Port d67de22458
2023-05-09 23:28:40 +02:00
b21d2eaeb6
[Glitch] Remove unused iOS agent sniffing function
...
Port d57be2731c
2023-05-09 23:20:57 +02:00
e8415aa727
[Glitch] Rework polyfills loading
...
Port b640f89777
2023-05-09 23:20:24 +02:00
c5fb52eb23
[Glitch] Add more detailed type annotation for Account
...
Port a2e9b9d87d
2023-05-09 23:16:23 +02:00
7f078e41c0
Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We deleted it.
Kept it removed.
- `app/javascript/packs/public.jsx`:
Upstream changed an import, we have slightly different ones.
Ported upstream changes.
2023-05-09 23:12:48 +02:00
81b01c961b
Disable broken onboarding code
2023-05-09 23:03:23 +02:00
d0545c950c
[Glitch] Enforce stricter rules for Typescript files
...
Port 85b3823e66
2023-05-09 22:56:26 +02:00
a7d51b92f3
[Glitch] Enforce React Rules of Hooks with eslint
...
Port b785500809
2023-05-09 22:28:53 +02:00
4e88d37759
[Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere
...
Port 45146e3f3b
2023-05-09 22:28:53 +02:00
5c4a012ac5
Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream reworked imports, but we had many changes.
Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
Upstream reworked imports, but we had many changes.
Reworked imports as upstream did.
2023-05-09 22:12:05 +02:00
8a2bb3fb99
[Glitch] Add TypeScript support for `mastodon` alias and image imports
...
Port 5f709b1601
2023-05-09 21:50:48 +02:00
43b38dc9e6
Copy hooks/useHovering.ts to glitch-soc
2023-05-09 21:30:10 +02:00
a0047223a5
Fix IconButton prop types in glitch-soc
2023-05-09 21:11:23 +02:00
d8cae2752c
[Glitch] Mark `wheel` events on scrollable list as passive
...
Port b8d44c55fd
2023-05-09 20:42:07 +02:00
fe8412bcf4
[Glitch] Rewrite Domain component as function component
...
Port 4ab18dee50
2023-05-09 20:33:58 +02:00
7630b904ee
[Glitch] Use LayoutType from is_mobile in actions/app
...
Port 01caf92d80
2023-05-09 20:32:30 +02:00
bf45760e0b
[Glitch] Rewrite RadioButton component as FC
...
Port 13a16f3054
2023-05-09 20:25:31 +02:00
3c62d50502
[Glitch] Rewrite Image component as function component
...
Port c1ccb55a59
2023-05-09 20:24:49 +02:00
77edfc33ba
[Glitch] Rewrite <NotSignedInIndicator /> as FC
...
Port 23a97effdb
2023-05-09 20:24:01 +02:00
63c706d26f
Merge commit 'b8d44c55fd9264cdacf66c32541b4343e164bbfb' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream changed the config to properly process imports.
Glitch-soc had previously already done so.
Changed the config to better match upstream.
2023-05-09 20:12:33 +02:00
0886856bd2
Use Prettier for ESLint formatting TypeScript ( #23631 )
2023-05-09 19:02:12 +02:00
d67de22458
Type Redux store and middleware ( #24843 )
2023-05-09 16:56:26 +02:00
da803512c9
Fix javascript on moderation interface ( #24933 )
2023-05-09 16:42:02 +02:00
d57be2731c
Remove unused iOS agent sniffing function ( #24931 )
2023-05-09 15:48:53 +02:00
b640f89777
Rework polyfills loading ( #24907 )
2023-05-09 14:55:35 +02:00
a2e9b9d87d
Add more detailed type annotation for Account ( #24815 )
2023-05-09 12:09:32 +02:00
85b3823e66
Enforce stricter rules for Typescript files ( #24910 )
2023-05-09 03:11:56 +02:00
b785500809
Enforce React Rules of Hooks with eslint ( #24911 )
2023-05-09 03:09:11 +02:00
45146e3f3b
Dont use CommonJS (`require`, `module.exports`) anywhere ( #24913 )
2023-05-09 03:08:47 +02:00
b8d44c55fd
Mark `wheel` events on scrollable list as passive ( #24914 )
2023-05-09 03:07:13 +02:00
2354041cb7
[Glitch] Fixes build errors from some previous TS-related commits
...
Port e1985e14f6
2023-05-08 22:15:00 +02:00
31e4da41ee
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 9ed91c444e
2023-05-08 22:15:00 +02:00
2c5141e5ed
[Glitch] Remove MastodonMap TS type
...
Port 7bc13c1ca3
2023-05-08 22:15:00 +02:00
ac97d77cb3
[Glitch] Add type annotation for some js files
...
Port 6fa4054a5d
2023-05-08 22:15:00 +02:00
902b2175df
Copy Typescript type definitions to glitch-soc
2023-05-08 22:15:00 +02:00
9775d02a15
[Glitch] Fix incorrect import of redux store
...
Port d76495d080
2023-05-08 22:15:00 +02:00
5af7007906
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 69bd3a86f3
2023-05-08 22:15:00 +02:00
c10a2036bc
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port d6808a561e
2023-05-08 22:15:00 +02:00
62f5d29c25
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 8c43856691
2023-05-08 22:15:00 +02:00
319ff9bd71
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port 52ed627d9e
2023-05-08 21:09:49 +02:00
e225a49255
[Glitch] Add type annotation for Blurhash component
...
Port fc4bb5ed66
2023-05-08 21:09:49 +02:00
cccf0bdace
[Glitch] Add type annotation for IconButton component
...
Port bee49de3db
2023-05-08 21:09:49 +02:00
348aed03cf
Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes, but we had removed it.
Discarded upstream changes.
- `.rubocop_todo.yml`:
Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
Minor upstream code style change where glitch-soc had slightly different code
due to handling of local-only posts.
Updated to match upstream's code style.
- `app/models/status.rb`:
Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
Upstream rewrote a lot of the backup service, glitch-soc had changes because
of exporting local-only posts.
Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
Upstream split the file into different files, while glitch-soc had a few
extra routes.
Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
and `config/routes/admin.rb`
- `db/schema.rb`:
Upstream has new migrations, while glitch-soc had an extra migration.
Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
Upstream added support to set version tags from environment variables, while
glitch-soc has an extra `+glitch` tag.
Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests due to
`directMessage` handling.
Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests.
Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
2847b0423b
Fix glitch-soc's thread line styling ( #2214 )
...
Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes.
2023-05-08 18:21:36 +02:00
kouhai dev
Claire
Ariadne Conill