Mark Felder
|
a0e08c6ec2
|
Merge branch 'develop' into phoenix1.7
|
2023-11-07 16:05:04 -05:00 |
|
Mark Felder
|
8076deeeb4
|
Activate test for object validator that has not been running
|
2023-11-07 16:00:13 -05:00 |
|
feld
|
11c520607f
|
Merge branch 'mailer-queue' into 'develop'
Fix digest email processing, consolidate Oban queues
See merge request pleroma/pleroma!3966
|
2023-11-07 20:45:48 +00:00 |
|
Mark Felder
|
bf426c53b4
|
Fix digest email processing, consolidate Oban queues
The email related jobs can all share a single Oban queue
|
2023-11-07 15:14:36 -05:00 |
|
tusooa
|
4c5b45ed73
|
Merge branch 'mergeback/2.6.0' into 'develop'
mergeback: 2.6.0
Closes #3135
See merge request pleroma/pleroma!3964
|
2023-11-01 03:19:05 +00:00 |
|
tusooa
|
aaf53d9d77
|
Bump package version for mergeback
|
2023-10-31 20:49:31 -04:00 |
|
tusooa
|
6f654d534a
|
Merge branch 'release/2.6.0' into 'stable'
Release/2.6.0
See merge request pleroma/pleroma!3924
|
2023-11-01 00:43:35 +00:00 |
|
tusooa
|
ad45b06b3f
|
Merge branch 'stable' into 'release/2.6.0'
# Conflicts:
# .gitlab-ci.yml
# lib/pleroma/web/common_api/utils.ex
# lib/pleroma/web/xml.ex
# mix.exs
# test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
# test/pleroma/web/common_api/utils_test.exs
# test/pleroma/web/mastodon_api/update_credentials_test.exs
# test/pleroma/web/xml_test.exs
|
2023-10-31 01:07:43 +00:00 |
|
tusooa
|
ab894d98f4
|
Bundle 2.6.0 frontend
|
2023-10-29 12:59:03 -04:00 |
|
marcin mikołajczak
|
d860a66753
|
Merge branch 'audio-scrobbling' into 'develop'
Undeprecate audio scrobbling
See merge request soapbox-pub/rebased!287
|
2023-10-28 09:23:43 +00:00 |
|
|
|
0ebbe8d9d7
|
Merge remote-tracking branch 'pleroma/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-28 00:30:08 +02:00 |
|
|
|
1e7e9b77d8
|
Undeprecate audio scrobbling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-28 00:27:57 +02:00 |
|
marcin mikołajczak
|
3a9b1200c9
|
Merge branch 'mkljczk-develop-patch-66604' into 'develop'
all InstanceController actions should not require authentication
See merge request soapbox-pub/rebased!286
|
2023-10-27 19:01:17 +00:00 |
|
marcin mikołajczak
|
6fd09f3416
|
all InstanceController actions should not require authentication
|
2023-10-27 18:50:24 +00:00 |
|
tusooa
|
6a13c2d180
|
Add collect-changelog script
|
2023-10-25 20:45:23 -04:00 |
|
tusooa
|
a2a69709b5
|
Bump version to 2.6.0
|
2023-10-24 19:57:31 -04:00 |
|
Haelwenn
|
e3ea311cd5
|
Merge branch 'tusooa/2810-punycode-mention' into 'develop'
Fix mentioning punycode domains when using Markdown
Closes #2810
See merge request pleroma/pleroma!3925
|
2023-10-18 01:20:00 +00:00 |
|
tusooa
|
df0b56576a
|
Fix other quotation mark conversion tests
|
2023-10-16 21:35:37 -04:00 |
|
tusooa
|
b748efe66a
|
Fix mentioning punycode domains when using Markdown
|
2023-10-16 21:35:25 -04:00 |
|
tusooa
|
340c881296
|
Merge branch 'tusooa/3018-unified-stream' into 'develop'
Unified streaming endpoint
Closes #3018
See merge request pleroma/pleroma!3864
|
2023-10-15 21:35:30 +00:00 |
|
tusooa
|
eb33a03d0a
|
Explain the encode-decode roundtrip
|
2023-10-15 17:20:26 -04:00 |
|
tusooa
|
3e7d2e29b3
|
Add changelog
|
2023-10-15 17:20:26 -04:00 |
|
tusooa
|
840dd01035
|
Fix duplicated schema names
|
2023-10-15 17:20:26 -04:00 |
|
tusooa
|
32de0683c4
|
Fix unsubscribe event type in streaming doc
|
2023-10-15 17:20:26 -04:00 |
|
tusooa
|
c13f0a8460
|
Add meta-info and query strings to streaming doc
|
2023-10-15 17:20:26 -04:00 |
|
tusooa
|
f393a15dd1
|
Fix some specs about server-sent events in streaming
|
2023-10-15 17:20:26 -04:00 |
|
tusooa
|
8829dcaee4
|
Document client-sent events in streaming
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
dcef33f5f0
|
Document server-sent events of streaming
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
844d1a14e0
|
Start writing api docs for streaming endpoint
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
314360e5e3
|
Add test to cover edit streaming
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
26f5caebae
|
Add test to cover notifications streaming
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
4cf109d3c4
|
Add test to cover rendering update with user
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
050227f118
|
Add test to cover error: bad_topic
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
eebc605bc2
|
Clear up debug statement
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
949c4f01c6
|
Fix NotificationTest
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
7f12ad6dcc
|
Fix docs wording
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
9572be1e5f
|
Add tests for list streams
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
2d43067946
|
Document the streaming endpoint
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
a348c2e4dd
|
Use pleroma: instead of pleroma. for ws events
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
7d005e8c93
|
Return stream attribute in server-sent events
|
2023-10-15 17:20:23 -04:00 |
|
tusooa
|
21395aa509
|
Allow authenticating via client-sent events
|
2023-10-15 17:19:49 -04:00 |
|
tusooa
|
273cda63ad
|
Allow subscribing to streams
|
2023-10-15 17:19:49 -04:00 |
|
tusooa
|
2b5636bf12
|
Allow unified streaming endpoint
|
2023-10-15 17:19:40 -04:00 |
|
tusooa
|
14b1b9c9b0
|
Merge branch 'tusooa/quote' into 'develop'
Quoting
See merge request pleroma/pleroma!3921
|
2023-10-15 20:48:16 +00:00 |
|
Alex Gleason
|
acbec64051
|
Merge branch 'sentry-csp' into 'develop'
Let Sentry DSN through CSP
See merge request soapbox-pub/rebased!283
|
2023-10-05 22:49:04 +00:00 |
|
Alex Gleason
|
5cd3711e2f
|
Let Sentry DSN through CSP
|
2023-10-05 17:47:03 -05:00 |
|
Alex Gleason
|
a110a395c1
|
Merge branch 'pleroma_ctl-soapbox' into 'develop'
Update config.exs, to fix incomplete soapbox install via pleroma_ctl
See merge request soapbox-pub/rebased!282
|
2023-10-04 23:11:03 +00:00 |
|
Aldis Ruiz
|
c86b34eb45
|
Update config.exs, to fix incomplete soapbox install via pleroma_ctl
|
2023-10-04 23:03:24 +00:00 |
|
marcin mikołajczak
|
6ceceef805
|
Merge branch 'static-pages-styles' into 'develop'
Static pages: Improve authorization token styling
See merge request soapbox-pub/rebased!281
|
2023-09-27 14:40:35 +00:00 |
|
|
|
01168f9dd8
|
Static pages: Improve authorization token styling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-09-27 13:44:58 +02:00 |
|
