Claire
42f36aa55a
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream fixed an issue that was not present in glitch-soc.
Kept our version.
2023-07-30 13:49:35 +02:00
Stanislas Signoud
f05effeb8f
[Glitch] Fix a missing redirection on getting-started in multi column mode
...
Port 586b1c9dca
2023-07-30 13:32:16 +02:00
Christian Schmidt
d3d6147286
[Glitch] Wrong count in response when removing favourite/reblog
...
Port 4c18928a93
2023-07-30 13:31:41 +02:00
Claire
993d0a9950
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
github-actions[bot]
3a14104411
New Crowdin translations ( #2338 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-30 13:09:02 +02:00
Plastikmensch
1cc3fcf7d0
Fix Public TL not indicating new toots when onlyRemote or allowLocalOnly is enabled ( #2336 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-29 16:45:37 +02:00
Plastikmensch
feaf3cf780
Fix firehose not indicating new toots in "All" ( #2335 )
...
When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-29 08:37:29 +02:00
Plastikmensch
e69fe94669
Fix "All" live feed not loading automatically. ( #2332 )
...
The dispatch to expand the timeline was missing the `allowLocalOnly` param.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-27 19:25:55 +02:00
github-actions[bot]
8864d5b580
New Crowdin translations ( #2327 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-27 19:25:29 +02:00
Claire
6256cee034
Change error boundary to upstream's ( #2323 )
2023-07-27 19:25:07 +02:00
Plastikmensch
cf9affdeac
Apply padding to all notifications in notif-cleaning mode ( #2325 )
...
* Add missing padding to notif-cleaning for admin-sign-up
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Apply padding to all notification types instead
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-23 18:50:24 +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
944c29033d
Fix relationship-tag background color ( #2322 )
2023-07-23 14:40:37 +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
49767d20bd
Fix glitch local settings navigation items not being proper buttons ( #2320 )
2023-07-23 14:31:16 +02:00
Claire
dd09535bda
Annotate doodle parameters to please eslint ( #2321 )
2023-07-23 14:31:05 +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]
9a45198ab0
New Crowdin translations ( #2317 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-22 09:53:26 +02:00
Trevor Wolf
59478a1b46
change focus ui for keyboard only input ( #25935 )
2023-07-21 13:20:14 +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
github-actions[bot]
e7cb6c6c44
New Crowdin translations ( #2314 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-21 09:26:08 +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
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
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
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]
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
0c45bed333
[Glitch] Fix “Back” button sometimes redirecting out of Mastodon
...
Port a442a1d1c6
2023-07-17 19:12:09 +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
Claire
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
2023-07-17 17:32:46 +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
27f7e5b0f3
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port b923a4c755
2023-07-17 13:01:07 +02:00
Claire
c943f17b1b
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-17 12:52:15 +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
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
b923a4c755
Prevent split line between icon and number on reposts & favourites ( #26004 )
2023-07-16 10:06:33 +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
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
0d61985713
Remove layout glitch-soc settings
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
a98b5c2246
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 41f65edb21
2023-07-13 22:42:15 +02:00
Claire
d9adda1a99
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
2023-07-13 22:40: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
e271d018b7
Fix home timeline's regexp field
2023-07-13 19:33:58 +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
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
41f65edb21
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
Claire
98e5589ed4
[Glitch] Fix follow link style in embeds
...
Port 5a3f174d56
2023-07-13 14:52:36 +02:00
Renaud Chaput
18f55567b0
[Glitch] Upgrade to typescript-eslint v6
...
Port a7253075d1
2023-07-13 14:51:24 +02:00
Claire
3be4f4266d
Fix incorrect types in DisplayName
2023-07-13 14:51:24 +02:00
Claire
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
