Jeremy Kescher
|
9090719153
|
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop
|
2024-10-10 22:57:13 +02:00 |
|
Matt Jankowski
|
1e19242134
|
Extract constants for header and avatar geometry (#32151)
|
2024-10-04 17:48:03 +02:00 |
|
Jeremy Kescher
|
1290a5609d
|
Merge branch 'glitch-v4.3.0-rc.1' into develop
|
2024-10-03 22:25:40 +02:00 |
|
Jeremy Kescher
|
655d28f6a7
|
Merge remote-tracking branch 'upstream/main' into develop
Also apply "Make addReaction and removeReaction optional props", therefore:
Co-authored by: Essem <smswessem@gmail.com>
|
2024-09-20 11:53:07 +02:00 |
|
Matt Jankowski
|
5405bdd344
|
Remove unused E2EE messaging code (#31193)
|
2024-09-18 09:27:43 +00:00 |
|
David Roetzel
|
c1b2c4fd9a
|
Strip protocol from attribution domains (#31900)
|
2024-09-13 11:37:15 +00:00 |
|
Eugen Rochko
|
e0c27a5047
|
Add ability to manage which websites can credit you in link previews (#31819)
|
2024-09-10 12:00:40 +00:00 |
|
Jeremy Kescher
|
cb080ca3ef
|
Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0
|
2024-05-30 18:51:42 +02:00 |
|
Matt Jankowski
|
4a77e477ee
|
Consolidate account scopes for LOWER (index using) username/domain queries (#30451)
|
2024-05-28 14:11:31 +00:00 |
|
Jeremy Kescher
|
e73c612cb1
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-05-11 23:31:31 +02:00 |
|
Matt Jankowski
|
88882fbbee
|
Move Rails/HABTM cop out of todo (#30118)
|
2024-05-02 09:40:05 +00:00 |
|
Matt Jankowski
|
6fed108703
|
Use Rails upsert to generate update_count! query in Counters concern (#28738)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2024-04-17 08:16:51 +00:00 |
|
Jeremy Kescher
|
2df3b9f803
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/serializers/initial_state_serializer.rb
|
2024-04-11 21:50:48 +02:00 |
|
Matt Jankowski
|
285f63c02e
|
Use composable query in User.active scope (#29775)
|
2024-04-08 13:53:49 +00:00 |
|
Claire
|
d71d26a3c9
|
Reattribute notification-related records if possible when merging accounts (#29694)
|
2024-03-22 16:21:53 +00:00 |
|
Matt Jankowski
|
77897cd24c
|
Use existing SeveredRelationship.about_local_account scope in more places (#29673)
|
2024-03-21 08:36:49 +00:00 |
|
Claire
|
44bf7b8128
|
Add notifications of severed relationships (#27511)
|
2024-03-20 15:37:21 +00:00 |
|
Jeremy Kescher
|
a53f2cf970
|
Merge branch 'glitch-soc' into develop
|
2024-03-19 18:31:27 +01:00 |
|
Matt Jankowski
|
838b0bdf2d
|
Remove unused Account::Interactions#endorsed? method (#29463)
|
2024-03-15 09:00:26 +00:00 |
|
Jeremy Kescher
|
21a23b58ab
|
Merge branch 'glitch-soc' into develop
|
2024-03-14 21:46:57 +01:00 |
|
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 |
|
Matt Jankowski
|
0bc17a3d48
|
Use enum-generated public_visibility scope on Status (#28156)
|
2024-03-14 09:31:57 +00: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 |
|