Commit graph

38623 commits

Author SHA1 Message Date
dependabot[bot]
59b53c6869
Bump eslint-plugin-react from 7.30.1 to 7.31.1 (#19082)
Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.30.1 to 7.31.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.30.1...v7.31.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-01 01:14:28 +09:00
dependabot[bot]
d8d43c3694 Bump workbox-webpack-plugin from 6.5.3 to 6.5.4 (#19093)
Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4)

---
updated-dependencies:
- dependency-name: workbox-webpack-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-01 01:12:53 +09:00
dependabot[bot]
06b64f2e19
Bump workbox-webpack-plugin from 6.5.3 to 6.5.4 (#19093)
Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4)

---
updated-dependencies:
- dependency-name: workbox-webpack-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-01 01:12:53 +09:00
Claire
0dfcf54d06 Fix position of “expand” icon in media modal on glitch-soc (#1838) 2022-08-31 16:23:10 +02:00
Claire
156c6ea36c
Fix position of “expand” icon in media modal on glitch-soc (#1838) 2022-08-31 16:23:10 +02:00
Claire
a6d6d303f7 Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)
I failed to account for glitch-soc's theming system when merging
from upstream.
2022-08-31 11:55:27 +02:00
Claire
0fece174f6
Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)
I failed to account for glitch-soc's theming system when merging
from upstream.
2022-08-31 11:55:27 +02:00
Claire
4c688d82b4 Fix local settings navigation (#1836)
The “filters” page was removed, but not from the navigation, which would offset
everything.
2022-08-30 10:57:27 +02:00
Claire
0495302f1c
Fix local settings navigation (#1836)
The “filters” page was removed, but not from the navigation, which would offset
everything.
2022-08-30 10:57:27 +02:00
Claire
f5b0cfe050 Fix WebUI error in development mode (#19078)
Caused by using JSX features without importing React
2022-08-29 10:02:40 +02:00
Claire
90917b305a
Fix WebUI error in development mode (#19078)
Caused by using JSX features without importing React
2022-08-29 10:02:40 +02:00
Claire
1b3977b3fb Fix WebUI error in development mode (#1835)
Caused by using JSX features without importing React

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-29 08:23:05 +02:00
Claire
bbb45568ad
Fix WebUI error in development mode (#1835)
Caused by using JSX features without importing React

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-29 08:23:05 +02:00
Claire
b7e297dc6c Add regexp filter field to public timeline column settings (#1834)
* Add regexp filter field to public timeline column settings

This has accidentally been removed while porting an upstream change years ago.

* Remove dead code

* Fix regexp filter not working for local and public TLs when using non-default settings
2022-08-28 22:21:55 +02:00
Claire
7a02c1d9ba
Add regexp filter field to public timeline column settings (#1834)
* Add regexp filter field to public timeline column settings

This has accidentally been removed while porting an upstream change years ago.

* Remove dead code

* Fix regexp filter not working for local and public TLs when using non-default settings
2022-08-28 22:21:55 +02:00
luzpaz
45ddea2f0c Fix typos (#18604)
* Fix typos

Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,pixelx,ro`

* Follow-up typo fix
2022-08-28 17:44:34 +02:00
luzpaz
4aa3b9bd01
Fix typos (#18604)
* Fix typos

Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,pixelx,ro`

* Follow-up typo fix
2022-08-28 17:44:34 +02:00
Claire
87395544b3 Merge pull request #1833 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-08-28 13:27:17 +02:00
Claire
215738bb3c
Merge pull request #1833 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-08-28 13:27:17 +02:00
Yamagishi Kazutoshi
a348bc9e84 [Glitch] Replace to workbox-webpack-plugin from offline-plugin
Port f922858b78 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-28 11:41:21 +02:00
Yamagishi Kazutoshi
54ae7a221e [Glitch] Replace to workbox-webpack-plugin from offline-plugin
Port 81e1cc5fec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-28 11:41:21 +02:00
Claire
cefde556b6 Revert "Remove preference to aggregate reblogs in home/list feeds (#18112)"
This reverts commit dd5b90e4f2.
2022-08-28 11:31:39 +02:00
Claire
6c7bb926d8 Revert "Remove preference to aggregate reblogs in home/list feeds (#18112)"
This reverts commit af396fa35f.
2022-08-28 11:31:39 +02:00
Claire
2a7538aeed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
Claire
077183a121 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
Eugen Rochko
ecddc06474 Change "Allow trends without prior review" setting to include statuses (#17977)
* Change "Allow trends without prior review" setting to include posts

* Fix i18n-tasks
2022-08-28 04:00:39 +02:00
Eugen Rochko
546672e292
Change "Allow trends without prior review" setting to include statuses (#17977)
* Change "Allow trends without prior review" setting to include posts

* Fix i18n-tasks
2022-08-28 04:00:39 +02:00
Eugen Rochko
4207f3d8fc Change search API to be accessible without being logged in (#18963)
But with the resolve option turned off
2022-08-28 03:45:19 +02:00
Eugen Rochko
c57907737a
Change search API to be accessible without being logged in (#18963)
But with the resolve option turned off
2022-08-28 03:45:19 +02:00
Eugen Rochko
7c8bba150b Change following and followers API to be accessible without being logged in (#18964) 2022-08-28 03:45:07 +02:00
Eugen Rochko
c99c106ef0
Change following and followers API to be accessible without being logged in (#18964) 2022-08-28 03:45:07 +02:00
Eugen Rochko
e7cc67d505 Add admin API for managing e-mail domain blocks (#19066) 2022-08-28 03:37:55 +02:00
Eugen Rochko
2a7766dcc9
Add admin API for managing e-mail domain blocks (#19066) 2022-08-28 03:37:55 +02:00
Eugen Rochko
a0bb5674d9 Add admin API for managing canonical e-mail blocks (#19067) 2022-08-28 03:31:54 +02:00
Eugen Rochko
c556c3a0d1
Add admin API for managing canonical e-mail blocks (#19067) 2022-08-28 03:31:54 +02:00
Eugen Rochko
71f59e78b8 Add admin API for managing IP blocks (#19065) 2022-08-27 20:56:47 +02:00
Eugen Rochko
b399d79545
Add admin API for managing IP blocks (#19065) 2022-08-27 20:56:47 +02:00
Claire
a24c6e5b3d Fix crash when adding a new filter (#18894)
Fixes #18742
2022-08-27 17:41:20 +02:00
Claire
ff19dad5a0
Fix crash when adding a new filter (#18894)
Fixes #18742
2022-08-27 17:41:20 +02:00
Shlee
db8125a1b3 Update docker-compose.yml (#19063) 2022-08-27 17:40:46 +02:00
Shlee
159b4edeef
Update docker-compose.yml (#19063) 2022-08-27 17:40:46 +02:00
Jeong Arm
c3ee35282d Fix react warning on notifications column (#1832) 2022-08-27 15:17:27 +02:00
Jeong Arm
54d9a9c18a
Fix react warning on notifications column (#1832) 2022-08-27 15:17:27 +02:00
Claire
8aaa9a7595 Fix incorrect and slow cache invalidation in ClearDomainMediaService (#19062)
Fixes #19060
2022-08-27 00:45:54 +02:00
Claire
c7147bab90
Fix incorrect and slow cache invalidation in ClearDomainMediaService (#19062)
Fixes #19060
2022-08-27 00:45:54 +02:00
Shlee
708e3b3992 Add rel="noopener" to links to remote profiles (#19014)
* Update timeline_hint.js

* Update timeline_hint.js
2022-08-26 02:12:46 +02:00
Shlee
1fac99e842
Add rel="noopener" to links to remote profiles (#19014)
* Update timeline_hint.js

* Update timeline_hint.js
2022-08-26 02:12:46 +02:00
Eugen Rochko
218654bf07 Fix "select all matching items" being offered when all items are on the page (#19054) 2022-08-26 02:11:23 +02:00
Eugen Rochko
1d84cbeaab
Fix "select all matching items" being offered when all items are on the page (#19054) 2022-08-26 02:11:23 +02:00
Eugen Rochko
dd5b90e4f2 Remove preference to aggregate reblogs in home/list feeds (#18112) 2022-08-25 23:38:36 +02:00