Skye
415c5eb2d4
Merge remote-tracking branch 'claire/glitch-soc/features/redesign-localonly-toots' into th-downstream
10 months ago
Skye
fa3b5195fd
Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream
10 months ago
4467b3ff37
Merge remote-tracking branch 'glitch/main'
10 months ago
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
10 months ago
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
10 months ago
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1)
10 months ago
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
10 months ago
ceade78182
Fix `Rails/WhereExists` cop in app/services ( #28853 )
10 months ago
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
10 months ago
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
10 months ago
cf2a2ed71c
Fix processing of compacted single-item JSON-LD collections ( #28816 )
10 months ago
de09176ab9
Retry 401 errors on replies fetching ( #28788 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
00234f401c
Move reaction normalization to API controller
10 months ago
daf8502163
Normalize emojis with variant selectors
10 months ago
71fba86454
Refactor react services
10 months ago
f578317f53
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
10 months ago
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
10 months ago
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
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
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
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
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
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
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
11 months ago
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
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
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
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
11 months ago
dcc24db793
Fix N+1s because of association preloaders not actually getting called ( #28339 )
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
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
d0a5ebf914
Fix error when encountering malformed Tag objects from Kbin ( #28235 )
12 months ago
963354978a
Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases ( #28053 )
12 months ago
bb0efe16e6
Remove `default_scope` from `MediaAttachment` class ( #28043 )
12 months ago
6b46bf9953
Handle scenario when webfinger response `subject` is missing host value ( #28088 )
12 months ago
bac9e0b55d
Add variable delay before link verification of remote account links ( #27774 )
1 year ago
07a4059901
Add support for invite codes in the registration API ( #27805 )
1 year ago
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
1 year ago
0c4e7c06dc
Fix `Rails/FindEach` cop ( #26886 )
1 year ago
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
1 year ago
1cc512909c
Have `Follow` activities bypass availability ( #27586 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
8f998cd96a
Handle featured collections without items ( #27581 )
1 year ago
b24d7bb6f2
th: Merge remote-tracking branch 'glitch/main' ( 18eacc7a07)
1 year ago
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
1 year ago
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
1 year ago
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
1 year ago
Skye
Kouhai
Claire
Matt Jankowski
Jonathan de Jong
Essem
MitarashiDango
Eugen Rochko
Jeong Arm
kouhai