7cea9de3b2
merge with catstodon/main
2024-05-30 20:39:38 +02:00
cb080ca3ef
Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0
2024-05-30 18:51:42 +02:00
Eugen Rochko
4069fae10d
[Glitch] Add support for fediverse:creator OpenGraph tag
...
Port 128987eded
2024-05-29 18:52:11 +02:00
Renaud Chaput
2e3d6e451f
[Glitch] Enable stricter Typescript options
...
Port 3750e8050c
2024-05-29 17:09:35 +02:00
Renaud Chaput
6b4c182806
[Glitch] Fix createDataLoadingThunk to allow actions without arguments
...
Port 6a75e1c8c8
2024-05-29 17:08:13 +02:00
Claire
c827a98f19
Merge commit ' d20a5c3ec9' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
6d448d46ff
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
# app/javascript/flavours/glitch/reducers/statuses.js
2024-05-29 14:23:08 +02:00
github-actions[bot]
6eea83211c
New Crowdin Translations (automated) ( #30464 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-29 11:12:23 +00:00
Eugen Rochko
128987eded
Add support for fediverse:creator OpenGraph tag ( #30398 )
2024-05-29 01:34:33 +02:00
github-actions[bot]
e5c3dc33a2
New Crowdin Translations (automated) ( #30421 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-27 09:35:45 +00:00
Renaud Chaput
3750e8050c
Enable stricter Typescript options ( #30435 )
2024-05-27 09:24:59 +00:00
Renaud Chaput
6a75e1c8c8
Fix createDataLoadingThunk to allow actions without arguments ( #30439 )
2024-05-27 09:00:40 +00:00
Renaud Chaput
e947f1f2ed
[Glitch] Fix a leftover argument to api()
...
Port 8ea2726376
2024-05-24 17:09:49 +02:00
Claire
d76106da12
Merge commit ' ccb6aeddac' into glitch-soc/merge-upstream
2024-05-24 17:08:21 +02:00
github-actions[bot]
54351d01f2
New Crowdin Translations (automated) ( #30410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-24 08:26:38 +00:00
Renaud Chaput
8ea2726376
Fix a leftover argument to api() ( #30405 )
2024-05-24 08:25:42 +00:00
Renaud Chaput
e32bfad88a
[Glitch] Fix createDataLoadingThunk and related actions
...
Port b6fd14f0e2
2024-05-23 20:37:00 +02:00
Renaud Chaput
8d6058b40a
[Glitch] Proposal: a modern & typed way of writing Redux actions doing API requests
...
Port 10ec421dd4
2024-05-23 20:33:05 +02:00
Claire
51631c785f
Merge commit ' b6fd14f0e2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Glitch-soc had changes to adjacent lines.
Ported upstream's changes.
2024-05-23 20:30:23 +02:00
Renaud Chaput
b6fd14f0e2
Fix createDataLoadingThunk and related actions ( #30408 )
2024-05-23 18:22:42 +00:00
Renaud Chaput
c465ef7560
[Glitch] Fix some API calls that should not use an API token
...
Port 15d3070754
2024-05-23 20:11:20 +02:00
Claire
0e8633f6c7
Merge commit ' 3a862439df' into glitch-soc/merge-upstream
2024-05-23 20:11:12 +02:00
Renaud Chaput
10ec421dd4
Proposal: a modern & typed way of writing Redux actions doing API requests ( #30270 )
2024-05-23 09:50:13 +00:00
github-actions[bot]
5b5a35cf96
New Crowdin Translations (automated) ( #30402 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-23 08:26:29 +00:00
Renaud Chaput
15d3070754
Fix some API calls that should not use an API token ( #30401 )
2024-05-23 07:30:48 +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
3e9298370d
[Glitch] Remove the access token from Redux & context
...
Port 2c5ab8f647
2024-05-22 21:14:54 +02:00
Claire
22d12229b2
Merge commit ' 2c5ab8f647' into glitch-soc/merge-upstream
2024-05-22 21:05:19 +02:00
Renaud Chaput
2c5ab8f647
Remove the access token from Redux & context ( #30275 )
2024-05-22 14:45:18 +00:00
github-actions[bot]
a2b4c29c8f
New Crowdin Translations (automated) ( #30394 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-22 07:57:51 +00:00
David Lapshin
dc35563f65
[Glitch] Fix announcements icon rotating like settings one
...
Port cd0c547936
2024-05-21 17:45:59 +02:00
Claire
5ab111554e
Merge commit ' cd0c547936' into glitch-soc/merge-upstream
2024-05-21 17:45:21 +02:00
David Lapshin
cd0c547936
Fix announcements icon rotating like settings one ( #30388 )
2024-05-21 15:24:51 +00:00
Claire
d3136e6d58
Merge commit ' 89f89d738f' into glitch-soc/merge-upstream
2024-05-21 12:06:38 +02:00
github-actions[bot]
eda2bdfc7a
New Crowdin Translations (automated) ( #30383 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-21 08:48:36 +00:00
16ce10a2bd
Apply changes from emoji reactions branch
2024-05-21 05:47:06 +02:00
47884616f7
[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code
2024-05-21 00:46:17 +02: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
ca5955ed76
[Glitch] Use a modern React context for identity in the app
...
Port a178ba7cd5
2024-05-20 12:53:52 +02:00
Claire
e46321e63d
Merge commit ' de4815afda' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
github-actions[bot]
8b75d18371
New Crowdin Translations (automated) ( #30358 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-20 07:41:38 +00:00
Renaud Chaput
990a0c19a9
Fix a warning when running JS Tests because of FakeIdentityContext using deprecated context API ( #30368 )
2024-05-20 07:29:27 +00:00
Renaud Chaput
a178ba7cd5
Use a modern React context for identity in the app ( #30098 )
2024-05-19 17:07:32 +00:00
70c76a1f30
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-17 15:33:30 +02:00
Claire
7b078b46a2
[Glitch] Fix Web UI trying to save user settings when logged out
...
Port 66906a1bc1
2024-05-16 19:34:50 +02:00
David Lapshin
061464a563
[Glitch] Fix incorrect element selector from #30221
...
Port 94493cff92
2024-05-16 19:34:17 +02:00
Claire
2810231180
Merge commit ' b2388be71e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
Claire
66906a1bc1
Fix Web UI trying to save user settings when logged out ( #30324 )
2024-05-16 13:01:01 +00:00
github-actions[bot]
cdb042ae86
New Crowdin Translations (automated) ( #30319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-16 07:50:19 +00:00
David Lapshin
94493cff92
Fix incorrect element selector from #30221 ( #30307 )
2024-05-16 07:33:29 +00:00
