166d412414
Merge remote-tracking branch 'treehouse/main' into th-downstream
2024-02-17 00:59:36 +09:00
Kouhai
3644101a79
th: Merge remote-tracking branch 'glitch/main'
2024-02-16 03:59:40 -08:00
Kouhai
d6a8c69b5c
th: Merge remote-tracking branch 'glitch/main'
2024-02-16 03:58:50 -08:00
Kouhai
ecc917008e
th: maybe deal with spam
2024-02-16 03:49:59 -08:00
Claire
6c1b6194f7
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 12:17:15 +01:00
76b36ba10d
Revert "Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream""
...
This reverts commit 8aae9712d9
2024-02-15 12:30:05 +09:00
52aeef3834
Merge remote-tracking branch 'treehouse/main' into th-downstream
2024-02-15 12:19:13 +09:00
8aae9712d9
Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream"
...
This reverts commit fa3b5195fd1b1c4ff940
2024-02-15 12:16:40 +09:00
Claire
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
Kouhai
bb4c06aa95
th: reapply css
2024-02-14 12:25:28 -08:00
Kouhai
a1c7ba38b7
th: Merge remote-tracking branch 'glitch/main' ( 486e4bc7d3)
2024-02-14 09:59:05 -08:00
Claire
53b73ed6a2
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:25:15 +01:00
Emelia Smith
436419cc2f
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:25:15 +01:00
Emelia Smith
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
Claire
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
Kouhai
0d1e55d566
th: smile sweet sadistic surprise service
...
should've just hardcoded instead but noooooooooooo
"needs to be decent"
2024-02-13 16:59:34 +09:00
Kouhai
6a5351ede0
th: etc etc host host s s
2024-02-13 16:59:21 +09:00
Kouhai
34f677cd03
th: smile sweet sadistic surprise service
...
should've just hardcoded instead but noooooooooooo
"needs to be decent"
2024-02-12 08:26:49 -08:00
Kouhai
7719de5665
th: etc etc host host s s
2024-02-12 02:37:48 -08:00
Claire
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
Ariadne Conill
c379487041
th: revert more emoji-mart twemoji 14 hacks
2024-02-10 21:02:47 -08:00
Claire
d391e01b59
Revert notification bar color for now
2024-02-08 21:12:57 +01:00
Claire
3f89cec3c9
Further reduce differences with upstream
2024-02-08 19:52:03 +01:00
Claire
f6f62002c7
Remove leftovers from glitch-soc's layout option
2024-02-08 19:21:35 +01:00
Claire
189b70cd6a
Merge SCSS in a single components.scss file
2024-02-08 18:50:38 +01:00
Eugen Rochko
65eb943b9d
Fix confirmation e-mails when signing up through an app ( #29064 )
2024-02-06 21:00:33 +01:00
github-actions[bot]
a2611d782c
New Crowdin Translations (automated) ( #2588 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:45:07 +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
Essem
08e511cecb
Fix doodle modal icons ( #2597 )
2024-02-06 20:22:42 +01:00
Kouhai
8fd45df06e
th: fiddle with quote style
2024-02-03 14:39:12 -08:00
Ariadne Conill
98ae4ef813
th: glitch: status: fix quote icon on quotes
2024-02-03 14:39:12 -08:00
Ariadne Conill
46d70b1ca6
th: glitch: fix quote-toot icon
2024-02-03 14:39:12 -08:00
Ariadne Conill
aa8741fff3
th: glitch: compose: remove annoying post published messages
2024-02-03 14:39:12 -08:00
Kouhai
43e58d1558
th: Merge remote-tracking branch 'glitch/main'
2024-02-03 14:39:12 -08:00
472eec8ae1
I'm just trying random shit at this point
2024-02-03 16:06:55 +09:00
b919006502
uhhhhh help
2024-02-03 15:03:02 +09:00
1daea5fb31
AAAAA
2024-02-03 14:56:27 +09:00
309dd36816
neofox_transgender
2024-02-03 14:41:20 +09:00
415c5eb2d4
Merge remote-tracking branch 'claire/glitch-soc/features/redesign-localonly-toots' into th-downstream
2024-02-03 14:28:39 +09:00
fa3b5195fd
Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream
2024-02-03 14:21:55 +09:00
1b1c4ff940
also send misskey quote data
2024-02-03 14:18:41 +09:00
Ariadne Conill
2029340d6a
glitch: status: fix quote icon on quotes
2024-02-02 21:14:01 -08:00
Ariadne Conill
2a35ae9dc2
glitch: fix quote-toot icon
2024-02-02 20:59:21 -08:00
Ariadne Conill
a3cebd15da
glitch: compose: remove annoying post published messages
2024-02-02 20:29:43 -08:00
Kouhai
4467b3ff37
Merge remote-tracking branch 'glitch/main'
2024-02-01 09:15:33 -08:00
Claire
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:57:08 +01:00
Kouhai
c1910db65f
th: live from new york it's friday night
...
various critical fixes (pls don't report this to NVD)
2024-02-01 02:37:15 -08:00
Kouhai
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
2024-02-01 00:46:44 -08:00
Kouhai
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1)
2024-02-01 00:33:58 -08:00
Claire
8b87673f5e
Remove obsolete locale file ( #2596 )
2024-01-30 23:21:35 +01:00
