kouhai dev
d54e2a6753
th: fix js quote issue
2023-07-06 22:33:05 -07:00
Ariadne Conill
e8b0b5d83e
Merge pull request 'Incorporate glitch changes as of 2023-07-06' ( #62 ) from test-merge-2023-07-04 into main
...
ci/woodpecker/push/woodpecker Pipeline was successful
Details
Reviewed-on: #62
2023-07-06 20:27:32 +00:00
kouhai dev
3c398c2d47
th: force ci
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-06 12:34:15 -07:00
kouhai dev
f26d104e75
th: Merge remote-tracking branch 'glitch/main'
...
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
fixes: CVE-2023-36459
fixes: CVE-2023-36460
fixes: CVE-2023-36461
fixes: CVE-2023-36462
fixes: GHSA-55j9-c3mp-6fcq
fixes: GHSA-9928-3cp5-93fm
fixes: GHSA-9pxv-6qvf-pjwc
fixes: GHSA-ccm4-vgcc-73hp
2023-07-06 12:12:21 -07:00
c25ba31e95
Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-06 15:21:10 +02:00
ff7aae3037
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
5e1752ce3f
Bump version to v4.1.3 ( #25757 )
2023-07-06 15:14:42 +02:00
610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
c5929798bf
Merge pull request from GHSA-9pxv-6qvf-pjwc
...
* Fix timeout handling of outbound HTTP requests
* Use CLOCK_MONOTONIC instead of Time.now
2023-07-06 15:06:23 +02:00
dc8f1fbd97
Merge pull request from GHSA-9928-3cp5-93fm
...
* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged
2023-07-06 15:05:05 +02:00
6d8e0fae3e
Merge pull request from GHSA-ccm4-vgcc-73hp
...
* Tighten allowed HTML in oEmbed-based preview cards
* Sanitize preview cards at render time
* Add `sandbox` attribute to preview card iframes
2023-07-06 15:03:33 +02:00
fed9cbfd2b
Add hardened headers to user-uploaded files ( #25756 )
2023-07-06 14:31:37 +02:00
kouhai dev
814c1f7a71
th: reduce ci clone depth
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-06 02:47:21 -07:00
kouhai dev
4ff0116cf6
th: quieter yarn please
...
yarn cache logs make woodpecker webui lag. this is not ideal.
2023-07-06 02:47:21 -07:00
30ad9d976b
Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-05 16:47:23 +02:00
c0fa85b8dd
[Glitch] Fix regression of icon button colors in web UI
...
Port 69e124e2ed
2023-07-05 13:31:26 +02:00
4719d88117
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 54cb679c19
2023-07-05 13:30:52 +02:00
a117c953d0
[Glitch] Add button to see results for polls in web UI
...
Port b7910bc751
2023-07-05 12:42:24 +02:00
b3f209370b
[Glitch] Add canonical link tags in web UI
...
Port 000b835803
2023-07-05 12:41:52 +02:00
c6246807f5
[Glitch] Fix local live feeds does not expand
...
Port 6268188543
2023-07-05 12:39:46 +02:00
ac74374311
[Glitch] Add at-symbol prepended to mention span title
...
Port d9a5c1acfa
2023-07-05 12:38:54 +02:00
0a5271629c
[Glitch] Change labels of live feeds tabs in web UI
...
Port 54a10523e2
2023-07-05 12:37:37 +02:00
5de49e74d4
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
000b835803
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
kouhai dev
361dc97e40
th: run haml-lint on quote haml
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-05 01:50:54 -07:00
kouhai dev
4801cfbf78
th: invite limit nonfixited bugs
2023-07-05 01:50:54 -07:00
kouhai dev
e5fdf9ab86
th: update haml-lint for autocorrect
2023-07-05 01:49:42 -07:00
kouhai dev
ea47ea1479
th: oops, foreman's back
2023-07-05 01:49:42 -07:00
b7910bc751
Add button to see results for polls in web UI ( #25726 )
2023-07-05 10:32:04 +02:00
kouhai dev
961ac9e493
th: merge glitch again (lol)
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-05 01:14:10 -07:00
kouhai dev
1857350c10
th: update ruby
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-05 00:27:37 -07:00
kouhai dev
763bcbbc19
th: update node base docker
ci/woodpecker/push/woodpecker Pipeline failed
Details
2023-07-05 00:24:27 -07:00
kouhai dev
0c68cb08f5
th: add invite limits behind TH_USE_INVITE_QUOTA
...
ci/woodpecker/push/woodpecker Pipeline was successful
Details
TH_USE_INVITE_QUOTA: feature flag
TH_INVITE_MAX_USES: max uses per invite for non-moderators
TH_ACTIVE_INVITE_SLOT_QUOTA: max slots in active invites, including consumed slots
2023-07-05 00:20:28 -07:00
c4f112ff01
th: add slowest dot network to readme
2023-07-05 00:14:12 -07:00
kouhai dev
aeaeed71f3
th: 12-factor ~~authentication~~ apps were a mistake
2023-07-05 00:14:12 -07:00
eb2417ce99
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
2023-07-04 18:58:23 +02:00
4658263b4a
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
2023-07-04 18:36:24 +02:00
182fd93a07
fix read more button overlapping thread line bug ( #25706 )
2023-07-04 14:57:46 +02:00
12fa24a885
Fix forgotten unconfirmed_email migration file ( #25702 )
2023-07-04 11:25:29 +02:00
6268188543
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
d9a5c1acfa
Add at-symbol prepended to mention span title ( #25684 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-03 22:58:10 +02:00
54a10523e2
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
383c00819c
Fix `/api/v2/search` not working with following query param ( #25681 )
2023-07-03 18:06:57 +02:00
69e124e2ed
Fix regression of icon button colors in web UI ( #25679 )
2023-07-03 16:51:04 +02:00
ed15893eed
Add regex filter back to firehose ( #2266 )
...
* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 15:41:50 +02:00
54cb679c19
Change button colors to increase hover/focus contrast and consistency ( #25677 )
2023-07-03 11:32:31 +02:00
b422b5eebd
Fix showing local only toots in "All" ( #2265 )
...
* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 07:00:38 +02:00
ed567c9de6
Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-02 22:14:45 +02:00
9f3c3f5209
Show local-only posts in “All” by default, and add back option to toggle it
2023-07-02 20:28:02 +02:00
e6a8faae81
Add users index on unconfirmed_email ( #25672 )
2023-07-02 19:41:35 +02:00
kouhai dev
Ariadne Conill
Claire