eggplants
af7bf59b3e
Fix wrong documentation link ( #24924 )
2023-05-09 14:56:02 +02:00
Renaud Chaput
b640f89777
Rework polyfills loading ( #24907 )
2023-05-09 14:55:35 +02:00
Renaud Chaput
a3a2414f0e
Rework polyfills loading ( #24907 )
2023-05-09 14:55:35 +02:00
Claire
820ad34fe2
Merge pull request #2215 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-05-09 14:47:11 +02:00
Claire
f08f6d20e6
Merge pull request #2215 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-05-09 14:47:11 +02:00
Daniel M Brasil
f7b92ed93d
Add ability to block sign-ups from IP using the CLI ( #24870 )
2023-05-09 14:46:00 +02:00
Daniel M Brasil
536dd046d4
Add ability to block sign-ups from IP using the CLI ( #24870 )
2023-05-09 14:46:00 +02:00
Daniel M Brasil
1b1b940202
Fix uncaught ActiveRecord::StatementInvalid
in Mastodon::IpBlocksCLI ( #24861 )
2023-05-09 14:45:47 +02:00
Daniel M Brasil
ffb3fef7db
Fix uncaught ActiveRecord::StatementInvalid
in Mastodon::IpBlocksCLI ( #24861 )
2023-05-09 14:45:47 +02:00
Renaud Chaput
33fff17ebb
Upgrade uuid
to 9.0.0 ( #24917 )
2023-05-09 14:43:07 +02:00
Renaud Chaput
aec486b4ec
Upgrade uuid
to 9.0.0 ( #24917 )
2023-05-09 14:43:07 +02:00
fusagiko / takayamaki
a2e9b9d87d
Add more detailed type annotation for Account ( #24815 )
2023-05-09 12:09:32 +02:00
fusagiko / takayamaki
6579e3af7d
Add more detailed type annotation for Account ( #24815 )
2023-05-09 12:09:32 +02:00
Renaud Chaput
85b3823e66
Enforce stricter rules for Typescript files ( #24910 )
2023-05-09 03:11:56 +02:00
Renaud Chaput
c8181eb0a4
Enforce stricter rules for Typescript files ( #24910 )
2023-05-09 03:11:56 +02:00
Renaud Chaput
cabc9e5979
Make Webpack fail on failed imports ( #24908 )
2023-05-09 03:10:04 +02:00
Renaud Chaput
64ec41d89c
Make Webpack fail on failed imports ( #24908 )
2023-05-09 03:10:04 +02:00
Renaud Chaput
b785500809
Enforce React Rules of Hooks with eslint ( #24911 )
2023-05-09 03:09:11 +02:00
Renaud Chaput
d9b93bd15e
Enforce React Rules of Hooks with eslint ( #24911 )
2023-05-09 03:09:11 +02:00
Renaud Chaput
45146e3f3b
Dont use CommonJS (require
, module.exports
) anywhere ( #24913 )
2023-05-09 03:08:47 +02:00
Renaud Chaput
955179fc55
Dont use CommonJS (require
, module.exports
) anywhere ( #24913 )
2023-05-09 03:08:47 +02:00
Renaud Chaput
b8d44c55fd
Mark wheel
events on scrollable list as passive ( #24914 )
2023-05-09 03:07:13 +02:00
Renaud Chaput
89269e4b71
Mark wheel
events on scrollable list as passive ( #24914 )
2023-05-09 03:07:13 +02:00
Renaud Chaput
2354041cb7
[Glitch] Fixes build errors from some previous TS-related commits
...
Port e1985e14f6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Renaud Chaput
ea04f33f50
[Glitch] Fixes build errors from some previous TS-related commits
...
Port 45579a26cf
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
31e4da41ee
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 9ed91c444e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
3d9e35375c
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 0999cb4601
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Renaud Chaput
2c5141e5ed
[Glitch] Remove MastodonMap TS type
...
Port 7bc13c1ca3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Renaud Chaput
a33d6c946a
[Glitch] Remove MastodonMap TS type
...
Port 9a52a7f7a0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
ac97d77cb3
[Glitch] Add type annotation for some js files
...
Port 6fa4054a5d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
e8243d5bbd
[Glitch] Add type annotation for some js files
...
Port e38b391940
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire
902b2175df
Copy Typescript type definitions to glitch-soc
2023-05-08 22:15:00 +02:00
Claire
5f0d2b6e3b
Copy Typescript type definitions to glitch-soc
2023-05-08 22:15:00 +02:00
Claire
9775d02a15
[Glitch] Fix incorrect import of redux store
...
Port d76495d080
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire
f3af434c25
[Glitch] Fix incorrect import of redux store
...
Port 9c1929efad
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
5af7007906
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 69bd3a86f3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
f4e3e309b1
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 8227af8dcc
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Eugen Rochko
c10a2036bc
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port d6808a561e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Eugen Rochko
bbd0e9caa6
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port 8131a5b330
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire
62f5d29c25
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 8c43856691
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire
a8939e9098
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 598e63dad2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire
319ff9bd71
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port 52ed627d9e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
Claire
10f5329ddf
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port d37c0a1060
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
e225a49255
[Glitch] Add type annotation for Blurhash component
...
Port fc4bb5ed66
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
9ab89bb832
[Glitch] Add type annotation for Blurhash component
...
Port f50105779b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
cccf0bdace
[Glitch] Add type annotation for IconButton component
...
Port bee49de3db
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
20f1f3aa7d
[Glitch] Add type annotation for IconButton component
...
Port 5a5975d7f7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
Claire
da25a0bd04
Fix rubocop issues in glitch-soc-specific code
2023-05-08 19:28:43 +02:00
Claire
8b31030fe4
Fix rubocop issues in glitch-soc-specific code
2023-05-08 19:28:43 +02:00
Claire
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