156c6ea36c
Fix position of “expand” icon in media modal on glitch-soc ( #1838 )
2022-08-31 16:23:10 +02:00
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
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
90917b305a
Fix WebUI error in development mode ( #19078 )
...
Caused by using JSX features without importing React
2022-08-29 10:02:40 +02:00
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
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
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
215738bb3c
Merge pull request #1833 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-08-28 13:27:17 +02:00
54ae7a221e
[Glitch] Replace to `workbox-webpack-plugin` from `offline-plugin`
...
Port 81e1cc5fec
2022-08-28 11:41:21 +02:00
6c7bb926d8
Revert "Remove preference to aggregate reblogs in home/list feeds ( #18112 )"
...
This reverts commit af396fa35f
2022-08-28 11:31:39 +02:00
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
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
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
c99c106ef0
Change following and followers API to be accessible without being logged in ( #18964 )
2022-08-28 03:45:07 +02:00
2a7766dcc9
Add admin API for managing e-mail domain blocks ( #19066 )
2022-08-28 03:37:55 +02:00
c556c3a0d1
Add admin API for managing canonical e-mail blocks ( #19067 )
2022-08-28 03:31:54 +02:00
b399d79545
Add admin API for managing IP blocks ( #19065 )
2022-08-27 20:56:47 +02:00
ff19dad5a0
Fix crash when adding a new filter ( #18894 )
...
Fixes #18742
2022-08-27 17:41:20 +02:00
159b4edeef
Update docker-compose.yml ( #19063 )
2022-08-27 17:40:46 +02:00
54d9a9c18a
Fix react warning on notifications column ( #1832 )
2022-08-27 15:17:27 +02:00
c7147bab90
Fix incorrect and slow cache invalidation in ClearDomainMediaService ( #19062 )
...
Fixes #19060
2022-08-27 00:45:54 +02:00
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
1d84cbeaab
Fix "select all matching items" being offered when all items are on the page ( #19054 )
2022-08-26 02:11:23 +02:00
af396fa35f
Remove preference to aggregate reblogs in home/list feeds ( #18112 )
2022-08-25 23:38:36 +02:00
0b3e4fd5de
Remove digest e-mails ( #17985 )
...
* Remove digest e-mails
* Remove digest-related code
2022-08-25 23:38:22 +02:00
5b0e8cc92b
Add ability to select all accounts matching search for batch actions ( #19053 )
2022-08-25 23:33:34 +02:00
d696f729f1
Add meta tag for official iOS app ( #16599 )
2022-08-25 23:27:10 +02:00
3c79ccb7e3
Bump addressable from 2.8.0 to 2.8.1 ( #19033 )
...
Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.8.0...addressable-2.8.1 )
---
updated-dependencies:
- dependency-name: addressable
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-08-26 03:57:41 +09:00
c36262c914
Bump oj from 3.13.20 to 3.13.21 ( #19031 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.20 to 3.13.21.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.13.20...v3.13.21 )
---
updated-dependencies:
- dependency-name: oj
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-08-26 03:57:01 +09:00
0396acf39e
Add audit log entries for user roles ( #19040 )
...
* Refactor audit log schema
* Add audit log entries for user roles
2022-08-25 20:39:40 +02:00
99aed9069d
Bump puma from 5.6.4 to 5.6.5 ( #19042 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.6.4 to 5.6.5.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.6.4...v5.6.5 )
---
updated-dependencies:
- dependency-name: puma
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-08-25 20:10:43 +02:00
81e1cc5fec
Replace to `workbox-webpack-plugin` from `offline-plugin` ( #18409 )
2022-08-25 20:10:01 +02:00
978dd7e73c
Merge pull request #1830 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-08-25 19:30:24 +02:00
d99f91bceb
[Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
...
Port 55bef1e34f
2022-08-25 18:19:09 +02:00
43a1bfd05d
[Glitch] Fix “Filter this post” potentially listing deleted filters
...
Port 2cae5f5b8d
2022-08-25 18:18:34 +02:00
3ff340c790
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-25 17:49:14 +02:00
55bef1e34f
Fix quickly switching notification filters resulting in empty or incorrect list ( #19052 )
...
Follow-up to #18960
The aforementioned PR fixed an issue in which switching notification filters
while notifications were loading prevented the query for the new filter from
running, but another issue remained: if the first query completed after the
second one, its results would override the second one, thus leading to the
same issue.
This commit cancels the first request if it is still running, before issuing
the second one.
2022-08-25 17:36:54 +02:00
2cae5f5b8d
Fix “Filter this post” potentially listing deleted filters ( #19051 )
2022-08-25 17:36:35 +02:00
63adef2021
Change wording of a few filter-related strings ( #19050 )
...
Follow-up on #18945 addressing review comments
2022-08-25 17:36:01 +02:00
acc580fb7d
Merge pull request #1829 from ClearlyClaire/glitch-soc/merge-upstream
...
Port UI filter changes from upstream
2022-08-25 14:12:44 +02:00
3efa8da2d6
New Crowdin updates ( #18972 )
...
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Uyghur)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Dutch)
* New translations en.json (Portuguese)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Danish)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.json (Catalan)
* New translations en.json (Hungarian)
* New translations en.json (Slovenian)
* New translations en.json (Galician)
* New translations en.json (Greek)
* New translations en.json (Polish)
* New translations en.json (Turkish)
* New translations devise.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* New translations en.json (Albanian)
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Icelandic)
* New translations en.json (Latvian)
* New translations en.json (Spanish)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Ido)
* New translations en.json (Russian)
* New translations en.json (Vietnamese)
* New translations en.yml (Esperanto)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.json (Thai)
* New translations en.json (Russian)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Korean)
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Albanian)
* New translations en.yml (Korean)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Portuguese)
* New translations en.yml (Slovenian)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Italian)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Georgian)
* New translations en.yml (Armenian)
* New translations en.yml (Spanish)
* New translations en.yml (Japanese)
* New translations en.yml (German)
* New translations en.yml (Russian)
* New translations en.yml (Slovak)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Romanian)
* New translations en.yml (French)
* New translations en.yml (Afrikaans)
* New translations en.yml (Hungarian)
* New translations en.yml (Arabic)
* New translations en.yml (Bulgarian)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Frisian)
* New translations en.yml (Basque)
* New translations en.yml (Irish)
* New translations en.yml (Hebrew)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Corsican)
* New translations en.yml (Breton)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Ido)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Sinhala)
* New translations en.yml (Malayalam)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Latvian)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Hindi)
* New translations en.yml (Tatar)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Swedish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Polish)
* New translations en.yml (Slovenian)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Polish)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Spanish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Vietnamese)
* New translations en.yml (Icelandic)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-08-25 19:40:19 +09:00
2b03e21d36
Fix glitch-soc-specific timeline filtering logic
2022-08-25 11:53:16 +02:00
3844f15da0
Remove obsolete filter local settings
2022-08-25 09:52:13 +02:00
0b733ca790
[Glitch] Add ability to filter individual posts
...
Port 50487db122
2022-08-25 09:52:13 +02:00
28f0dfc0b4
[Glitch] Fix case where boolean was passed to onFilter on StatusActionBar
...
Port 66b8abf218
2022-08-25 09:52:13 +02:00
93b6ad2c6c
[Glitch] Remove dead code in WebUI filtering code
...
Port a233a9bfb5
2022-08-25 09:52:13 +02:00
bbafe28fbc
[Glitch] Fix reblogged statuses being erroneously shown as filtered
...
Port 3c24f19afe
2022-08-25 09:52:13 +02:00
a15fe32e61
[Glitch] Revamp post filtering system
...
Port front-end changes from 02851848e9
2022-08-25 09:40:45 +02:00
4be626734d
Merge pull request #1827 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-08-25 06:15:55 +02:00
448ed92f76
[Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
...
Port afb8bc97d0
2022-08-25 05:16:43 +02:00
Claire
luzpaz
Yamagishi Kazutoshi
Eugen Rochko
Shlee
Jeong Arm
dependabot[bot]
Takeshi Umeda