Eugen Rochko
6230d50f3f
[Glitch] Fix various icon styles in web UI
...
Port fa7e64df1d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Renaud Chaput
b67d977e20
[Glitch] Add missing ban icons
...
Port a4e6fe36cb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Renaud Chaput
9b32a37b6f
[Glitch] Fix missing icon props
...
Port f08ca3f042
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Eugen Rochko
d54414866c
[Glitch] Change icons in web UI
...
Port 134de736dc
to glitch-soc
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
5f8618443c
Merge pull request #2566 from ClearlyClaire/glitch-soc/ports/badge-design
...
Port upstream's role badge design
10 months ago
Eugen Rochko
eae3275fff
[Glitch] Change design of role badges in web UI
...
Port 2cbdff97ce
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
a40ce78f11
[Glitch] Add role badges to the WebUI
...
Port 1e4ccc655a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
a25e03dbc3
Revert "Add role badges to WebUI ( #2096 )"
...
This reverts commit d9a078e6d3
.
10 months ago
Renaud Chaput
d6609635cb
[Glitch] Add a version comment to the emoji preval-ed file so it is regenerated
...
Port 383be173af
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Essem
ca31b4de3a
[Glitch] Add new emojis from `jdecked/twemoji` 15.0
...
Port b6e353537b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
10 months ago
Claire
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
10 months ago
Claire
1070804a1a
Fix `RedownloadMediaWorker` not being called on transient S3 failure ( #28714 )
10 months ago
MitarashiDango
2c05b8a60d
Fix Undo Announce activity is not sent, when not followed by the reblogged post author ( #18482 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Matt Jankowski
a90c134850
Move followable by logic to suggestion class ( #28710 )
10 months ago
Renaud Chaput
608f66f978
Change icon SVG imports to use a default import ( #28709 )
10 months ago
Renaud Chaput
c6684aa1e3
Use the assets pipeline to load `inert.css` ( #28701 )
10 months ago
Matt Jankowski
a90696011e
Add coverage/bugfix for invalid appeal submission ( #28703 )
10 months ago
Matt Jankowski
7801db7ba4
Spec coverage for custom css endpoint ( #28706 )
10 months ago
github-actions[bot]
b86083f0dc
New Crowdin Translations (automated) ( #28708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Matt Jankowski
575ab085be
Disable `Rails/ApplicationController` for `HealthController` ( #28705 )
10 months ago
Renaud Chaput
383be173af
Add a version comment to the emoji preval-ed file so it is regenerated ( #28700 )
10 months ago
Claire
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
10 months ago
Essem
b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 ( #28404 )
10 months ago
Matt Jankowski
b68f185573
Reduce `LineLength` for `react_component` helper in views/admin ( #28694 )
10 months ago
Claire
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
10 months ago
Claire
5dcb8d92c3
Fix lint issue in glitch-soc-only setting form
10 months ago
Claire
63acdebc5d
Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because of a code style fix, while some changed lines are
absent from glitch-soc.
Ignored the deleted lines.
10 months ago
Claire
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
10 months ago
github-actions[bot]
e5b97eadd5
New Crowdin Translations (automated) ( #2502 )
...
* New Crowdin translations
* Update no.yml
* Update simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Matt Jankowski
87097a227c
Clean up `settings/featured_tags/index` view ( #28688 )
10 months ago
Matt Jankowski
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
10 months ago
github-actions[bot]
204bbf49d2
New Crowdin Translations (automated) ( #28692 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Matt Jankowski
6daa69327b
Fix `LineLength` haml-lint in `t` usage ( #28686 )
10 months ago
Claire
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
10 months ago
Renaud Chaput
09376a8207
[Glitch] Upgrade Redux packages
...
Port a0e237a96f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
51d2d98174
Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream
10 months ago
Claire
7cd88ae2f4
[Glitch] Fix scrolling to detailed status not always working
...
Port d0fd14f851
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
10 months ago
Claire
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
10 months ago
Matt Jankowski
543d7890fd
Use normalizes to prepare `User` values ( #28650 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Matt Jankowski
a71e918e95
Fix `LineLength` haml-lint in `media/player` view ( #28667 )
10 months ago
Matt Jankowski
eed4eef39a
Fix `LineLength` haml-lint in `app/views/auth` area ( #28664 )
10 months ago
Matt Jankowski
09ab073f0c
Fix `LineLength` haml-lint in `app/views/settings` area ( #28663 )
10 months ago
Claire
10203bd57a
Clean up `Setting` model and remove dead code ( #28661 )
10 months ago
Jean Boussier
1781849884
Inline what remains of the rails-settings-cached gem ( #28618 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
gunchleoc
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Matt Jankowski
68f06f1fd4
Fix haml-lint `LineLength` cop for `settings/preferences/notifications/show` ( #28655 )
10 months ago
github-actions[bot]
8e7d5fe2ac
New Crowdin Translations (automated) ( #28658 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Matt Jankowski
cd4b4d4734
Replace unused `by_recent_sign_in` scope ( #28616 )
10 months ago
Matt Jankowski
e677eb164c
Remove unused `Announcement#time_range?` ( #28648 )
10 months ago
Matt Jankowski
3e43cd095c
Remove unused scope `Announcement.without_muted` ( #28645 )
10 months ago
Matt Jankowski
9322396e58
Use normalizes to prepare `Account#username` value ( #28646 )
10 months ago
Matt Jankowski
cd58e37b25
Remove unused `DomainBlock#affected_accounts_count` method ( #28642 )
10 months ago
Matt Jankowski
3e7a9266ea
Remove unused `EmojiFormatter#count_tag_nesting` method ( #28643 )
10 months ago
Matt Jankowski
4ccba94489
Remove unused `*_silenced_accounts` scopes on Status ( #28644 )
10 months ago
Matt Jankowski
c52a593a30
Remove unused scope `User.emailable` ( #28647 )
10 months ago
Matt Jankowski
e827c4692c
Use Arel `matches` method in CustomEmoji search ( #28615 )
10 months ago
github-actions[bot]
cc67943df2
New Crowdin Translations (automated) ( #28627 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Matt Jankowski
1bc5a52139
Extract SQL heredoc method for Announcement scopes ( #28613 )
10 months ago
Matt Jankowski
aa6d07dbd9
Use normalizes to prepare CustomEmoji `domain` value ( #28624 )
10 months ago
Matt Jankowski
202951e6d9
Use Arel `in_order_of` method to generate CASE for `DomainBlock.by_severity` ( #28617 )
10 months ago
Matt Jankowski
57f49c8191
Use Arel `nulls_first` method in ordering CustomEmojiFilter scope ( #28614 )
10 months ago
Renaud Chaput
a0e237a96f
Upgrade Redux packages ( #28585 )
10 months ago
Jean Boussier
5a6d533c53
Enable Rails 7.1 Marshalling format ( #28609 )
10 months ago
Matt Jankowski
12bed81187
Add validation specs to `CustomFilter` model ( #28600 )
10 months ago
github-actions[bot]
43d800ada6
New Crowdin Translations (automated) ( #28604 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Claire
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs ( #28607 )
10 months ago
Claire
5f4643b895
Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used ( #28561 )
10 months ago
Claire
d0fd14f851
Fix scrolling to detailed status not always working ( #28577 )
10 months ago
Claire
419c659bc4
Add fallback redirection when getting a webfinger query `WEB_DOMAIN@WEB_DOMAIN` ( #28592 )
10 months ago
github-actions[bot]
bdf4750633
New Crowdin Translations (automated) ( #28590 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
10 months ago
Claire
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
10 months ago
Michael Stanclift
195b89d336
Fix .opus file uploads being misidentified by Paperclip ( #28580 )
10 months ago
Matt Jankowski
e12d8893f4
Fix intermittent failure from unspecified order in `export_domain_blocks` controller spec ( #28562 )
10 months ago
Claire
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
10 months ago
Claire
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
10 months ago
github-actions[bot]
7cce2a41f2
New Crowdin Translations (automated) ( #28573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Claire
48c9192b47
[Glitch] Fix loading local accounts with extraneous domain part in WebUI
...
Port 65ea097f1d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
f685c953e5
Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream
10 months ago
Claire
65ea097f1d
Fix loading local accounts with extraneous domain part in WebUI ( #28559 )
10 months ago
Michael Stanclift
0cd497ba7d
[Glitch] Fix OCR when using S3/CDN for assets
...
Port fdec8d7ffb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
b3542ac57b
Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our README.
10 months ago
Claire
1184887b01
Fix streaming API redirection ignoring the port of `streaming_api_base_url` ( #28558 )
10 months ago
github-actions[bot]
0374e11091
New Crowdin Translations (automated) ( #28529 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Michael Stanclift
fdec8d7ffb
Fix OCR when using S3/CDN for assets ( #28551 )
10 months ago
Claire
eb342a6082
Fix media attachments not being hidden in report modal in glitch flavor
11 months ago
Cal Moody
df43bb124c
[Glitch] Fix destructive actions in dropdowns not using error color in light theme
...
Port 3599622b5b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
35b6583371
Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream
11 months ago
Claire
6374358357
Change media to be hidden/blurred by default in report modal ( #28522 )
11 months ago
Claire
fcfdeadc04
Fix random `NoMethodError` errors on cached `CustomFilter` objects ( #28521 )
11 months ago
Cal Moody
3599622b5b
Fix destructive actions in dropdowns not using error color in light theme ( #28484 )
11 months ago
Matt Jankowski
ba5f659bb3
Use shorter attribute query methods in `Announcement` ( #28474 )
11 months ago
github-actions[bot]
7df9c4f6f3
New Crowdin Translations (automated) ( #28481 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Matt Jankowski
128c5b7db3
Fix `Performance/StringIdentifierArgument` cop ( #28508 )
11 months ago
Santiago Kozak
1cba91d6d1
Fix reply icon display in picture-in-picture footer ( #28519 )
11 months ago
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
11 months ago
Claire
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
11 months ago
Claire
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
11 months ago
Claire
72ff0d30d8
Fix submitting post from content warning field not working properly ( #2538 )
11 months ago
Claire
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
11 months ago
github-actions[bot]
e70a65761a
New Crowdin Translations (automated) ( #28467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Renaud Chaput
1c041356a1
Fix error on viewing a profile when unlogged ( #28465 )
11 months ago
Claire
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
11 months ago
Claire
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
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
11 months ago
Claire
7a0be26367
[Glitch] Fix empty column explainer getting cropped under certain conditions
...
Port 3f1ec16377
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
a60b9acf3c
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream
11 months ago
Claire
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
Eugen Rochko
5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI ( #28452 )
11 months ago
github-actions[bot]
9e5ddc1745
New Crowdin Translations (automated) ( #28451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Eugen Rochko
01f0a6ca4f
Fix profile setup showing default avatar in web UI ( #28453 )
11 months ago
Claire
9ac13bbc9c
Fix glitch-only HAML linting issue
11 months ago
Matt Jankowski
01e77a0f34
[Glitch] Enable the eslint `react/no-unknown-property` rule
...
Port ee83d5c760
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
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
Claire
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
Claire
5de551002d
[Glitch] Fix onboarding step descriptions being truncated on narrow screens
...
Port b20af17a2c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
11 months ago
Claire
b41af99673
[Glitch] Change dismissed banners to be stored server-side
...
Port 7faa27e17d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
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
Renaud Chaput
a4a728b01d
[Glitch] Fix the loading bar with the new Redux actions
...
Port 8b1eeb2f90
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
93c71e2c7c
[Glitch] Fix notification sounds
...
Port f3864db409
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
70652e49eb
[Glitch] Fix error when muting users from Web UI
...
Port 32319187ee
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Renaud Chaput
e94fecdcc8
[Glitch] Fix the `notificationsUpdate` call
...
Port f476d9dab2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Renaud Chaput
79678cf841
[Glitch] Fixes website not loading for unlogged users
...
Port 6712bf86cd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Renaud Chaput
7fe5623a27
[Glitch] Use Immutable `Record` for accounts in Redux state
...
Port 3bf2a7296e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Renaud Chaput
3b7caa00e2
[Glitch] Add Typescript types for some API objects
...
Port 57f592fed5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
a3a58c041e
Merge pull request #2527 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 8ebc94dd22
11 months ago
Claire
d29b1cca2e
Fix `friends_of_friends` sometimes suggesting already-followed accounts ( #28433 )
11 months ago
github-actions[bot]
fecc07856c
New Crowdin Translations (automated) ( #28439 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Essem
b7cb17fecf
Fix the poll option add button attempting to submit a form ( #2530 )
11 months ago
Claire
9bfb699c4c
[Glitch] Change search popout to not list unusable search options when logged out
...
Port 6e70819840
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
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
Claire
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
Claire
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
11 months ago
Claire
7db68e2dca
[Glitch] Fix upper border radius of onboarding columns
...
Port 0a6ec048a8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
11 months ago
Jeong Arm
94c4c7f330
[Glitch] Fix open status on media modal
...
Port 922f086253
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
11 months ago
Claire
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
Claire
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
Eugen Rochko
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Matt Jankowski
c28976d89e
Handle negative offset param in `api/v2/search` ( #28282 )
11 months ago
Renaud Chaput
7b1d390734
Fixes dropdown target without a `buttonRef` (edit history) ( #28427 )
11 months ago
github-actions[bot]
fa987db738
New Crowdin Translations (automated) ( #28423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Claire
3598c2e1db
Revert "Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )" ( #28251 )
11 months ago
Renaud Chaput
8b1eeb2f90
Fix the loading bar with the new Redux actions ( #28422 )
11 months ago
Matt Jankowski
7cfc078198
Fix rails mailer preview not honouring locale ( #28418 )
11 months ago
Brian Holley
4259f4a4aa
[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
...
Port 4aa06cbdbf
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
11 months ago
pajowu
6261db2a26
[Glitch] Fix modal content not being selectable
...
Port ed79713f3a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
11 months ago
Claire
60eb57ce1b
Fix HAML listing issue
11 months ago
Claire
f5de9fe99a
[Glitch] Allow viewing and severing relationships with suspended accounts
...
Port c451bbe249
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Aleks Xhuvani
dee28c3fbf
[Glitch] Do not try to update an undefined video element
...
Port 7840c6b75b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Aleks Xhuvani
372c455218
[Glitch] Add volume saving/reuse to video player
...
Port 58f01a5c9a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
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
Claire
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
11 months ago
Claire
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
Claire
7d9b209fe8
Fix call to inefficient `delete_matched` cache method in domain blocks ( #28374 )
11 months ago
Claire
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
11 months ago
Matt Jankowski
1820bad646
Fix `Performance/StringIdentifierArgument` cop ( #28399 )
11 months ago
Matt Jankowski
2bd8d343cf
Fix `Style/SoleNestedConditional` and `Style/IfInsideElse` cops, regenerate haml todo ( #28384 )
11 months ago
Matt Jankowski
0e5b8fc46b
Fix `Style/RedundantReturn` cop ( #28391 )
11 months ago
github-actions[bot]
f99e05710e
New Crowdin Translations (automated) ( #28373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Claire
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
mogaminsk
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
bb4fa0c374
[Glitch] Rewrite `AutosuggestTextarea` as Functional Component
...
Port 9c8891b39a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Renaud Chaput
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Claire
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
Claire
f62bafc7a1
Fix HAML linting issue
11 months ago
Claire
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
Matt Jankowski
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
11 months ago
Matt Jankowski
e17faedffb
Move default `meta` options from `InitialStateSerializer` to private method (AbcSize reduction) ( #28355 )
11 months ago
github-actions[bot]
b2f915b31a
New Crowdin Translations (automated) ( #28344 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Claire
dcc24db793
Fix N+1s because of association preloaders not actually getting called ( #28339 )
11 months ago
Claire
3f1ec16377
Fix empty column explainer getting cropped under certain conditions ( #28337 )
11 months ago
github-actions[bot]
14e64bc880
New Crowdin Translations (automated) ( #28334 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Claire
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
11 months ago
Claire
a8a5c6514f
Fix `LinkCrawlWorker` error when encountering empty OEmbed response ( #28268 )
11 months ago
Matt Jankowski
2c6369918c
Fix `Style/RedundantArgument` cop ( #28321 )
11 months ago
Claire
f3864db409
Fix notification sounds ( #28316 )
11 months ago
github-actions[bot]
79a81da69c
New Crowdin Translations (automated) ( #28291 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Michael Stanclift
afc8550b63
Change preview card deletes to be done using batch method ( #28183 )
11 months ago
Claire
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
Claire
df5c64fe57
Further reduce differences with upstream
11 months ago
Claire
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc
and 8e2530ea16
to glitch-soc
Co-Authored-By: Darius Kazemi <darius.kazemi@gmail.com>
11 months ago
Claire
4b2ddaf106
Further reduce differences with upstream
11 months ago
Claire
408d4710ed
Further reduce differences with upstream
11 months ago
Claire
a27abb4802
Further reduce code differences with upstream ( #2509 )
11 months ago
Claire
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
11 months ago
Claire
b2647bc3f2
[Glitch] Update `Avatar`, `AvatarComposite`, and `AvatarOverlay` components ( #2508 )
...
Various ports including 8dfe5179ee
,
d1de7fb7fa
and
9f8d34620b
.
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com>
11 months ago
github-actions[bot]
ca1b7efb06
New Crowdin Translations (automated) ( #28275 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Matt Jankowski
3918dc68c7
Use composite primary key for `PreviewCardsStatus` model ( #28208 )
11 months ago
Michael Stanclift
da3d8aff79
Error handling for attachment batch delete process ( #28184 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
github-actions[bot]
e0dacf6b4c
New Crowdin Translations (automated) ( #28264 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
Claire
7593465c23
Fix error when processing link preview with an array as `inLanguage` ( #28252 )
11 months ago
Matt Jankowski
ee83d5c760
Enable the eslint `react/no-unknown-property` rule ( #28217 )
11 months ago
github-actions[bot]
954169966b
New Crowdin Translations (automated) ( #28245 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago