fecc07856c
New Crowdin Translations (automated) ( #28439 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
9a24b12416
Update dependency sass-loader to v10.5.1 ( #28432 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
11 months ago
961d65aba6
Add coverage to CLI Maintenance for duplicate users on `confirmation_token` and `reset_password_token` values ( #28434 )
11 months ago
b7cb17fecf
Fix the poll option add button attempting to submit a form ( #2530 )
11 months ago
9bfb699c4c
[Glitch] Change search popout to not list unusable search options when logged out
...
Port 6e70819840
11 months ago
b135b6ba8f
Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
11 months ago
6c00d5b0c4
Fix test failure caused by glitch-soc changes
11 months ago
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
11 months ago
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
11 months ago
7db68e2dca
[Glitch] Fix upper border radius of onboarding columns
...
Port 0a6ec048a8
11 months ago
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
11 months ago
94c4c7f330
[Glitch] Fix open status on media modal
...
Port 922f086253
11 months ago
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
11 months ago
8afd313807
Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
11 months ago
cd1e3ac2c7
Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/timelines/public_controller.rb`:
Upstream refactored this code, the conflict was because of an extra supported
parameter, `allow_local_only`.
Updated the controller to follow upstream's refactor, and moved the extra
parameter definition accordingly.
11 months ago
4fdbffc57c
Merge pull request #2522 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to b2c5b20ef2
11 months ago
6fed0fcbaa
Remove unneeded settings cleanup from specs ( #28425 )
11 months ago
c7c727994a
Add spec for `CLI::Maintenance#fix_duplicates` ( #28326 )
11 months ago
5489d4c84c
Update dependency aws-sdk-s3 to v1.141.0 ( #28116 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
11 months ago
4075b4d7ee
Update dependency node to 20.10 ( #28040 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
11 months ago
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
b7bdcd4f39
Update dependency @material-symbols/svg-600 to v0.14.3 ( #28276 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
11 months ago
c28976d89e
Handle negative offset param in `api/v2/search` ( #28282 )
11 months ago
7b1d390734
Fixes dropdown target without a `buttonRef` (edit history) ( #28427 )
11 months ago
fa987db738
New Crowdin Translations (automated) ( #28423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
3598c2e1db
Revert "Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )" ( #28251 )
11 months ago
8b1eeb2f90
Fix the loading bar with the new Redux actions ( #28422 )
11 months ago
7cfc078198
Fix rails mailer preview not honouring locale ( #28418 )
11 months ago
4259f4a4aa
[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
...
Port 4aa06cbdbf
11 months ago
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
11 months ago
6261db2a26
[Glitch] Fix modal content not being selectable
...
Port ed79713f3a
11 months ago
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
11 months ago
60eb57ce1b
Fix HAML listing issue
11 months ago
f5de9fe99a
[Glitch] Allow viewing and severing relationships with suspended accounts
...
Port c451bbe249
11 months ago
dee28c3fbf
[Glitch] Do not try to update an undefined video element
...
Port 7840c6b75b
11 months ago
372c455218
[Glitch] Add volume saving/reuse to video player
...
Port 58f01a5c9a
11 months ago
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
11 months ago
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
11 months ago
cd2ee0ec5f
Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept ours.
- `yarn.lock`:
Upstream changed from yarn 1 to yarn 4, but we had some different
dependencies.
Updated to yarn 4 and re-added our dependencies.
11 months ago
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
11 months ago
476d1237d4
Typo fix in json ld helper spec ( #28417 )
11 months ago
ab1201c9d9
Update dependency regenerator-runtime to v0.14.1 ( #28393 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
11 months ago
7d9b209fe8
Fix call to inefficient `delete_matched` cache method in domain blocks ( #28374 )
11 months ago
f4b9c2ba40
Group artifact actions ( #28413 )
11 months ago
af366f65ee
Add spec coverage for `models/form/custom_emoji_batch` class ( #28388 )
11 months ago
b2ca71f733
Update dependency rubocop-performance to v1.20.0 ( #28395 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
11 months ago
0b42cf2979
Opt out of `Rails/NegateInclude` cop ( #28370 )
11 months ago
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
11 months ago
18856371be
Merge pull request #2520 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to f476d9dab2
11 months ago
1820bad646
Fix `Performance/StringIdentifierArgument` cop ( #28399 )
11 months ago
github-actions[bot]
renovate[bot]
Matt Jankowski
Essem
Claire
Jeong Arm
Eugen Rochko
Renaud Chaput
Brian Holley
pajowu
Aleks Xhuvani
Yamagishi Kazutoshi