Alex Gleason
|
491f84f284
|
Merge branch 'develop-main' into 'main'
develop -> main
See merge request soapbox-pub/rebased!297
|
2023-12-21 04:31:19 +00:00 |
|
Alex Gleason
|
d028bf02d2
|
develop -> main
|
2023-12-20 22:30:51 -06:00 |
|
Alex Gleason
|
cb3e046235
|
Merge branch 'service-outbox' into 'develop'
Fix federation with Threads
See merge request soapbox-pub/rebased!296
|
2023-12-14 21:39:47 +00: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 |
|
Alex Gleason
|
2e64ab0c26
|
Merge branch 'neetzsche/add-scrobble-urls' into 'develop'
Add optional URL value for scrobbles
See merge request soapbox-pub/rebased!292
|
2023-11-20 20:56:36 +00:00 |
|
NEETzsche
|
61c810eba0
|
Add optional URL value for scrobbles
|
2023-11-20 13:21:11 -07:00 |
|
Alex Gleason
|
e52efb1efe
|
Merge branch 'revert-d92eef29' into 'develop'
Revert "Merge branch 'neetzsche/include-scrobble-url' into 'develop'"
See merge request soapbox-pub/rebased!291
|
2023-11-20 17:45:42 +00: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 |
|
Alex Gleason
|
d92eef2967
|
Merge branch 'neetzsche/include-scrobble-url' into 'develop'
Add optional URL value for scrobbles
See merge request soapbox-pub/rebased!288
|
2023-11-16 20:22:54 +00:00 |
|
NEETzsche
|
19b041a90b
|
Add optional URL value for scrobbles
|
2023-11-16 20:13:42 +00:00 |
|
Haelwenn
|
ca1b18ba2d
|
Merge branch 'federation_status-access' into 'develop'
router: Make /federation_status publicly available
See merge request pleroma/pleroma!3937
|
2023-11-15 08:20:37 +00:00 |
|
Haelwenn
|
50c896169c
|
Merge branch 'cflags' into 'develop'
Make eblurhash and elixir-captcha use system CFLAGS
See merge request pleroma/pleroma!3943
|
2023-11-15 08:19:29 +00:00 |
|
Haelwenn
|
6d708664b5
|
Merge branch 'docs/max-elixir-erlang' into 'develop'
docs: Put a max version on erlang and elixir
Closes #3194
See merge request pleroma/pleroma!3945
|
2023-11-14 09:49:49 +00:00 |
|
Haelwenn (lanodan) Monnier
|
66f5ae0c5a
|
router: Make /federation_status publicly available
|
2023-11-14 10:48:30 +01:00 |
|
Haelwenn (lanodan) Monnier
|
19519d6c96
|
docs: clang is also supported
|
2023-11-14 10:47:34 +01:00 |
|
Haelwenn (lanodan) Monnier
|
3831d31009
|
docs: Put a max version on erlang and elixir
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3194
|
2023-11-14 10:47:33 +01:00 |
|
Haelwenn (lanodan) Monnier
|
4472ab1fe9
|
changelog.d/system-cflags.fix: New entry
|
2023-11-14 10:45:00 +01:00 |
|
Haelwenn (lanodan) Monnier
|
5f85067a95
|
mix: Bump elixir-captcha for system-CFLAGS
|
2023-11-14 10:44:59 +01:00 |
|
Haelwenn (lanodan) Monnier
|
2b6ae571bb
|
mix: cherry-pick eblurhash latest git for system-CFLAGS
|
2023-11-14 10:44:57 +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
|
e902c7168d
|
Merge branch 'meilisearch' into 'develop'
Different search backends, in particular meilisearch as an additional one
See merge request pleroma/pleroma!3529
|
2023-11-12 13:29: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
|
5996bef7cd
|
Fix most tests that call SearchIndexWorker.
|
2023-11-12 15:54:16 +04:00 |
|
Lain Soykaf
|
5208bd8a95
|
Add changelog.
|
2023-11-12 15:00:51 +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 |
|
feld
|
a51f3937ee
|
Merge branch 'benchee' into 'develop'
Ensure benchee doesn't run unless we are executing benchmarks
See merge request pleroma/pleroma!3972
|
2023-11-08 18:27:08 +00:00 |
|
Mark Felder
|
e23672d82f
|
Ensure benchee doesn't run unless we are executing benchmarks
|
2023-11-08 12:44:57 -05:00 |
|
Mark Felder
|
ef6d3dddd4
|
Fix changelogd grep syntax error
|
2023-11-08 12:28:23 -05:00 |
|
feld
|
aef1a88dc6
|
Merge branch 'changelogd-fix' into 'develop'
Fix changelogd grep syntax error
See merge request pleroma/pleroma!3973
|
2023-11-08 17:28:14 +00:00 |
|
Mark Felder
|
addc5408ff
|
Fix changelogd grep syntax error
|
2023-11-08 12:27:46 -05:00 |
|
feld
|
17524865e5
|
Merge branch 'update_mr_template' into 'develop'
Update MR template to include the type 'change'
See merge request pleroma/pleroma!3971
|
2023-11-08 14:39:00 +00:00 |
|
Mark Felder
|
1810b2f477
|
Update MR template to include the type 'change'
|
2023-11-08 09:37:08 -05:00 |
|
Mark Felder
|
0ab853cab8
|
Merge branch 'develop' into phoenix1.7
|
2023-11-08 09:18:08 -05:00 |
|
feld
|
0f56304f09
|
Merge branch 'bare_uri_test' into 'develop'
Activate test for object validator that has not been running
See merge request pleroma/pleroma!3968
|
2023-11-08 14:13:37 +00:00 |
|
feld
|
cfc01a660a
|
Merge branch 'changelogd-change' into 'develop'
changelogd: Support a type called "change"
See merge request pleroma/pleroma!3970
|
2023-11-08 14:12:33 +00:00 |
|
Mark Felder
|
e1bc95ae6e
|
Support a type called "change"
|
2023-11-08 09:11:41 -05:00 |
|
Haelwenn (lanodan) Monnier
|
76c070fe86
|
ObjectValidators.BareUriTest: Replace calls of SafeText to BareUri
|
2023-11-08 02:17:50 +01:00 |
|
