ad1f724853
Fix interaction modal being broken because of glitch-soc's theming system
1 year ago
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.
1 year ago
c89f9f17b9
[Glitch] Fix missing GIF badge in account gallery
...
Port aa8d37c422
1 year ago
99464b6842
[Glitch] Preserve translation on status re-import
...
Port 28eb5e8f4c
1 year ago
68d080177a
Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream
1 year ago
1ed1d5fcff
[Glitch] Add published date and author to news on the explore screen in web UI
...
Port b977a84e19
1 year ago
906332696c
[Glitch] Revert poll colors to green outside of compose form
...
Port 1d29569d89
1 year ago
b3fc8aacd9
[Glitch] fix poll input active style
...
Port e6475f79d7
1 year ago
fef9f157a9
[Glitch] Fix missing action label on sensitive videos and embeds in web UI
...
Port a90d7ac141
1 year ago
cf47592d87
[Glitch] Fix missing border on error screen in light theme in web UI
...
Port 5db70fc514
1 year ago
61e1e2d0fc
[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab
...
Port 633071d1d5
1 year ago
7fb62d780f
[Glitch] Add `lang` attribute to trending links
...
Port bfa1f2a86f
1 year ago
0955660641
[Glitch] change poll form element colors to fit with the rest of the ui
...
Port d5a4ef8459
1 year ago
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.
1 year ago
9a6d0b04cd
[Glitch] Replace 'favourite' by 'favorite' for American English
...
Port 257fadcec4
1 year ago
1039fce896
Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream
1 year ago
de27fa27b0
[Glitch] Change thread view to scroll to the selected post rather than the post being replied to
...
Port 70b4eb5baa
1 year ago
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.
1 year ago
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.
1 year ago
53b24f6ac5
[Glitch] Fix a missing redirection on getting-started in multi column mode
...
Port cf170761e7
1 year ago
9a35793e13
[Glitch] Wrong count in response when removing favourite/reblog
...
Port 540cced981
1 year ago
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.
1 year ago
5e3dac8adc
New Crowdin translations ( #2338 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
7186b6ce0f
Fix Public TL not indicating new toots when `onlyRemote` or `allowLocalOnly` is enabled ( #2336 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
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>
1 year ago
6a19d5ce99
Fix missing return values in streaming ( #26233 )
1 year ago
d21fa55246
Swap debug statements in streaming server ( #26231 )
1 year ago
813acdb431
Fix: Streaming server memory leak in HTTP EventSource cleanup ( #26228 )
1 year ago
afb246aff7
Update dependency haml_lint to v0.49.2 ( #26222 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
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>
1 year ago
df7c9e1ed4
New Crowdin translations ( #2327 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
eed89bc69f
Change error boundary to upstream's ( #2323 )
1 year ago
fc10002966
Change the wording of the dismissable explore prompt ( #25917 )
1 year ago
7c911ce842
Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )
1 year ago
2b24070594
Remove queued_at value from pubsub payloads ( #26173 )
1 year ago
a4cdbc52b1
Storage: add :azure to remaining callers ( #26080 )
1 year ago
e76a4d54e3
Fix crash when processing Flag activity with no status ( #26189 )
1 year ago
20809d5d8c
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
03ccbb053b
Add role badges to the WebUI ( #25649 )
1 year ago
0ee5d7a804
Refactor streaming's filtering logic & improve documentation ( #26213 )
1 year ago
eb1139fd42
Fix wrong filters sometimes applying in streaming ( #26159 )
1 year ago
03c444d6e2
Migrate to request specs in `/api/v2/filters` ( #25721 )
1 year ago
61ee553176
Use correct naming on controller concern specs ( #26197 )
1 year ago
991df39b0a
Remove the `sr` locale override .rb files ( #25927 )
1 year ago
4a9961e904
New Crowdin Translations (automated) ( #26072 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
b23699709a
Extract private methods in `StatusCacheHydrator` ( #26177 )
1 year ago
724f933dac
Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration ( #26178 )
1 year ago
430f87e554
Reformat large hash in `ContextHelper` module ( #26180 )
1 year ago
77da32bd70
Reformat large key values in service specs ( #26181 )
1 year ago
90f77d0112
Ignore long line in regex initializer ( #26182 )
1 year ago
Claire
Christian Schmidt
Eugen Rochko
Trevor Wolf
gol-cha
gunchleoc
Stanislas Signoud
github-actions[bot]
Plastikmensch
Renaud Chaput
Emelia Smith
renovate[bot]
Misty De Méo
Daniel M Brasil
Matt Jankowski