1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-23 08:03:02 -05:00

18654 Commits

Author SHA1 Message Date
gunchleoc
09ebf7e37c [Glitch] Replace 'favourite' by 'favorite' for American English
Port 217ef7f2aff08575c505368199f059c3c9d79df5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 14:44:36 +02:00
Claire
b2515feb29 Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
Claire
5914dfdd69 [Glitch] Change thread view to scroll to the selected post rather than the post being replied to
Port e4ea80d8089110790bf11f7d4021dbe7b6a866de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 14:26:52 +02:00
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
Claire
7635c67450 Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
2023-07-30 13:42:06 +02:00
Stanislas Signoud
f05effeb8f [Glitch] Fix a missing redirection on getting-started in multi column mode
Port 586b1c9dca07c894af4248f59c847e7a3bf6d786 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 13:32:16 +02:00
Christian Schmidt
d3d6147286 [Glitch] Wrong count in response when removing favourite/reblog
Port 4c18928a931c8dc149fa3e0bd7de8ce4f6242715 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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 ()
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 ()
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" ()
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. ()
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 ()
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-27 19:25:29 +02:00
Claire
6256cee034
Change error boundary to upstream's () 2023-07-27 19:25:07 +02:00
Plastikmensch
cf9affdeac
Apply padding to all notifications in notif-cleaning mode ()
* 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
Eugen Rochko
cfd50f30bb
Fix focus and hover styles in web UI () 2023-07-23 17:55:13 +02:00
Nick Schonning
67016dd29d
Update haml-lint 0.49.1 () 2023-07-23 17:48:16 +02:00
Plastikmensch
51311c1978
Fix CW icon being on wrong side in app settings in RTL languages ()
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-23 17:19:09 +02:00
Christian Schmidt
3abe0fc5c8
Use valid email address for first account () 2023-07-23 15:58:19 +02:00
mogaminsk
db310f383d
Fix missing translation strings for importing lists () 2023-07-23 15:57:57 +02:00
Jeong Arm
944c29033d
Fix relationship-tag background color () 2023-07-23 14:40:37 +02:00
github-actions[bot]
9ec43107f2
New Crowdin translations ()
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 () 2023-07-23 14:31:16 +02:00
Claire
dd09535bda
Annotate doodle parameters to please eslint () 2023-07-23 14:31:05 +02:00
Claire
0078e7e760
Fix incorrect connect timeout in outgoing requests () 2023-07-22 20:42:31 +02:00
Claire
52500965cc
Fix “Open in advanced web interface” being shown on mobile view ()
Fixes 
2023-07-22 17:22:04 +02:00
github-actions[bot]
9a45198ab0
New Crowdin translations ()
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-22 09:53:26 +02:00
Claire
f2c683336b
Bump version to v4.1.5 () 2023-07-21 21:23:14 +02:00
наб
1b4cf0eba0
Favourits -> Favorites () 2023-07-21 21:13:20 +02:00
Christian Schmidt
296ec6cf57
Override default Action Mailer preview_path () 2023-07-21 21:12:57 +02:00
gunchleoc
217ef7f2af
Replace 'favourite' by 'favorite' for American English () 2023-07-21 19:09:13 +02:00
Claire
5b457961fc
Fix linting issue () 2023-07-21 14:21:10 +02:00
Claire
e5f1000ad1
Fix CSP headers being unintendedly wide () 2023-07-21 13:34:15 +02:00
Claire
14fad60384
Use username as display name for suspended users or users with blank display names () 2023-07-21 13:20:53 +02:00
Trevor Wolf
59478a1b46
change focus ui for keyboard only input () 2023-07-21 13:20:14 +02:00
Claire
934c7b33d1
Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades () 2023-07-21 13:17:43 +02:00
Claire
e4ea80d808
Change thread view to scroll to the selected post rather than the post being replied to () 2023-07-21 13:14:30 +02:00
Claire
144a406d33
Clean up unused application records () 2023-07-21 13:13:16 +02:00
Claire
5cbc402687
Fix replica being used even if not explicitly defined () 2023-07-21 11:30:53 +02:00
Renaud Chaput
42698b4c5c
Fix the crossorigin attribute () 2023-07-21 11:14:26 +02:00
Renaud Chaput
4ea041fe67
Improve the bug report templates () 2023-07-21 10:46:12 +02:00
github-actions[bot]
e7cb6c6c44
New Crowdin translations ()
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-21 09:26:08 +02:00
Claire
1e3b19230a
Add stricter protocol fields validation for accounts () 2023-07-20 18:23:48 +02:00
Matt Jankowski
1cceb62afd
Fix Lint/Void cop () 2023-07-20 17:31:34 +02:00
Matt Jankowski
a5842df123
Fix haml-lint Rubocop Lint/UnusedBlockArguments cop () 2023-07-20 17:03:39 +02:00
Matt Jankowski
285a3df56c
Move localized subject mailer shared example to separate file () 2023-07-20 15:50:50 +02:00
gunchleoc
cabe1ea560
Change casing for 'Server Settings' string () 2023-07-20 15:17:40 +02:00
Matt Jankowski
df05ece265
Fix haml-lint Rubocop Style/NumericPredicate cop () 2023-07-20 15:13:06 +02:00
Stanislas Signoud
586b1c9dca
Fix a missing redirection on getting-started in multi column mode () 2023-07-20 14:46:02 +02:00
Misty De Méo
b848ba3867
Paperclip: add support for Azure blob storage () 2023-07-19 09:02:49 +02:00