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
226e53fdd7
Merge remote-tracking branch 'origin/develop' into status-notification-type
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-01-31 22:19:33 +01: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
6051715a99
Merge remote-tracking branch 'origin/develop' into instance_rules
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-22 14:34:30 +01: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
f1592b2947
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-26 22:32:27 +02:00
95cf3933fa
Improve authorization page permissions styles
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-23 00:19:55 +02:00
tusooa
1ab4ab8d38
Extract translatable strings
2023-07-18 18:24:30 -04:00
Haelwenn
043a00991d
Merge branch 'instance-nodeinfo-metadata' into 'develop'
...
instances: Store some metadata based on NodeInfo
See merge request pleroma/pleroma!3853
2023-06-27 18:58:04 +00:00
Haelwenn
41f2ee69a8
Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop'
...
Detail backup states
Closes #3024
See merge request pleroma/pleroma!3809
2023-06-27 12:08:11 +00:00
weblate-extractor
8bf8906045
Extract translatable strings
2023-06-22 06:09:47 +00:00
Lain Soykaf
22878cf84a
B Migrations: Don't remove activity_visibility_index for now.
2023-06-11 16:22:16 +04:00
Lain Soykaf
175ee9e6fe
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unused_indexes
2023-06-11 16:20:30 +04:00
lain
1f4618d64b
Merge branch 'cleanup/ostatus-user-upgrade' into 'develop'
...
Cleanup OStatus-era user upgrades and ap_enabled indicator
See merge request pleroma/pleroma!3880
2023-06-11 11:13:57 +00:00
Alex Gleason
944fd73b36
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2023-06-05 15:38:19 -05:00
Haelwenn (lanodan) Monnier
313e68c180
mix: bump gettext to ~0.20
...
Includes https://github.com/elixir-gettext/gettext/pull/304 in 0.20.0+
Includes https://github.com/elixir-gettext/expo/issues/91 in 0.22+ via expo 0.2.0+
2023-06-02 03:06:32 +02:00
a1567f2c68
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-27 01:33:43 +02:00
Haelwenn
ce1c0f75cd
Merge branch 'tusooa/3065-scopes' into 'develop'
...
OAuth scopes descriptions
Closes #3065
See merge request pleroma/pleroma!3848
2023-05-17 18:51:26 +00:00
tusooa
163e82bab1
Allow lang attribute
2023-05-09 19:27:32 -04:00
Haelwenn (lanodan) Monnier
fcd49e3985
User: Remove ap_enabled field
2023-05-05 11:11:26 +02:00
tusooa
9283c784a3
Add English translation for oauth scopes
2023-05-02 17:03:09 -04:00
tusooa
530284e1b9
Add extracted pot
2023-05-02 16:32:33 -04:00
Mark Felder
d91a823836
Remove unused indexes
...
These indexes were always listed as unused and several grow quite large.
The most significant impact is the activities_visibility_index which takes many hours to rebuild when restoring the server from backup even on fast hardware.
2023-04-22 16:43:33 +00:00
89b7557732
Improve account header styles on authorization page
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-05 23:42:55 +02:00
Haelwenn (lanodan) Monnier
9a2523a09a
instances: Store some metadata based on NodeInfo
2023-03-16 09:02:20 +01:00
bda8589f16
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-15 19:39:24 +01:00
tusooa
f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
2023-03-01 20:09:50 -05:00
tusooa
5d34fe1868
Bundle frontend
2023-02-20 12:37:44 -05:00
78d1105bff
Fix down migration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-19 22:02:38 +01:00
92592c25c2
Merge remote-tracking branch 'pleroma/develop' into status-notification-type
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-19 22:02:03 +01:00
weblate-extractor
274b3a0d26
Extract translatable strings
2023-02-18 06:06:52 +00:00
marcin mikołajczak
c6c724cea1
Merge branch 'merge-pleroma' into 'develop'
...
merge pleroma
See merge request soapbox-pub/rebased!229
2023-02-04 22:39:35 +00:00
marcin mikołajczak
9e3468c833
Merge branch 'develop' into 'internal-webhooks'
...
# Conflicts:
# lib/pleroma/webhook.ex
2023-01-11 09:58:50 +00:00
lain
e853cfe7c3
Revert "Merge branch 'copyright-bump' into 'develop'"
...
This reverts merge request !3825
2023-01-02 20:38:50 +00:00
10886eeaa2
Bump copyright year
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-01 12:13:06 +01:00
5c69ecf2bf
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2022-12-30 21:16:15 +01:00
weblate-extractor
64eef1eae4
Extract translatable strings
2022-12-24 06:06:39 +00:00
tusooa
e4ac2a7cd6
Detail backup states
2022-12-24 00:04:32 -05:00
e3970f730c
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-23 19:45:55 +01:00
Haelwenn (lanodan) Monnier
2c5bc9cffd
Update PleromaFE bundle to 2.5.0
2022-12-23 15:01:49 +01:00
7ee63904ec
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-22 19:20:52 +01:00
Haelwenn (lanodan) Monnier
cf1d91c718
Update AdminFE bundle to version 2.5.0
2022-12-21 13:03:32 +01:00
Ekaterina Vaartis
398141da68
Merge remote-tracking branch 'upstream/develop' into meilisearch
2022-12-20 21:00:07 +03:00
weblate-extractor
b3d250a70a
Extract translatable strings
2022-12-20 06:11:50 +00:00
weblate-extractor
cfca9544e8
Extract translatable strings
2022-12-16 16:59:26 +00:00
Lain Soykaf
63d00f8123
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
2022-12-15 17:19:36 -05:00
Alex Gleason
9a091a8d85
Add events index
2022-12-07 18:01:42 -06:00
Xnuk Shuman
3e8f49be67
Added translation using Weblate (Korean)
2022-12-01 17:17:03 +00:00
1d011e6ed2
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
2022-11-27 14:09:03 +01:00
Haelwenn (lanodan) Monnier
8f3e750530
scrubbers: Scrub img class attribute
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
2022-11-27 03:40:21 +01:00
Alex Gleason
6d4f99d9b3
Disable inline images
2022-11-26 16:21:15 -06:00
2e7a713e58
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-16 00:06:25 +01:00
b7879d58f3
Merge remote-tracking branch 'pleroma/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-15 23:27:58 +01:00
Dmytro Poltavchenko
451c415fca
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (95 of 95 strings)
Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/uk/
2022-11-12 22:13:38 +00:00
Dmytro Poltavchenko
1c97a86b8d
Added translation using Weblate (Ukrainian)
2022-11-12 22:13:38 +00:00
Dmytro Poltavchenko
3979eaf14a
Added translation using Weblate (Ukrainian)
2022-11-12 22:13:38 +00:00
Mark Felder
8a3b450397
Add migration to remove Quack from ConfigDB
2022-11-11 12:36:34 -05:00
8661703c16
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-09 17:08:18 +01:00
