3f5041fd60
Merge branch 'emoji-reactions-base' into develop
2025-08-12 22:12:00 +02:00
Echo
dfaca794bf
Force modern emoji experimental to be dev mode only ( #35505 )
2025-07-24 14:55:00 +00:00
Echo
760d00b7f7
Emoji Rendering ( #35424 )
2025-07-22 14:43:15 +00:00
Echo
94bceb8683
Expose enabled features to the frontend ( #35348 )
2025-07-11 13:15:22 +00:00
aa0045e1b1
Merge branch 'upstream-main' into develop
2025-02-25 12:31:21 +01:00
Eugen Rochko
1e70da5e3c
Add reminder when about to post without alt text in web UI ( #33760 )
2025-01-29 11:37:56 +00:00
c34f481005
Merge branch 'upstream-main' into develop
2025-01-04 19:35:00 +01:00
b9c08026fd
Merge branch 'upstream-main' into develop
2025-01-03 23:46:21 +01:00
Christian Schmidt
f9582bcfc3
Localize language names ( #33402 )
2025-01-03 15:29:25 +00:00
Eugen Rochko
30aa0df88c
Add terms of service ( #33055 )
2024-12-09 10:04:46 +00:00
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
Claire
c620452fd7
Enable grouped notifications unconditionally ( #31929 )
2024-09-16 13:12:10 +00:00
9c355a240b
Merge remote-tracking branch 'upstream/main' into develop
2024-08-31 12:53:19 +02:00
Claire
c73868cd78
Add ability for admins to force grouped notifications in web UI ( #31610 )
2024-08-27 14:55:51 +00:00
1862a60e51
Merge branch 'refs/heads/glitch' into develop
2024-07-16 22:32:15 +02:00
Claire
ad52b04a1c
Add setting to disable hover cards ( #30931 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-07-11 19:42:58 +00:00
d1856ea48d
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/mastodon/initial_state.js
2024-05-22 23:56:46 +02:00
Renaud Chaput
2c5ab8f647
Remove the access token from Redux & context ( #30275 )
2024-05-22 14:45:18 +00:00
fae98d1deb
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
2024-05-20 23:57:04 +02:00
Renaud Chaput
a178ba7cd5
Use a modern React context for identity in the app ( #30098 )
2024-05-19 17:07:32 +00:00
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
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )
2024-03-22 16:24:04 +00:00
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
4c24022984
Fix min_options, let vanilla flavor behave properly for pollLimits
2024-02-24 18:25:47 +01:00
5be3fb3d66
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
2024-01-02 12:16:35 +01:00
Claire
ddf3ad9541
Merge commit ' 3bf896c973' 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.
2023-12-17 17:43:30 +01:00
Renaud Chaput
3bf2a7296e
Use Immutable Record for accounts in Redux state ( #26559 )
2023-11-03 15:00:03 +00:00
Claire
c10a667ac2
Merge commit ' 935d54124e' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
Stanislas Signoud
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
2023-10-17 14:59:07 +02:00
Claire
c107512fa6
Merge commit ' 05093266e6' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Claire
6530f9709c
Merge commit ' 121443c0fc' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
CSDUMMI
120f5802c0
Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )
2023-08-03 16:43:15 +02:00
Claire
bd349cb850
Merge commit ' ce1f35d7e2' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Eugen Rochko
4d01d1a1ee
Remove 16:9 cropping from web UI ( #26132 )
2023-07-24 13:46:55 +02:00
Claire
d9adda1a99
Merge commit ' 71db616fed' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
Stanislas Signoud
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
2023-07-13 17:18:09 +02:00
Claire
82eebd0482
Merge commit ' 41a505513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
Eugen Rochko
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
f26f4676db
Add missing visible_reactions to vanilla initial_state typedef
2023-05-09 23:26:15 +02:00
1fb6e312ff
Merge remote-tracking branch 'upstream/main' into develop
2023-04-27 08:59:13 +02:00
Plastikmensch
1565af1caf
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4520e6473a
2023-04-26 21:30:41 +02:00
1e866e57ac
Merge remote-tracking branch 'upstream/main' into develop
2023-04-10 08:14:20 +02:00
Claire
ce12934f5b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Nick Schonning
17b2fd2177
Update display_media typing to string ( #24416 )
2023-04-05 13:20:21 +02:00
198d0b2ed4
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
2023-04-04 15:26:23 +02:00
Claire
4d5b4dacd6
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
fusagiko / takayamaki
4520e6473a
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00
ddc4022845
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
# app/lib/feed_manager.rb
# app/services/batched_remove_status_service.rb
# lib/mastodon/feeds_cli.rb
2023-03-15 14:13:29 +01:00
Claire
7623e18124
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
