CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
19,529 Commits 1 Branch 1 Tag 344 MiB
5894051838
Commit Graph

19529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Noa Himesaka
cebe2f1a05 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-07-30 18:02:36 +09:00
Eugen Rochko
d4807a5e64
Change aspect ratios on link previews in web UI (#26250) 2023-07-30 03:35:17 +02:00
Christian Schmidt
d76f79f647
Remove obsolete backport from Rails 7 (#26254) 2023-07-29 22:28:05 +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
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
Matt Jankowski
74903af7ce
Ignore the brakeman PermitAttributes check (#25915) 2023-07-28 23:17:53 +02:00
Matt Jankowski
8ac9e446df
Load rspec-rails gem in test + development (#25768) 2023-07-28 23:17:35 +02:00
Matt Jankowski
7581b1ff96
Profiling tools configuration improvement (#25383) 2023-07-28 23:16:23 +02:00
Matt Jankowski
6f1fa1364f
Fix RSpec/EmptyExampleGroup cop (#24735) 2023-07-28 23:15:33 +02:00
Matt Jankowski
660993b415
Add coverage for URLValidator (#25591) 2023-07-28 23:12:25 +02:00
Matt Jankowski
6602edf064
Add coverage for LanguageValidator (#25593) 2023-07-28 23:12:09 +02:00
Matt Jankowski
ad81be6c8e
Update rubocop rules for linelength (#26190) 2023-07-28 23:11:45 +02:00
Matt Jankowski
30f5ec7303
Rubocop fix: Perfomance/UnfreezeString (#26217) 2023-07-28 23:11:05 +02:00
Renaud Chaput
4d1b67f664
Add end-to-end (system) tests (#25461) 2023-07-28 23:09:49 +02:00
Jay Prakash Kalia
8d5d707cc1
Update README.md (#25435) 2023-07-28 23:09:19 +02:00
gunchleoc
b0134db6ff
Allow filtering for Chinese languages (#26066) 2023-07-28 23:07:22 +02:00
Christian Schmidt
f96e4b3047
Use original URL in preview if it redirects to 4xx page (#26200) 2023-07-28 23:02:08 +02:00
Renaud Chaput
3554c52795
Fix missing return values in streaming (#26233) 2023-07-28 19:11:58 +02:00
Claire
446821a0dc
Swap debug statements in streaming server (#26231) 2023-07-28 17:59:31 +02:00
Noa Himesaka
f8713d1e4a fix: adapt to Rails 7.0 changes 2023-07-28 23:04:48 +09:00
Emelia Smith
81cdc0f972
Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228) 2023-07-28 12:06:29 +02:00
renovate[bot]
255606d2da
Update dependency haml_lint to v0.49.2 (#26222) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-28 10:45:52 +02:00
Noa Himesaka
4bd9739759 fix: JSX error 2023-07-28 16:22:35 +09:00
Noa Himesaka
4f20c5430b Glitch-YRYR YRYRg release 2023-07-28 11:09:06 +09:00
Noa Himesaka
8afb64ba3b Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-07-28 11:07:23 +09:00
Noa Himesaka
47013e0a02 feat: Merge Emoji Reactions 2023-07-28 11:07:18 +09: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
a4ec187a20
Change the wording of the dismissable explore prompt (#25917) 2023-07-27 16:51:02 +02:00
Claire
bbea052935
Fix emoji picker button scrolling with textarea content in single-column view (#25304) 2023-07-27 16:20:33 +02:00
Emelia Smith
317cd26fba
Remove queued_at value from pubsub payloads (#26173) 2023-07-27 16:19:33 +02:00
Misty De Méo
12a6cf569e
Storage: add :azure to remaining callers (#26080) 2023-07-27 16:13:45 +02:00
Claire
6c3c5bbbc3
Fix crash when processing Flag activity with no status (#26189) 2023-07-27 16:11:56 +02:00
Claire
b4e739ff0f
Change interaction modal in web UI (#26075) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-07-27 16:11:17 +02:00
Claire
1e4ccc655a
Add role badges to the WebUI (#25649) 2023-07-27 16:05:24 +02:00
Emelia Smith
ddaf200c78
Refactor streaming's filtering logic & improve documentation (#26213) 2023-07-27 15:38:18 +02:00