Commit graph

9732 commits

Author SHA1 Message Date
lain
188b32145e InstanceView: Expose background image link.
This will make it easier for more clients to support this feature.
2020-05-18 13:29:30 +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
lain
2dcb26a6e5 CommonAPI: Unblock a user even if we don't have an activity. 2020-05-16 12:28:24 +02:00
Maksim Pechnikov
cb40602a16 added media proxy invalidation 2020-05-15 21:39:42 +03:00
lain
aeacfb2479 Merge branch 'chore/update-fe-settings-and-docs' into 'develop'
Synchronize PleromaFE settings

See merge request pleroma/pleroma!2532
2020-05-15 14:37:38 +00:00
lain
5633637862 Merge branch 'fix/digest-task-otp' into 'develop'
Fix digest mix task on OTP releases

See merge request pleroma/pleroma!2526
2020-05-15 14:22:59 +00:00
lain
fee3aa82e8 Merge branch 'fix/database-config' into 'develop'
Returning partial chain

Closes #1772

See merge request pleroma/pleroma!2537
2020-05-15 13:45:02 +00:00
Alexander Strizhakov
3c29f4f957
returning partial chain 2020-05-15 16:16:02 +03:00
rinpatch
081d1d3f48 Merge branch 'openapi/nullable-request-fields' into 'develop'
[OpenAPI] Mark all not required request fields as nullable

Closes #1761

See merge request pleroma/pleroma!2536
2020-05-15 11:13:08 +00:00
Egor Kislitsyn
e090191d03
[OpenAPI] Mark all not required request fields as nullable 2020-05-15 14:55:41 +04:00
rinpatch
907acbf62b Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma!2531
2020-05-15 05:06:29 +00:00
Michał Sidor
0d074751b5 Translated using Weblate (Polish)
Currently translated at 61.3% (65 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14 16:07:45 +00:00
Michał Sidor
08f5e49395 Translated using Weblate (Polish)
Currently translated at 55.6% (59 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14 16:07:45 +00:00
Michał Sidor
c2e57f2981 Added translation using Weblate (Polish) 2020-05-14 16:07:45 +00:00
rinpatch
e455ca3f3e Merge branch 'feature/database-configuration-whitelist' into 'develop'
Database configuration whitelist

See merge request pleroma/pleroma!2522
2020-05-14 16:07:37 +00:00
Stephanie Wilde-Hobbs
80308c5c26
Add config migration disclaimer to config whitelist documentation 2020-05-14 15:56:14 +01:00
lain
4157c459b8 Merge branch 'bcrypt-auth' into 'develop'
Handle bcrypt passwords for Mastodon migration

See merge request pleroma/pleroma!2527
2020-05-14 14:36:56 +00:00
Alex Gleason
5b0f27d23d
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw 2020-05-14 08:57:38 -05:00
Egor Kislitsyn
bb03dfdb03
Do not require description in update action 2020-05-14 16:29:32 +04:00
Egor Kislitsyn
0f885b4b86
Fix OpenAPI spec 2020-05-14 16:18:30 +04:00
Stephanie Wilde-Hobbs
3eff542678
Add Changelog entry 2020-05-14 12:43:54 +01:00
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
Steph
5c6f575315
Style fixes 2020-05-14 12:15:48 +01:00
Haelwenn (lanodan) Monnier
099e314a1b
Add OpenAPISpex for MediaController 2020-05-14 12:13:25 +02:00
lain
a2a8c8e9e0 Merge branch 'features/openrc-console' into 'develop'
init.d/pleroma: Add option to attach an elixir console

See merge request pleroma/pleroma!1704
2020-05-14 09:27:33 +00:00
lain
39ec1af993 Merge branch 'openapi/pleroma-api/accounts' into 'develop'
Add OpenAPI spec for PleromaAPI.AccountController

See merge request pleroma/pleroma!2528
2020-05-14 09:25:18 +00:00
lain
41db52729e Apply suggestion to docs/configuration/storing_remote_media.md 2020-05-14 09:14:59 +00:00
lain
359d7b0a6d Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex 2020-05-14 09:09:11 +00:00
lain
1c2629328d Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex 2020-05-14 09:07:09 +00:00
lain
4134bfbbb2 Merge branch 'pleroma_internal' into 'develop'
Add `pleroma_internal` as an internal field

See merge request pleroma/pleroma!2533
2020-05-14 08:22:53 +00:00
Haelwenn (lanodan) Monnier
cb363f0183
MastodonAPI: /api/v2/media endpoints 2020-05-14 10:14:28 +02:00
Mark Felder
54b4824186 Lint 2020-05-13 17:07:14 -05:00
Mark Felder
6f53d8815e Clarify where the Features panel is 2020-05-13 16:57:33 -05:00