lain
|
8a4bd9e5d1
|
OStatusController: Add Mastodon compatibility route for objects.
|
2020-05-22 16:47:22 +02:00 |
|
rinpatch
|
1fa7aa9fc5
|
Merge branch 'emoji-react-better-errors' into 'develop'
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
|
2020-05-22 14:36:08 +00:00 |
|
Egor Kislitsyn
|
ba106aa9c8
|
Fix notifications mark as read API
|
2020-05-22 18:15:36 +04:00 |
|
lain
|
ca755f9a73
|
ActivityPubController: Add Mastodon compatibility route.
|
2020-05-22 16:15:29 +02:00 |
|
lain
|
bcb549531f
|
EmojiReactionController: Return more appropriate error.
|
2020-05-22 14:38:28 +02:00 |
|
Haelwenn
|
7b02bfca51
|
Merge branch 'announce-validator' into 'develop'
Announce validator
See merge request pleroma/pleroma!2567
|
2020-05-22 05:47:53 +00:00 |
|
Haelwenn
|
a57e7f3503
|
Merge branch '1113-op-mentioning' into 'develop'
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
|
2020-05-22 05:22:07 +00:00 |
|
lain
|
ab1154e13f
|
Merge branch 'admin-logo-upload' into 'develop'
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
|
2020-05-21 14:30:34 +00:00 |
|
lain
|
a42a0716ec
|
Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
|
2020-05-21 13:31:49 +00:00 |
|
lain
|
f166316f50
|
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
|
2020-05-21 13:30:09 +00:00 |
|
lain
|
283fb1e05b
|
Merge branch 'issue/749' into 'develop'
[#749] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
|
2020-05-21 13:27:44 +00:00 |
|
Egor Kislitsyn
|
45d2c4157f
|
Add OpenAPI spec for AdminAPI.StatusController
|
2020-05-21 17:23:12 +04:00 |
|
lain
|
cdc6ba8d7b
|
AnnounceValidator: Check for announcability
|
2020-05-21 13:58:18 +02:00 |
|
lain
|
c76267afb9
|
Credo fixes.
|
2020-05-21 13:31:52 +02:00 |
|
lain
|
23e248694d
|
Announcements: Fix all tests.
|
2020-05-21 13:16:21 +02:00 |
|
lain
|
d9d425708e
|
SideEffects: Builed out Announce effects.
|
2020-05-21 12:43:09 +02:00 |
|
Egor Kislitsyn
|
9de9760aa6
|
Move status actions to AdminAPI.StatusController
|
2020-05-21 13:52:30 +04:00 |
|
eugenijm
|
b7fc61e17b
|
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
|
2020-05-21 04:41:42 +03:00 |
|
lain
|
39031f4860
|
Pipeline: Don't federate if federation is disabled.
|
2020-05-20 16:36:55 +02:00 |
|
lain
|
e42bc5f557
|
Announcements: Handle through common pipeline.
|
2020-05-20 15:44:37 +02:00 |
|
lain
|
265746b21f
|
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
|
2020-05-20 12:08:28 +00:00 |
|
lain
|
c7cdc553ff
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
|
2020-05-20 14:02:40 +02:00 |
|
lain
|
423ea497bb
|
Merge branch 'feature/1734-user-deletion' into 'develop'
User deletion
Closes #1734
See merge request pleroma/pleroma!2493
|
2020-05-20 11:43:49 +00:00 |
|
lain
|
eb5f428565
|
CommonAPI: Change public->private implicit addressing.
This will not add the OP to the `to` field anymore when going from
public to private.
|
2020-05-20 13:38:47 +02:00 |
|
Egor Kislitsyn
|
26f01744bc
|
Add background_image to InstanceOperation
|
2020-05-20 15:18:58 +04:00 |
|
Egor Kislitsyn
|
5ba6e1c322
|
Move notification actions to PleromaAPI.NotificationController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
f3fc8b22b1
|
Move conversation actions to PleromaAPI.ConversationController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
9a5de0f454
|
Move reaction actions to EmojiReactionController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
490a3a34b6
|
Add OpenAPI spec for PleromaAPI.PleromaAPIController
|
2020-05-20 15:15:13 +04:00 |
|
Haelwenn
|
94ba5a7802
|
Merge branch 'exposed-background-image' into 'develop'
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
|
2020-05-20 10:53:54 +00:00 |
|
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
|
8a6ddf26ac
|
InstanceOperation: Add background image to example
|
2020-05-20 12:12:07 +02: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 |
|
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 |
|
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 |
|
Egor Kislitsyn
|
e4c720f14c
|
Fix typo
|
2020-05-19 14:59:50 +04: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 |
|
Maksim Pechnikov
|
41f8f17260
|
fix api/v1/accounts/update_credentials
|
2020-05-19 09:42:41 +03:00 |
|
Maksim Pechnikov
|
5f0a3ac74d
|
added tests
|
2020-05-19 06:05:09 +03:00 |
|
Egor Kislitsyn
|
fe5d423b43
|
Add OpenAPI spec for MascotController
|
2020-05-18 22:01:18 +04:00 |
|
Egor Kislitsyn
|
45c3a72404
|
[OpenAPI] Use BooleanLike in all request bodies
|
2020-05-18 20:58:59 +04:00 |
|
Ivan Tashkinov
|
5735b5c8be
|
Fixed missing support for with_muted param in direct timeline.
|
2020-05-18 19:00:00 +03:00 |
|
Egor Kislitsyn
|
aef31c69df
|
Rename EmojiAPIController to EmojiPackController
|
2020-05-18 19:43:25 +04:00 |
|
Egor Kislitsyn
|
8bde8dfec2
|
Cleanup Pleroma.Emoji.Pack
|
2020-05-18 19:43:23 +04:00 |
|
Egor Kislitsyn
|
6e4de715b3
|
Add OpenAPI spec for PleromaAPI.EmojiAPIController
|
2020-05-18 19:28:46 +04:00 |
|
lain
|
0d5bce018d
|
AnnounceValidator: Validate for existing announce
|
2020-05-18 16:54:10 +02:00 |
|
lain
|
17a8342c1e
|
ObjectValidators: Add basic Announce validator.
|
2020-05-18 16:45:11 +02:00 |
|
lain
|
7d381b16b7
|
Transmogrifier Test: Extract Announce handling.
|
2020-05-18 14:48:37 +02:00 |
|
Alexander Strizhakov
|
215daabdb4
|
copyright update
|
2020-05-18 15:15:51 +03:00 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Alexander Strizhakov
|
3c29f4f957
|
returning partial chain
|
2020-05-15 16:16:02 +03:00 |
|
Egor Kislitsyn
|
e090191d03
|
[OpenAPI] Mark all not required request fields as nullable
|
2020-05-15 14:55:41 +04: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 |
|
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
|
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
|
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
|
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 |
|
Haelwenn (lanodan) Monnier
|
cb363f0183
|
MastodonAPI: /api/v2/media endpoints
|
2020-05-14 10:14:28 +02:00 |
|
Haelwenn (lanodan) Monnier
|
e688d4ee69
|
MRF.StealEmojiPolicy: New Policy
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
|
2020-05-14 09:59:56 +02:00 |
|
Alex Gleason
|
249e009c5e
|
Add pleroma_internal as an internal field
|
2020-05-13 16:14:24 -05:00 |
|
Ivan Tashkinov
|
8062d590dd
|
[#2456] OpenAPI-related tweaks. Removed support for with_relationships param in GET /api/v1/accounts/search.
|
2020-05-13 18:56:45 +03:00 |
|
Alex Gleason
|
9cbf17d59f
|
Handle bcrypt passwords for Mastodon migration
|
2020-05-13 10:53:56 -05:00 |
|
Egor Kislitsyn
|
6802dc28ba
|
Add OpenAPI spec for PleromaAPI.AccountController
|
2020-05-13 19:06:46 +04:00 |
|
Ivan Tashkinov
|
59b6d5f2aa
|
[#2456] Changed embed_relationships param to with_relationships.
|
2020-05-13 15:08:07 +03:00 |
|
Egor Kislitsyn
|
bcadbf964a
|
Add OpenAPI spec for SuggestionController
|
2020-05-13 14:15:24 +04:00 |
|
Ivan Tashkinov
|
33b798425f
|
[#2456] Post-merge fix.
|
2020-05-13 12:50:52 +03:00 |
|
Ivan Tashkinov
|
fd2fb2bb2e
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
|
2020-05-13 12:42:36 +03:00 |
|
lain
|
156c8a5088
|
Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
|
2020-05-13 09:34:30 +00:00 |
|
lain
|
1307d6ca3c
|
Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
|
2020-05-13 09:33:37 +00:00 |
|
Alex Gleason
|
b46811a074
|
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
|
2020-05-12 17:14:59 -05:00 |
|
Egor Kislitsyn
|
79ad12064d
|
Fix format
|
2020-05-13 01:59:17 +04:00 |
|
minibikini
|
cb1a3e196c
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:43 +00:00 |
|
minibikini
|
5a2333925c
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:36 +00:00 |
|
minibikini
|
822e9c09aa
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:21 +00:00 |
|
minibikini
|
40646a7e0e
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:14:52 +00:00 |
|
minibikini
|
0bb164a3e1
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:12:22 +00:00 |
|
minibikini
|
648cc0d72d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:09:26 +00:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
Stephanie Wilde-Hobbs
|
a2fcfc78c9
|
Filter config descriptions by config whitelist
|
2020-05-12 21:07:33 +01:00 |
|