Jeremy Kescher
|
caccc2e0f4
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# README.md
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/reducers/compose.js
# app/javascript/flavours/glitch/styles/components.scss
# app/javascript/mastodon/reducers/compose.js
# app/models/notification.rb
|
2024-03-14 20:01:30 +01:00 |
|
Jeong Arm
|
4a6ddbc9c0
|
Normalize idna domain before account unblock domain (#29530)
|
2024-03-11 09:28:08 +00:00 |
|
Eugen Rochko
|
50b17f7e10
|
Add notification policies and notification requests (#29366)
|
2024-03-07 14:53:37 +00:00 |
|
Jeremy Kescher
|
009251a17d
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
|
2024-02-24 19:11:05 +01:00 |
|
Matt Jankowski
|
245064bb98
|
Move "everyone" role and "instance actor" account magic number IDs to constants (#29260)
|
2024-02-19 11:09:43 +00:00 |
|
Jeremy Kescher
|
c2c2afc294
|
Merge branch 'glitch-soc' into develop
|
2024-01-28 02:29:46 +01:00 |
|
Matt Jankowski
|
89c9a4502d
|
Fix Rails/WhereExists cop in account/interactions concern (#28789)
|
2024-01-18 09:36:16 +00:00 |
|
Essem
|
6ae86f40d1
|
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>
|
2023-12-29 12:33:13 -06:00 |
|
Eugen Rochko
|
b5ac61b2c5
|
Change algorithm of follow recommendations (#28314)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-19 10:59:43 +00:00 |
|
Claire
|
7d9b209fe8
|
Fix call to inefficient delete_matched cache method in domain blocks (#28374)
|
2023-12-18 16:14:43 +00:00 |
|
Claire
|
dcc24db793
|
Fix N+1s because of association preloaders not actually getting called (#28339)
|
2023-12-13 07:47:32 +00:00 |
|
Matt Jankowski
|
f70f39dd04
|
Add explicit dependent: nil to associations (#28169)
|
2023-12-01 15:52:47 +00:00 |
|
Matt Jankowski
|
440b80b2e7
|
Model concerns organization into module namespaces (#28149)
|
2023-12-01 11:00:41 +00:00 |
|