Claire
be17d619d5
[Glitch] Change the wording of the dismissable explore prompt
...
Port fc10002966
2023-07-30 17:01:29 +02:00
Claire
17f5142a44
[Glitch] Change interaction modal in web UI
...
Port 20809d5d8c
2023-07-30 16:59:32 +02:00
Claire
ad1f724853
Fix interaction modal being broken because of glitch-soc's theming system
2023-07-30 16:45:50 +02:00
Claire
84bc751433
Merge commit '6a19d5ce9942686e0cda1a9decec349d0a1f4e26' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
Small conflict due to our theming system.
- `streaming/index.js`:
Upstream refactored part of the streaming server.
We had some extra logic for handling local-only posts.
Applied the refactor.
2023-07-30 16:11:55 +02:00
Christian Schmidt
c89f9f17b9
[Glitch] Fix missing GIF badge in account gallery
...
Port aa8d37c422
2023-07-30 15:58:20 +02:00
Christian Schmidt
99464b6842
[Glitch] Preserve translation on status re-import
...
Port 28eb5e8f4c
2023-07-30 15:57:45 +02:00
Claire
68d080177a
Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Eugen Rochko
1ed1d5fcff
[Glitch] Add published date and author to news on the explore screen in web UI
...
Port b977a84e19
2023-07-30 15:50:53 +02:00
Claire
906332696c
[Glitch] Revert poll colors to green outside of compose form
...
Port 1d29569d89
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
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
cf47592d87
[Glitch] Fix missing border on error screen in light theme in web UI
...
Port 5db70fc514
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
Christian Schmidt
7fb62d780f
[Glitch] Add lang attribute to trending links
...
Port bfa1f2a86f
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
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
gunchleoc
9a6d0b04cd
[Glitch] Replace 'favourite' by 'favorite' for American English
...
Port 257fadcec4
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
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
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
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
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
Christian Schmidt
9a35793e13
[Glitch] Wrong count in response when removing favourite/reblog
...
Port 540cced981
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
github-actions[bot]
5e3dac8adc
New Crowdin translations ( #2338 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-30 13:09:02 +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
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
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
github-actions[bot]
df7c9e1ed4
New Crowdin translations ( #2327 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-27 19:25:29 +02:00
Claire
eed89bc69f
Change error boundary to upstream's ( #2323 )
2023-07-27 19:25:07 +02:00
Claire
fc10002966
Change the wording of the dismissable explore prompt ( #25917 )
2023-07-27 16:51:02 +02:00
Claire
7c911ce842
Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )
2023-07-27 16:20:33 +02:00
Emelia Smith
2b24070594
Remove queued_at value from pubsub payloads ( #26173 )
2023-07-27 16:19:33 +02:00
Misty De Méo
a4cdbc52b1
Storage: add :azure to remaining callers ( #26080 )
2023-07-27 16:13:45 +02:00
Claire
e76a4d54e3
Fix crash when processing Flag activity with no status ( #26189 )
2023-07-27 16:11:56 +02:00
Claire
20809d5d8c
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-07-27 16:11:17 +02:00
Claire
03ccbb053b
Add role badges to the WebUI ( #25649 )
2023-07-27 16:05:24 +02:00
github-actions[bot]
4a9961e904
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
b23699709a
Extract private methods in StatusCacheHydrator ( #26177 )
2023-07-26 09:50:48 +02:00
Matt Jankowski
430f87e554
Reformat large hash in ContextHelper module ( #26180 )
2023-07-26 09:46:11 +02:00
Christian Schmidt
aa8d37c422
Fix missing GIF badge in account gallery ( #26166 )
2023-07-26 03:33:31 +02:00
Christian Schmidt
28eb5e8f4c
Preserve translation on status re-import ( #26168 )
2023-07-25 20:29:31 +02:00
Claire
1d29569d89
Revert poll colors to green outside of compose form ( #26164 )
2023-07-25 15:32:59 +02:00
Eugen Rochko
ca6ff4f9a1
Add published_at attribute to preview cards ( #26153 )
2023-07-25 13:40:35 +02:00
Trevor Wolf
e6475f79d7
fix poll input active style ( #26162 )
2023-07-25 13:39:15 +02:00
Matt Jankowski
2a0b6be46a
Coverage for Auth::OmniauthCallbacks controller ( #26147 )
2023-07-25 09:46:57 +02:00
Eugen Rochko
b977a84e19
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
6ac7dcf180
Fix lang for UI texts in link preview ( #26149 )
2023-07-24 23:01:31 +02:00
Eugen Rochko
a90d7ac141
Fix missing action label on sensitive videos and embeds in web UI ( #26135 )
2023-07-24 22:04:38 +02:00
Eugen Rochko
5db70fc514
Fix missing border on error screen in light theme in web UI ( #26152 )
2023-07-24 19:53:33 +02:00
