403a5c0f3f
[Glitch] Change the wording of the dismissable explore prompt
...
Port a4ec187a20
2023-07-30 17:01:29 +02:00
aa1789f0dd
[Glitch] Change interaction modal in web UI
...
Port b4e739ff0f
2023-07-30 16:59:32 +02:00
a1f1424e76
Fix interaction modal being broken because of glitch-soc's theming system
2023-07-30 16:45:50 +02:00
92fa9d34b0
Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' 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
879c7ed2d3
[Glitch] Fix missing GIF badge in account gallery
...
Port a4b69bec2e
2023-07-30 15:58:20 +02:00
88ba538aad
[Glitch] Preserve translation on status re-import
...
Port 6781dc6462
2023-07-30 15:57:45 +02:00
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
450f75b6f7
[Glitch] Add published date and author to news on the explore screen in web UI
...
Port f826a95f6e
2023-07-30 15:50:53 +02:00
887a17bb83
[Glitch] Revert poll colors to green outside of compose form
...
Port ce1f35d7e2
2023-07-30 15:50:53 +02:00
e92dde0b16
[Glitch] fix poll input active style
...
Port 49d2e8979f
2023-07-30 15:50:53 +02:00
e48a6a5f2c
[Glitch] Fix missing action label on sensitive videos and embeds in web UI
...
Port 714a20697f
2023-07-30 15:50:53 +02:00
4b26e44ef4
[Glitch] Fix missing border on error screen in light theme in web UI
...
Port d1a9f601c7
2023-07-30 15:23:08 +02:00
168fadb6b9
[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab
...
Port 9a567ec1d1
2023-07-30 15:22:28 +02:00
1d4df97049
[Glitch] Add `lang` attribute to trending links
...
Port 76fce34ebb
2023-07-30 15:18:40 +02:00
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
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
09ebf7e37c
[Glitch] Replace 'favourite' by 'favorite' for American English
...
Port 217ef7f2af
2023-07-30 14:44:36 +02:00
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
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
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
f05effeb8f
[Glitch] Fix a missing redirection on getting-started in multi column mode
...
Port 586b1c9dca
2023-07-30 13:32:16 +02:00
d3d6147286
[Glitch] Wrong count in response when removing favourite/reblog
...
Port 4c18928a93
2023-07-30 13:31:41 +02:00
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
3a14104411
New Crowdin translations ( #2338 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-30 13:09:02 +02:00
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
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
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
8864d5b580
New Crowdin translations ( #2327 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-27 19:25:29 +02:00
6256cee034
Change error boundary to upstream's ( #2323 )
2023-07-27 19:25:07 +02:00
a4ec187a20
Change the wording of the dismissable explore prompt ( #25917 )
2023-07-27 16:51:02 +02:00
bbea052935
Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )
2023-07-27 16:20:33 +02:00
b4e739ff0f
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-07-27 16:11:17 +02:00
1e4ccc655a
Add role badges to the WebUI ( #25649 )
2023-07-27 16:05:24 +02:00
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
a4b69bec2e
Fix missing GIF badge in account gallery ( #26166 )
2023-07-26 03:33:31 +02:00
6781dc6462
Preserve translation on status re-import ( #26168 )
2023-07-25 20:29:31 +02:00
ce1f35d7e2
Revert poll colors to green outside of compose form ( #26164 )
2023-07-25 15:32:59 +02:00
49d2e8979f
fix poll input active style ( #26162 )
2023-07-25 13:39:15 +02:00
f826a95f6e
Add published date and author to news on the explore screen in web UI ( #26155 )
2023-07-25 00:57:15 +02:00
4299208487
Fix `lang` for UI texts in link preview ( #26149 )
2023-07-24 23:01:31 +02:00
714a20697f
Fix missing action label on sensitive videos and embeds in web UI ( #26135 )
2023-07-24 22:04:38 +02:00
d1a9f601c7
Fix missing border on error screen in light theme in web UI ( #26152 )
2023-07-24 19:53:33 +02:00
9a567ec1d1
Fix UI Overlap with the loupe icon in the Explore Tab ( #26113 )
2023-07-24 17:56:20 +02:00
76fce34ebb
Add `lang` attribute to trending links ( #26111 )
2023-07-24 13:48:23 +02:00
80809ef33e
change poll form element colors to fit with the rest of the ui ( #26139 )
2023-07-24 13:48:09 +02:00
6b2952d1dd
Change design of link previews in web UI ( #26136 )
2023-07-24 13:47:28 +02:00
4d01d1a1ee
Remove 16:9 cropping from web UI ( #26132 )
2023-07-24 13:46:55 +02:00
cf9affdeac
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
5e8cbb5f82
Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )
2023-07-23 17:55:20 +02:00
cfd50f30bb
Fix focus and hover styles in web UI ( #26125 )
2023-07-23 17:55:13 +02:00
Claire