Claire
887a17bb83
[Glitch] Revert poll colors to green outside of compose form
...
Port ce1f35d7e2
2023-07-30 15:50:53 +02:00
Trevor Wolf
b3fc8aacd9
[Glitch] fix poll input active style
...
Port e6475f79d7
2023-07-30 15:50:53 +02:00
Trevor Wolf
e92dde0b16
[Glitch] fix poll input active style
...
Port 49d2e8979f
2023-07-30 15:50:53 +02:00
Eugen Rochko
fef9f157a9
[Glitch] Fix missing action label on sensitive videos and embeds in web UI
...
Port a90d7ac141
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
2023-07-30 15:50:53 +02:00
Eugen Rochko
cf47592d87
[Glitch] Fix missing border on error screen in light theme in web UI
...
Port 5db70fc514
2023-07-30 15:23:08 +02:00
Eugen Rochko
4b26e44ef4
[Glitch] Fix missing border on error screen in light theme in web UI
...
Port d1a9f601c7
2023-07-30 15:23:08 +02:00
gol-cha
61e1e2d0fc
[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab
...
Port 633071d1d5
2023-07-30 15:22:28 +02:00
gol-cha
168fadb6b9
[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab
...
Port 9a567ec1d1
2023-07-30 15:22:28 +02:00
Christian Schmidt
7fb62d780f
[Glitch] Add lang attribute to trending links
...
Port bfa1f2a86f
2023-07-30 15:18:40 +02:00
Christian Schmidt
1d4df97049
[Glitch] Add lang attribute to trending links
...
Port 76fce34ebb
2023-07-30 15:18:40 +02:00
Trevor Wolf
0955660641
[Glitch] change poll form element colors to fit with the rest of the ui
...
Port d5a4ef8459
2023-07-30 15:18:07 +02:00
Trevor Wolf
f3bd96c91c
[Glitch] change poll form element colors to fit with the rest of the ui
...
Port 80809ef33e
2023-07-30 15:18:07 +02:00
Claire
f55959ebd9
Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' 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
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
9a6d0b04cd
[Glitch] Replace 'favourite' by 'favorite' for American English
...
Port 257fadcec4
2023-07-30 14:44:36 +02:00
gunchleoc
09ebf7e37c
[Glitch] Replace 'favourite' by 'favorite' for American English
...
Port 217ef7f2af
2023-07-30 14:44:36 +02:00
Claire
1039fce896
Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
Claire
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
Claire
de27fa27b0
[Glitch] Change thread view to scroll to the selected post rather than the post being replied to
...
Port 70b4eb5baa
2023-07-30 14:26:52 +02:00
Claire
5914dfdd69
[Glitch] Change thread view to scroll to the selected post rather than the post being replied to
...
Port e4ea80d808
2023-07-30 14:26:52 +02:00
Claire
cb4ffdea8b
Merge commit '1d3f8af23a23c2d3d8399d7b4367de69b72e269a' 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
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
db809f8789
Merge commit 'f3127af389f6043fe19c9ef4addefb6c6da0095a' 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
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
53b24f6ac5
[Glitch] Fix a missing redirection on getting-started in multi column mode
...
Port cf170761e7
2023-07-30 13:32:16 +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
9a35793e13
[Glitch] Wrong count in response when removing favourite/reblog
...
Port 540cced981
2023-07-30 13:31:41 +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
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
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]
5e3dac8adc
New Crowdin translations ( #2338 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-30 13:09:02 +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
Eugen Rochko
b49ab86b01
Change aspect ratios on link previews in web UI ( #26250 )
2023-07-30 03:35:17 +02:00
Eugen Rochko
d4807a5e64
Change aspect ratios on link previews in web UI ( #26250 )
2023-07-30 03:35:17 +02:00
Christian Schmidt
988898a8f3
Remove obsolete backport from Rails 7 ( #26254 )
2023-07-29 22:28:05 +02:00
Christian Schmidt
d76f79f647
Remove obsolete backport from Rails 7 ( #26254 )
2023-07-29 22:28:05 +02:00
Plastikmensch
0ec4833397
Fix public TL not indicating new toots when onlyRemote is enabled ( #26247 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-29 20:18:38 +02:00
Plastikmensch
4d3a129212
Fix public TL not indicating new toots when onlyRemote is enabled ( #26247 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-29 20:18:38 +02:00
Plastikmensch
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
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
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
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
Matt Jankowski
c7b9089646
Ignore the brakeman PermitAttributes check ( #25915 )
2023-07-28 23:17:53 +02:00
Matt Jankowski
74903af7ce
Ignore the brakeman PermitAttributes check ( #25915 )
2023-07-28 23:17:53 +02:00
Matt Jankowski
dad7e3574e
Load rspec-rails gem in test + development ( #25768 )
2023-07-28 23:17:35 +02:00
Matt Jankowski
8ac9e446df
Load rspec-rails gem in test + development ( #25768 )
2023-07-28 23:17:35 +02:00
Matt Jankowski
99a8c1a01e
Profiling tools configuration improvement ( #25383 )
2023-07-28 23:16:23 +02:00
Matt Jankowski
7581b1ff96
Profiling tools configuration improvement ( #25383 )
2023-07-28 23:16:23 +02:00
Matt Jankowski
756255b88e
Fix RSpec/EmptyExampleGroup cop ( #24735 )
2023-07-28 23:15:33 +02:00
