Commit graph

9712 commits

Author SHA1 Message Date
lain
6dd1575c64 Merge branch 'issue/1509' into 'develop'
[#1509]  purge media from cache after delete

See merge request pleroma/pleroma!2539
2020-05-20 10:35:36 +00:00
lain
c3cfe87c60 Merge branch 'mastofe/bundle-2020-05-20' into 'develop'
MastoFE: update to bundle-2020-05-20

See merge request pleroma/pleroma!2561
2020-05-20 09:12:35 +00:00
Haelwenn (lanodan) Monnier
c2dd4639d6
MastoFE: update to bundle-2020-05-20 2020-05-20 07:55:14 +02:00
Maksim
376147fb82 Apply suggestion to installation/nginx-cache-purge.sh.example 2020-05-20 04:12:21 +00:00
Haelwenn
5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop'
Add OpenAPI spec for PleromaAPI.ScrobbleController

See merge request pleroma/pleroma!2559
2020-05-20 04:00:46 +00:00
Maksim Pechnikov
b5b9d161cd update purge script 2020-05-20 06:56:04 +03:00
rinpatch
48bcb22146 Merge branch 'recipients-query-speedup' into 'develop'
Greatly speed up recipients query

See merge request pleroma/pleroma!2558
2020-05-19 14:32:27 +00:00
Egor Kislitsyn
47ed9ee441
Fix summary 2020-05-19 17:29:58 +04:00
lain
be322541c8 User.Query: Remove superfluous distinct 2020-05-19 14:36:34 +02:00
lain
2328eff09c UserTest: Hide warning in tests. 2020-05-19 14:36:13 +02:00
Egor Kislitsyn
6609714d66
Move Scrobble views to ScrobbleView 2020-05-19 16:26:06 +04:00
Egor Kislitsyn
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController 2020-05-19 16:26:06 +04:00
lain
a985bd57b4 User.Query: Speed up recipients query. 2020-05-19 14:11:32 +02:00
lain
7075fa92a5 Merge branch 'deps/update-crypt' into 'develop'
Update crypt library

See merge request pleroma/pleroma!2557
2020-05-19 11:57:01 +00:00
Roman Chvanikov
512261c97d Update crypt library 2020-05-19 14:46:06 +03:00
Haelwenn
58ccd2bbfd Merge branch 'openapi/pleroma-api/mascot' into 'develop'
Add OpenAPI spec for MascotController

See merge request pleroma/pleroma!2553
2020-05-19 09:41:57 +00:00
Haelwenn
7e3814390e Merge branch 'issue/1667' into 'develop'
[#1667] fix api/v1/accounts/update_credentials

See merge request pleroma/pleroma!2556
2020-05-19 06:56:44 +00:00
Haelwenn
86f50a809f Merge branch 'support/docs' into 'develop'
fix docs

See merge request pleroma/pleroma!2555
2020-05-19 06:43:57 +00:00
Maksim Pechnikov
41f8f17260 fix api/v1/accounts/update_credentials 2020-05-19 09:42:41 +03:00
Maksim Pechnikov
ed442a225a removed Quantum from docs 2020-05-19 06:15:42 +03:00
Maksim Pechnikov
5f0a3ac74d added tests 2020-05-19 06:05:09 +03:00
Egor Kislitsyn
d4a7577cde
Fix API documentation 2020-05-18 22:01:38 +04:00
Egor Kislitsyn
fe5d423b43
Add OpenAPI spec for MascotController 2020-05-18 22:01:18 +04:00
rinpatch
a66da971ff Merge branch 'openapi/use-boolean-like-in-requests' into 'develop'
[OpenAPI] Use BooleanLike in all request bodies

Closes #1782

See merge request pleroma/pleroma!2551
2020-05-18 17:13:53 +00:00
Egor Kislitsyn
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies 2020-05-18 20:58:59 +04:00
lain
8e9c939e42 Merge branch 'direct-timeline-with-muted-param-fix' into 'develop'
Fixed missing support for `with_muted` param in direct timeline

See merge request pleroma/pleroma!2548
2020-05-18 16:27:54 +00:00
Ivan Tashkinov
5735b5c8be Fixed missing support for with_muted param in direct timeline. 2020-05-18 19:00:00 +03:00
lain
20a22362b8 Merge branch 'copyright' into 'develop'
Copyright update

See merge request pleroma/pleroma!2547
2020-05-18 12:35:27 +00:00
Alexander Strizhakov
215daabdb4
copyright update 2020-05-18 15:15:51 +03:00
lain
5c502eb3ad Merge branch '1778-benchmark-fix' into 'develop'
Load Testing: adjust to new CommonAPI.post format.

Closes #1778

See merge request pleroma/pleroma!2546
2020-05-18 12:14:24 +00:00
lain
15c7e3b4bf Merge branch 'docs/storing-remote-media' into 'develop'
Document how to store remote media permanently

See merge request pleroma/pleroma!1871
2020-05-18 11:59:07 +00:00
lain
7b500d6b4f Load Testing: adjust to new CommonAPI.post format. 2020-05-18 13:56:58 +02:00
lain
96f7b1b140 Merge branch 'show-media-endpoint-fixes' into 'develop'
MediaController OAuth scope assignments fix

See merge request pleroma/pleroma!2541
2020-05-18 10:57:59 +00:00
rinpatch
1199cf3a78 Merge branch '1763-password-updates' into 'develop'
Authentication Plug: Update bcrypt password on login.

Closes #1763

See merge request pleroma/pleroma!2542
2020-05-18 07:57:13 +00:00
Ivan Tashkinov
9b76565264 MediaController: enforced owner-only access in :show action.
Improved error response on denied access (now 403). Adjusted tests.
2020-05-18 09:51:53 +03:00
Maksim Pechnikov
c33a4315fb updated docs 2020-05-18 06:48:19 +03:00
lain
8bfd9710ae Pleroma Authenticator: Also update passwords here. 2020-05-17 11:53:17 +02:00
lain
bfdd90f6d7 AuthenticationPlug: Also update crypt passwords. 2020-05-17 11:40:25 +02:00
lain
baef35bcc8 Authentication Plug: Update bcrypt password on login. 2020-05-17 10:31:01 +02:00
lain
b0ccdb5af4 Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma!2535
2020-05-17 07:58:24 +00:00
Jędrzej Tomaszewski
4b6190baec Translated using Weblate (Polish)
Currently translated at 65.0% (69 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-17 07:49:01 +00:00
5725e03f55 Added translation using Weblate (Dutch) 2020-05-17 07:49:01 +00:00
lain
64b3d81e50 Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
Remove settings that shouldn't be altered

Closes admin-fe#110

See merge request pleroma/pleroma!2540
2020-05-17 07:48:52 +00:00
lain
21c85a106c Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'
PleromaFE bundle supporting `with_relationships` param

See merge request pleroma/pleroma!2530
2020-05-17 07:26:56 +00:00
lain
4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships

See merge request pleroma/pleroma!2456
2020-05-17 07:26:51 +00:00
Ivan Tashkinov
af9dfdce6b MediaController OAuth scope assignments fix.
Typo fix (`def get_media` instead of `def show`).
2020-05-17 08:46:43 +03:00
Maksim Pechnikov
3f8d68bdf3 added example cache purge script 2020-05-17 05:56:20 +03:00
Angelina Filippova
4a925b964a Remove description of the settings that should't be altered 2020-05-16 20:39:42 +03:00
lain
d96f8f17e8 Merge branch 'features/mastoapi_v2_media' into 'develop'
MastodonAPI: /api/v2/media endpoints

See merge request pleroma/pleroma!2439
2020-05-16 17:13:38 +00:00
rinpatch
3bc1138dd9 Merge branch '1757-fix-unblocks-too' into 'develop'
CommonAPI: Unblock a user even if we don't have an activity.

Closes #1757

See merge request pleroma/pleroma!2538
2020-05-16 11:17:14 +00:00