Commit graph

9659 commits

Author SHA1 Message Date
bd33a7ac8f Remove stuff I don't need to stay closer to upstream
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 16:07:29 +01:00
marcin mikołajczak
81414cc413 Merge branch 'translateLocally' into 'main'
Support translateLocally translation provider

See merge request soapbox-pub/rebased!302
2024-02-14 08:45:50 +00:00
eb1995d7c6 Add test for translateLocally
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-02-13 20:10:10 +01:00
9e19753269 Support translateLocally translation provider
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-02-13 19:45:47 +01:00
Alex Gleason
b46c19c36a
Fix notifications index 2024-02-12 12:39:47 -06:00
Alex Gleason
24e0815251
Fix preferredUsername of internal.fetch actor 2024-01-18 17:55:54 -06:00
marcin mikołajczak
ff9ebb2351 instanceview: only include quote_posting once 2023-12-28 09:40:39 +00:00
Alex Gleason
2eb5c453ad
Allow configuring the origin of the service actor 2023-12-24 00:02:50 -06:00
Alex Gleason
4d19bc8219
Add outbox to Service actors 2023-12-14 15:21:19 -06:00
marcin mikołajczak
fdbcf99836 Merge branch 'merge-pleroma' into 'develop'
Merge pleroma

See merge request soapbox-pub/rebased!268
2023-11-21 21:23:21 +00:00
marcin mikołajczak
4a60306d7d Merge branch 'authorize_interaction' into 'develop'
Support /authorize-interaction route used by Mastodon

See merge request soapbox-pub/rebased!285
2023-11-21 15:21:47 +00:00
d611be290a Support /authorize-interaction route used by Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-21 16:12:28 +01:00
ea1805218c fix tests?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-21 00:39:29 +01:00
NEETzsche
61c810eba0 Add optional URL value for scrobbles 2023-11-20 13:21:11 -07:00
Alex Gleason
ff1db302c9 Revert "Merge branch 'neetzsche/include-scrobble-url' into 'develop'"
This reverts merge request !288
2023-11-20 17:44:55 +00:00
739dbfff6f Update/fix test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-18 00:01:54 +01:00
c78495900e Merge remote-tracking branch 'origin/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-17 22:53:06 +01:00
NEETzsche
19b041a90b Add optional URL value for scrobbles 2023-11-16 20:13:42 +00:00
Haelwenn (lanodan) Monnier
66f5ae0c5a router: Make /federation_status publicly available 2023-11-14 10:48:30 +01:00
Haelwenn
bf2d6abaf2 Merge branch 'healthcheck-disabled-error' into 'develop'
TwitterAPI: Return proper error when healthcheck is disabled

See merge request pleroma/pleroma!3953
2023-11-14 09:41:26 +00:00
lain
752bc168f6 Merge branch 'quotes-count' into 'develop'
Count and display post quotes

See merge request pleroma/pleroma!3956
2023-11-12 13:38:09 +00:00
marcin mikołajczak
9a063deacc Count and display post quotes 2023-11-12 13:38:08 +00:00
lain
5f19fbc5a9 Merge branch 'phoenix1.7' into 'develop'
Update to Phoenix 1.7

See merge request pleroma/pleroma!3900
2023-11-12 13:34:27 +00:00
Lain Soykaf
3d62c71edf Credo fixes. 2023-11-12 17:13:27 +04:00
Lain Soykaf
59018d73c3 B Meilisearch: Update to current API responses. 2023-11-12 16:43:50 +04:00
Lain Soykaf
a1a25029da B DatabaseSearch: Fix local-only search. 2023-11-12 16:19:54 +04:00
Lain Soykaf
d3f8950588 B MeiliSearch, SearchIndexingWorker: Use Config.Getting, make tests async. 2023-11-12 14:49:50 +04:00
Lain Soykaf
c1402af293 B Getting: Add default implementation, delegate, prepare test support. 2023-11-12 14:49:15 +04:00
Lain Soykaf
0c5cc51983 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch 2023-11-12 13:53:18 +04:00
Mark Felder
e23672d82f Ensure benchee doesn't run unless we are executing benchmarks 2023-11-08 12:44:57 -05:00
Mark Felder
a0e08c6ec2 Merge branch 'develop' into phoenix1.7 2023-11-07 16:05:04 -05: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
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
6fd09f3416 all InstanceController actions should not require authentication 2023-10-27 18:50:24 +00:00
tusooa
b748efe66a
Fix mentioning punycode domains when using Markdown 2023-10-16 21:35:25 -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
eebc605bc2
Clear up debug statement 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
Alex Gleason
5cd3711e2f
Let Sentry DSN through CSP 2023-10-05 17:47:03 -05:00