Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,246 Commits 1 Branch 0 Tags 222 MiB
8113dd31ee
Commit Graph

14246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Gleason
2451d65bd8 Merge branch 'api-docs-fixes' into 'develop' 
Docs: fix various Pleroma API endpoints paths, fix MFA response

See merge request pleroma/pleroma!3596
 2022-01-07 20:29:28 +00:00
Alex Gleason
e8b340aaa7
Docs: fix various Pleroma API endpoints paths, fix MFA response 2022-01-07 12:51:54 -06:00
Alex Gleason
a3094b64df Merge branch 'change/web-push-encryption-dep' into 'develop' 
Upgrade web_push_encryption to 0.3.1

See merge request pleroma/pleroma!3592
 2022-01-02 15:41:56 +00:00
Sean King
bf995a7770
Upgrade web_push_encryption to 0.3.1 2022-01-01 21:02:09 -07:00
Alex Gleason
c8026fe492 Merge branch 'change/concurrent-limiter-dep' into 'develop' 
Change concurrent_limiter to version 0.1.1

See merge request pleroma/pleroma!3591
 2022-01-01 22:15:08 +00:00
Sean King
91ea394cd0
Change concurrent_limiter to Hex PM version 0.1.1 2022-01-01 14:49:57 -07:00
Alex Gleason
86e692aeb1 Merge branch 'erratic-streamer-test' into 'develop' 
StreamerTest: tag erratic test

See merge request pleroma/pleroma!3590
 2021-12-31 16:40:14 +00:00
Alex Gleason
2ae867842b
StreamerTest: tag erratic test 2021-12-31 10:29:50 -06:00
Sean King
dafcf896d9 Merge more stuff from upstream develop branch 2021-12-30 14:25:45 -07:00
lain
e25af3f2d8 Merge branch 'more-efficient-ci' into 'develop' 
CI: Use own package as base

See merge request pleroma/pleroma!3577
 2021-12-30 15:53:33 +00:00
Sean King
ffeae7ef2c
Fix merge conflict in CHANGELOG.md 2021-12-29 18:08:50 -07:00
lain
84420d9439 Merge branch 'chore/user-relationships-target-id-rel-type-index' into 'develop' 
Added index on [:target_id, :relationship_type] to :user_relationships

See merge request pleroma/pleroma!3588
 2021-12-29 13:06:47 +00: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
a61ed5c488 Merge branch 'changelog' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma!3586
 2021-12-28 21:42:39 +00:00
Alex Gleason
5f87472cdf
Update CHANGELOG.md 2021-12-28 15:14:09 -06:00
Alex Gleason
b5b98f9e10 Merge branch 'mastodon-lookup' into 'develop' 
MastoAPI: Add `GET /api/v1/accounts/lookup`

See merge request pleroma/pleroma!3584
 2021-12-28 21:00:09 +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
9032d065e6 wip 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 18:07:19 +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
52a3f0f08b Merge branch 'ensure-staff-privileged-strict' into 'develop' 
EnsureStaffPrivilegedPlug: don't let non-moderators through

See merge request pleroma/pleroma!3582
 2021-12-28 00:53:11 +00:00
Alex Gleason
5c80d4087d
PleromaAPI.AppView: add test 2021-12-27 18:52:34 -06:00
Alex Gleason
7704a722c0
AppController: remove unnecessary require Logger 2021-12-27 18:30:16 -06:00
Alex Gleason
cb2a072e62
Apps: add test for get_user_apps/1 2021-12-27 18:29:03 -06:00
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user 2021-12-27 18:14:15 -06: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
138f5a4517
EnsureStaffPrivilegedPlug: don't let non-moderators through 2021-12-27 17:18:26 -06:00
Alex Gleason
264f0fde1b Merge branch 'admin-fix-duplicated-endpoints' into 'develop' 
AdminAPI: fix duplicated routes

See merge request pleroma/pleroma!3581
 2021-12-27 23:12:14 +00:00
Alex Gleason
a3fa987611
AdminAPI: fix duplicated routes 2021-12-27 16:58:10 -06:00
Alex Gleason
fd9260d1b5 Merge branch 'finch' into 'develop' 
Finch support

See merge request pleroma/pleroma!3565
 2021-12-27 18:27:13 +00:00
Alex Gleason
9b5dbd20b0 Merge branch 'tag-gun-erratic' into 'develop' 
ConnectionPoolTest: tag erratic test

See merge request pleroma/pleroma!3580
 2021-12-27 17:41:28 +00:00
Alex Gleason
326575d5b7
Merge remote-tracking branch 'origin/develop' into finch 2021-12-27 11:31:15 -06:00
Alex Gleason
d61a5515e6
ConnectionPoolTest: tag erratic test 2021-12-27 11:27:25 -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
479fc5fff8
EnsureStaffPrivilegedPlug: add tests 2021-12-27 10:39:59 -06: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
f02715c4b2 Fix lint errors 2021-12-27 03:42:03 +03:00
Alibek Omarov
f66675f349 API: fix duplicate :get_password_token route 2021-12-27 02:57:54 +03:00
Alibek Omarov
1c223331fc API: show info about privileged staff in instance metadata 2021-12-27 02:28:09 +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
Sean King
8ef1d8b566 Revert "Merge branch 'notice-routes' into 'develop'" 2021-12-26 11:02:51 -07:00
Lain Soykaf
ac3b503721 CI: Fix the broken tasks. 2021-12-26 18:54:54 +01:00
Lain Soykaf
c52390a7d9 CI: Use own package as base 
So we can skip updating and installing the same packages a million
times. It will still grab the hex.pm stuff -- maybe we can find a way to
avoid this, too.
 2021-12-26 18:05:42 +01:00
lain
3b8eaadb0d Merge branch 'erratic' into 'develop' 
CI: Start testing erratic test again

See merge request pleroma/pleroma!3575
 2021-12-26 16:35:09 +00:00