Claire
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Eugen Rochko
450f75b6f7
[Glitch] Add published date and author to news on the explore screen in web UI
...
Port f826a95f6e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:50:53 +02:00
Claire
887a17bb83
[Glitch] Revert poll colors to green outside of compose form
...
Port ce1f35d7e2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:50:53 +02:00
Trevor Wolf
e92dde0b16
[Glitch] fix poll input active style
...
Port 49d2e8979f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:50:53 +02:00
Eugen Rochko
e48a6a5f2c
[Glitch] Fix missing action label on sensitive videos and embeds in web UI
...
Port 714a20697f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:50:53 +02:00
Eugen Rochko
4b26e44ef4
[Glitch] Fix missing border on error screen in light theme in web UI
...
Port d1a9f601c7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:23:08 +02:00
gol-cha
168fadb6b9
[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab
...
Port 9a567ec1d1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:22:28 +02:00
Christian Schmidt
1d4df97049
[Glitch] Add lang
attribute to trending links
...
Port 76fce34ebb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:18:40 +02:00
Trevor Wolf
f3bd96c91c
[Glitch] change poll form element colors to fit with the rest of the ui
...
Port 80809ef33e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:18:07 +02:00
Claire
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
gunchleoc
09ebf7e37c
[Glitch] Replace 'favourite' by 'favorite' for American English
...
Port 217ef7f2af
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 e4ea80d808
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 586b1c9dca
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 4c18928a93
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 ( #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
Claire
1814990a3d
Fix wrong filters sometimes applying in streaming ( #26159 )
2023-07-27 15:12:10 +02:00
Daniel M Brasil
812a84ff5f
Migrate to request specs in /api/v2/filters
( #25721 )
2023-07-27 14:58:20 +02:00
Matt Jankowski
f48d345de1
Use correct naming on controller concern specs ( #26197 )
2023-07-27 14:27:21 +02:00
Matt Jankowski
b06763dc11
Remove the sr
locale override .rb files ( #25927 )
2023-07-26 15:39:53 +02:00
github-actions[bot]
b9adea9695
New Crowdin Translations (automated) ( #26072 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-26 13:46:16 +02:00
Matt Jankowski
84d520ee80
Extract private methods in StatusCacheHydrator
( #26177 )
2023-07-26 09:50:48 +02:00
Matt Jankowski
a2dca50ef3
Use heredoc SQL blocks in AddFromAccountIdToNotifications
migration ( #26178 )
2023-07-26 09:49:15 +02:00
Matt Jankowski
8ac5a93a7d
Reformat large hash in ContextHelper
module ( #26180 )
2023-07-26 09:46:11 +02:00
Matt Jankowski
2d9808f648
Reformat large key values in service specs ( #26181 )
2023-07-26 09:45:50 +02:00
Matt Jankowski
bada7a65aa
Ignore long line in regex initializer ( #26182 )
2023-07-26 09:45:27 +02:00
Matt Jankowski
7d62e3b198
Reformat large text arg in FetchLinkCardService
spec ( #26183 )
2023-07-26 09:44:51 +02:00
Christian Schmidt
a4b69bec2e
Fix missing GIF badge in account gallery ( #26166 )
2023-07-26 03:33:31 +02:00
Christian Schmidt
6781dc6462
Preserve translation on status re-import ( #26168 )
2023-07-25 20:29:31 +02:00
Claire
ce1f35d7e2
Revert poll colors to green outside of compose form ( #26164 )
2023-07-25 15:32:59 +02:00
renovate[bot]
edc104c9ef
Update dependency sass to v1.64.1 ( #26146 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-25 14:45:35 +02:00
Eugen Rochko
7bd8ef355c
Add published_at
attribute to preview cards ( #26153 )
2023-07-25 13:40:35 +02:00
Trevor Wolf
49d2e8979f
fix poll input active style ( #26162 )
2023-07-25 13:39:15 +02:00
Matt Jankowski
50ff3d3342
Coverage for Auth::OmniauthCallbacks
controller ( #26147 )
2023-07-25 09:46:57 +02:00
Eugen Rochko
f826a95f6e
Add published date and author to news on the explore screen in web UI ( #26155 )
2023-07-25 00:57:15 +02:00
Christian Schmidt
4299208487
Fix lang
for UI texts in link preview ( #26149 )
2023-07-24 23:01:31 +02:00
Eugen Rochko
714a20697f
Fix missing action label on sensitive videos and embeds in web UI ( #26135 )
2023-07-24 22:04:38 +02:00
Eugen Rochko
d1a9f601c7
Fix missing border on error screen in light theme in web UI ( #26152 )
2023-07-24 19:53:33 +02:00
gol-cha
9a567ec1d1
Fix UI Overlap with the loupe icon in the Explore Tab ( #26113 )
2023-07-24 17:56:20 +02:00
Claire
2dfa8f797a
Fix LinkCrawlWorker crashing on null
created_at
( #26151 )
2023-07-24 17:55:36 +02:00
Vyr Cossont
394d1f19b1
Add report.updated webhook ( #24211 )
2023-07-24 17:37:38 +02:00
renovate[bot]
173a268025
Update dependency aws-sdk-s3 to v1.131.0 ( #26145 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-24 16:18:19 +02:00