Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
Claire
016d194274
Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, upstream added helpers right next to glitch-soc only
helpers.
Added upstream's helpers.
- `spec/models/status_spec.rb`:
Not a real conflict, upstream added specs right next to glitch-soc only
specs.
Added upstream's tests.
2024-05-06 17:53:51 +02:00
Fawaz Farid
bc24c4792d
Allow admins to configure instance favicon and logo ( #30040 )
2024-05-06 15:06:52 +00:00
Emelia Smith
116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata ( #29191 )
2024-05-06 13:17:56 +00:00
Claire
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
Claire
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
Claire
15f6d2d038
Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
Claire
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
Claire
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
Claire
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
Claire
fc89ecc6ca
Change /api/v1/announcements to return regular Status entities ( #26736 )
2024-04-17 09:06:23 +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
Claire
1d1c3a808a
Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream removed a setting textually adjacent to a glitch-soc-only setting.
Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
Claire
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
Claire
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
Claire
f2b23aa5f3
Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
2024-04-06 19:35:21 +02:00
Matt Jankowski
34489591ec
Add max_pinned_statuses to instances serializer and api response ( #29441 )
2024-04-02 13:54:11 +00:00
Renaud Chaput
b4d991adaa
Use integers and not numbers in notification policy API counters ( #29810 )
2024-04-02 10:06:26 +00:00
Renaud Chaput
e47a3d00fe
Add API types for status and related objects ( #29792 )
2024-04-02 10:03:33 +00:00
Renaud Chaput
27d014a7fa
Rewrite markers reducer in Typescript ( #27644 )
2024-03-27 12:47:09 +00:00
Claire
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )
2024-03-22 16:24:04 +00:00
Claire
dfa43707eb
Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
Claire
98a2bb8be2
Fix issue with severed relationships notifications ( #29668 )
2024-03-20 17:02:09 +00:00
Claire
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00: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
Claire
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
Eugen Rochko
5b3a8737d6
Add hints for rules ( #29539 )
2024-03-11 08:57:07 +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
Claire
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
Claire
47b5105e5d
Remove max_toot_chars from initial-state
...
This is still in `/api/v1/instance` for compatibility with other clients
2024-02-24 13:58:00 +01:00
Essem
4cbaf46950
Hydrate reactions on streaming API
2024-02-11 17:25:53 +01:00
Jeremy Kescher
e4a333c6ae
Adjust initial_state_serializer to state of updated emoji reactions PR
2024-02-07 16:46:08 +01:00
Jeremy Kescher
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +01:00
JS Moore
541cbdd963
Add env variable support for number of followable hashtags in feed column ( #2500 )
...
* Add env variable support for number of followable hashtags in feed column.
* Add a note about performance concerns for higher values.
See discussion in https://github.com/glitch-soc/mastodon/pull/2500
* Update .devcontainer/docker-compose.yml
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:23:36 +01:00
Claire
7ee93b7431
Change source attribute of Suggestion entity in /api/v2/suggestions back to a string ( #29108 )
2024-02-06 17:10:17 +00:00
Emelia Smith
4fb7f611de
Return domain block digests from admin domain blocks API ( #29092 )
2024-02-06 12:38:14 +00:00
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
2024-01-28 02:29:46 +01:00
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Matt Jankowski
7c9c6c7f80
Fix remaining Rails/WhereExists cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
Eugen Rochko
5b1eb09d54
Add annual reports for accounts ( #28693 )
2024-01-24 09:38:10 +00:00
Claire
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
Matt Jankowski
4ec7d7d989
Fix Rails/WhereExists cop in REST::TagSerializer model ( #28790 )
2024-01-19 09:35:58 +00:00
Jeremy Kescher
93ae46fa14
Merge branch 'glitch-soc' into develop
2024-01-18 22:59:27 +01:00
Claire
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
Renaud Chaput
cb5ac15923
Use a helper to avoid using media/ asset prefixes ( #28756 )
2024-01-17 12:19:51 +00:00
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5
2024-01-12 22:03:50 +01:00
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`.
2024-01-10 17:51:12 +01:00
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
