918c406a91
Merge remote-tracking branch 'origin/develop' into instance_rules
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-18 13:50:25 +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
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
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
fb3eb6e0a4
Fix more Logger warn -> warning
2023-12-20 16:24:27 -05:00
453cb6a388
Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1
2023-12-15 19:43:07 -05:00
948f01f19a
Bundle 2.6.1 frontend
2023-12-14 20:32:49 -05:00
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
ee15939d33
Skip transaction to generate the index concurrently
2023-12-09 05:54:02 +00:00
003d3312fd
Permit the index creation to run concurrently
2023-12-08 15:48:00 -05:00
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
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
fe776d8b33
Fix GenerateUnsetUserKeys migration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-13 14:18:22 +01:00
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
9a063deacc
Count and display post quotes
2023-11-12 13:38:08 +00:00
0c5cc51983
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch
2023-11-12 13:53:18 +04:00
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
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
163e563733
Allow more flexibility in InlineQuotePolicy
2023-09-13 19:19:05 -04:00
b0a7e795e7
Unify logic for normalizing quoteUri
2023-09-13 19:19:05 -04:00
79fca39faf
Actually, don't send _misskey_quote anymore
2023-09-13 19:19:05 -04:00
817e308c0d
Handle Fedibird's new quoteUri field
2023-09-13 19:19:05 -04:00
3c8319fe9f
Transmogrifier: federate quotes with _misskey_quote field
2023-09-13 19:19:04 -04:00
36a5578d2b
Scrubber.Default: allow span.quote-inline for quote post compatibility
2023-09-13 19:19:04 -04:00
db46abce47
@context: add quoteUrl
2023-09-13 19:19:04 -04:00
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
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
8bf8906045
Extract translatable strings
2023-06-22 06:09:47 +00:00
22878cf84a
B Migrations: Don't remove activity_visibility_index for now.
2023-06-11 16:22:16 +04:00
175ee9e6fe
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unused_indexes
2023-06-11 16:20:30 +04:00
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
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
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
163e82bab1
Allow lang attribute
2023-05-09 19:27:32 -04:00
fcd49e3985
User: Remove ap_enabled field
2023-05-05 11:11:26 +02:00
9283c784a3
Add English translation for oauth scopes
2023-05-02 17:03:09 -04:00
530284e1b9
Add extracted pot
2023-05-02 16:32:33 -04:00
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
9a2523a09a
instances: Store some metadata based on NodeInfo
2023-03-16 09:02:20 +01:00
f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
2023-03-01 20:09:50 -05:00
5d34fe1868
Bundle frontend
2023-02-20 12:37:44 -05:00
274b3a0d26
Extract translatable strings
2023-02-18 06:06:52 +00:00
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
64eef1eae4
Extract translatable strings
2022-12-24 06:06:39 +00:00
e4ac2a7cd6
Detail backup states
2022-12-24 00:04:32 -05:00
2c5bc9cffd
Update PleromaFE bundle to 2.5.0
2022-12-23 15:01:49 +01:00
cf1d91c718
Update AdminFE bundle to version 2.5.0
2022-12-21 13:03:32 +01:00
marcin mikołajczak