|
|
0bf8a2e38c
|
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-27 20:26:16 +02:00 |
|
|
|
4f5c4d79c4
|
FEP-2c59, add "webfinger" to user actor
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-11 17:50:11 +02:00 |
|
|
|
cd86965cde
|
Add hint to rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-06 12:01:04 +02:00 |
|
|
|
512db8f6dc
|
Remove service_domain leftovers
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-24 13:10:18 +01:00 |
|
|
|
8b92459345
|
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-18 22:00:35 +01:00 |
|
lain
|
2b71f4897f
|
Merge branch 'develop' into 'bookmark-folders'
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
|
2024-03-18 10:35:02 +00:00 |
|
|
|
51edd70319
|
Merge branch 'bookmark-folders' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:32:16 +01:00 |
|
|
|
53a73aada2
|
Merge branch 'multitenancy' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:29:24 +01:00 |
|
|
|
1b6301fee7
|
Use 'schema' alias for schema.org
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:12:23 +01:00 |
|
|
|
0f33698747
|
Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-12 23:08:40 +01:00 |
|
|
|
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 |
|
|
|
d415686bb9
|
Allow to group bookmarks in folders
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-01 11:04:01 +01:00 |
|
|
|
c592a0e58d
|
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-02-22 21:05:20 +01:00 |
|
SyoBoN
|
2c9fed9b73
|
Translated using Weblate (Japanese)
Currently translated at 63.1% (60 of 95 strings)
Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-errors/ja/
|
2024-02-16 17:54:01 +00:00 |
|
|
|
913465f3d2
|
Merge remote-tracking branch 'origin/develop' into multitenancy-v2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-01-24 16:59:21 +01:00 |
|
Haelwenn
|
ab3f03a04a
|
Merge branch 'develop' into 'public-polls'
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
|
2024-01-21 12:03:29 +00:00 |
|
Mark Felder
|
fb3eb6e0a4
|
Fix more Logger warn -> warning
|
2023-12-20 16:24:27 -05:00 |
|
tusooa
|
453cb6a388
|
Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1
|
2023-12-15 19:43:07 -05:00 |
|
tusooa
|
948f01f19a
|
Bundle 2.6.1 frontend
|
2023-12-14 20:32:49 -05:00 |
|
lain
|
a7f82ff82e
|
Merge branch 'scrubbers-html4-GtS' into 'develop'
scrubbers/default: Add more formatting elements from HTML4 / GoToSocial
See merge request pleroma/pleroma!3979
|
2023-12-10 12:18:22 +00:00 |
|
lain
|
ee15939d33
|
Skip transaction to generate the index concurrently
|
2023-12-09 05:54:02 +00:00 |
|
Mark Felder
|
003d3312fd
|
Permit the index creation to run concurrently
|
2023-12-08 15:48:00 -05:00 |
|
|
|
96747ece8d
|
Merge remote-tracking branch 'origin/develop' into multitenancy
|
2023-11-28 13:50:56 +01:00 |
|
lain
|
35774d44b2
|
Merge branch 'generate-unset-user-keys-migration' into 'develop'
Fix GenerateUnsetUserKeys migration
See merge request pleroma/pleroma!3976
|
2023-11-28 12:34:32 +00:00 |
|
|
|
cee4e2b6a1
|
Cache domains list
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-28 00:22:47 +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 |
|
Haelwenn (lanodan) Monnier
|
06c58bce00
|
scrubbers/default: Add more formatting elements from HTML4 / GoToSocial
Added: acronym, bdo, big, cite, dfn, ins, kbd, q, samp, s, tt, var, wbr
|
2023-11-16 18:27:32 +01:00 |
|
|
|
1ee3ba5fd3
|
Optionally filter local timelines according to domain
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-16 17:31:36 +01:00 |
|
|
|
a1a6abf6c6
|
Merge remote-tracking branch 'origin/develop' into multitenancy
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-14 13:56:33 +01:00 |
|
|
|
3075b8c923
|
Set domain timestamps type to utc_datetime
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-14 13:55:33 +01:00 |
|
|
|
c3b989951a
|
Check if domains resolve correctly
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-14 13:51:55 +01:00 |
|
|
|
fe776d8b33
|
Fix GenerateUnsetUserKeys migration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-13 14:18:22 +01: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 Soykaf
|
0c5cc51983
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch
|
2023-11-12 13:53:18 +04:00 |
|
|
|
182e0b58da
|
Add initial docs page, improve adding domains
Signed-off-by: Marcin Mikołajczak <git@mkljczk.pl>
|
2023-11-10 00:53:17 +01: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 |
|
|
|
c2c7c23aab
|
Allow using multiple domains for WebFinger
Signed-off-by: Marcin Mikołajczak <git@mkljczk.pl>
|
2023-11-07 00:07:18 +01:00 |
|
tusooa
|
ab894d98f4
|
Bundle 2.6.0 frontend
|
2023-10-29 12:59:03 -04:00 |
|
|
|
e5bd1ee801
|
Add entry to @context, tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-29 00:02:17 +02: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 |
|
|
|
01168f9dd8
|
Static pages: Improve authorization token styling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-09-27 13:44:58 +02:00 |
|
tusooa
|
163e563733
|
Allow more flexibility in InlineQuotePolicy
|
2023-09-13 19:19:05 -04:00 |
|
tusooa
|
b0a7e795e7
|
Unify logic for normalizing quoteUri
|
2023-09-13 19:19:05 -04:00 |
|
Alex Gleason
|
79fca39faf
|
Actually, don't send _misskey_quote anymore
|
2023-09-13 19:19:05 -04:00 |
|
Alex Gleason
|
817e308c0d
|
Handle Fedibird's new quoteUri field
|
2023-09-13 19:19:05 -04:00 |
|
Alex Gleason
|
3c8319fe9f
|
Transmogrifier: federate quotes with _misskey_quote field
|
2023-09-13 19:19:04 -04:00 |
|
Alex Gleason
|
36a5578d2b
|
Scrubber.Default: allow span.quote-inline for quote post compatibility
|
2023-09-13 19:19:04 -04:00 |
|
Alex Gleason
|
db46abce47
|
@context: add quoteUrl
|
2023-09-13 19:19:04 -04:00 |
|
|
|
83054ebd5e
|
Replace deprecated Logger.warn/1 with Logger.warning
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-08-10 23:29:35 +02:00 |
|
