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

769 commits

Author SHA1 Message Date
marcin mikołajczak
d76bfd4e89 Location: user_location_length 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-14 22:52:06 +01:00
Alex Gleason
502b63d8ea
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-06 12:31:53 -06:00
marcin mikołajczak
e473bcf7a0 Max media attachment count 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-06 17:41:15 +01:00
Alex Gleason
5371017fa7
Merge remote-tracking branch 'pleroma/quote-post' into inline-quote-default 2022-01-27 15:01:58 -06:00
Alex Gleason
a3d65937ab
Add InlineQuotePolicy as a default MRF 2022-01-27 15:01:20 -06:00
Alex Gleason
93a340668f
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-25 11:57:04 -06:00
Alex Gleason
25786c804b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-25 09:39:25 -06:00
Alex Gleason
dd7977bb68 Merge branch 'birth-dates' into 'develop' 
Birth dates

See merge request pleroma/pleroma!3608
 2022-01-25 15:35:47 +00:00
Alex Gleason
51dd5a6e21
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements 2022-01-24 17:18:30 -06:00
Alex Gleason
7f1d82a523
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-24 16:55:39 -06:00
Alex Gleason
1cb8326cfb
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-24 16:48:37 -06:00
Alex Gleason
0571f8f553
Add InlineQuotePolicy to force quote URLs inline 2022-01-24 16:44:35 -06:00
Alex Gleason
53de3a9d44 Revert "Merge branch 'log-slow-queries' into 'develop'" 
This reverts merge request !3553
 2022-01-24 18:54:43 +00: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
marcin mikołajczak
0f90fd5805 WIP account endorsements 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-12 18:15:10 +01:00
Alex Gleason
bb0571cb35
Merge remote-tracking branch 'pleroma/develop' into next 2021-12-27 17:04:24 -06:00
Alex Gleason
a659428024 Merge branch 'restricted-moderators' into 'develop' 
AdminAPI: Optionally restrict moderators from accessing sensitive data

See merge request pleroma/pleroma!3578
 2021-12-27 17:06:22 +00:00
Alex Gleason
6e27fc9c12 Merge branch 'log-slow-queries' into 'develop' 
Log slow Ecto queries

See merge request pleroma/pleroma!3553
 2021-12-27 15:41:06 +00:00
Ivan Tashkinov
08c0f09bad Made slow queries logging disabled by default. 2021-12-27 09:13:31 +03:00
Alibek Omarov
cd1041c3a4 API: optionally restrict moderators from accessing sensitive data 2021-12-27 02:27:48 +03:00
Ivan Tashkinov
3e9e7178bc Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params. 2021-12-26 22:49:00 +03: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
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
lain
e2772d6bf1 Merge branch 'block-behavior' into 'develop' 
Configurable block visibility, fixes #2123

Closes #2123

See merge request pleroma/pleroma!3242
 2021-11-15 14:27:59 +00:00
Haelwenn
6b3842cf50 Merge branch 'remove/mastofe' into 'develop' 
Remove MastoFE from Pleroma, fixes #2625

Closes #2625

See merge request pleroma/pleroma!3392
 2021-09-07 16:41:53 +00:00
Haelwenn
901204df22 Merge branch 'poll-notification' into 'develop' 
MastodonAPI: Support poll notification

See merge request pleroma/pleroma!3484
 2021-08-09 10:02:37 +00:00
Alex Gleason
90680aad90
Merge tag 'v2.4.0' into pleroma-v2.4.0 2021-08-08 10:46:48 -05:00
Sean King
1841bd8383 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe 2021-08-06 08:08:20 -06:00
Alex Gleason
f709d9d106
Merge remote-tracking branch 'origin/develop' into errorview-json-fix 2021-07-27 08:39:48 -05:00
Alex Gleason
33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix 2021-07-27 08:29:53 -05:00
Alex Gleason
94db0b7cd6
Add activity+json to Phoenix :format_encoders 
Fixes ErrorView rendering
 2021-07-27 08:28:52 -05:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes 2021-07-18 11:49:22 -05:00
Alex Gleason
d3df5b0841
Merge remote-tracking branch 'origin/develop' into poll-notification 2021-07-17 22:25:35 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification 2021-07-17 22:19:38 -05:00
Alex Gleason
04ab689653
Merge remote-tracking branch 'origin/develop' into nsfw-api-mrf 2021-06-17 15:32:59 -05:00
Alex Gleason
718e8e1edb
Create NsfwApiPolicy 2021-06-16 22:35:04 -05:00
Alex Gleason
723fd67b26
Merge remote-tracking branch 'origin/develop' into frontend-enable 2021-06-14 21:26:43 -05:00
Alex Gleason
d9a45175c0
Set soapbox-fe ref to develop 2021-06-14 17:56:19 -05:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream 2021-06-04 14:42:44 -06:00
Mark Felder
d6432a65da Move shout configuration from :instance, update docs and changelog 2021-06-01 11:49:46 -05:00
Mark Felder
68aa56b9e4 Just call it shout 2021-06-01 11:49:16 -05:00
Mark Felder
ff00b354fa Rename the non-federating Chat feature to Shout 2021-06-01 11:49:14 -05:00
Mark Felder
fe40f6f291 Switch from the deprecated "use Mix.config" to "import Config" 2021-05-20 14:02:58 -05:00
Alex Gleason
b00d3bafa6
Merge remote-tracking branch 'origin/develop' into rich-media-redux 2021-05-05 12:38:58 -05:00
Alex Gleason
6b2fa5f0bb
Let :oembed_providers_enabled be configurable 2021-05-04 16:28:14 -05:00