Plastikmensch
21fed4601f
Fix CW icon being on wrong side in app settings in RTL languages ( #2324 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-23 17:19:09 +02:00
Plastikmensch
51311c1978
Fix CW icon being on wrong side in app settings in RTL languages ( #2324 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-23 17:19:09 +02:00
Jeong Arm
15561ace1b
Fix relationship-tag background color ( #2322 )
2023-07-23 14:40:37 +02:00
Jeong Arm
944c29033d
Fix relationship-tag background color ( #2322 )
2023-07-23 14:40:37 +02:00
github-actions[bot]
d6e767559c
New Crowdin translations ( #2319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-23 14:31:38 +02:00
github-actions[bot]
9ec43107f2
New Crowdin translations ( #2319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-23 14:31:38 +02:00
Claire
cf9d76d4a1
Fix glitch local settings navigation items not being proper buttons ( #2320 )
2023-07-23 14:31:16 +02:00
Claire
49767d20bd
Fix glitch local settings navigation items not being proper buttons ( #2320 )
2023-07-23 14:31:16 +02:00
Claire
1eed0d1bb7
Annotate doodle parameters to please eslint ( #2321 )
2023-07-23 14:31:05 +02:00
Claire
dd09535bda
Annotate doodle parameters to please eslint ( #2321 )
2023-07-23 14:31:05 +02:00
Claire
b255abbb75
Fix incorrect connect timeout in outgoing requests ( #26116 )
2023-07-22 20:42:31 +02:00
Claire
0078e7e760
Fix incorrect connect timeout in outgoing requests ( #26116 )
2023-07-22 20:42:31 +02:00
Claire
8933e41b19
Fix “Open in advanced web interface” being shown on mobile view ( #2318 )
...
Fixes #2307
2023-07-22 17:22:04 +02:00
Claire
52500965cc
Fix “Open in advanced web interface” being shown on mobile view ( #2318 )
...
Fixes #2307
2023-07-22 17:22:04 +02:00
github-actions[bot]
9279c388c5
New Crowdin translations ( #2317 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-22 09:53:26 +02:00
github-actions[bot]
9a45198ab0
New Crowdin translations ( #2317 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-22 09:53:26 +02:00
наб
1c6232f0da
Favourits -> Favorites ( #26109 )
2023-07-21 21:13:20 +02:00
наб
1b4cf0eba0
Favourits -> Favorites ( #26109 )
2023-07-21 21:13:20 +02:00
gunchleoc
257fadcec4
Replace 'favourite' by 'favorite' for American English ( #26009 )
2023-07-21 19:09:13 +02:00
gunchleoc
217ef7f2af
Replace 'favourite' by 'favorite' for American English ( #26009 )
2023-07-21 19:09:13 +02:00
Claire
4cf27100c0
Use username as display name for suspended users or users with blank display names ( #25276 )
2023-07-21 13:20:53 +02:00
Claire
14fad60384
Use username as display name for suspended users or users with blank display names ( #25276 )
2023-07-21 13:20:53 +02:00
Trevor Wolf
e1c5bed7b4
change focus ui for keyboard only input ( #25935 )
2023-07-21 13:20:14 +02:00
Trevor Wolf
59478a1b46
change focus ui for keyboard only input ( #25935 )
2023-07-21 13:20:14 +02:00
Claire
70b4eb5baa
Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )
2023-07-21 13:14:30 +02:00
Claire
e4ea80d808
Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )
2023-07-21 13:14:30 +02:00
Claire
f3127af389
Clean up unused application records ( #24871 )
2023-07-21 13:13:16 +02:00
Claire
144a406d33
Clean up unused application records ( #24871 )
2023-07-21 13:13:16 +02:00
Claire
d6fae56d3f
Fix replica being used even if not explicitly defined ( #26074 )
2023-07-21 11:30:53 +02:00
Claire
5cbc402687
Fix replica being used even if not explicitly defined ( #26074 )
2023-07-21 11:30:53 +02:00
Renaud Chaput
f31a9bd78e
Fix the crossorigin attribute ( #26096 )
2023-07-21 11:14:26 +02:00
Renaud Chaput
42698b4c5c
Fix the crossorigin attribute ( #26096 )
2023-07-21 11:14:26 +02:00
github-actions[bot]
356f2fc4c5
New Crowdin translations ( #2314 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-21 09:26:08 +02:00
github-actions[bot]
e7cb6c6c44
New Crowdin translations ( #2314 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-21 09:26:08 +02:00
Claire
58b52b7a33
Add stricter protocol fields validation for accounts ( #25937 )
2023-07-20 18:23:48 +02:00
Claire
1e3b19230a
Add stricter protocol fields validation for accounts ( #25937 )
2023-07-20 18:23:48 +02:00
Matt Jankowski
549518a1a2
Fix haml-lint Rubocop Lint/UnusedBlockArguments cop ( #26039 )
2023-07-20 17:03:39 +02:00
Matt Jankowski
a5842df123
Fix haml-lint Rubocop Lint/UnusedBlockArguments cop ( #26039 )
2023-07-20 17:03:39 +02:00
Matt Jankowski
a4f826d4a8
Fix haml-lint Rubocop Style/NumericPredicate cop ( #26040 )
2023-07-20 15:13:06 +02:00
Matt Jankowski
df05ece265
Fix haml-lint Rubocop Style/NumericPredicate cop ( #26040 )
2023-07-20 15:13:06 +02:00
Stanislas Signoud
cf170761e7
Fix a missing redirection on getting-started in multi column mode ( #26070 )
2023-07-20 14:46:02 +02:00
Stanislas Signoud
586b1c9dca
Fix a missing redirection on getting-started in multi column mode ( #26070 )
2023-07-20 14:46:02 +02:00
Misty De Méo
9e19cfdb05
Paperclip: add support for Azure blob storage ( #23607 )
2023-07-19 09:02:49 +02:00
Misty De Méo
b848ba3867
Paperclip: add support for Azure blob storage ( #23607 )
2023-07-19 09:02:49 +02:00
Christian Schmidt
540cced981
Wrong count in response when removing favourite/reblog ( #24365 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-19 09:02:30 +02:00
Christian Schmidt
4c18928a93
Wrong count in response when removing favourite/reblog ( #24365 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-19 09:02:30 +02:00
Matt Jankowski
4be315f0ae
Cleanup unused portions of statuses/status partial ( #26045 )
2023-07-19 08:44:16 +02:00
Matt Jankowski
6edd404482
Cleanup unused portions of statuses/status partial ( #26045 )
2023-07-19 08:44:16 +02:00
Claire
d315c684e4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream entirely refactored this, while we changed the docker repository
to upload to and disabled the “latest” tag.
Applied the repository change to `.github/workflows/build-*.yml`, as well
as disabling native ARMv64 builds.
- `README.md`:
We have a completely different README.
Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
Upstream refactored, we had an extra item.
Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
Upstream deleted this file, to be replaced by a request spec at
`spec/requests/api/v1/timelines/public_spec.rb`.
We had an extra bit about enabling the public timelines because we have
different defaults than upstream.
Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
Claire
0092fe50ac
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream entirely refactored this, while we changed the docker repository
to upload to and disabled the “latest” tag.
Applied the repository change to `.github/workflows/build-*.yml`, as well
as disabling native ARMv64 builds.
- `README.md`:
We have a completely different README.
Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
Upstream refactored, we had an extra item.
Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
Upstream deleted this file, to be replaced by a request spec at
`spec/requests/api/v1/timelines/public_spec.rb`.
We had an extra bit about enabling the public timelines because we have
different defaults than upstream.
Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
Claire
4c50463116
New Crowdin updates ( #2306 )
...
* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (French, Quebec)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
2023-07-19 07:05:33 +02:00
Claire
111686c38b
New Crowdin updates ( #2306 )
...
* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (French, Quebec)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
2023-07-19 07:05:33 +02:00
github-actions[bot]
33a41a214a
New Crowdin Translations (automated) ( #26054 )
...
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 21:13:25 +02:00
github-actions[bot]
47832a1ac0
New Crowdin Translations (automated) ( #26054 )
...
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 21:13:25 +02:00
Claire
e77bbcc463
Change request timeout handling to use a longer deadline ( #26055 )
2023-07-18 20:51:20 +02:00
Claire
ff41e5426a
Change request timeout handling to use a longer deadline ( #26055 )
2023-07-18 20:51:20 +02:00
Matt Jankowski
630744563f
Fix haml-lint InstanceVariables rule for auth/registrations/edit ( #26061 )
2023-07-18 18:10:52 +02:00
Matt Jankowski
6657695ec6
Fix haml-lint InstanceVariables rule for auth/registrations/edit ( #26061 )
2023-07-18 18:10:52 +02:00
Matt Jankowski
d2e79d0df9
Fix haml-lint Rubocop Style/SymbolProc cop ( #26059 )
2023-07-18 17:43:04 +02:00
Matt Jankowski
f6dda59e5d
Fix haml-lint Rubocop Style/SymbolProc cop ( #26059 )
2023-07-18 17:43:04 +02:00
Matt Jankowski
fb30fb4d89
Fix haml-lint Rubocop Style/WordArray cop ( #26058 )
2023-07-18 17:25:41 +02:00
Matt Jankowski
39d9804119
Fix haml-lint Rubocop Style/WordArray cop ( #26058 )
2023-07-18 17:25:41 +02:00
Matt Jankowski
359255c799
Fix haml-lint rubocop style negation cops ( #26057 )
2023-07-18 17:02:02 +02:00
Matt Jankowski
b3f48089e6
Fix haml-lint rubocop style negation cops ( #26057 )
2023-07-18 17:02:02 +02:00
Matt Jankowski
b9c408b344
Fix haml-lint ConsecutiveSilentScripts rule ( #26043 )
2023-07-18 09:25:37 +02:00
Matt Jankowski
e663e6d2c2
Fix haml-lint ConsecutiveSilentScripts rule ( #26043 )
2023-07-18 09:25:37 +02:00
Claire
87d2e00e66
[Glitch] Fix “Back” button sometimes redirecting out of Mastodon
...
Port 80fa2baa3d
2023-07-17 19:12:09 +02:00
Claire
0c45bed333
[Glitch] Fix “Back” button sometimes redirecting out of Mastodon
...
Port a442a1d1c6
2023-07-17 19:12:09 +02:00
Claire
cb70bb8665
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Claire
c04f2d0cf7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Matt Jankowski
4bbb68d888
Fix haml-lint Rubocop Style/SlicingWithRange cop ( #25947 )
2023-07-17 18:18:13 +02:00
Matt Jankowski
4207c95d4f
Fix haml-lint Rubocop Style/SlicingWithRange cop ( #25947 )
2023-07-17 18:18:13 +02:00
Claire
80fa2baa3d
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
2023-07-17 17:32:46 +02:00
Claire
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
2023-07-17 17:32:46 +02:00
Matt Jankowski
65d52af3e7
Fix haml-lint Rubocop Style/StringLiterals cop ( #25948 )
2023-07-17 16:57:18 +02:00
Matt Jankowski
d0f00206dc
Fix haml-lint Rubocop Style/StringLiterals cop ( #25948 )
2023-07-17 16:57:18 +02:00
Jeong Arm
90a68ac5b5
Check if json body is null on Activitipub::ProcessingWorker ( #26021 )
2023-07-17 15:51:30 +02:00
Jeong Arm
664b0ca8cb
Check if json body is null on Activitipub::ProcessingWorker ( #26021 )
2023-07-17 15:51:30 +02:00
Matt Jankowski
a522b40507
Fix haml-lint Rubocop Style/MinMaxComparison cop ( #25974 )
2023-07-17 15:38:04 +02:00
Matt Jankowski
bd33efdf16
Fix haml-lint Rubocop Style/MinMaxComparison cop ( #25974 )
2023-07-17 15:38:04 +02:00
Matt Jankowski
af05a88ea8
Fix haml-lint Rubocop lambda cop ( #25946 )
2023-07-17 15:07:29 +02:00
Matt Jankowski
361dd43235
Fix haml-lint Rubocop lambda cop ( #25946 )
2023-07-17 15:07:29 +02:00
Matt Jankowski
84c5baf149
Fix haml lint Rubocop Style/RedundantStringCoercion cop ( #25975 )
2023-07-17 14:08:56 +02:00
Matt Jankowski
5096deb818
Fix haml lint Rubocop Style/RedundantStringCoercion cop ( #25975 )
2023-07-17 14:08:56 +02:00
Claire
e8631f8e90
Remove unfollowed hashtag posts from home feed ( #26028 )
2023-07-17 13:56:28 +02:00
Claire
943f27f437
Remove unfollowed hashtag posts from home feed ( #26028 )
2023-07-17 13:56:28 +02:00
Michael Stanclift
df2d18c52a
[Glitch] Fix for "follows you" indicator in light web UI not readable
...
Port 40e20d687a
2023-07-17 13:01:47 +02:00
Michael Stanclift
12e7f5fabd
[Glitch] Fix for "follows you" indicator in light web UI not readable
...
Port 97ce47e451
2023-07-17 13:01:47 +02:00
Terence Eden
d2500a89fc
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port 82b0cfce7e
2023-07-17 13:01:07 +02:00
Terence Eden
27f7e5b0f3
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port b923a4c755
2023-07-17 13:01:07 +02:00
Claire
0ef1efbe71
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-17 12:52:15 +02:00
Claire
c943f17b1b
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-17 12:52:15 +02:00
Claire
a75c14ffc0
Fix ArgumentError in mailers when a user's timezone is blank ( #26025 )
2023-07-17 12:10:50 +02:00
Claire
c667fc5a4a
Fix ArgumentError in mailers when a user's timezone is blank ( #26025 )
2023-07-17 12:10:50 +02:00
Michael Stanclift
40e20d687a
Fix for "follows you" indicator in light web UI not readable ( #25993 )
2023-07-17 11:51:00 +02:00
Michael Stanclift
97ce47e451
Fix for "follows you" indicator in light web UI not readable ( #25993 )
2023-07-17 11:51:00 +02:00
Eugen Rochko
45a7291d2c
Fix not actually connecting to the configured replica ( #25977 )
2023-07-17 08:26:52 +02:00
Eugen Rochko
26e522ac55
Fix not actually connecting to the configured replica ( #25977 )
2023-07-17 08:26:52 +02:00
Claire
84c0f759d3
Reduce dropdown menu margin and padding ( #2301 )
...
* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency
2023-07-16 18:23:07 +02:00
Claire
23197cebce
Reduce dropdown menu margin and padding ( #2301 )
...
* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency
2023-07-16 18:23:07 +02:00
Terence Eden
82b0cfce7e
Prevent split line between icon and number on reposts & favourites ( #26004 )
2023-07-16 10:06:33 +02:00
Terence Eden
b923a4c755
Prevent split line between icon and number on reposts & favourites ( #26004 )
2023-07-16 10:06:33 +02:00
Claire
37e01f530b
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
...
Port 528a8d0cbe
2023-07-14 13:01:31 +02:00
Claire
c45a965bf7
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
...
Port 71db616fed
2023-07-14 13:01:31 +02:00
Stanislas Signoud
160af03565
[Glitch] Change links in multi-column mode so tabs are open in single-column mode
...
Port 663e9484e2
2023-07-14 13:01:31 +02:00
Stanislas Signoud
9bd012b7cb
[Glitch] Change links in multi-column mode so tabs are open in single-column mode
...
Port 5fad7bd58a
2023-07-14 13:01:31 +02:00
Claire
6a458a9baf
Remove layout glitch-soc settings
2023-07-14 13:01:31 +02:00
Claire
0d61985713
Remove layout glitch-soc settings
2023-07-14 13:01:31 +02:00
Eugen Rochko
37e80ae4c8
[Glitch] Fix dropdowns being disabled for logged out users in web UI
...
Port 3df957104a
2023-07-14 13:01:31 +02:00
Eugen Rochko
f0d3267fbf
[Glitch] Fix dropdowns being disabled for logged out users in web UI
...
Port a8edbcf963
2023-07-14 13:01:31 +02:00
Claire
8d5e9e02e9
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 618eb10d18
2023-07-13 22:42:15 +02:00
Claire
a98b5c2246
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 41f65edb21
2023-07-13 22:42:15 +02:00
Claire
efa6d4416c
Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
Claire
d9adda1a99
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
Plastikmensch
7714478818
Fix notifications not loading when slow mode active ( #2292 )
...
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in f1de5093fb
2023-07-13 21:36:15 +02:00
Plastikmensch
470ded3687
Fix notifications not loading when slow mode active ( #2292 )
...
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in e91bf82083
2023-07-13 21:36:15 +02:00
Claire
b27efe7c22
Fix home timeline's regexp field
2023-07-13 19:33:58 +02:00
Claire
e271d018b7
Fix home timeline's regexp field
2023-07-13 19:33:58 +02:00
Claire
528a8d0cbe
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
2023-07-13 17:59:15 +02:00
Claire
71db616fed
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
2023-07-13 17:59:15 +02:00
Stanislas Signoud
663e9484e2
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
2023-07-13 17:18:09 +02:00
Stanislas Signoud
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
2023-07-13 17:18:09 +02:00
Claire
618eb10d18
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
Claire
41f65edb21
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
Matt Jankowski
ecf7aa0fb3
Refactor Status.tagged_with_all for brakeman SQL injection warning ( #25941 )
2023-07-13 15:52:37 +02:00
Matt Jankowski
644c5fddd8
Refactor Status.tagged_with_all for brakeman SQL injection warning ( #25941 )
2023-07-13 15:52:37 +02:00
Claire
c1bd8248c4
[Glitch] Fix follow link style in embeds
...
Port fc6d89573c
2023-07-13 14:52:36 +02:00
Claire
98e5589ed4
[Glitch] Fix follow link style in embeds
...
Port 5a3f174d56
2023-07-13 14:52:36 +02:00
Renaud Chaput
e5f09f145a
[Glitch] Upgrade to typescript-eslint v6
...
Port a09ed92a77
2023-07-13 14:51:24 +02:00
Renaud Chaput
18f55567b0
[Glitch] Upgrade to typescript-eslint v6
...
Port a7253075d1
2023-07-13 14:51:24 +02:00
Claire
90a0f97140
Fix incorrect types in DisplayName
2023-07-13 14:51:24 +02:00
Claire
3be4f4266d
Fix incorrect types in DisplayName
2023-07-13 14:51:24 +02:00
Claire
3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Claire
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Renaud Chaput
0e07aadfda
[Glitch] Convert Home timeline components to Typescript
...
Port f8302ec345
2023-07-13 14:21:08 +02:00
Renaud Chaput
447ab7ab24
[Glitch] Convert Home timeline components to Typescript
...
Port a75138d073
2023-07-13 14:21:08 +02:00
Claire
794ee87771
Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream
2023-07-13 14:02:28 +02:00
Claire
177497b367
Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream
2023-07-13 14:02:28 +02:00
Claire
385eb83893
[Glitch] Upgrade to Prettier 3
...
Port 9094a65fd4
2023-07-13 14:01:40 +02:00
Claire
0870c7c95e
[Glitch] Upgrade to Prettier 3
...
Port 73b64b8917
2023-07-13 14:01:40 +02:00
Claire
268e955aef
Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
Claire
95a1fde6b6
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
Claire
c6212d89f8
Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
Claire
2d09653d50
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
Claire
fc6d89573c
Fix follow link style in embeds ( #25965 )
2023-07-13 12:58:56 +02:00
Claire
5a3f174d56
Fix follow link style in embeds ( #25965 )
2023-07-13 12:58:56 +02:00
Renaud Chaput
a09ed92a77
Upgrade to typescript-eslint v6 ( #25904 )
2023-07-13 11:49:16 +02:00
Renaud Chaput
a7253075d1
Upgrade to typescript-eslint v6 ( #25904 )
2023-07-13 11:49:16 +02:00
renovate[bot]
789459cea3
Update dependency rubocop-rails to v2.20.1 ( #25493 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-07-13 11:44:02 +02:00
renovate[bot]
3ed9b55cb3
Update dependency rubocop-rails to v2.20.1 ( #25493 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-07-13 11:44:02 +02:00
Renaud Chaput
f8302ec345
Convert Home timeline components to Typescript ( #25583 )
2023-07-13 11:28:55 +02:00
Renaud Chaput
a75138d073
Convert Home timeline components to Typescript ( #25583 )
2023-07-13 11:28:55 +02:00
Renaud Chaput
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
Renaud Chaput
73b64b8917
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
Michael Stanclift
9e5862608f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
2023-07-13 11:12:51 +02:00
Michael Stanclift
063482a63f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
2023-07-13 11:12:51 +02:00
Nick Schonning
1b1f9dff10
Update rubocop to v1.54.1 ( #25627 )
2023-07-13 11:11:55 +02:00
Nick Schonning
1a6c2e450a
Update rubocop to v1.54.1 ( #25627 )
2023-07-13 11:11:55 +02:00
Matt Jankowski
5cdc196e44
Rails 7.0 update ( #25668 )
2023-07-13 09:36:07 +02:00
Matt Jankowski
ce43ed144c
Rails 7.0 update ( #25668 )
2023-07-13 09:36:07 +02:00
Claire
bd06bdf164
Fix various CSS issues
2023-07-12 19:13:31 +02:00
Claire
c2bfbf53a1
Fix various CSS issues
2023-07-12 19:13:31 +02:00
Eugen Rochko
8bc36b5084
Change markers API to use a replica ( #25851 )
2023-07-12 18:57:40 +02:00
Eugen Rochko
8d0c69529a
Change markers API to use a replica ( #25851 )
2023-07-12 18:57:40 +02:00
Eugen Rochko
315002c1be
Change notifications API to use a replica ( #25874 )
2023-07-12 17:06:00 +02:00
Eugen Rochko
fdc3ff7c2d
Change notifications API to use a replica ( #25874 )
2023-07-12 17:06:00 +02:00
Claire
1399e9d863
Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
Claire
9ae60f8738
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
Stanislas Signoud
3890b5c5fd
[Glitch] Fix sounds not being loaded from assets host
...
Port 01b9ee2b81
2023-07-12 16:00:20 +02:00
Stanislas Signoud
ec95f62cb4
[Glitch] Fix sounds not being loaded from assets host
...
Port 1392f31ed8
2023-07-12 16:00:20 +02:00
Claire
9af6f6db1a
Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
2023-07-12 15:54:58 +02:00
Claire
2aadebc769
Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
2023-07-12 15:54:58 +02:00
Trevor Wolf
7e3d2d3b4f
[Glitch] fix buttons showing inconsistent styles
...
Port 29c29410d2
2023-07-12 15:50:56 +02:00
Trevor Wolf
15f6fa8d47
[Glitch] fix buttons showing inconsistent styles
...
Port ea10febd25
2023-07-12 15:50:56 +02:00
Claire
05c57b674f
[Glitch] Fix filters not applying to explore tab
...
Port 047d44611b
2023-07-12 15:48:13 +02:00
Claire
c3af91ce48
[Glitch] Fix filters not applying to explore tab
...
Port af54bf52c8
2023-07-12 15:48:13 +02:00
Claire
e91c424b7c
[Glitch] Add forward_to_domains parameter to POST /api/v1/reports
...
Port 66693177ff
2023-07-12 15:47:43 +02:00
Claire
c699dc0908
[Glitch] Add forward_to_domains parameter to POST /api/v1/reports
...
Port c27b82a437
2023-07-12 15:47:43 +02:00
Claire
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
Claire
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
Eugen Rochko
70c0ba7e5b
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 7496c1b655
2023-07-12 15:43:10 +02:00
Eugen Rochko
71f8c45c18
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 338a0e70cc
2023-07-12 15:43:10 +02:00
Claire
54b6b035a7
Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
2023-07-12 15:38:35 +02:00
Claire
dd0002e1fe
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
2023-07-12 15:38:35 +02:00
Eugen Rochko
c2a5484268
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port 9f5eab728b
2023-07-12 15:34:12 +02:00
Eugen Rochko
c250b37f0a
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port ceeb2b8c41
2023-07-12 15:34:12 +02:00
Claire
63ca7222d6
Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
Claire
82eebd0482
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
fusagiko / takayamaki
f9042a3d40
[Glitch] simplify counters
...
Port 4106a801a0
2023-07-12 15:18:41 +02:00
fusagiko / takayamaki
9e311f95aa
[Glitch] simplify counters
...
Port e0d230fb37
2023-07-12 15:18:41 +02:00
alfe
4781c1f7eb
[Glitch] Rewrite <ShortNumber /> as FC and TS
...
Port b5c5e2bf36
2023-07-12 15:17:18 +02:00
alfe
5b9e43187c
[Glitch] Rewrite <ShortNumber /> as FC and TS
...
Port 20e85c0e83
2023-07-12 15:17:18 +02:00
Renaud Chaput
5a6f556541
[Glitch] Convert <DismissableBanner> to Typescript
...
Port 9203ab410c
2023-07-12 15:09:14 +02:00
Renaud Chaput
55ea79165a
[Glitch] Convert <DismissableBanner> to Typescript
...
Port 4534498a8e
2023-07-12 15:09:14 +02:00
Renaud Chaput
5cd9e85fbb
[Glitch] Fix translate button position
...
Port 7ff696d848
2023-07-12 15:05:24 +02:00
Renaud Chaput
0bfa4a990f
[Glitch] Fix translate button position
...
Port 9f078e238d
2023-07-12 15:05:24 +02:00
Claire
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
a64181f28b
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
Claire
67055b0343
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
Matt Jankowski
1b1ecf8ee2
Refactor Trends::Query to avoid brakeman sql injection warnings ( #25881 )
2023-07-12 14:19:20 +02:00
Matt Jankowski
1ef014802b
Refactor Trends::Query to avoid brakeman sql injection warnings ( #25881 )
2023-07-12 14:19:20 +02:00
Renaud Chaput
8d20afe0aa
Update Stylelint ( #25819 )
2023-07-12 12:31:23 +02:00
Renaud Chaput
ecd8e0d612
Update Stylelint ( #25819 )
2023-07-12 12:31:23 +02:00
Matt Jankowski
08421e7b90
Fix Naming/MemoizedInstanceVariableName cop ( #25928 )
2023-07-12 10:08:51 +02:00
Matt Jankowski
2e1391fdd2
Fix Naming/MemoizedInstanceVariableName cop ( #25928 )
2023-07-12 10:08:51 +02:00
Matt Jankowski
399a738c85
Fix Naming/AccessorMethodName cop ( #25924 )
2023-07-12 10:03:19 +02:00
Matt Jankowski
5134fc65e2
Fix Naming/AccessorMethodName cop ( #25924 )
2023-07-12 10:03:19 +02:00
Matt Jankowski
d98717ceef
Fix Style/SlicingWithRange cop ( #25923 )
2023-07-12 10:03:06 +02:00
Matt Jankowski
b8b2470cf8
Fix Style/SlicingWithRange cop ( #25923 )
2023-07-12 10:03:06 +02:00
Nick Schonning
96a8aa32ad
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
Nick Schonning
1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
Stanislas Signoud
01b9ee2b81
Fix sounds not being loaded from assets host ( #25931 )
2023-07-12 03:02:32 +02:00
Stanislas Signoud
1392f31ed8
Fix sounds not being loaded from assets host ( #25931 )
2023-07-12 03:02:32 +02:00
Stanislas Signoud
d36859f37e
Use invariant colors on notification toasts ( #25919 )
2023-07-11 23:30:21 +02:00
Stanislas Signoud
ca955ada0b
Use invariant colors on notification toasts ( #25919 )
2023-07-11 23:30:21 +02:00
Trevor Wolf
29c29410d2
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
Trevor Wolf
ea10febd25
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
jsgoldstein
c6ac835588
Change searching with # to include account index ( #25638 )
2023-07-10 20:58:13 +02:00
jsgoldstein
99be47f8b9
Change searching with # to include account index ( #25638 )
2023-07-10 20:58:13 +02:00
Claire
047d44611b
Fix filters not applying to explore tab ( #25887 )
2023-07-10 19:33:07 +02:00
Claire
af54bf52c8
Fix filters not applying to explore tab ( #25887 )
2023-07-10 19:33:07 +02:00
Claire
de3b86a5f8
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
2023-07-10 18:42:19 +02:00
Claire
999c343946
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
2023-07-10 18:42:19 +02:00
Claire
66693177ff
Add forward_to_domains parameter to POST /api/v1/reports ( #25866 )
2023-07-10 18:26:56 +02:00
Claire
c27b82a437
Add forward_to_domains parameter to POST /api/v1/reports ( #25866 )
2023-07-10 18:26:56 +02:00
Matt Jankowski
482071a976
Refactor NotificationMailer to use parameterization ( #25718 )
2023-07-10 03:06:22 +02:00
Matt Jankowski
f3fca78756
Refactor NotificationMailer to use parameterization ( #25718 )
2023-07-10 03:06:22 +02:00
Eugen Rochko
896f4ef2f6
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
2023-07-10 03:06:09 +02:00
Eugen Rochko
a1f5188c8c
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
2023-07-10 03:06:09 +02:00
Eugen Rochko
b945f16ddf
Fix trend calculation working on too many items at a time ( #25835 )
2023-07-08 20:16:48 +02:00
Eugen Rochko
610cf6c371
Fix trend calculation working on too many items at a time ( #25835 )
2023-07-08 20:16:48 +02:00
Eugen Rochko
7496c1b655
Change label and design of sensitive and unavailable media in web UI ( #25712 )
2023-07-08 20:05:33 +02:00
Eugen Rochko
338a0e70cc
Change label and design of sensitive and unavailable media in web UI ( #25712 )
2023-07-08 20:05:33 +02:00
Matt Jankowski
6555c33503
Admin mailer parameterization ( #25759 )
2023-07-08 20:03:38 +02:00
Matt Jankowski
cf33028f35
Admin mailer parameterization ( #25759 )
2023-07-08 20:03:38 +02:00
Renaud Chaput
e75e734ac2
Remove unused missed_update state ( #25832 )
2023-07-08 20:02:14 +02:00
Renaud Chaput
41a505513f
Remove unused missed_update state ( #25832 )
2023-07-08 20:02:14 +02:00
Eugen Rochko
703ff75549
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Eugen Rochko
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Eugen Rochko
3df957104a
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
Eugen Rochko
a8edbcf963
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
Eugen Rochko
9f5eab728b
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
Eugen Rochko
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
Eugen Rochko
6894f5c114
Add forwarding of reported replies to servers being replied to ( #25341 )
2023-07-08 20:00:02 +02:00
Eugen Rochko
93e8a15415
Add forwarding of reported replies to servers being replied to ( #25341 )
2023-07-08 20:00:02 +02:00
Kurtis Rainbolt-Greene
a27f2686ca
First pass at multi-database for read replica using Rails native adapter ( #25693 )
...
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
2023-07-08 19:45:36 +02:00
Kurtis Rainbolt-Greene
e4cfe4b3db
First pass at multi-database for read replica using Rails native adapter ( #25693 )
...
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
2023-07-08 19:45:36 +02:00
Renaud Chaput
9203ab410c
Convert <DismissableBanner> to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
Renaud Chaput
4534498a8e
Convert <DismissableBanner> to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
alfe
b5c5e2bf36
Rewrite <ShortNumber /> as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
alfe
20e85c0e83
Rewrite <ShortNumber /> as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
fusagiko / takayamaki
4106a801a0
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
fusagiko / takayamaki
e0d230fb37
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
Renaud Chaput
7ff696d848
Fix translate button position ( #25807 )
2023-07-08 00:12:31 +02:00
Renaud Chaput
9f078e238d
Fix translate button position ( #25807 )
2023-07-08 00:12:31 +02:00
Ariadne Conill
65288d95b8
th: Merge gitea.treehouse.systems:mirrors/mastodon-glitch into merge-2023-07-07
2023-07-07 21:57:32 +00:00
Ariadne Conill
2829c732f6
th: Merge gitea.treehouse.systems:mirrors/mastodon-glitch into merge-2023-07-07
2023-07-07 21:56:29 +00:00
Claire
9ba89aeeb5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
2023-07-07 19:59:43 +02:00
Claire
b9aa228c54
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
2023-07-07 19:59:43 +02:00
Claire
9a0cbecd67
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
2023-07-07 18:10:17 +02:00
Claire
b6d173b459
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
2023-07-07 18:10:17 +02:00
Claire
0b9ced4b0c
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
Claire
94fbac77e7
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
Claire
4c1f5cd847
Fix incorrect secondary button size ( #2276 )
2023-07-07 09:50:06 +02:00
Claire
513078de7a
Fix incorrect secondary button size ( #2276 )
2023-07-07 09:50:06 +02:00
Kouhai
e8fd392a23
th: build more fast
2023-07-06 23:05:23 -07:00
Kouhai
1a7cf76661
th: fix js quote issue
2023-07-06 22:33:05 -07:00
Kouhai
234f7cc84e
th: Merge remote-tracking branch 'glitch/main'
...
fixes: CVE-2023-36459
fixes: CVE-2023-36460
fixes: CVE-2023-36461
fixes: CVE-2023-36462
fixes: GHSA-55j9-c3mp-6fcq
fixes: GHSA-9928-3cp5-93fm
fixes: GHSA-9pxv-6qvf-pjwc
fixes: GHSA-ccm4-vgcc-73hp
2023-07-06 12:12:21 -07:00
Claire
3581e4be49
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
Claire
ff7aae3037
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
Claire
dab0be5aed
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
Claire
610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
Claire
d7ed682130
Merge pull request from GHSA-9pxv-6qvf-pjwc
...
* Fix timeout handling of outbound HTTP requests
* Use CLOCK_MONOTONIC instead of Time.now
2023-07-06 15:06:23 +02:00
Claire
c5929798bf
Merge pull request from GHSA-9pxv-6qvf-pjwc
...
* Fix timeout handling of outbound HTTP requests
* Use CLOCK_MONOTONIC instead of Time.now
2023-07-06 15:06:23 +02:00
Claire
3445bdfa45
Merge pull request from GHSA-9928-3cp5-93fm
...
* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged
2023-07-06 15:05:05 +02:00
Claire
dc8f1fbd97
Merge pull request from GHSA-9928-3cp5-93fm
...
* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged
2023-07-06 15:05:05 +02:00
Claire
96dcfa9745
Merge pull request from GHSA-ccm4-vgcc-73hp
...
* Tighten allowed HTML in oEmbed-based preview cards
* Sanitize preview cards at render time
* Add `sandbox` attribute to preview card iframes
2023-07-06 15:03:33 +02:00
Claire
6d8e0fae3e
Merge pull request from GHSA-ccm4-vgcc-73hp
...
* Tighten allowed HTML in oEmbed-based preview cards
* Sanitize preview cards at render time
* Add `sandbox` attribute to preview card iframes
2023-07-06 15:03:33 +02:00
Eugen Rochko
3676bc46da
[Glitch] Fix regression of icon button colors in web UI
...
Port 12c6337c96
2023-07-05 13:31:26 +02:00
Eugen Rochko
c0fa85b8dd
[Glitch] Fix regression of icon button colors in web UI
...
Port 69e124e2ed
2023-07-05 13:31:26 +02:00
Trevor Wolf
fa02ad3b8c
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 5f31104e1f
2023-07-05 13:30:52 +02:00
Trevor Wolf
4719d88117
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 54cb679c19
2023-07-05 13:30:52 +02:00
Eugen Rochko
c66faebe43
[Glitch] Add button to see results for polls in web UI
...
Port 5b05451744
2023-07-05 12:42:24 +02:00
Eugen Rochko
a117c953d0
[Glitch] Add button to see results for polls in web UI
...
Port b7910bc751
2023-07-05 12:42:24 +02:00
Eugen Rochko
7747947353
[Glitch] Add canonical link tags in web UI
...
Port 90911f4396
2023-07-05 12:41:52 +02:00
Eugen Rochko
b3f209370b
[Glitch] Add canonical link tags in web UI
...
Port 000b835803
2023-07-05 12:41:52 +02:00
mogaminsk
0003a22bc1
[Glitch] Fix local live feeds does not expand
...
Port f3ca8aede9
2023-07-05 12:39:46 +02:00
mogaminsk
c6246807f5
[Glitch] Fix local live feeds does not expand
...
Port 6268188543
2023-07-05 12:39:46 +02:00
forsamori
136ed77764
[Glitch] Add at-symbol prepended to mention span title
...
Port 7731fbbba7
2023-07-05 12:38:54 +02:00
forsamori
ac74374311
[Glitch] Add at-symbol prepended to mention span title
...
Port d9a5c1acfa
2023-07-05 12:38:54 +02:00
Eugen Rochko
5b328d07e6
[Glitch] Change labels of live feeds tabs in web UI
...
Port 80fee1403f
2023-07-05 12:37:37 +02:00
Eugen Rochko
0a5271629c
[Glitch] Change labels of live feeds tabs in web UI
...
Port 54a10523e2
2023-07-05 12:37:37 +02:00
Claire
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Claire
5de49e74d4
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Eugen Rochko
90911f4396
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
Eugen Rochko
000b835803
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
Kouhai
d0edb9444c
th: run haml-lint on quote haml
2023-07-05 01:50:54 -07:00
Kouhai
c03ac30374
th: invite limit nonfixited bugs
2023-07-05 01:50:54 -07:00
Eugen Rochko
5b05451744
Add button to see results for polls in web UI ( #25726 )
2023-07-05 10:32:04 +02:00
Eugen Rochko
b7910bc751
Add button to see results for polls in web UI ( #25726 )
2023-07-05 10:32:04 +02:00
Kouhai
fa0f31a8fb
th: merge glitch again (lol)
2023-07-05 01:14:10 -07:00
Kouhai
280cf13f59
th: add invite limits behind TH_USE_INVITE_QUOTA
...
TH_USE_INVITE_QUOTA: feature flag
TH_INVITE_MAX_USES: max uses per invite for non-moderators
TH_ACTIVE_INVITE_SLOT_QUOTA: max slots in active invites, including consumed slots
2023-07-05 00:20:28 -07:00
Claire
cac4f7fdd7
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
2023-07-04 18:58:23 +02:00
Claire
eb2417ce99
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
2023-07-04 18:58:23 +02:00
Claire
1aa9197efd
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
2023-07-04 18:36:24 +02:00
Claire
4658263b4a
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
2023-07-04 18:36:24 +02:00
Trevor Wolf
b34a0ff011
fix read more button overlapping thread line bug ( #25706 )
2023-07-04 14:57:46 +02:00
Trevor Wolf
182fd93a07
fix read more button overlapping thread line bug ( #25706 )
2023-07-04 14:57:46 +02:00
mogaminsk
f3ca8aede9
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
mogaminsk
6268188543
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
forsamori
7731fbbba7
Add at-symbol prepended to mention span title ( #25684 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-03 22:58:10 +02:00
forsamori
d9a5c1acfa
Add at-symbol prepended to mention span title ( #25684 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-03 22:58:10 +02:00
Eugen Rochko
80fee1403f
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
Eugen Rochko
54a10523e2
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
Daniel M Brasil
2b877ad937
Fix /api/v2/search not working with following query param ( #25681 )
2023-07-03 18:06:57 +02:00
Daniel M Brasil
383c00819c
Fix /api/v2/search not working with following query param ( #25681 )
2023-07-03 18:06:57 +02:00
Eugen Rochko
12c6337c96
Fix regression of icon button colors in web UI ( #25679 )
2023-07-03 16:51:04 +02:00
Eugen Rochko
69e124e2ed
Fix regression of icon button colors in web UI ( #25679 )
2023-07-03 16:51:04 +02:00
Plastikmensch
bd0986e5d7
Add regex filter back to firehose ( #2266 )
...
* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 15:41:50 +02:00
Plastikmensch
ed15893eed
Add regex filter back to firehose ( #2266 )
...
* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 15:41:50 +02:00
Trevor Wolf
5f31104e1f
Change button colors to increase hover/focus contrast and consistency ( #25677 )
2023-07-03 11:32:31 +02:00
Trevor Wolf
54cb679c19
Change button colors to increase hover/focus contrast and consistency ( #25677 )
2023-07-03 11:32:31 +02:00
Plastikmensch
cd902b7fd4
Fix showing local only toots in "All" ( #2265 )
...
* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 07:00:38 +02:00
Plastikmensch
b422b5eebd
Fix showing local only toots in "All" ( #2265 )
...
* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 07:00:38 +02:00
Claire
c33c8bc048
Show local-only posts in “All” by default, and add back option to toggle it
2023-07-02 20:28:02 +02:00
Claire
9f3c3f5209
Show local-only posts in “All” by default, and add back option to toggle it
2023-07-02 20:28:02 +02:00
Claire
4885232358
Add users index on unconfirmed_email ( #25672 )
2023-07-02 19:41:35 +02:00
Claire
e6a8faae81
Add users index on unconfirmed_email ( #25672 )
2023-07-02 19:41:35 +02:00
Claire
fe1735f409
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
2023-07-02 16:08:58 +02:00
Claire
180f0e6715
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
2023-07-02 16:08:58 +02:00
mogaminsk
db90f2b456
[Glitch] Prevent duplicate concurrent calls of /api/*/instance in web UI
...
Port ee22b32aef
2023-07-02 12:00:03 +02:00
mogaminsk
587ddc2c7f
[Glitch] Prevent duplicate concurrent calls of /api/*/instance in web UI
...
Port 5b46345459
2023-07-02 12:00:03 +02:00
Eugen Rochko
f3140305f9
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port f504aded26
2023-07-02 11:59:31 +02:00
Eugen Rochko
c49e339c89
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port 0512537eb6
2023-07-02 11:59:31 +02:00
Claire
95da88be87
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port 6ca66c8cad
2023-07-02 11:58:51 +02:00
Claire
7cc2c1be29
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port cea9db5a0b
2023-07-02 11:58:51 +02:00
Renaud Chaput
bb5fddd588
[Glitch] Use an Immutable Record as the root state
...
Port 2751a6d716
2023-07-02 11:55:34 +02:00
Renaud Chaput
eb1cb8224a
[Glitch] Use an Immutable Record as the root state
...
Port 78ba12f0bf
2023-07-02 11:55:34 +02:00
Claire
f6ede7b089
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 1408b62211
2023-07-02 11:55:08 +02:00
Claire
2ba4773ebe
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 9934949fc4
2023-07-02 11:55:08 +02:00
Claire
34dd555a1c
[Glitch] Remove the search button from UI header when logged out
...
Port 7a47a52cd3
2023-07-02 11:54:47 +02:00
Claire
b75aa6b819
[Glitch] Remove the search button from UI header when logged out
...
Port 285a691936
2023-07-02 11:54:47 +02:00
Claire
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
Claire
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
Eugen Rochko
edb6aab974
Revert "Rails 7 update" ( #25667 )
2023-07-02 11:14:22 +02:00
Eugen Rochko
ba06a2f104
Revert "Rails 7 update" ( #25667 )
2023-07-02 11:14:22 +02:00
mogaminsk
ee22b32aef
Prevent duplicate concurrent calls of /api/*/instance in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
mogaminsk
5b46345459
Prevent duplicate concurrent calls of /api/*/instance in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
Eugen Rochko
f504aded26
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
Eugen Rochko
0512537eb6
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
Matt Jankowski
5cadbaa296
Rails 7 update ( #24241 )
2023-07-02 10:38:53 +02:00
Matt Jankowski
50c2a03695
Rails 7 update ( #24241 )
2023-07-02 10:38:53 +02:00
Daniel M Brasil
2f17abc686
Fix HTTP 500 in /api/v1/emails/check_confirmation ( #25595 )
2023-07-02 00:05:44 +02:00
Daniel M Brasil
4fe2d7cb59
Fix HTTP 500 in /api/v1/emails/check_confirmation ( #25595 )
2023-07-02 00:05:44 +02:00
Claire
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
Claire
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
Vivianne
6c6857f7ad
Fixing an issue with a missing argument ( #2261 )
...
undefined
2023-07-01 22:55:43 +02:00
Vivianne
155fc459e3
Fixing an issue with a missing argument ( #2261 )
...
undefined
2023-07-01 22:55:43 +02:00
Matt Jankowski
843448c7d9
Fix rails rewhere deprecation warning in directories api controller ( #25625 )
2023-07-01 21:48:16 +02:00
Matt Jankowski
683ba5ecb1
Fix rails rewhere deprecation warning in directories api controller ( #25625 )
2023-07-01 21:48:16 +02:00
Renaud Chaput
2751a6d716
Use an Immutable Record as the root state ( #25584 )
2023-06-30 17:03:25 +02:00
Renaud Chaput
78ba12f0bf
Use an Immutable Record as the root state ( #25584 )
2023-06-30 17:03:25 +02:00
Claire
1408b62211
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
Claire
9934949fc4
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
Claire
85dc0869a5
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
2023-06-29 14:48:54 +02:00
Claire
a209d1e683
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
2023-06-29 14:48:54 +02:00
jsgoldstein
5d75bf9846
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-06-29 13:05:21 +02:00
jsgoldstein
4581a528f7
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-06-29 13:05:21 +02:00
Claire
7a47a52cd3
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
Claire
285a691936
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
Renaud Chaput
bbe08e28cd
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ff9ed824db
2023-06-27 13:25:21 +02:00
Renaud Chaput
c43cfd2406
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ae30a60b1f
2023-06-27 13:25:21 +02:00
Eugen Rochko
5e3d6a3433
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 66c513511c
2023-06-27 13:21:55 +02:00
Eugen Rochko
4faa4eb3c4
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 65aa04647a
2023-06-27 13:21:55 +02:00
Eugen Rochko
fa093eef89
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 1924660c5b
2023-06-27 13:21:14 +02:00
Eugen Rochko
2f996375e5
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 2b78c07ef1
2023-06-27 13:21:14 +02:00
Claire
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
Claire
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
Claire
92fbaae7b6
Fix suspending an already-limited domain ( #25603 )
2023-06-27 12:32:51 +02:00
Claire
c7c6f02ae6
Fix suspending an already-limited domain ( #25603 )
2023-06-27 12:32:51 +02:00
Claire
1569b36e28
Fix batch attachment deletion leaving empty directories ( #25587 )
2023-06-27 09:36:11 +02:00
Claire
0ccf6c0eb7
Fix batch attachment deletion leaving empty directories ( #25587 )
2023-06-27 09:36:11 +02:00
S.H
2c6f88ad71
Remove media attachment only when file was exist ( #25586 )
2023-06-26 16:38:19 +02:00
S.H
7a25af64dd
Remove media attachment only when file was exist ( #25586 )
2023-06-26 16:38:19 +02:00
Eugen Rochko
bcee25e36c
Change files to be deleted in batches instead of one-by-one ( #23302 )
2023-06-26 14:17:41 +02:00
Eugen Rochko
bb4756c823
Change files to be deleted in batches instead of one-by-one ( #23302 )
2023-06-26 14:17:41 +02:00
Renaud Chaput
ff9ed824db
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
Renaud Chaput
ae30a60b1f
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
Claire
1164011bad
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
2023-06-26 12:30:35 +02:00
Claire
ed96e28c9e
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
2023-06-26 12:30:35 +02:00
Eugen Rochko
65b5808421
Change header backgrounds to use fewer different colors in web UI ( #25577 )
2023-06-26 05:27:07 +02:00
Eugen Rochko
7b024baf50
Change header backgrounds to use fewer different colors in web UI ( #25577 )
2023-06-26 05:27:07 +02:00
Eugen Rochko
66c513511c
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
Eugen Rochko
65aa04647a
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
Eugen Rochko
1924660c5b
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Eugen Rochko
2b78c07ef1
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Claire
a4e2d81804
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 7acdf21c77
2023-06-25 17:40:01 +02:00
Claire
5def74a436
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 0842a68532
2023-06-25 17:40:01 +02:00
Eugen Rochko
5660204731
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port ad92c48d71
2023-06-25 17:40:01 +02:00
Eugen Rochko
6fb34258a4
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port 00ec43914a
2023-06-25 17:40:01 +02:00
Claire
7cd1b2d753
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port 9a27d4ec36
2023-06-25 17:40:01 +02:00
Claire
7d160d2272
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port a8c1c8bd37
2023-06-25 17:40:01 +02:00
mogaminsk
34310c3924
[Glitch] Fix custom signup URL may not loaded
...
Port e87a2c676c
2023-06-25 14:27:46 +02:00
mogaminsk
222713a768
[Glitch] Fix custom signup URL may not loaded
...
Port 8d2c26834f
2023-06-25 14:27:46 +02:00
Ian
e7905c8b32
[Glitch] Change emoji picker icon
...
Port a56475866f
2023-06-25 14:27:46 +02:00
Ian
6fe345c383
[Glitch] Change emoji picker icon
...
Port 69db507924
2023-06-25 14:27:46 +02:00
たいち ひ
f0999de66f
[Glitch] Rewrite <AutosuggestHashtag /> as FC and TS
...
Port 6c4a6bd115
2023-06-25 14:27:46 +02:00
たいち ひ
c71fc42f4e
[Glitch] Rewrite <AutosuggestHashtag /> as FC and TS
...
Port 804488d38e
2023-06-25 14:27:46 +02:00
Claire
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
Claire
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
Claire
3d50947e62
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
2023-06-24 17:24:31 +02:00
Claire
55e7c08a83
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
2023-06-24 17:24:31 +02:00
Eugen Rochko
1caf3a3933
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Eugen Rochko
a985d587e1
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Claire
7acdf21c77
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
Claire
0842a68532
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
Eugen Rochko
ad92c48d71
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Eugen Rochko
00ec43914a
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Claire
3406cb0427
Add POST /api/v1/conversations/:id/unread ( #25509 )
2023-06-22 18:46:43 +02:00
Claire
1d622c8033
Add POST /api/v1/conversations/:id/unread ( #25509 )
2023-06-22 18:46:43 +02:00
Claire
9a27d4ec36
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
Claire
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
Claire
d0144d2be3
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
2023-06-22 14:56:14 +02:00
Claire
a5b6f6da80
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
2023-06-22 14:56:14 +02:00
Claire
c1c87fe7b9
Add finer permission requirements for managing webhooks ( #25463 )
2023-06-22 14:52:25 +02:00
Claire
602c458ab6
Add finer permission requirements for managing webhooks ( #25463 )
2023-06-22 14:52:25 +02:00
mogaminsk
e87a2c676c
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
mogaminsk
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
Ian
a56475866f
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00
Ian
69db507924
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00
Claire
5e5af7a0fe
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
2023-06-20 18:32:26 +02:00
Claire
ebfeaebedb
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
2023-06-20 18:32:26 +02:00
Claire
ba5c12974a
Fix missing validation on default_privacy setting ( #25513 )
2023-06-20 18:32:14 +02:00
Claire
ec91ea4457
Fix missing validation on default_privacy setting ( #25513 )
2023-06-20 18:32:14 +02:00
Claire
923dde8e6c
Fix wrong view being displayed when a webhook fails validation ( #25464 )
2023-06-20 18:15:35 +02:00
Claire
fd23f50243
Fix wrong view being displayed when a webhook fails validation ( #25464 )
2023-06-20 18:15:35 +02:00
Claire
4e861795a4
Add translate="no" to outgoing mentions and links ( #25524 )
2023-06-20 18:10:19 +02:00
Claire
c78280a8ce
Add translate="no" to outgoing mentions and links ( #25524 )
2023-06-20 18:10:19 +02:00
Emelia Smith
71d3100038
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
2023-06-20 18:04:35 +02:00
Emelia Smith
3a91603b15
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
2023-06-20 18:04:35 +02:00
Claire
ecf17008e8
Fix user settings not getting validated ( #25508 )
2023-06-19 14:06:06 +01:00
Claire
dd07393e75
Fix user settings not getting validated ( #25508 )
2023-06-19 14:06:06 +01:00
たいち ひ
6c4a6bd115
Rewrite <AutosuggestHashtag /> as FC and TS ( #25481 )
2023-06-19 14:11:46 +02:00
たいち ひ
804488d38e
Rewrite <AutosuggestHashtag /> as FC and TS ( #25481 )
2023-06-19 14:11:46 +02:00
Matt Jankowski
d05a68a12e
Reduce sleep time in request pool spec ( #25470 )
2023-06-19 13:48:25 +02:00
Matt Jankowski
e1c9d52e91
Reduce sleep time in request pool spec ( #25470 )
2023-06-19 13:48:25 +02:00
Matt Jankowski
eb10ac2b3e
Remove unused picture_hint helper method ( #25485 )
2023-06-19 09:04:15 +02:00
Matt Jankowski
155ec185b2
Remove unused picture_hint helper method ( #25485 )
2023-06-19 09:04:15 +02:00
Daniel M Brasil
498e3231b6
Fix incorrect pagination headers in /api/v2/admin/accounts ( #25477 )
2023-06-19 08:53:05 +02:00
Daniel M Brasil
b9bc9d0bda
Fix incorrect pagination headers in /api/v2/admin/accounts ( #25477 )
2023-06-19 08:53:05 +02:00
Claire
4e889e478f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
2023-06-18 16:14:29 +02:00
Claire
dc68306b8e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
2023-06-18 16:14:29 +02:00
Claire
85f74ed0a7
Fix cross-origin loading of locales ( #25498 )
2023-06-18 15:47:04 +02:00
Claire
64f7a11658
Fix cross-origin loading of locales ( #25498 )
2023-06-18 15:47:04 +02:00
Claire
d5a295f8c0
[Glitch] Fix non-interactive upload container being given a button role and tabIndex
...
Port 7c70237d7e
2023-06-18 14:10:49 +02:00
Claire
3b04e39534
[Glitch] Fix non-interactive upload container being given a button role and tabIndex
...
Port c9d06d10d4
2023-06-18 14:10:49 +02:00
Claire
7066e3d5ce
Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
Claire
6c99479ef4
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
Eugen Rochko
85041b74fb
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 239ee4f5d1
2023-06-18 12:11:58 +02:00
Eugen Rochko
d795c2c70c
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 39110d1d0a
2023-06-18 12:11:58 +02:00
たいち ひ
5a38d538a0
[Glitch] Rewrite emoji_mart_data_light as TS
...
Port 6e0c48cbe8
2023-06-18 12:11:19 +02:00
たいち ひ
b1b95ddd1f
[Glitch] Rewrite emoji_mart_data_light as TS
...
Port 3b5e302f7f
2023-06-18 12:11:19 +02:00
alfe
7e24689b7d
[Glitch] Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
...
Port 293cf44626
2023-06-18 12:10:37 +02:00
alfe
9bf63257fb
[Glitch] Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
...
Port a86886b1fd
2023-06-18 12:10:37 +02:00
Renaud Chaput
0e43f4d4fc
[Glitch] Add missing report category translation
...
Port b51a10a066
2023-06-18 10:43:07 +02:00
Renaud Chaput
0a212cfa7f
[Glitch] Add missing report category translation
...
Port 1cb4514d0e
2023-06-18 10:43:07 +02:00
alfe
8cbdffe2c7
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port 569ff79fb8
2023-06-18 10:42:04 +02:00
alfe
cdec45eca9
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port dfaf59d99a
2023-06-18 10:42:04 +02:00
Eugen Rochko
1ce44ec36e
[Glitch] Change "bot" label to "automated"
...
Port 272e099bce
2023-06-18 10:40:56 +02:00
Eugen Rochko
f815bd5fd9
[Glitch] Change "bot" label to "automated"
...
Port 432a5d2d4b
2023-06-18 10:40:56 +02:00
Claire
f101b67a45
Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
Claire
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
Claire
7c70237d7e
Fix non-interactive upload container being given a button role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
Claire
c9d06d10d4
Fix non-interactive upload container being given a button role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
Daniel M Brasil
4a994e5b50
Fix ArgumentError in /api/v1/admin/accounts/:id/action ( #25386 )
2023-06-14 15:21:36 +02:00
Daniel M Brasil
d9c6f70cc6
Fix ArgumentError in /api/v1/admin/accounts/:id/action ( #25386 )
2023-06-14 15:21:36 +02:00
Eugen Rochko
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
Eugen Rochko
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
Claire
a424076226
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
Claire
ec59166844
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
Eugen Rochko
989a8758e3
Change edit profile page ( #25413 )
2023-06-14 04:38:07 +02:00
Eugen Rochko
bca649ba79
Change edit profile page ( #25413 )
2023-06-14 04:38:07 +02:00
Eugen Rochko
239ee4f5d1
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
2023-06-13 22:30:40 +02:00
Eugen Rochko
39110d1d0a
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
2023-06-13 22:30:40 +02:00
たいち ひ
6e0c48cbe8
Rewrite emoji_mart_data_light as TS ( #25138 )
2023-06-13 19:28:31 +02:00
たいち ひ
3b5e302f7f
Rewrite emoji_mart_data_light as TS ( #25138 )
2023-06-13 19:28:31 +02:00
alfe
293cf44626
Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
alfe
a86886b1fd
Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
Renaud Chaput
b51a10a066
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
Renaud Chaput
1cb4514d0e
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
Eugen Rochko
94ef94c5ea
Add unsubscribe link to e-mails ( #25378 )
2023-06-12 14:22:46 +02:00
Eugen Rochko
6637ef7852
Add unsubscribe link to e-mails ( #25378 )
2023-06-12 14:22:46 +02:00
Plastikmensch
a804371e21
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 868d478b1b
2023-06-11 13:33:45 +02:00
Plastikmensch
fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 68a192e718
2023-06-11 13:33:45 +02:00
alfe
569ff79fb8
Rewrite <LoadPending /> as FC and TS ( #25363 )
2023-06-11 04:47:18 +02:00
alfe
dfaf59d99a
Rewrite <LoadPending /> as FC and TS ( #25363 )
2023-06-11 04:47:18 +02:00
Eugen Rochko
272e099bce
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
Eugen Rochko
432a5d2d4b
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
Claire
f49b12e06d
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
Claire
20718a8b59
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
Claire
1c25f35ddf
Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
Claire
42a0898f16
Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
Claire
14788cf0ce
Switch to using a common runtime chunk rather than locales
2023-06-10 17:43:13 +02:00
Claire
34efd1a24c
Switch to using a common runtime chunk rather than locales
2023-06-10 17:43:13 +02:00
Claire
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
Claire
8c26d49cbd
Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
Eugen Rochko
b5872b0686
[Glitch] Change design of dropdowns in web UI
...
Port 7abfddd8a5
2023-06-10 17:10:06 +02:00
Eugen Rochko
fb0d2de8fe
[Glitch] Change design of dropdowns in web UI
...
Port e4fd9503ec
2023-06-10 17:10:06 +02:00
alfe
ee6682e48d
[Glitch] Rewrite <LoadMore /> as FC and TS
...
Port f9c819e8db
2023-06-10 16:59:25 +02:00
alfe
83ae40e192
[Glitch] Rewrite <LoadMore /> as FC and TS
...
Port fb5bf5cbf8
2023-06-10 16:59:25 +02:00
Claire
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
Claire
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
Claire
29e63ef4d5
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 21f904b344
2023-06-10 16:38:03 +02:00
Claire
88c5ad3136
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 1483a3ddfe
2023-06-10 16:38:03 +02:00
S.H
00307189bc
[Glitch] Fix not shown announcements in hometimeline.
...
Port 94f9888d57
2023-06-10 16:37:20 +02:00
S.H
5a961f84cf
[Glitch] Fix not shown announcements in hometimeline.
...
Port a6c898f501
2023-06-10 16:37:20 +02:00
Claire
3dd186bbf1
[Glitch] Fix design issues with recent react-intl upgrade
...
Port 4c2503d36c
2023-06-10 16:36:54 +02:00
Claire
475185a2ee
[Glitch] Fix design issues with recent react-intl upgrade
...
Port c2c396157f
2023-06-10 16:36:54 +02:00
Darius Kazemi
46b4268007
[Glitch] Add exclusive lists
...
Port 6debddcf89
2023-06-10 16:36:15 +02:00
Darius Kazemi
a8a30f1298
[Glitch] Add exclusive lists
...
Port bacb674921
2023-06-10 16:36:15 +02:00
Claire
60762fb8ba
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from c7a8838bd7
2023-06-10 16:30:36 +02:00
Claire
bf23afa059
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from 0766c9a631
2023-06-10 16:30:36 +02:00
Jed Fox
2877b12754
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port 2d2750c6a9
2023-06-10 16:29:48 +02:00
Jed Fox
753385d3e0
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port acc419b81b
2023-06-10 16:29:48 +02:00
Claire
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
2023-06-10 16:22:14 +02:00
Claire
d8b0a732aa
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
2023-06-10 16:22:14 +02:00
Renaud Chaput
333c28ce6d
[Glitch] Fix /share and cleanup and reorganize frontend locale loading
...
Port 29851c83bd
2023-06-10 16:18:01 +02:00
Renaud Chaput
9e66c07be7
[Glitch] Fix /share and cleanup and reorganize frontend locale loading
...
Port b0780cfeed
2023-06-10 16:18:01 +02:00
Claire
3b87fe21fa
Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
Claire
734e186717
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
S.H
7ccf99b652
[Glitch] Fix using Date.now() instead of intl.now()
...
Port 4e28b89f51
2023-06-10 15:21:04 +02:00
S.H
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
2023-06-10 15:21:04 +02:00
Claire
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
Claire
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
Claire
fd0b9c9881
[Glitch] Add a confirmation screen when suspending a domain
...
Port 8ee98cfd2b
2023-06-10 15:10:24 +02:00
Claire
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
2023-06-10 15:10:24 +02:00
Claire
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
Claire
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
Renaud Chaput
5715cd6b8a
[Glitch] Fix prev/next buttons color in media viewer
...
Port 40e756f291
2023-06-10 14:48:41 +02:00
Renaud Chaput
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
2023-06-10 14:48:41 +02:00
Christian Schmidt
8b958c0858
[Glitch] Translate CW, poll options and media descriptions
...
Port 971eafc709
2023-06-10 14:48:41 +02:00
Christian Schmidt
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
2023-06-10 14:48:41 +02:00
Claire
447b44a5d6
Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
2023-06-10 14:38:04 +02:00
Claire
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
2023-06-10 14:38:04 +02:00
Renaud Chaput
b428d82286
[Glitch] Upgrade react-intl
...
Port 76960f128a
2023-06-10 14:37:08 +02:00
Renaud Chaput
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
2023-06-10 14:37:08 +02:00
Claire
c22b032483
Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
Claire
85722a918d
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
Eugen Rochko
1dd243cc09
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
Eugen Rochko
4c9406bdb0
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
Matt Jankowski
8b5680fd9a
Remove unused redis_info method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
Matt Jankowski
75e299f440
Remove unused redis_info method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
jsgoldstein
975914e0a6
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
jsgoldstein
18f092d927
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
Eugen Rochko
66a5173629
Add legal as report category ( #23941 )
2023-06-06 23:41:59 +02:00
Eugen Rochko
67d17ce194
Add legal as report category ( #23941 )
2023-06-06 23:41:59 +02:00
Eugen Rochko
7abfddd8a5
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
Eugen Rochko
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
Nick Schonning
ef344388c5
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
Nick Schonning
c66250abf1
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
alfe
f9c819e8db
Rewrite <LoadMore /> as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
alfe
fb5bf5cbf8
Rewrite <LoadMore /> as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
Claire
51046cb4db
Fix autocomplete suggestions being cut off in compose form ( #25275 )
2023-06-06 11:05:25 +02:00
Claire
6833732852
Fix autocomplete suggestions being cut off in compose form ( #25275 )
2023-06-06 11:05:25 +02:00
Eugen Rochko
2252e4d8bb
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 10:42:47 +02:00
Eugen Rochko
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 10:42:47 +02:00
Eugen Rochko
8f34072fc0
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +02:00
Eugen Rochko
0ddc895282
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +02:00
Matt Jankowski
14dc8a6a5f
Update Admin::Metrics::Measure classes for Rails 7 ( #25236 )
2023-06-05 20:46:04 +02:00
Matt Jankowski
af135bddd0
Update Admin::Metrics::Measure classes for Rails 7 ( #25236 )
2023-06-05 20:46:04 +02:00
Claire
21f904b344
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00
Claire
1483a3ddfe
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00
Matt Jankowski
c74040abfa
Rails 7 compatibility fix for Admin::Metrics::Dimension classes ( #25277 )
2023-06-05 16:52:33 +02:00
Matt Jankowski
3b21c13dcc
Rails 7 compatibility fix for Admin::Metrics::Dimension classes ( #25277 )
2023-06-05 16:52:33 +02:00
S.H
94f9888d57
Fix not shown announcements in hometimeline. ( #25251 )
2023-06-05 14:49:51 +02:00
S.H
a6c898f501
Fix not shown announcements in hometimeline. ( #25251 )
2023-06-05 14:49:51 +02:00
dependabot[bot]
d6feba366b
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 9ba1135000
2023-06-05 13:31:45 +02:00
dependabot[bot]
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
2023-06-05 13:31:45 +02:00
Claire
cd107b054d
[Glitch] Fix null signUp URL in various places
...
Port 75ebb60ef6
2023-06-05 13:28:22 +02:00
Claire
5e876c2901
[Glitch] Fix null signUp URL in various places
...
Port 14bb6bb29a
2023-06-05 13:28:22 +02:00
y.takahashi
e7cb0dc83b
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 5c744a5d7d
2023-06-05 13:28:02 +02:00
y.takahashi
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
2023-06-05 13:28:02 +02:00
Claire
bda5be1406
Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
Claire
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
Claire
4c2503d36c
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
Claire
c2c396157f
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
Darius Kazemi
6debddcf89
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 09:37:02 +02:00
Darius Kazemi
bacb674921
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 09:37:02 +02:00
Matt Jankowski
a04157e69f
Add allow_other_host: true to backups controller ( #25266 )
2023-06-05 08:22:03 +02:00
Matt Jankowski
0daf78f903
Add allow_other_host: true to backups controller ( #25266 )
2023-06-05 08:22:03 +02:00
Eugen Rochko
c4426198c3
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
2023-06-05 01:42:17 +02:00
Eugen Rochko
4a5464f360
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
2023-06-05 01:42:17 +02:00
Claire
85e0bd73cf
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 62f386d44e
2023-06-04 22:05:45 +02:00
Claire
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
2023-06-04 22:05:45 +02:00
Jed Fox
e24a587f84
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
2023-06-02 19:58:18 +02:00
Jed Fox
768b00c4d0
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
2023-06-02 19:58:18 +02:00
Claire
c7a8838bd7
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
2023-06-02 18:35:37 +02:00
Claire
0766c9a631
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
2023-06-02 18:35:37 +02:00
Claire
1c298d97c5
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
2023-06-02 18:09:08 +02:00
Claire
94329f28e1
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
2023-06-02 18:09:08 +02:00
Jed Fox
2d2750c6a9
Fix spacing of middle dots in the detailed status meta section ( #25247 )
2023-06-02 15:40:23 +02:00
Jed Fox
acc419b81b
Fix spacing of middle dots in the detailed status meta section ( #25247 )
2023-06-02 15:40:23 +02:00
Renaud Chaput
29851c83bd
Fix /share and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
Renaud Chaput
b0780cfeed
Fix /share and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
Claire
a82f036309
Fix overflow behavior of account rows ( #25131 )
2023-06-01 14:47:55 +02:00
Claire
5fae2de454
Fix overflow behavior of account rows ( #25131 )
2023-06-01 14:47:55 +02:00
Claire
572086c8ad
Add support for importing lists ( #25203 )
2023-06-01 14:47:31 +02:00
Claire
8884d1ece0
Add support for importing lists ( #25203 )
2023-06-01 14:47:31 +02:00
S.H
4e28b89f51
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
S.H
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
Matt Jankowski
a6f0456756
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
2023-06-01 09:47:05 +02:00
Matt Jankowski
f84037ae2b
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
2023-06-01 09:47:05 +02:00
Claire
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
Claire
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
Claire
52b4e33d7f
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
2023-06-01 09:23:28 +02:00
Claire
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
2023-06-01 09:23:28 +02:00
Claire
3d550b5712
Fix multiple N+1s in ConversationsController ( #25134 )
2023-06-01 02:41:51 +02:00
Claire
2b45fecde1
Fix multiple N+1s in ConversationsController ( #25134 )
2023-06-01 02:41:51 +02:00
Renaud Chaput
40e756f291
Fix prev/next buttons color in media viewer ( #25231 )
2023-06-01 02:25:38 +02:00
Renaud Chaput
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
2023-06-01 02:25:38 +02:00
Christian Schmidt
971eafc709
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-01 00:10:21 +02:00
Christian Schmidt
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-01 00:10:21 +02:00
Renaud Chaput
76960f128a
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
Renaud Chaput
44cd88adc4
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
Matt Jankowski
68296cfb32
Remove unused Settings::Extend module ( #25214 )
2023-05-31 23:34:48 +02:00
Matt Jankowski
00c222377d
Remove unused Settings::Extend module ( #25214 )
2023-05-31 23:34:48 +02:00
Renaud Chaput
8bd9ce4d09
Disable some metrics cops ( #25215 )
2023-05-31 23:33:10 +02:00
Renaud Chaput
b7d995cb00
Disable some metrics cops ( #25215 )
2023-05-31 23:33:10 +02:00
Claire
654f5c9cdc
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
2023-05-31 09:57:24 +02:00
Claire
b6519ab3f5
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
2023-05-31 09:57:24 +02:00
dependabot[bot]
9ba1135000
Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 ( #25172 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-05-31 09:27:21 +02:00
dependabot[bot]
89d6341c80
Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 ( #25172 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-05-31 09:27:21 +02:00
Claire
75ebb60ef6
Fix null signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
Claire
14bb6bb29a
Fix null signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
S.H
f145662c05
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
2023-05-30 09:28:01 +02:00
S.H
8c183a9831
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
2023-05-30 09:28:01 +02:00
y.takahashi
5c744a5d7d
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
y.takahashi
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
Claire
615a7d5795
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
Claire
5ed48e6878
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
fusagiko / takayamaki
62f386d44e
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port a19c1671af
2023-05-28 17:49:55 +02:00
fusagiko / takayamaki
382b2a506a
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port 38c6216082
2023-05-28 17:49:55 +02:00
たいち ひ
cd0ff98425
[Glitch] Fix export style of <LoadGap /> based on <Domain />
...
Port ae0341c203
2023-05-28 17:15:21 +02:00
たいち ひ
6a592083f1
[Glitch] Fix export style of <LoadGap /> based on <Domain />
...
Port 4197b5e4c8
2023-05-28 17:15:21 +02:00
Renaud Chaput
f58504f2c7
[Glitch] Update inconsistent defaultMessage
...
Port 169f141c4c
2023-05-28 17:14:31 +02:00
Renaud Chaput
0009b4b574
[Glitch] Update inconsistent defaultMessage
...
Port e58c36d308
2023-05-28 17:14:31 +02:00
Claire
53b8a15ee9
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
Claire
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
Eugen Rochko
2592015ce6
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 97235baa4f
2023-05-28 16:59:12 +02:00
Eugen Rochko
e7dc375aab
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 1caa5ff39e
2023-05-28 16:59:12 +02:00
Renaud Chaput
b17b1827e7
[Glitch] Fix null signUp URL handling from #25014
...
Port 9be9f4f5e2
2023-05-28 16:52:16 +02:00
Renaud Chaput
7bec63e6e2
[Glitch] Fix null signUp URL handling from #25014
...
Port 40b948a1fb
2023-05-28 16:52:16 +02:00
たいち ひ
8134d62112
[Glitch] Rewrite <LoadGap /> as FC and TS
...
Port 6077f3e24c
2023-05-28 16:48:17 +02:00
たいち ひ
017fbc7a74
[Glitch] Rewrite <LoadGap /> as FC and TS
...
Port 7336f3648b
2023-05-28 16:48:17 +02:00
Claire
973743ff50
Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
2023-05-28 16:41:14 +02:00
Claire
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
2023-05-28 16:41:14 +02:00
Claire
a7e6f3df20
Fix import order with ESLint
...
Port 7b5a274836
2023-05-28 16:38:10 +02:00
Claire
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
2023-05-28 16:38:10 +02:00
Claire
fa16de4a4e
Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream
...
Conflicts:
- `.eslintrc.js`:
Upstream moved a configuration block in which we had added a glitch-only
path.
Moved the configuration block as upstream did.
- other files:
Upstream reordered imports, and those files had different ones.
Kept our version and reordered imports using the same rules.
2023-05-28 15:54:31 +02:00
Claire
1cd7f5ff17
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream
...
Conflicts:
- `.eslintrc.js`:
Upstream moved a configuration block in which we had added a glitch-only
path.
Moved the configuration block as upstream did.
- other files:
Upstream reordered imports, and those files had different ones.
Kept our version and reordered imports using the same rules.
2023-05-28 15:54:31 +02:00
Claire
214f04f04b
[Glitch] Add support for custom sign-up URLs
...
Port 4d631fcfb7
2023-05-28 15:09:28 +02:00
Claire
9e5278ea7b
[Glitch] Add support for custom sign-up URLs
...
Port ca66e61b93
2023-05-28 15:09:28 +02:00
Claire
ffc7a57f8b
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port cbcf32777e
2023-05-28 15:06:29 +02:00
Claire
8f380a33fc
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port 100840c06e
2023-05-28 15:06:29 +02:00
Claire
006bc485e4
Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
Claire
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
Claire
8793625bf3
[Glitch] Use JSX syntax for Fragments
...
Port abbc6dfcba
2023-05-28 14:56:24 +02:00
Claire
a0bc0619ca
[Glitch] Use JSX syntax for Fragments
...
Port 5a16bd7bf4
2023-05-28 14:56:24 +02:00
Claire
31c4b3183b
Merge commit 'abbc6dfcbaa105faee402694061c408d37320b75' into glitch-soc/merge-upstream
2023-05-28 14:32:26 +02:00
Claire
8278907ff7
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
2023-05-28 14:32:26 +02:00
Claire
fb2bf621eb
[Glitch] Use the new JSX transform everywhere
...
Port 3b0c3e94e0
2023-05-28 14:18:43 +02:00
Claire
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
2023-05-28 14:18:43 +02:00
Claire
03a3ff1f02
Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
Claire
9381f78166
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
Claire
20e8b117e3
fixup! [Glitch] Upgrade to React 18
2023-05-26 18:44:18 +02:00
Claire
1347ca6eb0
fixup! [Glitch] Upgrade to React 18
2023-05-26 18:44:18 +02:00
たいち ひ
114ad2d4d1
[Glitch] Rewrite <TimelineHint /> as FC and TS
...
Port 9cfab99590
2023-05-25 23:58:54 +02:00
たいち ひ
60c7e559d8
[Glitch] Rewrite <TimelineHint /> as FC and TS
...
Port 9a472efe7c
2023-05-25 23:58:54 +02:00
たいち ひ
76e9386332
[Glitch] Rewrite <Skeleton/> as FC and TS
...
Port 0b87919abf
2023-05-25 23:55:36 +02:00
たいち ひ
6746e5d430
[Glitch] Rewrite <Skeleton/> as FC and TS
...
Port 8066118d1f
2023-05-25 23:55:36 +02:00
Claire
758a0ae1e9
[Glitch] Allow scripts in post embed previews
...
Port 18361ae0c5
2023-05-25 23:52:04 +02:00
Claire
892b3c16f5
[Glitch] Allow scripts in post embed previews
...
Port 711a037660
2023-05-25 23:52:04 +02:00
Claire
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
2023-05-25 23:47:28 +02:00
Claire
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2023-05-25 23:47:28 +02:00
Renaud Chaput
056dd39631
[Glitch] Upgrade to React 18
...
Port ab029328cf
2023-05-25 23:45:01 +02:00
Renaud Chaput
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
2023-05-25 23:45:01 +02:00
Claire
3413fc7002
Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream
2023-05-25 23:18:57 +02:00
Claire
45d7358100
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
2023-05-25 23:18:57 +02:00
Claire
ee6f9d2c92
Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
Claire
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
Claire
9e224add8a
Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
Additional changes:
- `Gemfile`:
Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
Upstream added the `captcha_enabled` setting in another place in the file.
2023-05-25 22:49:18 +02:00
Claire
ad1098970b
Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
Additional changes:
- `Gemfile`:
Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
Upstream added the `captcha_enabled` setting in another place in the file.
2023-05-25 22:49:18 +02:00
Claire
b55d56387b
[Glitch] Add polling and automatic redirection to /start on email confirmation
...
Port 86961b5b7b
2023-05-25 22:37:14 +02:00
Claire
ba73f0ea3a
[Glitch] Add polling and automatic redirection to /start on email confirmation
...
Port e60414792d
2023-05-25 22:37:14 +02:00
Claire
560f605dc2
Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream
2023-05-25 22:18:55 +02:00
Claire
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
2023-05-25 22:18:55 +02:00
Claire
c3cca0eff4
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
...
Port d2eef78d1c
2023-05-25 22:00:07 +02:00
Claire
b0ec3bfcf9
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
...
Port 7b54e47d03
2023-05-25 22:00:07 +02:00
Christian Schmidt
6cde4718c0
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 778fd4d29b
2023-05-25 21:57:19 +02:00
Christian Schmidt
4a1f4cb6a2
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 5241f7b2fd
2023-05-25 21:57:19 +02:00
Eugen Rochko
12c177a34e
[Glitch] Change "Sign in" to "Login"
...
Port d05ff56746
2023-05-25 21:52:37 +02:00
Eugen Rochko
d728222121
[Glitch] Change "Sign in" to "Login"
...
Port 3869e8c210
2023-05-25 21:52:37 +02:00
Claire
0042d5a246
[Glitch] Fix videos being improperly positioned on safari
...
Port de95d0ca8f
2023-05-25 21:47:48 +02:00
Claire
602ae7f2f6
[Glitch] Fix videos being improperly positioned on safari
...
Port 0eed06073f
2023-05-25 21:47:48 +02:00
Renaud Chaput
e11d884c53
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 6a3211876c
2023-05-25 21:43:19 +02:00
Renaud Chaput
e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
2023-05-25 21:43:19 +02:00
Nick Schonning
dc9dcd0fa9
[Glitch] Enable ESLint react/no-deprecated
...
Port b0dd260a7a
2023-05-25 21:07:38 +02:00
Nick Schonning
e8fc445e14
[Glitch] Enable ESLint react/no-deprecated
...
Port b878e3d8df
2023-05-25 21:07:38 +02:00
Renaud Chaput
afde99dc29
[Glitch] Disable RTK safety middlewares
...
Port c9dfc55b22
2023-05-25 20:57:42 +02:00
Renaud Chaput
79c43b61a6
[Glitch] Disable RTK safety middlewares
...
Port 6f8db56a01
2023-05-25 20:57:42 +02:00
fusagiko / takayamaki
a3c2519ba0
[Glitch] Add type annotation for DisplayName component
...
Port a150bb4f2e
2023-05-25 20:57:07 +02:00
fusagiko / takayamaki
7d9b7f28b8
[Glitch] Add type annotation for DisplayName component
...
Port 349cae0b57
2023-05-25 20:57:07 +02:00
fusagiko / takayamaki
b3e018ce58
[Glitch] Rename Image component to ServerHeroImage
...
Port cbca954632
2023-05-25 20:44:09 +02:00
fusagiko / takayamaki
ea1f9b4223
[Glitch] Rename Image component to ServerHeroImage
...
Port ab7716cff4
2023-05-25 20:44:09 +02:00
Claire
11368da545
Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
Claire
b735954971
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
Claire
31fe0780bf
Change captcha to be presented even for invited users ( #2227 )
2023-05-25 20:13:18 +02:00
Claire
646cde71d1
Change captcha to be presented even for invited users ( #2227 )
2023-05-25 20:13:18 +02:00
Claire
5a99be78e4
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2023-05-25 19:40:33 +02:00
Claire
69903b5830
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2023-05-25 19:40:33 +02:00
Claire
b13b71d1f5
Greatly simplify history management code ( #2230 )
...
Fixes #2220
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream.
2023-05-25 19:14:51 +02:00
Claire
cb6f445b90
Greatly simplify history management code ( #2230 )
...
Fixes #2220
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream.
2023-05-25 19:14:51 +02:00
Claire
56ac8eb6ea
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2023-05-25 19:14:37 +02:00
Claire
2f2f74efd8
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2023-05-25 19:14:37 +02:00
fusagiko / takayamaki
a19c1671af
Rewrite actions/modal and reducers/modal with typescript ( #24833 )
2023-05-25 15:42:37 +02:00
fusagiko / takayamaki
38c6216082
Rewrite actions/modal and reducers/modal with typescript ( #24833 )
2023-05-25 15:42:37 +02:00
たいち ひ
ae0341c203
Fix export style of <LoadGap /> based on <Domain /> ( #25128 )
2023-05-25 13:03:37 +02:00
たいち ひ
4197b5e4c8
Fix export style of <LoadGap /> based on <Domain /> ( #25128 )
2023-05-25 13:03:37 +02:00
Claire
245a4eac89
Improve various queries against account domains ( #25126 )
2023-05-25 09:27:16 +02:00
Claire
1d588d58f1
Improve various queries against account domains ( #25126 )
2023-05-25 09:27:16 +02:00
Renaud Chaput
169f141c4c
Update inconsistent defaultMessage ( #25114 )
2023-05-24 12:38:50 +02:00
Renaud Chaput
e58c36d308
Update inconsistent defaultMessage ( #25114 )
2023-05-24 12:38:50 +02:00
Eugen Rochko
97235baa4f
Change share action from being in action bar to being in dropdown in web UI ( #25105 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-24 11:04:43 +02:00
Eugen Rochko
1caa5ff39e
Change share action from being in action bar to being in dropdown in web UI ( #25105 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-24 11:04:43 +02:00
Renaud Chaput
9be9f4f5e2
Fix null signUp URL handling from #25014 ( #25108 )
2023-05-24 09:49:26 +02:00
Renaud Chaput
40b948a1fb
Fix null signUp URL handling from #25014 ( #25108 )
2023-05-24 09:49:26 +02:00
たいち ひ
6077f3e24c
Rewrite <LoadGap /> as FC and TS ( #25042 )
2023-05-24 09:20:39 +02:00
たいち ひ
7336f3648b
Rewrite <LoadGap /> as FC and TS ( #25042 )
2023-05-24 09:20:39 +02:00
Renaud Chaput
7b5a274836
Enforce import order with ESLint ( #25096 )
2023-05-23 17:15:17 +02:00
Renaud Chaput
d27216dc46
Enforce import order with ESLint ( #25096 )
2023-05-23 17:15:17 +02:00
Claire
4d631fcfb7
Add support for custom sign-up URLs ( #25014 )
2023-05-23 15:17:09 +02:00
Claire
ca66e61b93
Add support for custom sign-up URLs ( #25014 )
2023-05-23 15:17:09 +02:00
Claire
a5b52eb618
Change Identity to not destroy associated User on destroy ( #25098 )
2023-05-23 15:00:36 +02:00
Claire
dfa5889fc0
Change Identity to not destroy associated User on destroy ( #25098 )
2023-05-23 15:00:36 +02:00
Claire
cbcf32777e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2023-05-23 14:28:21 +02:00
Claire
100840c06e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2023-05-23 14:28:21 +02:00
Claire
4e8d882274
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
2023-05-23 14:27:37 +02:00
Claire
9017df7178
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
2023-05-23 14:27:37 +02:00
Claire
0b4d3bf363
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
2023-05-23 14:27:17 +02:00
Claire
fea0830614
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
2023-05-23 14:27:17 +02:00
Renaud Chaput
abbc6dfcba
Use JSX syntax for Fragments ( #25093 )
2023-05-23 11:47:36 +02:00
Renaud Chaput
5a16bd7bf4
Use JSX syntax for Fragments ( #25093 )
2023-05-23 11:47:36 +02:00
Renaud Chaput
3b0c3e94e0
Use the new JSX transform ( #25064 )
2023-05-23 10:52:27 +02:00
Renaud Chaput
8f66126b10
Use the new JSX transform ( #25064 )
2023-05-23 10:52:27 +02:00
Matt Jankowski
9e8323fdb9
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-23 10:49:12 +02:00
Matt Jankowski
9f5deb310b
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-23 10:49:12 +02:00
Matt Jankowski
d64a2c7aa8
Fix Performance/StartWith cop ( #24818 )
2023-05-23 10:16:50 +02:00
Matt Jankowski
0664704cd9
Fix Performance/StartWith cop ( #24818 )
2023-05-23 10:16:50 +02:00
たいち ひ
9cfab99590
Rewrite <TimelineHint /> as FC and TS ( #25091 )
2023-05-23 10:04:10 +02:00
たいち ひ
9a472efe7c
Rewrite <TimelineHint /> as FC and TS ( #25091 )
2023-05-23 10:04:10 +02:00
たいち ひ
0b87919abf
Rewrite <Skeleton/> as FC and TS ( #25055 )
2023-05-23 08:58:08 +02:00
たいち ひ
8066118d1f
Rewrite <Skeleton/> as FC and TS ( #25055 )
2023-05-23 08:58:08 +02:00
Claire
18361ae0c5
Allow scripts in post embed previews ( #25071 )
2023-05-22 21:18:21 +02:00
Claire
711a037660
Allow scripts in post embed previews ( #25071 )
2023-05-22 21:18:21 +02:00
Daniel M Brasil
6e38ffcaee
Fix uncaught TypeError in POST /api/v1/featured_tags ( #25072 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-22 19:14:54 +02:00
Daniel M Brasil
785e650ab4
Fix uncaught TypeError in POST /api/v1/featured_tags ( #25072 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-22 19:14:54 +02:00
Daniel M Brasil
5009e9aed5
Fix uncaught NoMethodError in POST /api/v1/featured_tags ( #25063 )
2023-05-22 18:11:28 +02:00
Daniel M Brasil
45d98959ac
Fix uncaught NoMethodError in POST /api/v1/featured_tags ( #25063 )
2023-05-22 18:11:28 +02:00
Claire
c59cbf1a38
Fix account confirmation flow not returning to app after captcha validation ( #25057 )
2023-05-22 17:38:05 +02:00
Claire
2a61f14753
Fix account confirmation flow not returning to app after captcha validation ( #25057 )
2023-05-22 17:38:05 +02:00
Renaud Chaput
ab029328cf
Upgrade to React 18 ( #24916 )
2023-05-22 15:48:01 +02:00
Renaud Chaput
8d6aea3326
Upgrade to React 18 ( #24916 )
2023-05-22 15:48:01 +02:00
Claire
da9237adb5
Fix “Authorized applications” inefficiently and incorrectly getting last use date ( #25060 )
2023-05-22 14:03:38 +02:00
Claire
e13d2edd47
Fix “Authorized applications” inefficiently and incorrectly getting last use date ( #25060 )
2023-05-22 14:03:38 +02:00
Daniel M Brasil
4d07793150
Fix POST /api/v1/admin/domain_allows returning 200 when no domain is specified ( #24958 )
2023-05-22 13:44:49 +02:00
Daniel M Brasil
ce8b5899ae
Fix POST /api/v1/admin/domain_allows returning 200 when no domain is specified ( #24958 )
2023-05-22 13:44:49 +02:00
Emelia Smith
8b4d7b22ed
Allow reports with long comments from remote instances, but truncate ( #25028 )
2023-05-22 13:15:21 +02:00
Emelia Smith
19f9098551
Allow reports with long comments from remote instances, but truncate ( #25028 )
2023-05-22 13:15:21 +02:00
Nick Schonning
26cdb19dc6
Remove duplicate JPG type ( #25054 )
2023-05-22 12:46:20 +02:00
Nick Schonning
23a4ecf444
Remove duplicate JPG type ( #25054 )
2023-05-22 12:46:20 +02:00
Claire
0635b1c228
Change OpenGraph-based embeds to allow fullscreen ( #25058 )
2023-05-22 12:25:56 +02:00
Claire
7bb8030cc1
Change OpenGraph-based embeds to allow fullscreen ( #25058 )
2023-05-22 12:25:56 +02:00
Frankie Roberto
9cf831be0b
Order sessions by most-recent to least-recently updated ( #25005 )
2023-05-22 11:40:00 +02:00
Frankie Roberto
36a77748b4
Order sessions by most-recent to least-recently updated ( #25005 )
2023-05-22 11:40:00 +02:00
Kouhai
a2e6a7d963
th: Merge remote-tracking branch 'glitch/main'
2023-05-22 00:10:53 -07:00
Nick Schonning
c4f2b1e86a
Fix minor typos in comments and spec names ( #21831 )
2023-05-19 17:13:29 +02:00
Nick Schonning
99e2e9b81f
Fix minor typos in comments and spec names ( #21831 )
2023-05-19 17:13:29 +02:00
Essem
a76777c33b
Fix oversight in backup service ( #25034 )
2023-05-19 11:27:10 +02:00
Essem
5fd8d1e417
Fix oversight in backup service ( #25034 )
2023-05-19 11:27:10 +02:00
Claire
0206081e40
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
Claire
058898802a
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
Claire
5bf9e2ebec
Fix race condition when reblogging a status ( #25016 )
2023-05-17 00:09:21 +02:00
Claire
45ba9ada34
Fix race condition when reblogging a status ( #25016 )
2023-05-17 00:09:21 +02:00
Claire
b030441368
Fix being able to vote on your own polls ( #25015 )
2023-05-17 00:08:42 +02:00
Claire
5cd55d8aaf
Fix being able to vote on your own polls ( #25015 )
2023-05-17 00:08:42 +02:00
Claire
844d8e101e
Add hCaptcha support ( #25019 )
2023-05-16 23:27:35 +02:00
Claire
bec6a1cad4
Add hCaptcha support ( #25019 )
2023-05-16 23:27:35 +02:00
Claire
86961b5b7b
Add polling and automatic redirection to /start on email confirmation ( #25013 )
2023-05-16 18:03:52 +02:00
Claire
e60414792d
Add polling and automatic redirection to /start on email confirmation ( #25013 )
2023-05-16 18:03:52 +02:00
Claire
d2eef78d1c
Fix being unable to load past a full page of filtered posts in Home timeline ( #24930 )
2023-05-16 15:36:25 +02:00
Claire
7b54e47d03
Fix being unable to load past a full page of filtered posts in Home timeline ( #24930 )
2023-05-16 15:36:25 +02:00
Claire
74ff0cd2d5
Change composer highlight border size to be more noticeable ( #25010 )
2023-05-16 14:59:44 +02:00
Claire
aa4c9730f6
Change composer highlight border size to be more noticeable ( #25010 )
2023-05-16 14:59:44 +02:00
Claire
99f1302cc3
Fix reports not being closed when performing batch suspensions ( #24988 )
2023-05-16 14:56:49 +02:00
Claire
3ed3d54bf3
Fix reports not being closed when performing batch suspensions ( #24988 )
2023-05-16 14:56:49 +02:00
Steven Munn
da2d3cc795
Fix spelling of "Lets" on the onboarding page after clicking the confirmation email ( #24959 )
...
Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-15 22:42:07 +02:00
Steven Munn
52d36f0f98
Fix spelling of "Lets" on the onboarding page after clicking the confirmation email ( #24959 )
...
Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-15 22:42:07 +02:00
Daniel M Brasil
7cf0ce19e2
Fix uncaught NoMethodError error in /api/v1/admin/canonical_email_blocks/test ( #24947 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-12 13:46:16 +02:00
Daniel M Brasil
433ab0c9a3
Fix uncaught NoMethodError error in /api/v1/admin/canonical_email_blocks/test ( #24947 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-12 13:46:16 +02:00
Claire
c8998a2678
Change profile updates to be sent to recently-mentioned servers ( #24852 )
2023-05-12 13:13:04 +02:00
Claire
9015c2d646
Change profile updates to be sent to recently-mentioned servers ( #24852 )
2023-05-12 13:13:04 +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
Christian Schmidt
778fd4d29b
Fix UI crash in moderation interface when opening the media modal ( #24816 )
2023-05-11 12:41:55 +02:00
Christian Schmidt
5241f7b2fd
Fix UI crash in moderation interface when opening the media modal ( #24816 )
2023-05-11 12:41:55 +02:00
Emelia Smith
db07cfb150
Fix Onboarding Errors ( #24883 )
2023-05-11 07:55:10 +02:00
Emelia Smith
b8a2430642
Fix Onboarding Errors ( #24883 )
2023-05-11 07:55:10 +02:00
Claire
c752e939d5
Change AccessTokensVacuum to also delete expired tokens ( #24868 )
2023-05-11 04:40:03 +02:00
Claire
6b0942d107
Change AccessTokensVacuum to also delete expired tokens ( #24868 )
2023-05-11 04:40:03 +02:00
Eugen Rochko
d05ff56746
Change "Sign in" to "Login" ( #24942 )
2023-05-10 20:17:55 +02:00
Eugen Rochko
3869e8c210
Change "Sign in" to "Login" ( #24942 )
2023-05-10 20:17:55 +02:00
Claire
de95d0ca8f
Fix videos being improperly positioned on safari ( #24943 )
2023-05-10 17:22:34 +02:00
Claire
0eed06073f
Fix videos being improperly positioned on safari ( #24943 )
2023-05-10 17:22:34 +02:00
Renaud Chaput
6a3211876c
Add stricter ESLint rules for Typescript files ( #24926 )
2023-05-10 12:59:29 +02:00
Renaud Chaput
5eeb40bdbe
Add stricter ESLint rules for Typescript files ( #24926 )
2023-05-10 12:59:29 +02:00
Nick Schonning
b0dd260a7a
Enable ESLint react/no-deprecated ( #24471 )
2023-05-10 09:05:32 +02:00
Nick Schonning
b878e3d8df
Enable ESLint react/no-deprecated ( #24471 )
2023-05-10 09:05:32 +02:00
たいち ひ
2f09bbdfe0
Rewrite logo.tsx as FC ( #24909 )
2023-05-10 08:58:21 +02:00
たいち ひ
2d5e257938
Rewrite logo.tsx as FC ( #24909 )
2023-05-10 08:58:21 +02:00
Renaud Chaput
c9dfc55b22
Disable RTK safety middlewares ( #24936 )
2023-05-10 08:38:02 +02:00
Renaud Chaput
6f8db56a01
Disable RTK safety middlewares ( #24936 )
2023-05-10 08:38:02 +02:00
Claire
abb99eca95
Remove our copy of image.d.ts as tsconfig already uses upstream's
2023-05-10 00:00:28 +02:00
Claire
f371464639
Remove our copy of image.d.ts as tsconfig already uses upstream's
2023-05-10 00:00:28 +02:00
Claire
e63a08bafd
Run prettier on Typescript files
...
Port 0886856bd2
2023-05-09 23:41:18 +02:00
Claire
96e99e2170
Run prettier on Typescript files
...
Port 51b83ed195
2023-05-09 23:41:18 +02:00
Claire
710151baf4
Merge commit '0886856bd2adecedcad6fad9dcb86ed8069c46c0' into glitch-soc/merge-upstream
2023-05-09 23:37:38 +02:00
Claire
facc7ab03c
Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream
2023-05-09 23:37:38 +02:00
Renaud Chaput
487715a3e3
[Glitch] Type Redux store and middleware
...
Port d67de22458
2023-05-09 23:28:40 +02:00
Renaud Chaput
5aa08826cf
[Glitch] Type Redux store and middleware
...
Port 6aeb162927
2023-05-09 23:28:40 +02:00
Renaud Chaput
b21d2eaeb6
[Glitch] Remove unused iOS agent sniffing function
...
Port d57be2731c
2023-05-09 23:20:57 +02:00
Renaud Chaput
a56c71faba
[Glitch] Remove unused iOS agent sniffing function
...
Port 224d458f7e
2023-05-09 23:20:57 +02:00
Renaud Chaput
e8415aa727
[Glitch] Rework polyfills loading
...
Port b640f89777
2023-05-09 23:20:24 +02:00
Renaud Chaput
526fe33e2f
[Glitch] Rework polyfills loading
...
Port a3a2414f0e
2023-05-09 23:20:24 +02:00
fusagiko / takayamaki
c5fb52eb23
[Glitch] Add more detailed type annotation for Account
...
Port a2e9b9d87d
2023-05-09 23:16:23 +02:00
fusagiko / takayamaki
e22a88b512
[Glitch] Add more detailed type annotation for Account
...
Port 6579e3af7d
2023-05-09 23:16:23 +02:00
Claire
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
Claire
1a664560cc
Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' 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
fusagiko / takayamaki
a150bb4f2e
Add type annotation for DisplayName component ( #24752 )
2023-05-09 23:08:54 +02:00
fusagiko / takayamaki
349cae0b57
Add type annotation for DisplayName component ( #24752 )
2023-05-09 23:08:54 +02:00
fusagiko / takayamaki
cbca954632
Rename Image component to ServerHeroImage ( #24894 )
2023-05-09 23:08:28 +02:00
fusagiko / takayamaki
ab7716cff4
Rename Image component to ServerHeroImage ( #24894 )
2023-05-09 23:08:28 +02:00
Claire
81b01c961b
Disable broken onboarding code
2023-05-09 23:03:23 +02:00
Claire
0fff2b67de
Disable broken onboarding code
2023-05-09 23:03:23 +02:00
Renaud Chaput
d0545c950c
[Glitch] Enforce stricter rules for Typescript files
...
Port 85b3823e66
2023-05-09 22:56:26 +02:00
Renaud Chaput
5f2071d055
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
2023-05-09 22:56:26 +02:00
Renaud Chaput
a7d51b92f3
[Glitch] Enforce React Rules of Hooks with eslint
...
Port b785500809
2023-05-09 22:28:53 +02:00
Renaud Chaput
b509b96504
[Glitch] Enforce React Rules of Hooks with eslint
...
Port d9b93bd15e
2023-05-09 22:28:53 +02:00
Renaud Chaput
4e88d37759
[Glitch] Dont use CommonJS (require, module.exports) anywhere
...
Port 45146e3f3b
2023-05-09 22:28:53 +02:00
Renaud Chaput
108720d7b0
[Glitch] Dont use CommonJS (require, module.exports) anywhere
...
Port 955179fc55
2023-05-09 22:28:53 +02:00
Claire
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
Claire
c81d1b0d38
Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' 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
たいち ひ
887112a065
[Glitch] Add TypeScript support for mastodon alias and image imports
...
Port 7c1305b3a4
2023-05-09 21:50:48 +02:00
Claire
43b38dc9e6
Copy hooks/useHovering.ts to glitch-soc
2023-05-09 21:30:10 +02:00
Claire
42bdc2add9
Copy hooks/useHovering.ts to glitch-soc
2023-05-09 21:30:10 +02:00
Claire
a0047223a5
Fix IconButton prop types in glitch-soc
2023-05-09 21:11:23 +02:00
Claire
8e806b6e88
Fix IconButton prop types in glitch-soc
2023-05-09 21:11:23 +02:00
Renaud Chaput
d8cae2752c
[Glitch] Mark wheel events on scrollable list as passive
...
Port b8d44c55fd
2023-05-09 20:42:07 +02:00
Renaud Chaput
6415981056
[Glitch] Mark wheel events on scrollable list as passive
...
Port 89269e4b71
2023-05-09 20:42:07 +02:00
fusagiko / takayamaki
fe8412bcf4
[Glitch] Rewrite Domain component as function component
...
Port 4ab18dee50
2023-05-09 20:33:58 +02:00
fusagiko / takayamaki
f94eb65cf9
[Glitch] Rewrite Domain component as function component
...
Port 9818f34273
2023-05-09 20:33:58 +02:00
fusagiko / takayamaki
7630b904ee
[Glitch] Use LayoutType from is_mobile in actions/app
...
Port 01caf92d80
2023-05-09 20:32:30 +02:00
fusagiko / takayamaki
468dfffd26
[Glitch] Use LayoutType from is_mobile in actions/app
...
Port 5bc8e2d1fd
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
たいち ひ
87a704f70b
[Glitch] Rewrite RadioButton component as FC
...
Port 76264e3fe8
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
たいち ひ
bd851d3b58
[Glitch] Rewrite Image component as function component
...
Port a65d2d1045
2023-05-09 20:24:49 +02:00
たいち ひ
77edfc33ba
[Glitch] Rewrite <NotSignedInIndicator /> as FC
...
Port 23a97effdb
2023-05-09 20:24:01 +02:00
たいち ひ
1edaf58fb9
[Glitch] Rewrite <NotSignedInIndicator /> as FC
...
Port 490ccbf40b
2023-05-09 20:24:01 +02:00
Claire
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
Claire
8b568755ad
Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' 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
Nick Schonning
0886856bd2
Use Prettier for ESLint formatting TypeScript ( #23631 )
2023-05-09 19:02:12 +02:00
Nick Schonning
51b83ed195
Use Prettier for ESLint formatting TypeScript ( #23631 )
2023-05-09 19:02:12 +02:00
Renaud Chaput
d67de22458
Type Redux store and middleware ( #24843 )
2023-05-09 16:56:26 +02:00
Renaud Chaput
6aeb162927
Type Redux store and middleware ( #24843 )
2023-05-09 16:56:26 +02:00
Claire
da803512c9
Fix javascript on moderation interface ( #24933 )
2023-05-09 16:42:02 +02:00
Claire
e1f466fbbe
Fix javascript on moderation interface ( #24933 )
2023-05-09 16:42:02 +02:00
Renaud Chaput
d57be2731c
Remove unused iOS agent sniffing function ( #24931 )
2023-05-09 15:48:53 +02:00
Renaud Chaput
224d458f7e
Remove unused iOS agent sniffing function ( #24931 )
2023-05-09 15:48:53 +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
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
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
2023-05-08 22:15:00 +02:00
Renaud Chaput
ea04f33f50
[Glitch] Fixes build errors from some previous TS-related commits
...
Port 45579a26cf
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
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
2023-05-08 22:15:00 +02:00
Renaud Chaput
2c5141e5ed
[Glitch] Remove MastodonMap TS type
...
Port 7bc13c1ca3
2023-05-08 22:15:00 +02:00
Renaud Chaput
a33d6c946a
[Glitch] Remove MastodonMap TS type
...
Port 9a52a7f7a0
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
ac97d77cb3
[Glitch] Add type annotation for some js files
...
Port 6fa4054a5d
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
e8243d5bbd
[Glitch] Add type annotation for some js files
...
Port e38b391940
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
2023-05-08 22:15:00 +02:00
Claire
f3af434c25
[Glitch] Fix incorrect import of redux store
...
Port 9c1929efad
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
5af7007906
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 69bd3a86f3
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
f4e3e309b1
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 8227af8dcc
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
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
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
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
2023-05-08 22:15:00 +02:00
Claire
319ff9bd71
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port 52ed627d9e
2023-05-08 21:09:49 +02:00
Claire
10f5329ddf
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port d37c0a1060
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
e225a49255
[Glitch] Add type annotation for Blurhash component
...
Port fc4bb5ed66
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
9ab89bb832
[Glitch] Add type annotation for Blurhash component
...
Port f50105779b
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
cccf0bdace
[Glitch] Add type annotation for IconButton component
...
Port bee49de3db
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
20f1f3aa7d
[Glitch] Add type annotation for IconButton component
...
Port 5a5975d7f7
2023-05-08 21:09:49 +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
Claire
d77fbbed73
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' 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
Claire
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
Claire
f89f3a8566
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
fusagiko / takayamaki
dd098625f0
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 90e4ab9f8f
2023-05-08 16:02:59 +02:00
fusagiko / takayamaki
aff2d55b80
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 15fd712464
2023-05-08 16:02:59 +02:00
fusagiko / takayamaki
c17c65aa57
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 27a750cc04
2023-05-08 15:59:27 +02:00
fusagiko / takayamaki
a49707dacb
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 81f75b1e0e
2023-05-08 15:59:27 +02:00
Eugen Rochko
5bfff5807a
[Glitch] Fix icons having an image role
...
Port c7924acf16
2023-05-08 15:57:35 +02:00
Eugen Rochko
7835f8fd22
[Glitch] Fix icons having an image role
...
Port 24b2c60beb
2023-05-08 15:57:35 +02:00
Claire
acc7cdc664
[Glitch] Fix audio player width in thread view
...
Port 9cf043f63a
2023-05-08 15:50:05 +02:00
Claire
e9eab013e7
[Glitch] Fix audio player width in thread view
...
Port cf1bc4bb93
2023-05-08 15:50:05 +02:00
Nick Schonning
55561098c4
[Glitch] Add eslint-plugin-jsdoc
...
Port 0224c3c0d9
2023-05-08 15:48:08 +02:00
Nick Schonning
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2023-05-08 15:48:08 +02:00
Christian Schmidt
a9089a2458
[Glitch] Fix media description not being cleared
...
Port 6ccea199ca
2023-05-08 15:41:17 +02:00
Christian Schmidt
09054f5485
[Glitch] Fix media description not being cleared
...
Port bfeccf6748
2023-05-08 15:41:17 +02:00
Claire
2aaf3528ca
Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Claire
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Claire
c90f09d36f
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2023-05-08 15:16:55 +02:00
Claire
5d18840ab9
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2023-05-08 15:16:55 +02:00
fusagiko / takayamaki
4ab18dee50
Rewrite Domain component as function component ( #24896 )
2023-05-08 15:12:12 +02:00
fusagiko / takayamaki
9818f34273
Rewrite Domain component as function component ( #24896 )
2023-05-08 15:12:12 +02:00
fusagiko / takayamaki
01caf92d80
Use LayoutType from is_mobile in actions/app ( #24863 )
2023-05-08 15:10:21 +02:00
fusagiko / takayamaki
5bc8e2d1fd
Use LayoutType from is_mobile in actions/app ( #24863 )
2023-05-08 15:10:21 +02:00
Claire
db240323f6
Fix some more JS linting issues ( #2211 )
...
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js
2023-05-08 14:02:41 +02:00
Claire
16c5354b8c
Fix some more JS linting issues ( #2211 )
...
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js
2023-05-08 14:02:41 +02:00
たいち ひ
5f709b1601
Add TypeScript support for mastodon alias and image imports ( #24895 )
2023-05-08 11:28:36 +02:00
たいち ひ
7c1305b3a4
Add TypeScript support for mastodon alias and image imports ( #24895 )
2023-05-08 11:28:36 +02:00
たいち ひ
13a16f3054
Rewrite RadioButton component as FC ( #24897 )
2023-05-08 11:12:53 +02:00
たいち ひ
76264e3fe8
Rewrite RadioButton component as FC ( #24897 )
2023-05-08 11:12:53 +02:00
たいち ひ
c1ccb55a59
Rewrite Image component as function component ( #24893 )
2023-05-08 11:12:44 +02:00
たいち ひ
a65d2d1045
Rewrite Image component as function component ( #24893 )
2023-05-08 11:12:44 +02:00
たいち ひ
23a97effdb
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2023-05-08 11:12:13 +02:00
たいち ひ
490ccbf40b
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2023-05-08 11:12:13 +02:00
たいち ひ
daecca565e
Rewrite <Check /> as FC ( #24901 )
2023-05-08 08:26:02 +02:00
たいち ひ
6fdbee240c
Rewrite <Check /> as FC ( #24901 )
2023-05-08 08:26:02 +02:00
Claire
12e8bcac9d
Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )
...
* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream
2023-05-07 21:43:25 +02:00
Claire
de74acbe0c
Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )
...
* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream
2023-05-07 21:43:25 +02:00
Claire
43c40b5df8
Fix thread lines not being properly updated when new posts are received ( #2210 )
2023-05-07 20:06:10 +02:00
Claire
ed0a407888
Fix thread lines not being properly updated when new posts are received ( #2210 )
2023-05-07 20:06:10 +02:00
Plastikmensch
ef5df7fc66
Reset language to default when cancelling a reply ( #2114 )
...
When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-07 18:45:10 +02:00
Plastikmensch
179e38cf15
Reset language to default when cancelling a reply ( #2114 )
...
When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-07 18:45:10 +02:00
Claire
e390c26429
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )
...
* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2023-05-07 18:22:25 +02:00
Claire
3fb7fe14c6
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )
...
* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2023-05-07 18:22:25 +02:00
Claire
6dbd28c763
Fix rubocop warnings ( #2206 )
2023-05-07 15:06:15 +02:00
Claire
9b59748679
Fix rubocop warnings ( #2206 )
2023-05-07 15:06:15 +02:00
Claire
b80dc7d2ed
Fix SCSS linting issues ( #2207 )
...
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons
* Run stylelint --fix
* Avoid `@extend` directives with doodle modal CSS
* Drop use of `@extend` for notification cleanup buttons SCSS
* Run prettier on SCSS
2023-05-07 15:04:59 +02:00
Claire
6f64c79ca4
Fix SCSS linting issues ( #2207 )
...
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons
* Run stylelint --fix
* Avoid `@extend` directives with doodle modal CSS
* Drop use of `@extend` for notification cleanup buttons SCSS
* Run prettier on SCSS
2023-05-07 15:04:59 +02:00
Claire
481aed8061
New Crowdin updates ( #2202 )
...
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
2023-05-07 13:37:47 +02:00
Claire
a6207d243b
New Crowdin updates ( #2202 )
...
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
2023-05-07 13:37:47 +02:00
fusagiko / takayamaki
2c894915dc
Rewrite VerifiedBadge component as function component ( #24892 )
2023-05-07 09:10:58 +02:00
fusagiko / takayamaki
140aa6b054
Rewrite VerifiedBadge component as function component ( #24892 )
2023-05-07 09:10:58 +02:00
Claire
f18f692f65
Fix compose textarea scroll behavior ( #24872 )
2023-05-05 18:58:58 +02:00
Claire
746979f75d
Fix compose textarea scroll behavior ( #24872 )
2023-05-05 18:58:58 +02:00
mogaminsk
3ea6c679cf
Fix import data field type ( #24874 )
2023-05-05 18:10:10 +02:00
mogaminsk
c9e040fb24
Fix import data field type ( #24874 )
2023-05-05 18:10:10 +02:00
S.H
2a651be35a
Fix column back button error ( #24867 )
2023-05-05 15:13:28 +02:00
S.H
5811ccc611
Fix column back button error ( #24867 )
2023-05-05 15:13:28 +02:00
zunda
458f6d0afb
Make it possible to upload audio and video to Heroku app ( #24866 )
2023-05-05 14:41:07 +02:00
zunda
c0ea33e3fc
Make it possible to upload audio and video to Heroku app ( #24866 )
2023-05-05 14:41:07 +02:00
Matt Jankowski
d65d954409
Extract StatusSafeReblogInsert concern from Status ( #24821 )
2023-05-04 14:06:20 +02:00
Matt Jankowski
0b249ebdb0
Extract StatusSafeReblogInsert concern from Status ( #24821 )
2023-05-04 14:06:20 +02:00
Nick Schonning
833076d6bf
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml ( #24469 )
2023-05-04 11:56:24 +02:00
Nick Schonning
569b39256b
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml ( #24469 )
2023-05-04 11:56:24 +02:00
Claire
53e3a1b06d
Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )
2023-05-04 10:13:00 +02:00
Claire
c3c7d59072
Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )
2023-05-04 10:13:00 +02:00
Nick Schonning
c366c93cfd
Fail ESLint for Warnings in CI ( #24836 )
2023-05-04 09:48:50 +02:00
Nick Schonning
f95125bd04
Fail ESLint for Warnings in CI ( #24836 )
2023-05-04 09:48:50 +02:00
Florin
1421a8efbd
Fix Back button going outside the app ( #24835 )
2023-05-04 08:14:04 +02:00
Florin
27bafabb64
Fix Back button going outside the app ( #24835 )
2023-05-04 08:14:04 +02:00
Nick Schonning
f6fd5e4ad0
Autofix Rubocop Style/ConcatArrayLiterals ( #23755 )
2023-05-04 05:57:40 +02:00
Nick Schonning
ff3b7069cf
Autofix Rubocop Style/ConcatArrayLiterals ( #23755 )
2023-05-04 05:57:40 +02:00
Nick Schonning
2f2c8f671b
Autofix Rubocop Style/HashSyntax ( #23754 )
2023-05-04 05:54:26 +02:00
Nick Schonning
da3bd913ae
Autofix Rubocop Style/HashSyntax ( #23754 )
2023-05-04 05:54:26 +02:00
Nick Schonning
54d59b8ee0
Autofix Rubocop Style/CaseLikeIf ( #23756 )
2023-05-04 05:51:18 +02:00
Nick Schonning
d5a185d721
Autofix Rubocop Style/CaseLikeIf ( #23756 )
2023-05-04 05:51:18 +02:00
Matt Jankowski
fded3a99ab
Spec coverage for settings/preferences/* controllers ( #24825 )
2023-05-04 05:44:27 +02:00
Matt Jankowski
08fb9d300a
Spec coverage for settings/preferences/* controllers ( #24825 )
2023-05-04 05:44:27 +02:00
Matt Jankowski
e8537a3a01
Fix Performance/CollectionLiteralInLoop cop ( #24819 )
2023-05-04 05:33:55 +02:00
Matt Jankowski
2c6c398c60
Fix Performance/CollectionLiteralInLoop cop ( #24819 )
2023-05-04 05:33:55 +02:00
Claire
90b45c5040
Fix various edge cases with local moves ( #24812 )
2023-05-03 19:19:25 +02:00
Claire
a2a22bad23
Fix various edge cases with local moves ( #24812 )
2023-05-03 19:19:25 +02:00
Claire
f89b5c08b6
Fix own posts not getting delivered to own lists ( #24810 )
2023-05-03 19:17:40 +02:00
Claire
1e75eb690d
Fix own posts not getting delivered to own lists ( #24810 )
2023-05-03 19:17:40 +02:00
Renaud Chaput
e1985e14f6
Fixes build errors from some previous TS-related commits ( #24811 )
2023-05-03 16:28:14 +02:00
Renaud Chaput
45579a26cf
Fixes build errors from some previous TS-related commits ( #24811 )
2023-05-03 16:28:14 +02:00
fusagiko / takayamaki
9ed91c444e
Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )
2023-05-03 15:28:39 +02:00
fusagiko / takayamaki
0999cb4601
Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )
2023-05-03 15:28:39 +02:00
Claire
a4e3f98fc7
Change Move handler to also move list memberships ( #24808 )
2023-05-03 14:03:38 +02:00
Claire
c98b012583
Change Move handler to also move list memberships ( #24808 )
2023-05-03 14:03:38 +02:00
Renaud Chaput
7bc13c1ca3
Remove MastodonMap TS type ( #24807 )
2023-05-03 13:32:11 +02:00
Renaud Chaput
9a52a7f7a0
Remove MastodonMap TS type ( #24807 )
2023-05-03 13:32:11 +02:00
fusagiko / takayamaki
6fa4054a5d
Add type annotation for some js files ( #24787 )
2023-05-03 11:43:29 +02:00
fusagiko / takayamaki
e38b391940
Add type annotation for some js files ( #24787 )
2023-05-03 11:43:29 +02:00
Claire
ca3003835d
Improve automatic post cleanup worker performances ( #24785 )
2023-05-03 10:31:40 +02:00
Claire
8b636a29c6
Improve automatic post cleanup worker performances ( #24785 )
2023-05-03 10:31:40 +02:00
Matt Jankowski
b7e49e1a70
Fix Performance/MethodObjectAsBlock cop ( #24798 )
2023-05-03 10:30:54 +02:00
Matt Jankowski
a0c9f2447e
Fix Performance/MethodObjectAsBlock cop ( #24798 )
2023-05-03 10:30:54 +02:00
Claire
d76495d080
Fix incorrect import of redux store ( #24805 )
2023-05-03 10:29:45 +02:00
Claire
9c1929efad
Fix incorrect import of redux store ( #24805 )
2023-05-03 10:29:45 +02:00
Claire
52ed627d9e
Fix incorrect box shadow on avatar in thread view ( #24800 )
2023-05-03 09:11:20 +02:00
Claire
d37c0a1060
Fix incorrect box shadow on avatar in thread view ( #24800 )
2023-05-03 09:11:20 +02:00
Matt Jankowski
53682a7b4f
Fix Performance/DeletePrefix cop ( #24796 )
2023-05-02 21:07:45 +02:00
Matt Jankowski
668a19a2f3
Fix Performance/DeletePrefix cop ( #24796 )
2023-05-02 21:07:45 +02:00
fusagiko / takayamaki
69bd3a86f3
use configureStore of redux-toolkit instead of createStore of redux ( #24790 )
2023-05-02 20:39:06 +02:00
fusagiko / takayamaki
8227af8dcc
use configureStore of redux-toolkit instead of createStore of redux ( #24790 )
2023-05-02 20:39:06 +02:00
Matt Jankowski
ec265b7d8a
Fix Rails/ActiveRecordCallbacksOrder cop ( #24689 )
2023-05-02 18:23:35 +02:00
Matt Jankowski
b5c4b47746
Fix Rails/ActiveRecordCallbacksOrder cop ( #24689 )
2023-05-02 18:23:35 +02:00
Matt Jankowski
7a843ed550
Extract AccountSearch concern from Account ( #24716 )
2023-05-02 18:21:36 +02:00
Matt Jankowski
38b2974a83
Extract AccountSearch concern from Account ( #24716 )
2023-05-02 18:21:36 +02:00
Matt Jankowski
4d1f9d4278
Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method ( #24741 )
2023-05-02 18:16:07 +02:00
Matt Jankowski
f1c1dd0118
Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method ( #24741 )
2023-05-02 18:16:07 +02:00
Matt Jankowski
c50acc4d2c
ApplicationHelper spec coverage, unused removal, tiny refactor ( #24762 )
2023-05-02 18:10:39 +02:00
Matt Jankowski
a7df578f97
ApplicationHelper spec coverage, unused removal, tiny refactor ( #24762 )
2023-05-02 18:10:39 +02:00
Matt Jankowski
276a0f7ff9
Fix Performance/Count cop ( #24793 )
2023-05-02 18:06:43 +02:00
Matt Jankowski
bae694108a
Fix Performance/Count cop ( #24793 )
2023-05-02 18:06:43 +02:00
Claire
7da78595fc
Add fallback redirection when getting a webfinger query LOCAL_DOMAIN@LOCAL_DOMAIN ( #23600 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-05-02 17:42:42 +02:00
Claire
9189e90ff2
Add fallback redirection when getting a webfinger query LOCAL_DOMAIN@LOCAL_DOMAIN ( #23600 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-05-02 17:42:42 +02:00
Matt Jankowski
621e53f8fc
Fix Performance/Sum cop ( #24788 )
2023-05-02 16:10:40 +02:00
Matt Jankowski
5e060e1f44
Fix Performance/Sum cop ( #24788 )
2023-05-02 16:10:40 +02:00
Claire
dc06dd260f
Check domain suspensions before trying to fetch resources ( #24535 )
2023-05-02 15:22:19 +02:00
Claire
a89b02af92
Check domain suspensions before trying to fetch resources ( #24535 )
2023-05-02 15:22:19 +02:00
Claire
e964406ec3
Optimize archive export service and export zip files instead of gzipped tar files ( #23360 )
2023-05-02 15:09:43 +02:00
Claire
b233da5996
Optimize archive export service and export zip files instead of gzipped tar files ( #23360 )
2023-05-02 15:09:43 +02:00
Eugen Rochko
d6808a561e
Add ALT badges to media that has alternative text in web UI ( #24782 )
2023-05-02 14:47:04 +02:00
Eugen Rochko
8131a5b330
Add ALT badges to media that has alternative text in web UI ( #24782 )
2023-05-02 14:47:04 +02:00
Claire
a247f77162
Change lists to be able to include accounts with pending follow requests ( #19727 )
2023-05-02 14:40:36 +02:00
Claire
6693a4fe7c
Change lists to be able to include accounts with pending follow requests ( #19727 )
2023-05-02 14:40:36 +02:00
Claire
8c43856691
Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )
2023-05-02 13:58:48 +02:00
Claire
598e63dad2
Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )
2023-05-02 13:58:48 +02:00
Matt Jankowski
182bb4595f
Fix Lint/DuplicateBranch cop ( #24766 )
2023-05-02 12:57:11 +02:00
Matt Jankowski
88d33f361f
Fix Lint/DuplicateBranch cop ( #24766 )
2023-05-02 12:57:11 +02:00
fusagiko / takayamaki
fc4bb5ed66
Add type annotation for Blurhash component ( #24750 )
2023-05-02 12:54:00 +02:00
fusagiko / takayamaki
f50105779b
Add type annotation for Blurhash component ( #24750 )
2023-05-02 12:54:00 +02:00
fusagiko / takayamaki
bee49de3db
Add type annotation for IconButton component ( #24753 )
2023-05-02 12:53:32 +02:00
fusagiko / takayamaki
5a5975d7f7
Add type annotation for IconButton component ( #24753 )
2023-05-02 12:53:32 +02:00
Claire
abce7cf2b9
Rewrite import feature ( #21054 )
2023-05-02 12:08:48 +02:00
Claire
32a030dd74
Rewrite import feature ( #21054 )
2023-05-02 12:08:48 +02:00
Nick Schonning
7a13eb370f
Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-05-01 18:23:57 +09:00
Nick Schonning
fc56eda94b
Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-05-01 18:23:57 +09:00
fusagiko / takayamaki
90e4ab9f8f
Add type annotation for RelativeTimestamp component ( #24749 )
2023-05-01 00:51:31 +02:00
fusagiko / takayamaki
15fd712464
Add type annotation for RelativeTimestamp component ( #24749 )
2023-05-01 00:51:31 +02:00
fusagiko / takayamaki
27a750cc04
Rewrite Icon and IconWithBadge with typescript ( #24747 )
2023-05-01 00:51:00 +02:00
fusagiko / takayamaki
81f75b1e0e
Rewrite Icon and IconWithBadge with typescript ( #24747 )
2023-05-01 00:51:00 +02:00
Matt Jankowski
bdbc9d0036
Fix Rails/CompactBlank cop ( #24690 )
2023-04-30 14:07:21 +02:00
Matt Jankowski
d902a707a3
Fix Rails/CompactBlank cop ( #24690 )
2023-04-30 14:07:21 +02:00
Matt Jankowski
e9e394fe57
Fix Rails/InverseOf cop ( #24732 )
2023-04-30 14:06:53 +02:00
Matt Jankowski
af824db398
Fix Rails/InverseOf cop ( #24732 )
2023-04-30 14:06:53 +02:00
Eugen Rochko
b9f44a797a
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-30 17:02:11 +09:00
Eugen Rochko
0a08e9d3d3
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-30 17:02:11 +09:00
dependabot[bot]
c943082b1b
Bump connection_pool from 2.3.0 to 2.4.0 ( #24290 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-04-30 15:45:02 +09:00
dependabot[bot]
fa14976a5d
Bump connection_pool from 2.3.0 to 2.4.0 ( #24290 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-04-30 15:45:02 +09:00
Matt Jankowski
ba0a49b7f6
Fix Rails/ContentTag cop ( #24691 )
2023-04-30 06:47:15 +02:00
Matt Jankowski
bdc74086e6
Fix Rails/ContentTag cop ( #24691 )
2023-04-30 06:47:15 +02:00
Matt Jankowski
390aa577e7
Fix Rails/ActionOrder cop ( #24692 )
2023-04-30 06:46:39 +02:00
Matt Jankowski
6e226f5a32
Fix Rails/ActionOrder cop ( #24692 )
2023-04-30 06:46:39 +02:00
Claire
9dfb594a45
Fix pop-in player placeholder layout in thread view ( #24715 )
2023-04-30 06:42:43 +02:00
Claire
678d836c7d
Fix pop-in player placeholder layout in thread view ( #24715 )
2023-04-30 06:42:43 +02:00
Claire
9cf043f63a
Fix audio player width in thread view ( #24713 )
2023-04-30 06:42:22 +02:00
Claire
cf1bc4bb93
Fix audio player width in thread view ( #24713 )
2023-04-30 06:42:22 +02:00
Nick Schonning
0224c3c0d9
Add eslint-plugin-jsdoc ( #24719 )
2023-04-30 02:29:54 +02:00
Nick Schonning
f22b4e556c
Add eslint-plugin-jsdoc ( #24719 )
2023-04-30 02:29:54 +02:00
Christian Schmidt
6ccea199ca
Fix media description not being cleared ( #24720 )
2023-04-30 02:29:24 +02:00
Christian Schmidt
bfeccf6748
Fix media description not being cleared ( #24720 )
2023-04-30 02:29:24 +02:00
Claire
eb3911d9bf
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2023-04-29 19:38:08 +02:00
Claire
e79998a11a
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2023-04-29 19:38:08 +02:00
Eugen Rochko
ffb5a3d4f3
[Glitch] Change logo version in header based on screen size in web UI
...
Port 4e6e4bcc4d
2023-04-29 18:54:13 +02:00
Eugen Rochko
38eeed6cbf
[Glitch] Change logo version in header based on screen size in web UI
...
Port 6028d047b9
2023-04-29 18:54:13 +02:00
Nick Schonning
c4e35a3f68
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 86d0a0b7d8
2023-04-29 18:38:23 +02:00
Nick Schonning
1033598416
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 2daa5a1549
2023-04-29 18:38:23 +02:00
Claire
a1a60257c5
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
Claire
edec08b970
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
Claire
a6a1587450
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 4e7a3a2faf
2023-04-29 12:21:44 +02:00
Claire
cb97a92954
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 105f8687e4
2023-04-29 12:21:44 +02:00
Claire
c82f3a67c1
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 3141130720
2023-04-29 12:17:06 +02:00
Claire
103b6de8b2
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 1527b02c6d
2023-04-29 12:17:06 +02:00
Eugen Rochko
a2a800c212
[Glitch] Add lines to threads in web UI
...
Port 4141f9228c
2023-04-29 12:08:13 +02:00
Eugen Rochko
7b01b7c3bf
[Glitch] Add lines to threads in web UI
...
Port 290e4aba31
2023-04-29 12:08:13 +02:00
Eugen Rochko
bf04ff4601
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port a6c7401225
2023-04-29 11:34:44 +02:00
Eugen Rochko
8015297f9e
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port 7cf963eec2
2023-04-29 11:34:44 +02:00
Chike Nwaenie
1b1a7e5a51
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port 84adcaa474
2023-04-29 11:28:24 +02:00
Chike Nwaenie
374a109546
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port e1b4eeb636
2023-04-29 11:28:24 +02:00
Christian Schmidt
ab2df6fb69
[Glitch] Use CSS to trim long card descriptions
...
Port 4613dfe97b
2023-04-29 11:26:58 +02:00
Christian Schmidt
0091b28ffe
[Glitch] Use CSS to trim long card descriptions
...
Port e713c545b8
2023-04-29 11:26:58 +02:00
Claire
5c4f034e9b
[Glitch] Fix infinite loop in emoji replacement code
...
Port a55f461b4b
2023-04-29 11:14:43 +02:00
Claire
11b34a903a
[Glitch] Fix infinite loop in emoji replacement code
...
Port fbb4de3dbc
2023-04-29 11:14:43 +02:00
Claire
53e8b2dc7e
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 2473078db7
2023-04-29 11:12:35 +02:00
Claire
0a813d96db
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 37886c28da
2023-04-29 11:12:35 +02:00
fusagiko / takayamaki
e45bb3f893
[Glitch] Allow == when null checking
...
Port f14395c2cf
2023-04-29 11:09:46 +02:00
fusagiko / takayamaki
66bda4713e
[Glitch] Allow == when null checking
...
Port c1a7e38d2b
2023-04-29 11:09:46 +02:00
Claire
498de92bc8
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
Claire
12b935fadf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
Claire
4e7a3a2faf
Fix thread lines in right-to-left locales ( #24714 )
2023-04-28 13:12:35 +02:00
Claire
105f8687e4
Fix thread lines in right-to-left locales ( #24714 )
2023-04-28 13:12:35 +02:00
Claire
febcc47cb3
Fix wrong classes audio and video instead of audio-player and video-player in CSS ( #24711 )
2023-04-28 11:15:43 +02:00
Claire
2a3a110f00
Fix wrong classes audio and video instead of audio-player and video-player in CSS ( #24711 )
2023-04-28 11:15:43 +02:00
Claire
75a3da1abf
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2023-04-28 10:27:26 +02:00
Claire
faa336e3f7
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2023-04-28 10:27:26 +02:00
Eugen Rochko
ff65e8e974
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
Eugen Rochko
8979b70975
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
Claire
3acc54f7bf
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2023-04-28 10:01:38 +02:00
Claire
1c61869eed
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2023-04-28 10:01:38 +02:00
Eugen Rochko
4e6e4bcc4d
Change logo version in header based on screen size in web UI ( #24707 )
2023-04-28 10:00:33 +02:00
Eugen Rochko
6028d047b9
Change logo version in header based on screen size in web UI ( #24707 )
2023-04-28 10:00:33 +02:00
Eugen Rochko
4438c74c20
Remove display name input from sign-up form ( #24704 )
2023-04-28 08:54:43 +02:00
Eugen Rochko
2b0f1f365a
Remove display name input from sign-up form ( #24704 )
2023-04-28 08:54:43 +02:00
Eugen Rochko
a6c7401225
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2023-04-28 08:54:20 +02:00
Eugen Rochko
7cf963eec2
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2023-04-28 08:54:20 +02:00
Claire
7aed94ab13
Fix refering to unused preview-card CSS class instead of status-card ( #24696 )
2023-04-28 07:50:31 +02:00
Claire
a5bc4ea550
Fix refering to unused preview-card CSS class instead of status-card ( #24696 )
2023-04-28 07:50:31 +02:00
Matt Jankowski
3104805285
Remove duplicate react helper method definitions ( #24700 )
2023-04-28 06:35:25 +02:00
Matt Jankowski
ece38b9318
Remove duplicate react helper method definitions ( #24700 )
2023-04-28 06:35:25 +02:00
Nick Schonning
519ae8c0c6
Drop EOL Ruby 2.7 ( #24237 )
2023-04-27 01:46:18 +02:00
Nick Schonning
49fad26eca
Drop EOL Ruby 2.7 ( #24237 )
2023-04-27 01:46:18 +02:00
Claire
4fb3d20faf
Fix preview cards layout in thread view ( #24677 )
2023-04-27 01:45:19 +02:00
Claire
d8a06c1375
Fix preview cards layout in thread view ( #24677 )
2023-04-27 01:45:19 +02:00
Eugen Rochko
231c132159
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
Eugen Rochko
d4511f2a76
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
Plastikmensch
c33ecc00fa
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4866812b28
2023-04-26 21:30:41 +02:00
Plastikmensch
1565af1caf
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4520e6473a
2023-04-26 21:30:41 +02:00
Matt Jankowski
dcb91de3ba
React component helper specs ( #24072 )
2023-04-26 18:21:32 +02:00
Matt Jankowski
91a8cd21d8
React component helper specs ( #24072 )
2023-04-26 18:21:32 +02:00
Claire
e82696a4b9
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
2023-04-26 11:42:47 +02:00
Claire
b0bf6216e6
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
2023-04-26 11:42:47 +02:00
Claire
8c30221a41
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
2023-04-26 11:42:26 +02:00
Claire
62ab7506d6
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
2023-04-26 11:42:26 +02:00
Claire
3141130720
Fix sass warning about deprecated slash as division ( #24653 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-04-25 22:15:00 +02:00
Claire
1527b02c6d
Fix sass warning about deprecated slash as division ( #24653 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-04-25 22:15:00 +02:00
Claire
0cfbe4c4af
Fix some user-independent endpoints potentially reading session cookies ( #24650 )
2023-04-25 22:14:44 +02:00
Claire
1419f90ef2
Fix some user-independent endpoints potentially reading session cookies ( #24650 )
2023-04-25 22:14:44 +02:00
Plastikmensch
c6305b9817
Fix small mistakes in RTL layout ( #2182 )
...
Borders in blockquotes in reply-indicator weren't colored properly.
avatar margin when viewing edited toots dropdown was applied to wrong side.
Conversations had padding applied to the wrong side.
Padding for notifcation cleaner checkboxes was applied to wrong side.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:33:27 +02:00
Plastikmensch
678480d4d3
Fix small mistakes in RTL layout ( #2182 )
...
Borders in blockquotes in reply-indicator weren't colored properly.
avatar margin when viewing edited toots dropdown was applied to wrong side.
Conversations had padding applied to the wrong side.
Padding for notifcation cleaner checkboxes was applied to wrong side.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:33:27 +02:00
Plastikmensch
10259df1be
Change drawer--header to drawer__header ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
Plastikmensch
aea7866161
Change drawer--header to drawer__header ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
Claire
31bd0da41f
Fix anonymous visitors getting a session cookie on first visit ( #24584 )
2023-04-25 16:51:38 +02:00
Claire
276c39361b
Fix anonymous visitors getting a session cookie on first visit ( #24584 )
2023-04-25 16:51:38 +02:00
Eugen Rochko
b61ff36351
Change unauthenticated responses to be cached in REST API ( #24348 )
2023-04-25 15:41:34 +02:00
Eugen Rochko
6084461cd0
Change unauthenticated responses to be cached in REST API ( #24348 )
2023-04-25 15:41:34 +02:00
Eugen Rochko
d94f500d9c
Add more tips to onboarding flow in web UI ( #24646 )
2023-04-25 11:12:37 +02:00
Eugen Rochko
c35e3cb6ac
Add more tips to onboarding flow in web UI ( #24646 )
2023-04-25 11:12:37 +02:00
Eugen Rochko
49493f8b50
Change hashtags and mentions in bios to open in-app in web UI ( #24643 )
2023-04-25 06:33:21 +02:00
Eugen Rochko
8099ba04be
Change hashtags and mentions in bios to open in-app in web UI ( #24643 )
2023-04-25 06:33:21 +02:00
Claire
24d5626e02
Fix crash when SSO_ACCOUNT_SETTINGS is not defined ( #24628 )
2023-04-24 20:26:04 +02:00
Claire
e9a79d46cd
Fix crash when SSO_ACCOUNT_SETTINGS is not defined ( #24628 )
2023-04-24 20:26:04 +02:00
Eugen Rochko
1af9d25c8a
Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )
2023-04-24 09:53:54 +02:00
Eugen Rochko
804aa8d501
Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )
2023-04-24 09:53:54 +02:00
Kouhai
7c715a1ec4
th: Merge remote-tracking branch 'glitch/main'
2023-04-23 23:23:28 -07:00
Nick Schonning
86d0a0b7d8
Enable formatjs/prefer-pound-in-plural ( #24622 )
2023-04-24 08:07:19 +02:00
Nick Schonning
2daa5a1549
Enable formatjs/prefer-pound-in-plural ( #24622 )
2023-04-24 08:07:19 +02:00
Eugen Rochko
4141f9228c
Add lines to threads in web UI ( #24549 )
2023-04-24 08:07:03 +02:00
Eugen Rochko
290e4aba31
Add lines to threads in web UI ( #24549 )
2023-04-24 08:07:03 +02:00
Christian Schmidt
7598355527
Remove tai locale ( #23880 )
2023-04-23 22:49:07 +02:00
Christian Schmidt
5141697323
Remove tai locale ( #23880 )
2023-04-23 22:49:07 +02:00
Nick Schonning
92e237574f
Remove empty Kushubian (csb) local files ( #24151 )
2023-04-23 22:43:12 +02:00
Nick Schonning
ef3675d688
Remove empty Kushubian (csb) local files ( #24151 )
2023-04-23 22:43:12 +02:00
Matt Jankowski
f01a643897
Remove instance variables from helper usage ( #24203 )
2023-04-23 22:35:54 +02:00
Matt Jankowski
0a5f0a8b20
Remove instance variables from helper usage ( #24203 )
2023-04-23 22:35:54 +02:00
Chike Nwaenie
84adcaa474
Change styling of the recommended accounts to allow bio to be more visible ( #24480 )
2023-04-23 22:33:08 +02:00
Chike Nwaenie
e1b4eeb636
Change styling of the recommended accounts to allow bio to be more visible ( #24480 )
2023-04-23 22:33:08 +02:00
Christian Schmidt
4613dfe97b
Use CSS to trim long card descriptions ( #24265 )
2023-04-23 22:32:47 +02:00
Christian Schmidt
e713c545b8
Use CSS to trim long card descriptions ( #24265 )
2023-04-23 22:32:47 +02:00
Claire
d8e7a72597
Fix caching logic with regards to Accept-Language, Cookie, and Signature ( #24604 )
2023-04-23 22:27:24 +02:00
Claire
58a1b2e330
Fix caching logic with regards to Accept-Language, Cookie, and Signature ( #24604 )
2023-04-23 22:27:24 +02:00
Claire
59a73ea537
Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly ( #24607 )
2023-04-23 22:25:40 +02:00
Claire
5dc3173ef8
Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly ( #24607 )
2023-04-23 22:25:40 +02:00
Eugen Rochko
30666618ea
Add new onboarding flow to web UI ( #24619 )
2023-04-23 22:24:53 +02:00
Eugen Rochko
0461f83320
Add new onboarding flow to web UI ( #24619 )
2023-04-23 22:24:53 +02:00
Claire
f353e2b0b5
Fix JS crashing if initial-state is not set ( #2193 )
...
Fixes issues with the JS for at least sign-up pages not working
2023-04-22 19:13:20 +02:00
Claire
5b58ebb04f
Fix JS crashing if initial-state is not set ( #2193 )
...
Fixes issues with the JS for at least sign-up pages not working
2023-04-22 19:13:20 +02:00
Eugen Rochko
4a0aa54a87
New Crowdin updates ( #24517 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-22 19:37:41 +09:00
Eugen Rochko
9d75b03ba4
New Crowdin updates ( #24517 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-22 19:37:41 +09:00
fusagiko / takayamaki
0015bd91a6
[Glitch] Rewrite AnimatedNumber component with React hooks
...
Port b72a9eb02e
2023-04-22 11:28:23 +02:00
fusagiko / takayamaki
9ef32ea570
[Glitch] Rewrite AnimatedNumber component with React hooks
...
Port ab740f464a
2023-04-22 11:28:23 +02:00
fusagiko / takayamaki
eadf9807fb
[Glitch] Rewrite GIFV component with React hooks
...
Port e8450b1dc2
2023-04-22 11:22:49 +02:00
fusagiko / takayamaki
799e9917e4
[Glitch] Rewrite GIFV component with React hooks
...
Port cf3fa1e814
2023-04-22 11:22:49 +02:00
Kouhai
004c452343
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 01:48:47 -07:00
Eugen Rochko
0bc7beb1b1
[Glitch] Add client-side validation for taken username in sign-up form
...
Port 39bb8504b5
2023-04-22 10:47:44 +02:00
Eugen Rochko
6ea9137233
[Glitch] Add client-side validation for taken username in sign-up form
...
Port 955ec252a4
2023-04-22 10:47:44 +02:00
Claire
3919549c96
[Glitch] Fix crash when trying to open the filter modal
...
Port 8e36b04fd2
2023-04-22 10:20:50 +02:00
Claire
bc7b3399fb
[Glitch] Fix crash when trying to open the filter modal
...
Port bc4745f482
2023-04-22 10:20:50 +02:00
Eugen Rochko
7642a3bb67
[Glitch] Add progress indicator to sign-up flow
...
Port 9a7a4d79ec
2023-04-22 10:18:20 +02:00
Eugen Rochko
2f3dffb057
[Glitch] Add progress indicator to sign-up flow
...
Port e5c0b16735
2023-04-22 10:18:20 +02:00
Ivan Rodriguez
98bc47e3ca
[Glitch] Fix status title for statuses without text
...
Port 9b7e66c109
2023-04-22 10:16:20 +02:00
Ivan Rodriguez
a21a875dba
[Glitch] Fix status title for statuses without text
...
Port f05fb51ecb
2023-04-22 10:16:20 +02:00
Nick Schonning
b31e7d43ea
[Glitch] typo: collapsable -> collapsible
...
Port de18852ec7
2023-04-22 10:13:58 +02:00
Nick Schonning
f2797276b2
[Glitch] typo: collapsable -> collapsible
...
Port d02aa274be
2023-04-22 10:13:58 +02:00
Claire
5c962d77bb
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
Upstream removed a method close to a glitch-soc theming-related method.
Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
Claire
abfdafef1e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
Upstream removed a method close to a glitch-soc theming-related method.
Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
Kouhai
bd2edc2d37
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
4be96df50b
th: fix build
2023-04-22 00:38:08 -07:00
Kouhai
ac9104875b
th: fix extension
2023-04-22 00:38:08 -07:00
Kouhai
ee1dc4a0d1
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
da1aa87c6f
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
228f9c72d4
th: update models, node/Gemfile state
2023-04-22 00:38:08 -07:00
Kouhai
705fd6c182
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
a936e75d02
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Claire
f769daf908
Change automatic post deletion thresholds and load detection ( #24614 )
2023-04-21 18:14:19 +02:00
Claire
501d6197c4
Change automatic post deletion thresholds and load detection ( #24614 )
2023-04-21 18:14:19 +02:00
Claire
a55f461b4b
Fix infinite loop in emoji replacement code ( #24615 )
2023-04-21 18:08:28 +02:00
Claire
fbb4de3dbc
Fix infinite loop in emoji replacement code ( #24615 )
2023-04-21 18:08:28 +02:00
Claire
d1e9e79cb7
Minor clean up and optimization of the automatic post deletion code ( #24613 )
2023-04-21 16:53:50 +02:00
Claire
b0eba1a060
Minor clean up and optimization of the automatic post deletion code ( #24613 )
2023-04-21 16:53:50 +02:00
Claire
2473078db7
Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )
2023-04-20 16:43:55 +02:00
Claire
37886c28da
Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )
2023-04-20 16:43:55 +02:00
fusagiko / takayamaki
f14395c2cf
Allow == when null checking ( #24593 )
2023-04-19 17:46:46 +02:00
fusagiko / takayamaki
c1a7e38d2b
Allow == when null checking ( #24593 )
2023-04-19 17:46:46 +02:00
Eugen Rochko
3ca64638d4
Refactor Cache-Control and Vary definitions ( #24347 )
2023-04-19 16:07:29 +02:00
Eugen Rochko
e98c86050a
Refactor Cache-Control and Vary definitions ( #24347 )
2023-04-19 16:07:29 +02:00
Robert R George
335b53ab48
Add trend management to admin API ( #24257 )
2023-04-18 11:33:30 +02:00
Robert R George
4db8230194
Add trend management to admin API ( #24257 )
2023-04-18 11:33:30 +02:00
Heitor de Melo Cardozo
a34c422490
Change moderation search an account using the username with @ ( #24242 )
2023-04-17 14:16:36 +02:00
Heitor de Melo Cardozo
bc75e62ca6
Change moderation search an account using the username with @ ( #24242 )
2023-04-17 14:16:36 +02:00
fusagiko / takayamaki
b72a9eb02e
Rewrite AnimatedNumber component with React hooks ( #24559 )
2023-04-17 13:25:15 +02:00
fusagiko / takayamaki
ab740f464a
Rewrite AnimatedNumber component with React hooks ( #24559 )
2023-04-17 13:25:15 +02:00
Claire
27fab2ce37
Fix crash in NotifyService when trying to send an email notification for polls ( #24558 )
2023-04-17 13:13:36 +02:00
Claire
85b1b45820
Fix crash in NotifyService when trying to send an email notification for polls ( #24558 )
2023-04-17 13:13:36 +02:00
Heitor de Melo Cardozo
e2760bd0ee
Add user handle to notification mail recipient address ( #24240 )
...
Co-authored-by: luccamps <luccamps@users.noreply.github.com>
Co-authored-by: Leonardo Negreiros de Oliveira <negreirosleo12@gmail.com>
Co-authored-by: Marcio Flavio <mflaviof1995@gmail.com>
Co-authored-by: Gabriel Quaresma <j.quaresmasantos_98@hotmail.com>
2023-04-17 11:06:06 +02:00
Heitor de Melo Cardozo
4601e0dcbb
Add user handle to notification mail recipient address ( #24240 )
...
Co-authored-by: luccamps <luccamps@users.noreply.github.com>
Co-authored-by: Leonardo Negreiros de Oliveira <negreirosleo12@gmail.com>
Co-authored-by: Marcio Flavio <mflaviof1995@gmail.com>
Co-authored-by: Gabriel Quaresma <j.quaresmasantos_98@hotmail.com>
2023-04-17 11:06:06 +02:00
Claire
8e36b04fd2
Fix crash when trying to open the filter modal ( #24556 )
2023-04-17 10:15:21 +02:00
Claire
bc4745f482
Fix crash when trying to open the filter modal ( #24556 )
2023-04-17 10:15:21 +02:00
fusagiko / takayamaki
d7a0f21886
Rewrite AvatarOverlay component with React hooks ( #24543 )
2023-04-17 07:07:27 +02:00
fusagiko / takayamaki
9f8d34620b
Rewrite AvatarOverlay component with React hooks ( #24543 )
2023-04-17 07:07:27 +02:00
Eugen Rochko
d509c41d38
[Glitch] Change all components to use the same error page in web UI
...
Port 8b0c634a8a
2023-04-16 18:20:51 +02:00
Eugen Rochko
34f8e696e2
[Glitch] Change all components to use the same error page in web UI
...
Port cee357d538
2023-04-16 18:20:51 +02:00
Claire
d6e6a036b4
[Glitch] Add “In Memoriam” banner back to profiles
...
Port e5498861d4
2023-04-16 18:02:16 +02:00
Claire
a3c05640f7
[Glitch] Add “In Memoriam” banner back to profiles
...
Port 86ad43173f
2023-04-16 18:02:16 +02:00
Claire
0332ac95c0
[Glitch] Fix tab arrows on RTL layouts
...
Port 98022f6f5d
2023-04-16 17:58:32 +02:00
Claire
cb0562f32c
[Glitch] Fix tab arrows on RTL layouts
...
Port af49d93fd6
2023-04-16 17:58:32 +02:00
Claire
fca86b29d9
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-16 17:52:44 +02:00
Claire
f9a9f9344b
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-16 17:52:44 +02:00
Plastikmensch
da094537d6
[Glitch] Refactor styles to use logical properties for positioning ( #2156 )
...
Port 5ec33534f80679fcd2f1
2023-04-16 17:45:18 +02:00
Plastikmensch
f28942cef9
[Glitch] Refactor styles to use logical properties for positioning ( #2156 )
...
Port babd86e59445848d6547
2023-04-16 17:45:18 +02:00
Claire
c012b39674
New Crowdin updates ( #2172 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Belarusian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Frisian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Burmese)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Faroese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Sinhala)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Aragonese)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Scots)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
2023-04-16 17:25:43 +02:00
Claire
0cbd579ef0
New Crowdin updates ( #2172 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Belarusian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Frisian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Burmese)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Faroese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Sinhala)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Aragonese)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Scots)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
2023-04-16 17:25:43 +02:00
fusagiko / takayamaki
e8450b1dc2
Rewrite GIFV component with React hooks ( #24552 )
2023-04-16 16:09:04 +02:00
fusagiko / takayamaki
cf3fa1e814
Rewrite GIFV component with React hooks ( #24552 )
2023-04-16 16:09:04 +02:00
Eugen Rochko
9a7a4d79ec
Add progress indicator to sign-up flow ( #24545 )
2023-04-16 07:01:24 +02:00
Eugen Rochko
e5c0b16735
Add progress indicator to sign-up flow ( #24545 )
2023-04-16 07:01:24 +02:00
Eugen Rochko
39bb8504b5
Add client-side validation for taken username in sign-up form ( #24546 )
2023-04-16 02:10:48 +02:00
Eugen Rochko
955ec252a4
Add client-side validation for taken username in sign-up form ( #24546 )
2023-04-16 02:10:48 +02:00
Ivan Rodriguez
9b7e66c109
Fix status title for statuses without text ( #24359 )
2023-04-14 17:29:09 +02:00
Ivan Rodriguez
f05fb51ecb
Fix status title for statuses without text ( #24359 )
2023-04-14 17:29:09 +02:00
Nick Schonning
de18852ec7
typo: collapsable -> collapsible ( #24521 )
2023-04-14 11:01:23 +02:00
Nick Schonning
d02aa274be
typo: collapsable -> collapsible ( #24521 )
2023-04-14 11:01:23 +02:00
Plastikmensch
c4708b54b5
Fix default content type setting not applying ( #2176 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-12 20:12:25 +02:00
Plastikmensch
bed63f6dae
Fix default content type setting not applying ( #2176 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-12 20:12:25 +02:00
Claire
98022f6f5d
Fix tab arrows on RTL layouts ( #24520 )
2023-04-12 16:01:49 +02:00
Claire
af49d93fd6
Fix tab arrows on RTL layouts ( #24520 )
2023-04-12 16:01:49 +02:00
Claire
da451d859f
Fix missing translation strings in en.json and defaultMessages.json ( #24518 )
2023-04-12 15:24:45 +02:00
Claire
8f0b0435ab
Fix missing translation strings in en.json and defaultMessages.json ( #24518 )
2023-04-12 15:24:45 +02:00
Claire
e5498861d4
Add “In Memoriam” banner back to profiles ( #23614 )
2023-04-12 14:50:02 +02:00
Claire
86ad43173f
Add “In Memoriam” banner back to profiles ( #23614 )
2023-04-12 14:50:02 +02:00
Eugen Rochko
7636512acb
New Crowdin updates ( #24447 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-12 20:21:32 +09:00
Eugen Rochko
c5eba06d8c
New Crowdin updates ( #24447 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-12 20:21:32 +09:00
Claire
1afa6d8cbf
Refactor Status._insert_record slightly and tighten the test around reblogs of discarded statuses ( #24516 )
2023-04-12 12:47:05 +02:00
Claire
f53d009778
Refactor Status._insert_record slightly and tighten the test around reblogs of discarded statuses ( #24516 )
2023-04-12 12:47:05 +02:00
Eugen Rochko
8b0c634a8a
Change all components to use the same error page in web UI ( #24512 )
2023-04-12 12:44:58 +02:00
Eugen Rochko
cee357d538
Change all components to use the same error page in web UI ( #24512 )
2023-04-12 12:44:58 +02:00
Kuba Suder
158d6fcb43
fixed typo in a constant name ( #24511 )
2023-04-12 10:06:57 +02:00
Kuba Suder
aca2cd1528
fixed typo in a constant name ( #24511 )
2023-04-12 10:06:57 +02:00
Claire
db3900bf4c
Run yarn manage:translations
2023-04-09 15:56:31 +02:00
Claire
63a39ae2fa
Run yarn manage:translations
2023-04-09 15:56:31 +02:00
Claire
ba8ba4f476
Move glitch-soc-only translation strings out of app/javascript/mastodono/locales
2023-04-09 15:53:45 +02:00
Claire
c11e69f33a
Move glitch-soc-only translation strings out of app/javascript/mastodono/locales
2023-04-09 15:53:45 +02:00
Nick Schonning
3237eb3759
[Glitch] Ensure tabIndex is number instead of string
...
Port 53376db94c
2023-04-09 14:47:29 +02:00
Nick Schonning
bfe46d08f9
[Glitch] Ensure tabIndex is number instead of string
...
Port ec0c104bf2
2023-04-09 14:47:29 +02:00
Christian Schmidt
3e1e35b8ec
[Glitch] Fix loading spinner + infinite scroll for private mentions
...
Port c9fed25d56
2023-04-09 12:10:01 +02:00
Christian Schmidt
53cdcce3d1
[Glitch] Fix loading spinner + infinite scroll for private mentions
...
Port 9ef9974ff2
2023-04-09 12:10:01 +02:00
Nick Schonning
61e2fa8b76
[Glitch] Enable Stylelint property-no-unknown
...
Port 24919590a0
2023-04-09 12:05:55 +02:00
Nick Schonning
b756e49cf1
[Glitch] Enable Stylelint property-no-unknown
...
Port cd14f712ad
2023-04-09 12:05:55 +02:00
Christian Schmidt
b32dbd5500
[Glitch] Fix tooltip for dates without time
...
Port 07497b9956
2023-04-09 12:04:17 +02:00
Christian Schmidt
7b04c2fb71
[Glitch] Fix tooltip for dates without time
...
Port aa136cf2fa
2023-04-09 12:04:17 +02:00
Nick Schonning
8aafeb72cf
[Glitch] Remove Array.prototype.includes polyfill
...
Port e9df65bad0
2023-04-09 12:03:11 +02:00
Nick Schonning
5b88b7e81a
[Glitch] Remove Array.prototype.includes polyfill
...
Port c0886dee14
2023-04-09 12:03:11 +02:00
Christian Schmidt
95a401efa4
[Glitch] Fix account header image missing in low-res
...
Port b2e306d3db
2023-04-09 12:01:55 +02:00
Christian Schmidt
df6602ede1
[Glitch] Fix account header image missing in low-res
...
Port d7b8c6db7e
2023-04-09 12:01:55 +02:00
Christian Schmidt
ba35f8f630
[Glitch] Fix height of announcements not being updated when using reduced animations
...
Port 2507c0a462
2023-04-09 12:01:11 +02:00
Christian Schmidt
74c61b05ae
[Glitch] Fix height of announcements not being updated when using reduced animations
...
Port ffd5b2eea4
2023-04-09 12:01:11 +02:00
Nick Schonning
e9fd7d9e02
[Glitch] Update display_media typing to string
...
Port a334f64652
2023-04-09 12:00:26 +02:00
Nick Schonning
791e712a80
[Glitch] Update display_media typing to string
...
Port 17b2fd2177
2023-04-09 12:00:26 +02:00
Nick Schonning
bd52e88774
[Glitch] Set marginRight as string
...
Port 37e98d9d56
2023-04-09 11:59:42 +02:00
Nick Schonning
f3f7ef2d13
[Glitch] Set marginRight as string
...
Port 927b2fd138
2023-04-09 11:59:42 +02:00
Nick Schonning
499485585e
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
...
Port d5a6c93808
2023-04-09 11:58:45 +02:00
Nick Schonning
358e4067bb
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
...
Port ab3f23da91
2023-04-09 11:58:45 +02:00
Nick Schonning
970001fd77
[Glitch] HTML string attributes set as booleans
...
Port 4ba81aa8dd
2023-04-09 11:56:02 +02:00
Nick Schonning
0f62451424
[Glitch] HTML string attributes set as booleans
...
Port a425915ce7
2023-04-09 11:56:02 +02:00
Claire
9558de3b67
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Claire
ce12934f5b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Claire
0cbf19affd
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +02:00
Claire
ff168ef202
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +02:00
Claire
69a94bf6e1
Move locale-data back to app/javascript/mastodon/locales/locale-data ( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2023-04-08 14:11:40 +02:00
Claire
10469a0b85
Move locale-data back to app/javascript/mastodon/locales/locale-data ( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2023-04-08 14:11:40 +02:00
Claire
172a4ad9f4
Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )
2023-04-08 12:51:14 +02:00
Claire
99e3e152cd
Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )
2023-04-08 12:51:14 +02:00
Claire
2d9cb47a4b
Fix glitch-soc HAML linting issues ( #2166 )
2023-04-07 20:55:28 +02:00
Claire
c3a8f6a0a3
Fix glitch-soc HAML linting issues ( #2166 )
2023-04-07 20:55:28 +02:00
Christian Schmidt
07497b9956
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
Christian Schmidt
aa136cf2fa
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
Christian Schmidt
c9fed25d56
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
Christian Schmidt
9ef9974ff2
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
Matt Jankowski
d30c48c975
Remove unused methods in 2FA OTP Auth Controller ( #24220 )
2023-04-07 14:13:53 +02:00
Matt Jankowski
d193bc8c5c
Remove unused methods in 2FA OTP Auth Controller ( #24220 )
2023-04-07 14:13:53 +02:00
Nick Schonning
e9df65bad0
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
Nick Schonning
c0886dee14
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
Christian Schmidt
b2e306d3db
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
Christian Schmidt
d7b8c6db7e
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
Eugen Rochko
66cbd18531
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
Eugen Rochko
c9f3438efe
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
Claire
0174059370
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2023-04-05 20:28:34 +02:00
Claire
02d5c69404
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2023-04-05 20:28:34 +02:00
Claire
caf209b28b
Fix user archive takeouts when using OpenStack Swift ( #24431 )
2023-04-05 19:31:49 +02:00
Claire
9d08b81193
Fix user archive takeouts when using OpenStack Swift ( #24431 )
2023-04-05 19:31:49 +02:00
Christian Schmidt
2507c0a462
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
Christian Schmidt
ffd5b2eea4
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
Nick Schonning
a334f64652
Update display_media typing to string ( #24416 )
2023-04-05 13:20:21 +02:00
Nick Schonning
17b2fd2177
Update display_media typing to string ( #24416 )
2023-04-05 13:20:21 +02:00
Nick Schonning
37e98d9d56
Set marginRight as string ( #24422 )
2023-04-05 10:57:36 +02:00
Nick Schonning
927b2fd138
Set marginRight as string ( #24422 )
2023-04-05 10:57:36 +02:00
Nick Schonning
d5a6c93808
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2023-04-05 10:56:55 +02:00
Nick Schonning
ab3f23da91
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2023-04-05 10:56:55 +02:00
Nick Schonning
24919590a0
Enable Stylelint property-no-unknown ( #24404 )
2023-04-05 09:04:08 +02:00
Nick Schonning
cd14f712ad
Enable Stylelint property-no-unknown ( #24404 )
2023-04-05 09:04:08 +02:00
Claire
0679fcd2f1
Fix styling regressions from RTL layout refactor ( #24415 )
2023-04-04 16:48:34 +02:00
Claire
45848d6547
Fix styling regressions from RTL layout refactor ( #24415 )
2023-04-04 16:48:34 +02:00
Nick Schonning
53376db94c
Ensure tabIndex is number instead of string ( #24409 )
2023-04-04 16:33:44 +02:00
Nick Schonning
ec0c104bf2
Ensure tabIndex is number instead of string ( #24409 )
2023-04-04 16:33:44 +02:00
Nick Schonning
4ba81aa8dd
HTML string attributes set as booleans ( #24408 )
2023-04-04 16:33:33 +02:00
Nick Schonning
a425915ce7
HTML string attributes set as booleans ( #24408 )
2023-04-04 16:33:33 +02:00
Rubicon Rowe
f49d2ec5a3
[Glitch] Fix inconsistent radius in drawer
...
Port ffa9249c1e
2023-04-04 12:51:24 +02:00
Rubicon Rowe
69ca6316ec
[Glitch] Fix inconsistent radius in drawer
...
Port fa98363a27
2023-04-04 12:51:24 +02:00
Claire
8364f82281
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-04 12:45:12 +02:00
Claire
d13ef49b15
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-04 12:45:12 +02:00
Claire
6ccd12b521
Fix unescaped user input in LDAP query ( #24379 )
2023-04-04 12:42:38 +02:00
Claire
0e919397db
Fix unescaped user input in LDAP query ( #24379 )
2023-04-04 12:42:38 +02:00
Rubicon Rowe
ffa9249c1e
Fix inconsistent radius in drawer ( #24407 )
2023-04-04 11:41:05 +02:00
Rubicon Rowe
fa98363a27
Fix inconsistent radius in drawer ( #24407 )
2023-04-04 11:41:05 +02:00
Nick Schonning
72a1dd736a
Align typings with installed versions ( #24410 )
2023-04-04 10:48:26 +02:00
Nick Schonning
8e19c44b2c
Align typings with installed versions ( #24410 )
2023-04-04 10:48:26 +02:00
Christian Schmidt
90ecb96dba
[Glitch] Add colour to follow button when hashtag is being followed
...
Port d5da587d27
2023-04-03 18:07:34 +02:00
Christian Schmidt
d29cf8a044
[Glitch] Add colour to follow button when hashtag is being followed
...
Port 77bd32a26a
2023-04-03 18:07:34 +02:00
Claire
5fbae7cb2a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
Claire
4d5b4dacd6
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
Christian Schmidt
d5da587d27
Add colour to follow button when hashtag is being followed ( #24361 )
2023-04-03 16:25:15 +02:00
Christian Schmidt
77bd32a26a
Add colour to follow button when hashtag is being followed ( #24361 )
2023-04-03 16:25:15 +02:00
Eugen Rochko
1c1bbbebd6
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
Eugen Rochko
4909c2e718
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
Nick Schonning
d0bf149232
Move ESLint configs to overrides ( #24370 )
2023-04-03 12:41:10 +02:00
Nick Schonning
373e4a8ff0
Move ESLint configs to overrides ( #24370 )
2023-04-03 12:41:10 +02:00
fusagiko / takayamaki
4866812b28
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00
fusagiko / takayamaki
4520e6473a
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00
Claire
b12fcd3d7a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-01 14:31:05 +02:00
Claire
7b15f4006a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-01 14:31:05 +02:00
Eugen Rochko
d22e712648
Change search pop-out in web UI ( #24305 )
2023-04-01 09:59:10 +02:00
Eugen Rochko
2b11376411
Change search pop-out in web UI ( #24305 )
2023-04-01 09:59:10 +02:00
Eugen Rochko
4e63f1e64b
Fix regressions from change in account row design in web UI ( #24343 )
2023-04-01 09:27:23 +02:00
Eugen Rochko
46483ae849
Fix regressions from change in account row design in web UI ( #24343 )
2023-04-01 09:27:23 +02:00
Vyr Cossont
15f9f8962e
Fix Redis client and type errors introduced in #24285 ( #24342 )
2023-04-01 08:28:35 +02:00
Vyr Cossont
d5ad8b6422
Fix Redis client and type errors introduced in #24285 ( #24342 )
2023-04-01 08:28:35 +02:00
Tdxdxoz
f9cc42d6db
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port d339684df5
2023-03-31 22:50:57 +02:00
Tdxdxoz
d874a7a10f
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port 74f56c64fc
2023-03-31 22:50:57 +02:00
Nick Schonning
bba0493afe
[Glitch] Move marky to devDependency
...
Port a159e8e5e1
2023-03-31 22:50:57 +02:00
Nick Schonning
a8f0592b72
[Glitch] Move marky to devDependency
...
Port ddb769f0b8
2023-03-31 22:50:57 +02:00
Claire
bb5b3182f0
Migrate glitch-soc's exclusive user settings
2023-03-31 22:50:57 +02:00
Claire
3dcba94e68
Migrate glitch-soc's exclusive user settings
2023-03-31 22:50:57 +02:00
Claire
db2b09bdd4
Fix invalid/expired invites being processed on sign-up ( #24337 )
2023-03-31 21:42:28 +02:00
Claire
280fa3b2c0
Fix invalid/expired invites being processed on sign-up ( #24337 )
2023-03-31 21:42:28 +02:00
Claire
1a0c54554f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
Claire
01d6f7529f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
Nick Schonning
5f1a0f550b
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2023-03-31 15:07:22 +02:00
Nick Schonning
cb2ce842b0
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2023-03-31 15:07:22 +02:00
Vyr Cossont
3cf19b953f
IndexingScheduler: fetch and import in batches ( #24285 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31 14:38:47 +02:00
Vyr Cossont
7646ad8a2b
IndexingScheduler: fetch and import in batches ( #24285 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31 14:38:47 +02:00
Christian Schmidt
41190c8172
Wrong type for user setting when default is defined by lambda ( #24321 )
2023-03-31 07:33:17 +02:00
Christian Schmidt
b4f38edf74
Wrong type for user setting when default is defined by lambda ( #24321 )
2023-03-31 07:33:17 +02:00
Eugen Rochko
868d478b1b
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +02:00
Eugen Rochko
68a192e718
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +02:00
Eugen Rochko
c75fccf033
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
Eugen Rochko
a9b5598c97
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
Tdxdxoz
d339684df5
Fix: set multiColumn value for /explore Statuses ( #24314 )
2023-03-30 10:14:49 +02:00
Tdxdxoz
74f56c64fc
Fix: set multiColumn value for /explore Statuses ( #24314 )
2023-03-30 10:14:49 +02:00
mogamin
a9715ecd73
Fix missing translation in pagination gap tags ( #24262 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-03-29 13:54:33 +02:00
mogamin
9c84563008
Fix missing translation in pagination gap tags ( #24262 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-03-29 13:54:33 +02:00
Christian Schmidt
72b4973f50
Requeue expiration notification ( #24311 )
2023-03-29 10:52:40 +02:00
Christian Schmidt
eb38e9df31
Requeue expiration notification ( #24311 )
2023-03-29 10:52:40 +02:00
Claire
af57bcd3cf
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support ( #24200 )
2023-03-27 17:07:37 +02:00
Claire
e084b5b82d
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support ( #24200 )
2023-03-27 17:07:37 +02:00
Nick Schonning
a159e8e5e1
Move marky to devDependency ( #24258 )
2023-03-27 16:11:45 +02:00
Nick Schonning
ddb769f0b8
Move marky to devDependency ( #24258 )
2023-03-27 16:11:45 +02:00
Eugen Rochko
5b9c983305
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
Eugen Rochko
cf12621e37
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
Eugen Rochko
5ec33534f8
Refactor styles to use logical properties for positioning ( #23944 )
2023-03-27 10:56:25 +02:00
Eugen Rochko
babd86e594
Refactor styles to use logical properties for positioning ( #23944 )
2023-03-27 10:56:25 +02:00
Vyr Cossont
13db7d0075
Serialize status webhook events in REST API format ( #24243 )
2023-03-27 09:14:21 +02:00
Vyr Cossont
88fc04d3d7
Serialize status webhook events in REST API format ( #24243 )
2023-03-27 09:14:21 +02:00
neatchee
a73b29e8cc
[Glitch] Remove legacy decorators syntax
...
Port e272fc91e4
2023-03-27 08:51:57 +02:00
neatchee
8215df76c0
[Glitch] Remove legacy decorators syntax
...
Port d1b057a0ac
2023-03-27 08:51:57 +02:00
Nick Schonning
57e9fc7e5a
[Glitch] Remove isNaN polyfill
...
Port 169b9c9b13
2023-03-26 15:49:49 +02:00
Nick Schonning
00c839b9a9
[Glitch] Remove isNaN polyfill
...
Port b46125224c
2023-03-26 15:49:49 +02:00
Claire
6a5a699fbb
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
Claire
14b0311029
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
mogamin
c88fc5179b
Fix typo in _login_activity.html.haml ( #24263 )
2023-03-26 10:59:14 +02:00
mogamin
63a6808ee1
Fix typo in _login_activity.html.haml ( #24263 )
2023-03-26 10:59:14 +02:00
Matt Jankowski
85e90f4b7d
Move link header setting to after_action ( #24251 )
2023-03-26 00:40:01 +01:00
Matt Jankowski
0663803348
Move link header setting to after_action ( #24251 )
2023-03-26 00:40:01 +01:00
Matt Jankowski
cc5208f020
Add allow_other_host in redirects which may go outside app ( #24252 )
2023-03-26 00:38:32 +01:00
Matt Jankowski
e633b26f4f
Add allow_other_host in redirects which may go outside app ( #24252 )
2023-03-26 00:38:32 +01:00
Matt Jankowski
4e6cf24ce9
Update retention model sql query ( #24249 )
2023-03-26 00:37:57 +01:00
Matt Jankowski
e63524f457
Update retention model sql query ( #24249 )
2023-03-26 00:37:57 +01:00
Eugen Rochko
1d2a941bc8
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
Eugen Rochko
9bda933740
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
Eugen Rochko
f185c40714
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
Eugen Rochko
ef127c964a
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
Yamagishi Kazutoshi
8b68ca7e61
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
Yamagishi Kazutoshi
6e8711ff91
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
Yamagishi Kazutoshi
e272fc91e4
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
Yamagishi Kazutoshi
d1b057a0ac
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
Nick Schonning
169b9c9b13
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
Nick Schonning
b46125224c
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
Christian Schmidt
61e7fe2e2a
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
Christian Schmidt
16da4a09e8
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
mogamin
aa45960804
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 6ffb8609f9
2023-03-22 20:00:33 +01:00
mogamin
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
2023-03-22 20:00:33 +01:00
Claire
d11d2dda17
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
Claire
5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
Claire
12eb6740d1
Fix Rails cache namespace being overriden with v2 for cached statuses ( #24202 )
2023-03-22 15:47:44 +01:00
Claire
2626097869
Fix Rails cache namespace being overriden with v2 for cached statuses ( #24202 )
2023-03-22 15:47:44 +01:00
Matt Jankowski
4e4b2bc78e
Remove unused InstancePresenter methods ( #24206 )
2023-03-22 14:15:22 +01:00
Matt Jankowski
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
2023-03-22 14:15:22 +01:00
Takeshi Umeda
df68ba2e6a
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
Takeshi Umeda
38c84f57b6
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
mogamin
6ffb8609f9
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
mogamin
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
Matt Jankowski
7a82026971
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
Matt Jankowski
7bef11630d
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
Plastikmensch
5569c86171
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19 17:26:02 +01:00
Plastikmensch
02ac94490a
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19 17:26:02 +01:00
Vyr Cossont
d1b3f02926
Webhooks for local status.create, status.update, account.update ( #24133 )
2023-03-19 07:47:54 +01:00
Vyr Cossont
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2023-03-19 07:47:54 +01:00
Claire
bcac7a5e06
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-18 11:21:03 +01:00
Claire
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-18 11:21:03 +01:00
Jean byroot Boussier
dfc075c9d4
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17 14:37:30 +01:00
Jean byroot Boussier
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17 14:37:30 +01:00
Nick Schonning
8d05167e5f
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
Nick Schonning
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
CSDUMMI
e7c5ccafca
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17 10:09:01 +01:00
CSDUMMI
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17 10:09:01 +01:00
Christian Schmidt
bb60db4471
[Glitch] Replace Status#translatable? with language matrix in separate endpoint
...
Port 7583523bf0
2023-03-16 23:21:08 +01:00
Christian Schmidt
8f97ffe91e
[Glitch] Replace Status#translatable? with language matrix in separate endpoint
...
Port bd047acc35
2023-03-16 23:21:08 +01:00
Claire
488cd37f1a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
Claire
193250556c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
Claire
3b17f2f718
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
Claire
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
Eugen Rochko
ef0c6a43ed
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
Eugen Rochko
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
Eugen Rochko
83f302c101
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
Eugen Rochko
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
Christian Schmidt
7583523bf0
Replace Status#translatable? with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
Christian Schmidt
bd047acc35
Replace Status#translatable? with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
Eugen Rochko
f0734513f4
Refactor monkey-patching of PrivateAddressCheck ( #24122 )
2023-03-16 04:33:38 +01:00
Eugen Rochko
630436ab2d
Refactor monkey-patching of PrivateAddressCheck ( #24122 )
2023-03-16 04:33:38 +01:00
Nick Schonning
0717d1b058
Autofix Rubocop Style/RedundantArgument ( #23798 )
2023-03-16 10:34:00 +09:00
Nick Schonning
25d36b6edd
Autofix Rubocop Style/RedundantArgument ( #23798 )
2023-03-16 10:34:00 +09:00
Nick Schonning
994cb73f56
Fix more haml-lint Rubocop ( #24107 )
2023-03-15 20:07:43 +01:00
Nick Schonning
65669d3c57
Fix more haml-lint Rubocop ( #24107 )
2023-03-15 20:07:43 +01:00
Rodion Borisov
20af3cc038
[Glitch] Center the text itself in upload area
...
Port 100ada1e2b
2023-03-15 09:33:48 +01:00
Rodion Borisov
32418f0ff3
[Glitch] Center the text itself in upload area
...
Port a52ccd7ad9
2023-03-15 09:33:48 +01:00
PauloVilarinho
08685405f1
[Glitch] add modal message when editing toot
...
Port c4c1c8aecc
2023-03-15 09:33:14 +01:00
PauloVilarinho
17fb58bff3
[Glitch] add modal message when editing toot
...
Port 8770473dbb
2023-03-15 09:33:14 +01:00
Claire
f39d9ab256
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
Claire
3ef5f62abf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
Nick Schonning
30328759da
Setup haml-lint CI with todo config ( #23524 )
2023-03-15 04:15:36 +01:00
Nick Schonning
75131e7bf7
Setup haml-lint CI with todo config ( #23524 )
2023-03-15 04:15:36 +01:00
Claire
8a618c8eca
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2023-03-15 04:15:20 +01:00
Claire
a232a1feb8
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2023-03-15 04:15:20 +01:00
Claire
5f11a64dbc
Fix incorrect post links in strikes when the account is remote ( #23611 )
2023-03-15 04:14:47 +01:00
Claire
cf50667e26
Fix incorrect post links in strikes when the account is remote ( #23611 )
2023-03-15 04:14:47 +01:00
Claire
bde1c7aa96
Fix dashboard crash on ElasticSearch server error ( #23751 )
2023-03-15 04:01:49 +01:00
Claire
9875be09fe
Fix dashboard crash on ElasticSearch server error ( #23751 )
2023-03-15 04:01:49 +01:00
CSDUMMI
cfc04637b5
Redirect users to SLO at the IdP after logging them out of Mastodon. ( #24020 )
2023-03-15 03:52:40 +01:00
CSDUMMI
39c7236649
Redirect users to SLO at the IdP after logging them out of Mastodon. ( #24020 )
2023-03-15 03:52:40 +01:00
Claire
23bce96f0c
Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ( #24034 )
2023-03-15 03:45:15 +01:00
Claire
1d0ad558ff
Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ( #24034 )
2023-03-15 03:45:15 +01:00
CSDUMMI
5f9f43d051
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller ( #24073 )
2023-03-13 00:06:27 +01:00
CSDUMMI
d258ec8e3b
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller ( #24073 )
2023-03-13 00:06:27 +01:00
Rodion Borisov
100ada1e2b
Center the text itself in upload area ( #24029 )
2023-03-09 14:35:44 +01:00
Rodion Borisov
a52ccd7ad9
Center the text itself in upload area ( #24029 )
2023-03-09 14:35:44 +01:00
Christian Schmidt
170d3a0bc8
Unescape HTML entities ( #24019 )
2023-03-08 19:56:41 +01:00
Christian Schmidt
684a970b3c
Unescape HTML entities ( #24019 )
2023-03-08 19:56:41 +01:00
Matt Jankowski
8ea6707b2b
Remove unused TOCGenerator ( #23986 )
2023-03-06 17:33:58 +01:00
Matt Jankowski
dfa1be4ab4
Remove unused TOCGenerator ( #23986 )
2023-03-06 17:33:58 +01:00
PauloVilarinho
c4c1c8aecc
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06 17:33:09 +01:00
PauloVilarinho
8770473dbb
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06 17:33:09 +01:00
Claire
aadb1317a5
Remove sidebar dead code ( #23984 )
2023-03-06 16:25:35 +01:00
Claire
21db91a0a8
Remove sidebar dead code ( #23984 )
2023-03-06 16:25:35 +01:00
Claire
980472efc8
Fix unconfirmed accounts being registered as active users ( #23803 )
2023-03-06 16:00:08 +01:00
Claire
86f8aa2db2
Fix unconfirmed accounts being registered as active users ( #23803 )
2023-03-06 16:00:08 +01:00
Christian Schmidt
e7e90a5e63
Do not strip tags from Setting.site_short_description ( #23975 )
2023-03-06 15:37:19 +01:00
Christian Schmidt
c4cf92094e
Do not strip tags from Setting.site_short_description ( #23975 )
2023-03-06 15:37:19 +01:00
Claire
5f94d33a67
Refactor glitch-soc rich text SCSS
2023-03-05 21:31:45 +01:00
Claire
7f3b0dedeb
Refactor glitch-soc rich text SCSS
2023-03-05 21:31:45 +01:00
Christian Schmidt
a813ea3c25
[Glitch] Only offer translation for supported languages
...
Port cc0c37cd69
2023-03-05 21:19:04 +01:00
Christian Schmidt
1317553f3a
[Glitch] Only offer translation for supported languages
...
Port 5a8c651e8f
2023-03-05 21:19:04 +01:00
Terry Garcia
81aac88f65
[Glitch] Switched bookmark and favourites around
...
Port f5fe444913
2023-03-05 21:07:55 +01:00
Terry Garcia
9a1bd1c3e9
[Glitch] Switched bookmark and favourites around
...
Port a1347f456e
2023-03-05 21:07:55 +01:00
Claire
05763031f1
[Glitch] Fix duplicate “Publish” button on mobile
...
Port 3faa229d8d
2023-03-05 21:07:10 +01:00
Claire
03ac84b0f4
[Glitch] Fix duplicate “Publish” button on mobile
...
Port b55fc883b6
2023-03-05 21:07:10 +01:00
Claire
a6363c3a2a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
Claire
7623e18124
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
Claire
f7a679a4f5
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
Claire
bb4e211c86
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
Christian Schmidt
b50a08b15b
[Glitch] Add lang attribute to media and poll options
...
Port 41655e16ea
2023-03-05 17:52:53 +01:00
Christian Schmidt
0e476f3c4f
[Glitch] Add lang attribute to media and poll options
...
Port d3eefead30
2023-03-05 17:52:53 +01:00
Nick Schonning
f731ba595b
Enable Rubocop for app/views ( #23874 )
2023-03-05 00:33:52 +01:00
Nick Schonning
82a6cf4012
Enable Rubocop for app/views ( #23874 )
2023-03-05 00:33:52 +01:00
Christian Schmidt
50b76430b4
Do not leave Mastodon when clicking “Back” ( #23953 )
2023-03-04 23:18:19 +01:00
Christian Schmidt
cb868228bd
Do not leave Mastodon when clicking “Back” ( #23953 )
2023-03-04 23:18:19 +01:00
Matt Jankowski
471346fd3a
User mailer spec coverage improvements ( #23905 )
2023-03-04 17:16:11 +01:00
Matt Jankowski
7f4412eeeb
User mailer spec coverage improvements ( #23905 )
2023-03-04 17:16:11 +01:00
Matt Jankowski
c48dd42fa8
Misc coverage improvements for validators ( #23928 )
2023-03-04 17:00:00 +01:00
Matt Jankowski
c40d5e5a8f
Misc coverage improvements for validators ( #23928 )
2023-03-04 17:00:00 +01:00
Jean byroot Boussier
08c2938b4a
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-04 16:38:28 +01:00
Jean byroot Boussier
922837dc96
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-04 16:38:28 +01:00
Nick Schonning
24b0410744
Remove implied StandardError rescue ( #23942 )
2023-03-03 22:49:16 +01:00
Nick Schonning
b00f945d92
Remove implied StandardError rescue ( #23942 )
2023-03-03 22:49:16 +01:00
Claire
fe098d35c2
Fix original account being unfollowed on migration before the follow request could be sent ( #21957 )
2023-03-03 21:13:55 +01:00
