53b24f6ac5
[Glitch] Fix a missing redirection on getting-started in multi column mode
...
Port cf170761e7
2023-07-30 13:32:16 +02:00
9a35793e13
[Glitch] Wrong count in response when removing favourite/reblog
...
Port 540cced981
2023-07-30 13:31:41 +02:00
2f3f1d75fa
Merge commit '58b52b7a33717406faa8d988b7c05efa52f46f6a' 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
5e3dac8adc
New Crowdin translations ( #2338 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-30 13:09:02 +02:00
7186b6ce0f
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
d7d3466b9a
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
7b2cfdeda3
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
df7c9e1ed4
New Crowdin translations ( #2327 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-27 19:25:29 +02:00
eed89bc69f
Change error boundary to upstream's ( #2323 )
2023-07-27 19:25:07 +02:00
6fb2982ec0
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
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
15561ace1b
Fix relationship-tag background color ( #2322 )
2023-07-23 14:40:37 +02:00
d6e767559c
New Crowdin translations ( #2319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-23 14:31:38 +02:00
cf9d76d4a1
Fix glitch local settings navigation items not being proper buttons ( #2320 )
2023-07-23 14:31:16 +02:00
1eed0d1bb7
Annotate doodle parameters to please eslint ( #2321 )
2023-07-23 14:31:05 +02:00
8933e41b19
Fix “Open in advanced web interface” being shown on mobile view ( #2318 )
...
Fixes #2307
2023-07-22 17:22:04 +02:00
9279c388c5
New Crowdin translations ( #2317 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-22 09:53:26 +02:00
356f2fc4c5
New Crowdin translations ( #2314 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-21 09:26:08 +02:00
58b52b7a33
Add stricter protocol fields validation for accounts ( #25937 )
2023-07-20 18:23:48 +02:00
20b9c1ca86
Fix `Lint/Void` cop ( #25922 )
2023-07-20 17:31:34 +02:00
549518a1a2
Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop ( #26039 )
2023-07-20 17:03:39 +02:00
0dd4a4a460
Move localized subject mailer shared example to separate file ( #25889 )
2023-07-20 15:50:50 +02:00
31dc72c828
Change casing for 'Server Settings' string ( #26011 )
2023-07-20 15:17:40 +02:00
a4f826d4a8
Fix haml-lint Rubocop `Style/NumericPredicate` cop ( #26040 )
2023-07-20 15:13:06 +02:00
cf170761e7
Fix a missing redirection on getting-started in multi column mode ( #26070 )
2023-07-20 14:46:02 +02:00
9e19cfdb05
Paperclip: add support for Azure blob storage ( #23607 )
2023-07-19 09:02:49 +02:00
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
4be315f0ae
Cleanup unused portions of statuses/status partial ( #26045 )
2023-07-19 08:44:16 +02:00
b3bc0e93e1
New Crowdin translations ( #2310 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-19 08:39:14 +02:00
0abc20d922
Fix Crowdin Github Action ( #2311 )
2023-07-19 08:36:25 +02:00
3fef4a8561
Merge pull request #2309 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-19 08:18:05 +02:00
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
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
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
e77bbcc463
Change request timeout handling to use a longer deadline ( #26055 )
2023-07-18 20:51:20 +02:00
630744563f
Fix haml-lint `InstanceVariables` rule for auth/registrations/edit ( #26061 )
2023-07-18 18:10:52 +02:00
d2e79d0df9
Fix haml-lint Rubocop `Style/SymbolProc` cop ( #26059 )
2023-07-18 17:43:04 +02:00
fb30fb4d89
Fix haml-lint Rubocop `Style/WordArray` cop ( #26058 )
2023-07-18 17:25:41 +02:00
359255c799
Fix haml-lint rubocop style negation cops ( #26057 )
2023-07-18 17:02:02 +02:00
441db971d9
Fixes to the new Image build actions ( #26056 )
2023-07-18 16:56:42 +02:00
4316506b91
Add a Github Action to send translations to Crowdin for each merge in main ( #25869 )
2023-07-18 16:56:01 +02:00
f5c0e7be04
Rework the container image build actions ( #26007 )
2023-07-18 13:36:12 +02:00
c05ff864cc
Migrate to request specs in `/api/v1/mutes` ( #25622 )
2023-07-18 13:05:19 +02:00
b9c408b344
Fix haml-lint `ConsecutiveSilentScripts` rule ( #26043 )
2023-07-18 09:25:37 +02:00
97a627d669
Update dependency ox to v2.14.17 ( #26044 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-18 09:24:48 +02:00
03eaa9746c
Migrate to request specs in `/api/v1/bookmarks` ( #25520 )
2023-07-18 09:15:50 +02:00
580d5831ec
Migrate to request specs in `/api/v1/timelines/public` ( #25746 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 09:15:18 +02:00
299515af60
Add MacOS M1/2 setup steps to README ( #25682 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-18 09:02:45 +02:00
f6cb394544
Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-17 21:06:58 +02:00
87d2e00e66
[Glitch] Fix “Back” button sometimes redirecting out of Mastodon
...
Port 80fa2baa3d
2023-07-17 19:12:09 +02:00
Stanislas Signoud