bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16244 commits 1 branch 0 tags 292 MiB
Commit graph

1260 commits

Author SHA1 Message Date
marcin mikołajczak
8d5592ef9d Update @context 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-29 11:45:46 +02:00
marcin mikołajczak
64d515df28 Use colors from frontend configuration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-25 14:58:28 +02:00
marcin mikołajczak
83946653d6 maybe try using prefers-color-scheme 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-25 12:13:06 +02:00
marcin mikołajczak
01950c1223 Update static pages styles 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-25 11:58:54 +02:00
marcin mikołajczak
2aae16d810 Event reminder notifications 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-22 22:47:55 +02:00
marcin mikołajczak
c4dea542cc fix migration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-21 12:46:53 +02:00
Tusooa Zhu
c59a0bd12f
Add margin to forms and make inputs fill whole width 2022-08-20 21:52:20 -04:00
Tusooa Zhu
f047088a93
Update thread visibility function 2022-08-20 21:06:12 -04:00
Tusooa Zhu
4e7ed563c0
Lint 2022-08-20 20:43:47 -04:00
Tusooa Zhu
3885ee182a
Switch to associated_object_id index 2022-08-20 20:43:46 -04:00
Tusooa Zhu
06678fb4ad
Add function to calculate associated object id 2022-08-20 20:43:40 -04:00
marcin mikołajczak
b3700afdd3 Notification for participation request/accepted participation 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-19 23:20:00 +02:00
Alex Gleason
6c87e7f16e Merge branch 'rebased' into 'develop' 
Soapbox BE --> Rebased

See merge request soapbox-pub/soapbox-be!163
 2022-08-19 13:04:41 +00:00
marcin mikołajczak
322e00e45a Revert "Merge branch 'revert-f6e02270' into 'develop'" 
This reverts commit 5b8ad6bc91, reversing
changes made to f6e02270c3.
 2022-08-18 23:06:18 +02:00
marcin mikołajczak
4de58c2b2c Revert "Merge branch 'polls' into 'develop'" 
This reverts merge request !152
 2022-08-18 06:38:03 +00:00
Alex Gleason
4de6c67e92
Soapbox BE --> Rebased 2022-08-17 11:25:39 -05:00
marcin mikołajczak
fa9106bb1b Merge remote-tracking branch 'soapbox/develop' into polls 2022-08-16 07:42:22 +02:00
Hélène
88c1c76d3e
Migrations: delete contexts with BaseMigrator 
Due to the lengthiness of this task, the migration has been adapted into
a BaseMigrator migration, running in the background instead.
 2022-08-15 01:47:09 +02:00
Alex Gleason
ce19607358
index.html: add server-generated-meta so tests pass 2022-08-13 14:33:12 -05:00
Alex Gleason
858f83c85a
Restore panel.html and terms-of-service.html so tests pass 2022-08-13 13:35:04 -05:00
Alex Gleason
705ccabec4
Fix landing page image 2022-08-13 13:06:31 -05:00
Alex Gleason
e8cfd1da05
Delete Pleroma FE 2022-08-13 12:50:37 -05:00
marcin mikołajczak
9ffb4d055a Handle voters count correctly 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-12 23:49:20 +02:00
Hélène
c559c240d1
Migrations: delete context objects 
These objects represent from 30 to 70% of the rows on the objects table,
based on numbers from a few live instances (single-user, small, large.)

As those pseudo-objects prevent creating objects with those actual IDs,
deleting them is a better solution. This could have happened if an
object used another object's ID as its context.
 2022-08-10 02:29:38 +02:00
marcin mikołajczak
538a210f70 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-09 15:30:34 +02:00
marcin mikołajczak
0412cdcb32 Merge remote-tracking branch 'soapbox/develop' into edits 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-08 17:01:48 +02:00
marcin mikołajczak
b4575815ed Add entry to @context, tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-08 10:45:43 +02:00
marcin mikołajczak
55c62d19a8 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-03 23:42:48 +02:00
Haelwenn
b2ba307f4d Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop' 
local only fixes

Closes #2871

See merge request pleroma/pleroma!3660
 2022-08-02 05:39:50 +00:00
Yating Zhan
99d4823ab1 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 18.9% (189 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-31 22:00:56 +00:00
tusooa
cc533e6956 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 18.9% (189 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-31 22:00:56 +00:00
marcin mikołajczak
3a6274f29a wip events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-28 11:07:21 +02:00
marcin mikołajczak
cca794e5fe Merge remote-tracking branch 'soapbox/develop' into webhooks 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-26 19:12:52 +02:00
Tusooa Zhu
4bdd8e349c
Extract translatable strings 2022-07-26 10:50:29 -04:00
marcin mikołajczak
a8540c3797 Merge Pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-25 23:51:14 +02:00
tusooa
301ce5bc62 Merge branch 'mute-expiration' into 'develop' 
MastoAPI: Show mutes expiration date

See merge request pleroma/pleroma!3682
 2022-07-23 00:34:15 +00:00
Haelwenn
c057ec6878 Translated using Weblate (French) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/fr/
 2022-07-22 19:00:37 +00:00
Yating Zhan
4217ac4074 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 13.0% (130 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-22 19:00:37 +00:00
tusooa
1b091c7950 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 13.0% (130 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-22 19:00:37 +00:00
Yating Zhan
0ad115ddf0 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.0% (102 of 103 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/zh_Hans/
 2022-07-22 19:00:37 +00:00
Yating Zhan
a543161ba9 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 88.2% (30 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/zh_Hans/
 2022-07-22 19:00:37 +00:00
Yating Zhan
2fffca8ef3 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 82.9% (39 of 47 strings)

Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/zh_Hans/
 2022-07-22 19:00:37 +00:00
tusooa
13e41ab8ba Translated using Weblate (Chinese (Simplified)) 
Currently translated at 82.9% (39 of 47 strings)

Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/zh_Hans/
 2022-07-22 19:00:37 +00:00
tusooa
ca8341a96c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 11.8% (118 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-22 19:00:37 +00:00
Yating Zhan
5ca95a4f1a Translated using Weblate (Chinese (Simplified)) 
Currently translated at 11.8% (118 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-22 19:00:37 +00:00
tusooa
aff4d5df1c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 88.2% (30 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/zh_Hans/
 2022-07-22 19:00:37 +00:00
tusooa
48bd45acec Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.0% (102 of 103 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/zh_Hans/
 2022-07-22 19:00:37 +00:00
Haelwenn
0b2243f17e Translated using Weblate (French) 
Currently translated at 100.0% (47 of 47 strings)

Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/fr/
 2022-07-22 19:00:37 +00:00
Haelwenn
9399fd4abd Translated using Weblate (French) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/fr/
 2022-07-22 19:00:37 +00:00
tusooa
54cf23f2f8 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 3.3% (33 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-22 19:00:37 +00:00
tusooa
8b55661ae6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (83 of 83 strings)

Translation: Pleroma/Pleroma Backend (domain static_pages)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-static_pages/zh_Hans/
 2022-07-22 19:00:37 +00:00
Haelwenn
8c3684ee8c Added translation using Weblate (French) 2022-07-22 19:00:37 +00:00
Haelwenn
bc488824f8 Added translation using Weblate (French) 2022-07-22 19:00:37 +00:00
Haelwenn
77ebde450e Translated using Weblate (French) 
Currently translated at 32.3% (11 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/fr/
 2022-07-22 19:00:37 +00:00
tusooa
21bd168226 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 1.6% (16 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-22 19:00:37 +00:00
Haelwenn
6da0b50645 Translated using Weblate (French) 
Currently translated at 100.0% (83 of 83 strings)

Translation: Pleroma/Pleroma Backend (domain static_pages)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-static_pages/fr/
 2022-07-22 19:00:37 +00:00
Haelwenn
37ea9e014a Added translation using Weblate (French) 2022-07-22 19:00:37 +00:00
Haelwenn
99ad602577 Added translation using Weblate (French) 2022-07-22 19:00:37 +00:00
tusooa
cc40640f54 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 0.5% (5 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-22 19:00:37 +00:00
tusooa
ffe8459349 Added translation using Weblate (Chinese (Simplified)) 2022-07-22 19:00:37 +00:00
marcin mikołajczak
8c537f7b99 Merge branch 'quotes-count' into 'develop' 
Count and display post quotes

See merge request soapbox-pub/soapbox-be!133
 2022-07-19 20:02:15 +00:00
marcin mikołajczak
f073443c79 Merge remote-tracking branch 'tusooa/from/upstream-develop/tusooa/edits' into edits 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-17 19:54:14 +02:00
Haelwenn
bb4860e222 Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop' 
Translatable config descriptions

Closes pleroma-meta#65

See merge request pleroma/pleroma!3695
 2022-07-17 17:34:21 +00:00
marcin mikołajczak
abe13622e6 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-17 16:08:26 +02:00
marcin mikołajczak
597f56b4c4 Use :utc_datetime 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-16 16:28:22 +02:00
Tusooa Zhu
1d7e8d6e01
Pass in msgctxt for config translation strings 2022-07-14 17:41:33 -04:00
tusooa
3fb9171694 Merge branch 'from/upstream-develop/tusooa/zh-translation' into 'develop' 
Translate static_pages.po (Simplified Chinese)

See merge request pleroma/pleroma!3655
 2022-07-13 23:39:46 +00:00
Tusooa Zhu
074a94e90d
Extract translatable strings 2022-07-13 18:57:57 -04:00
Haelwenn
29f4ab640b Merge branch 'from/upstream-develop/tusooa/report-too-long' into 'develop' 
Fix long report notes giving errors on creation

See merge request pleroma/pleroma!3679
 2022-07-04 05:21:20 +00:00
Tusooa Zhu
4edc867b87 Merge branch 'develop' into 'from/upstream-develop/tusooa/edits' 
# Conflicts:
#   lib/pleroma/constants.ex
 2022-07-03 22:24:57 +00:00
Haelwenn
eefa981e0a Merge branch 'indexing-hotspots' into 'develop' 
Add index hotspots

See merge request pleroma/pleroma!3664
 2022-07-03 22:01:37 +00:00
Haelwenn
de37583c49 Merge branch 'image_description_from_exif_data' into 'develop' 
Use EXIF data of image for image description

See merge request pleroma/pleroma!3535
 2022-07-03 21:14:25 +00:00
Haelwenn
6b937d1473 Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' 
Server announcements (1st pass)

See merge request pleroma/pleroma!3643
 2022-07-03 20:58:20 +00:00
Ilja
75ea766824 Migration failed when no value for Pleroma.Upload was set 2022-07-01 12:15:02 +02:00
Ilja
cc5686bbd6 Migration for exiftool filter 
Rename to Exiftool.StripLocation
 2022-07-01 12:15:02 +02:00
marcin mikołajczak
4a57a65695 Mastodon-compatible webhooks 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-06-25 23:26:42 +02:00
marcin mikołajczak
b0f83aea29 Store mutes expiration date 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-06-16 20:38:37 +02:00
Tusooa Zhu
06a3998013
Create Update notifications 2022-06-05 15:02:25 -04:00
Tusooa Zhu
b096fbba1a
Fix long report notes giving errors on creation 2022-06-02 01:28:39 -04:00
Tusooa Zhu
5e8aac0e07
Record edit history for Note and Question Updates 2022-05-29 13:54:16 -04:00
marcin mikołajczak
cd13b92a3b Add index for quoteUrl 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-27 13:52:28 +02:00
Alex Gleason
e13f64bd8e
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-05-17 11:19:29 -05:00
Tusooa Zhu
f1722a9f4a
Make lint happy 
Ref: fix-local-public
 2022-05-09 18:53:32 -04:00
Tusooa Zhu
38444aa92a
Allow authenticated users to access local-only posts in MastoAPI 
Ref: fix-local-public
 2022-05-09 18:53:18 -04:00
Pete
aa51fd068b Add index hotspots 
squash
 2022-05-06 18:48:08 -07:00
marcin mikołajczak
50d3590137 restyle static pages 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-04-30 23:24:25 +02:00
marcin mikołajczak
a0eb48b785 Merge remote-tracking branch 'soapbox/develop' into status-notification-type 2022-04-14 20:15:21 +02:00
Tusooa Zhu
6599607226
Translate static_pages.po (Simplified Chinese) 2022-04-07 17:42:19 -04:00
Alex Gleason
fc25b626da Merge branch 'merge-upstream' into 'develop' 
Merge upstream

See merge request soapbox-pub/soapbox-be!108
 2022-03-23 20:37:40 +00:00
marcin mikołajczak
7bc95acca0 Add "status" notification type 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-22 20:29:28 +01:00
Haelwenn
d7c53da77a Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop' 
Translate backend-rendered pages

See merge request pleroma/pleroma!3634
 2022-03-20 18:14:37 +00:00
marcin mikołajczak
4c56e0fceb Support account location field 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-14 22:41:33 +01:00
Alex Gleason
b56b0fb4e9
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-03-09 16:34:57 -06:00
Tusooa Zhu
ebcda5265b
Format announcements into html 2022-03-08 23:00:51 -05:00
Tusooa Zhu
fcf3c9057e
Implement visibility filtering for announcements 2022-03-08 18:21:20 -05:00
Tusooa Zhu
d7af67012f
Implement first pass of announcement admin api 
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
 2022-03-08 01:01:27 -05:00
Tusooa Zhu
79ccb6b999
Support fallbacking to other languages 2022-03-06 11:43:31 -05:00
Tusooa Zhu
0149ea4538
Send emails i18n'd using backend-stored user language 2022-03-01 22:19:13 -05:00
Tusooa Zhu
af82f09ce3
Make all emails translatable 2022-03-01 20:45:59 -05:00
Tusooa Zhu
1deab33fb0
Make mail and mailer translatable 2022-03-01 19:17:11 -05:00
Tusooa Zhu
32e4aa42d3
Make static fe translatable 2022-03-01 18:48:08 -05:00
Tusooa Zhu
cadca083ea
Make mfa pages translatable 2022-02-28 11:07:28 -05:00
Tusooa Zhu
50a316cd63
Make oauth pages translatable 2022-02-28 02:11:57 -05:00
Tusooa Zhu
0cc6557716
Make tag feed translatable 2022-02-28 01:13:39 -05:00
Tusooa Zhu
1edbda39e1
Make password reset pages translatable 2022-02-28 01:04:04 -05:00
Sean King
17aa3644be
Copyright bump for 2022 2022-02-25 23:11:42 -07:00
marcin mikołajczak
c8fc411b77 Add index for assigned_account 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-25 17:15:46 +01:00
Tusooa Zhu
2fa1ca84e6
Extract translatable text 2022-02-21 18:44:36 -05:00
marcin mikołajczak
6d18e6595c Instance rules 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-05 18:07:04 +01:00
Alex Gleason
dde02e9806
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-01-28 17:53:56 -06:00
Alex Gleason
4883b996ad
Actually, don't send _misskey_quote anymore 2022-01-28 17:53:19 -06:00
Alex Gleason
281ccab704
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-01-28 16:21:37 -06:00
Alex Gleason
b73a53ec69
Handle Fedibird's new quoteUri field 2022-01-28 15:55:52 -06:00
Alex Gleason
ac3426cbca
Transmogrifier: federate quotes with _misskey_quote field 2022-01-28 14:06:32 -06:00
Alex Gleason
93a340668f
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-25 11:57:04 -06:00
Alex Gleason
0f4e0e667e Merge branch 'recipients-inline' into 'develop' 
ForceMentionsInContent: wrap mentions in a span, fix the formatting

See merge request pleroma/pleroma!3620
 2022-01-25 17:43:39 +00:00
Alex Gleason
25786c804b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-25 09:39:25 -06:00
marcin mikołajczak
249fe88d12 Birthdays: users_birthday_month_day_index 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-25 11:49:42 +01:00
Alex Gleason
6bc109b31d
Merge remote-tracking branch 'pleroma/recipients-inline' into recipients-inline 2022-01-24 20:20:04 -06:00
Alex Gleason
d5644a52aa
ForceMentionsInContent: wrap inline mentions with span tag 2022-01-24 19:11:45 -06:00
Alex Gleason
51dd5a6e21
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements 2022-01-24 17:18:30 -06:00
Alex Gleason
cd9341dbff
Scrubber.Default: allow span.quote-inline for quote post compatibility 2022-01-24 15:34:23 -06:00
Alex Gleason
683f96da00
Merge remote-tracking branch 'pleroma/quote-post' into quote-post 2022-01-23 16:10:36 -06:00
marcin mikołajczak
61bae9a407 Create index for show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 12:07:05 +01:00
marcin mikołajczak
0266bc3c96 Birthdays: hide_birthday -> show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 09:13:33 +01:00
Alex Gleason
4f51c41f9f
@context: add quoteUrl 2022-01-22 23:29:55 -06:00
Alex Gleason
aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates 2022-01-22 14:24:50 -06:00
Alex Gleason
66e8c6f90f
Birthdays: birth_date --> birthday 2022-01-22 13:21:55 -06:00
Alex Gleason
64f48c4239
Merge remote-tracking branch 'pleroma/develop' into next 2022-01-22 11:24:43 -06:00
marcin mikołajczak
b108b05650 Birth dates, birthday reminders API, allow instance admins to require minimum age 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-18 14:57:48 +01:00
Alex Gleason
a4436bcc3f
Merge remote-tracking branch 'origin/stable' into mergeback 2022-01-14 12:37:00 -06:00
rinpatch
a98a127718 Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdf 2022-01-11 13:49:06 +03:00
Ivan Tashkinov
a7bdefc208 mix format 2021-12-29 11:44:33 +03:00
Ivan Tashkinov
0c7fb520bf Added index on [:target_id, :relationship_type] to :user_relationships (speeds up Notification.exclude_blockers/_). 2021-12-29 11:41:21 +03:00
Alex Gleason
fa35e24a5e
Apps: add user_id index 2021-12-27 18:05:35 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint 2021-12-27 18:01:25 -06:00
Alex Gleason
b41631f62c
Merge remote-tracking branch 'pleroma/develop' into next 2021-12-25 21:24:21 -06:00
marcin mikołajczak
de006443f0 MastoAPI: Profile directory 2021-12-26 02:35:17 +00:00
Alex Gleason
73609211a4 Merge branch 'account-notes' into 'develop' 
MastoAPI: Add user notes on accounts

See merge request pleroma/pleroma!3540
 2021-12-25 01:41:12 +00:00
Alex Gleason
1ff9ffed83 Merge branch 'live-dashboard' into 'develop' 
Add Phoenix LiveDashboard

See merge request pleroma/pleroma!3566
 2021-12-19 17:35:14 +00:00
Alex Gleason
bd853199d9 Merge branch 'v2-suggestions' into 'develop' 
V2 suggestions

See merge request pleroma/pleroma!3547
 2021-12-19 17:31:17 +00:00
Alex Gleason
58577d89e0
Merge remote-tracking branch 'origin/develop' into live-dashboard 2021-12-15 19:06:10 -05:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard 2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard 
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
 2021-12-15 19:05:27 -05:00
NEETzsche
182c563ed0 Force pinned_objects to be empty, not null 2021-11-29 18:08:09 +00:00
Alex Gleason
a43b8f8bb0
Merge remote-tracking branch 'origin/develop' into v2-suggestions 2021-11-26 22:47:05 -06:00
Alex Gleason
da06e1a17f
v2 Suggestions: add index on is_suggested column 2021-11-26 15:32:01 -06:00
Alex Gleason
b17360cd7c
v2 Suggestions: rudimentary API response 2021-11-26 14:34:10 -06:00
NEETzsche
929e60122f Force pinned_objects to be empty, not null 2021-11-25 16:34:48 +00:00
marcin mikołajczak
8e040e098b Lint 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-11-21 18:17:06 +01:00