3599622b5b
Fix destructive actions in dropdowns not using error color in light theme ( #28484 )
11 months ago
ba5f659bb3
Use shorter attribute query methods in `Announcement` ( #28474 )
11 months ago
7df9c4f6f3
New Crowdin Translations (automated) ( #28481 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
128c5b7db3
Fix `Performance/StringIdentifierArgument` cop ( #28508 )
11 months ago
1cba91d6d1
Fix reply icon display in picture-in-picture footer ( #28519 )
11 months ago
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
11 months ago
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
11 months ago
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
11 months ago
72ff0d30d8
Fix submitting post from content warning field not working properly ( #2538 )
11 months ago
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
11 months ago
e70a65761a
New Crowdin Translations (automated) ( #28467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
1c041356a1
Fix error on viewing a profile when unlogged ( #28465 )
11 months ago
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
11 months ago
30ee7339d3
Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream changed code style change, including on a line modified by glitch-soc.
Kept glitch-soc's line but with the code style change applied.
11 months ago
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
11 months ago
7a0be26367
[Glitch] Fix empty column explainer getting cropped under certain conditions
...
Port 3f1ec16377
11 months ago
a60b9acf3c
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream
11 months ago
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
11 months ago
5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI ( #28452 )
11 months ago
9e5ddc1745
New Crowdin Translations (automated) ( #28451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
01f0a6ca4f
Fix profile setup showing default avatar in web UI ( #28453 )
11 months ago
9ac13bbc9c
Fix glitch-only HAML linting issue
11 months ago
01e77a0f34
[Glitch] Enable the eslint `react/no-unknown-property` rule
...
Port ee83d5c760
11 months ago
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
11 months ago
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
11 months ago
5de551002d
[Glitch] Fix onboarding step descriptions being truncated on narrow screens
...
Port b20af17a2c
11 months ago
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
11 months ago
b41af99673
[Glitch] Change dismissed banners to be stored server-side
...
Port 7faa27e17d
11 months ago
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
11 months ago
a4a728b01d
[Glitch] Fix the loading bar with the new Redux actions
...
Port 8b1eeb2f90
11 months ago
93c71e2c7c
[Glitch] Fix notification sounds
...
Port f3864db409
11 months ago
70652e49eb
[Glitch] Fix error when muting users from Web UI
...
Port 32319187ee
11 months ago
e94fecdcc8
[Glitch] Fix the `notificationsUpdate` call
...
Port f476d9dab2
11 months ago
79678cf841
[Glitch] Fixes website not loading for unlogged users
...
Port 6712bf86cd
11 months ago
7fe5623a27
[Glitch] Use Immutable `Record` for accounts in Redux state
...
Port 3bf2a7296e
11 months ago
3b7caa00e2
[Glitch] Add Typescript types for some API objects
...
Port 57f592fed5
11 months ago
a3a58c041e
Merge pull request #2527 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 8ebc94dd22
11 months ago
d29b1cca2e
Fix `friends_of_friends` sometimes suggesting already-followed accounts ( #28433 )
11 months ago
fecc07856c
New Crowdin Translations (automated) ( #28439 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
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
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
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.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
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
7d9b209fe8
Fix call to inefficient `delete_matched` cache method in domain blocks ( #28374 )
11 months ago
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
11 months ago
1820bad646
Fix `Performance/StringIdentifierArgument` cop ( #28399 )
11 months ago
2bd8d343cf
Fix `Style/SoleNestedConditional` and `Style/IfInsideElse` cops, regenerate haml todo ( #28384 )
11 months ago
0e5b8fc46b
Fix `Style/RedundantReturn` cop ( #28391 )
11 months ago
f99e05710e
New Crowdin Translations (automated) ( #28373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
11 months ago
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
11 months ago
bb4fa0c374
[Glitch] Rewrite `AutosuggestTextarea` as Functional Component
...
Port 9c8891b39a
11 months ago
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
11 months ago
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
11 months ago
f62bafc7a1
Fix HAML linting issue
11 months ago
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
11 months ago
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
11 months ago
e17faedffb
Move default `meta` options from `InitialStateSerializer` to private method (AbcSize reduction) ( #28355 )
11 months ago
b2f915b31a
New Crowdin Translations (automated) ( #28344 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
dcc24db793
Fix N+1s because of association preloaders not actually getting called ( #28339 )
11 months ago
3f1ec16377
Fix empty column explainer getting cropped under certain conditions ( #28337 )
11 months ago
14e64bc880
New Crowdin Translations (automated) ( #28334 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
11 months ago
a8a5c6514f
Fix `LinkCrawlWorker` error when encountering empty OEmbed response ( #28268 )
11 months ago
2c6369918c
Fix `Style/RedundantArgument` cop ( #28321 )
11 months ago
f3864db409
Fix notification sounds ( #28316 )
11 months ago
79a81da69c
New Crowdin Translations (automated) ( #28291 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
afc8550b63
Change preview card deletes to be done using batch method ( #28183 )
11 months ago
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
11 months ago
df5c64fe57
Further reduce differences with upstream
11 months ago
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc8e2530ea16
11 months ago
4b2ddaf106
Further reduce differences with upstream
11 months ago
408d4710ed
Further reduce differences with upstream
11 months ago
a27abb4802
Further reduce code differences with upstream ( #2509 )
11 months ago
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
11 months ago
Cal Moody
Matt Jankowski
github-actions[bot]
Santiago Kozak
Claire
Renaud Chaput
Eugen Rochko
Essem
Jeong Arm
Brian Holley
pajowu
Aleks Xhuvani
mogaminsk
Michael Stanclift