|
|
f19c93cdaa
|
use tls1.3
|
2022-06-07 12:24:40 +01:00 |
|
|
|
6a19fbac2f
|
add copyright notice for forked files
|
2022-01-20 12:48:16 +00:00 |
|
|
|
0f6bece60d
|
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
|
2022-01-08 21:45:12 +00:00 |
|
|
|
0d012ebea1
|
Revert "Merge branch 'remove/mastofe' into 'develop'"
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
|
2022-01-08 21:44:37 +00:00 |
|
|
|
8cc6359a85
|
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
|
2022-01-07 20:23:53 +00:00 |
|
|
|
25b4395830
|
just drop unknown tags
|
2022-01-07 20:14:04 +00:00 |
|
|
|
34780cf182
|
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
|
2022-01-07 17:36:21 +00:00 |
|
|
|
2cc6b1e1bd
|
Allow for varying name fields
|
2022-01-07 17:35:56 +00:00 |
|
|
|
5c48fe1138
|
make credo happy
|
2022-01-07 17:31:13 +00:00 |
|
|
|
92d3742072
|
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
|
2022-01-07 17:21:44 +00:00 |
|
|
|
9ee27fb5ec
|
add bookwyrm entity tests
|
2022-01-07 17:17:18 +00:00 |
|
|
|
680c5d8d89
|
Add compatibility with bookwyrm's weird entities
|
2022-01-07 16:51:04 +00:00 |
|
|
|
3252ed0f54
|
format
|
2021-12-30 18:05:44 +00:00 |
|
|
|
4e7e95a17e
|
don't error out
|
2021-12-30 18:05:44 +00:00 |
|
|
|
4e8ee48cff
|
delete activities
|
2021-12-30 18:05:44 +00:00 |
|
|
|
12a171844b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-12-30 18:05:22 +00:00 |
|
marcin mikołajczak
|
1657db656c
|
AccountController.lookup: skip auth
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 20:02:59 +01:00 |
|
marcin mikołajczak
|
0dd1caa841
|
AccountController.lookup: skip visibility check
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 18:24:48 +01:00 |
|
marcin mikołajczak
|
746c9daa62
|
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:27:27 +01:00 |
|
marcin mikołajczak
|
f734579965
|
MastoAPI: Add GET /api/v1/accounts/lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:11:17 +01:00 |
|
Alex Gleason
|
de7f84deb3
|
Merge branch 'apps-api-endpoint' into 'develop'
Apps API endpoint
See merge request pleroma/pleroma!3583
|
2021-12-28 14:38:02 +00:00 |
|
Alex Gleason
|
7704a722c0
|
AppController: remove unnecessary require Logger
|
2021-12-27 18:30:16 -06:00 |
|
Alex Gleason
|
2e4a1c56c3
|
AppController: test creating with and without a user
|
2021-12-27 18:14:15 -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
|
138f5a4517
|
EnsureStaffPrivilegedPlug: don't let non-moderators through
|
2021-12-27 17:18:26 -06:00 |
|
Alex Gleason
|
a3fa987611
|
AdminAPI: fix duplicated routes
|
2021-12-27 16:58:10 -06:00 |
|
Alex Gleason
|
326575d5b7
|
Merge remote-tracking branch 'origin/develop' into finch
|
2021-12-27 11:31:15 -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 |
|
|
|
f02715c4b2
|
Fix lint errors
|
2021-12-27 03:42:03 +03:00 |
|
|
|
f66675f349
|
API: fix duplicate :get_password_token route
|
2021-12-27 02:57:54 +03:00 |
|
|
|
1c223331fc
|
API: show info about privileged staff in instance metadata
|
2021-12-27 02:28:09 +03:00 |
|
|
|
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 |
|
Lain Soykaf
|
4cf03046f5
|
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
|
2021-12-26 16:57:17 +01:00 |
|
Lain Soykaf
|
6efbd08854
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
|
2021-12-26 16:41:17 +01:00 |
|
Alex Gleason
|
913141379c
|
Merge branch 'profile-directory' into 'develop'
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
|
2021-12-26 02:35:17 +00:00 |
|
marcin mikołajczak
|
de006443f0
|
MastoAPI: Profile directory
|
2021-12-26 02:35:17 +00:00 |
|
Alex Gleason
|
db2bf55e9b
|
Merge remote-tracking branch 'origin/develop' into notice-routes
|
2021-12-25 19:57:53 -06: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
|
b96a58ff28
|
Merge branch 'account-subscriptions' into 'develop'
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
|
2021-12-25 01:34:27 +00:00 |
|
marcin mikołajczak
|
9775955974
|
Merge remote-tracking branch 'origin/develop' into remote-follow-api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-25 00:52:02 +01:00 |
|
Alex Gleason
|
d9746ae4cb
|
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
|
2021-12-23 16:00:16 +00:00 |
|
Alex Gleason
|
3f8fc34593
|
Merge remote-tracking branch 'origin/develop' into moderators
|
2021-12-19 12:55:36 -06:00 |
|
Alex Gleason
|
50892a198d
|
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
|
2021-12-19 18:51:41 +00:00 |
|
Alex Gleason
|
b0d2b53934
|
Merge branch 'manifest' into 'develop'
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
|
2021-12-19 18:18:59 +00:00 |
|
Ivan Tashkinov
|
e009950845
|
Slow queries logging improvements: added EXPLAIN results, listed params, improved stacktrace.
|
2021-12-19 20:45:28 +03:00 |
|
Alex Gleason
|
df5359aa72
|
Merge branch 'replies-count' into 'develop'
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
|
2021-12-19 17:36:25 +00:00 |
|
Alex Gleason
|
d1510c98d7
|
Merge branch 'link-headers-chats' into 'develop'
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
|
2021-12-19 17:35:50 +00:00 |
|
