summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-05-16Merge branch 'features/mastoapi_v2_media' into 'develop'lain
MastodonAPI: /api/v2/media endpoints See merge request pleroma/pleroma!2439
2020-05-16Merge branch 'develop' into 'remove-twitter-api'lain
# Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2020-05-16Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-05-16CommonAPI: Unblock a user even if we don't have an activity.lain
2020-05-15added media proxy invalidationMaksim Pechnikov
2020-05-15Merge branch 'fix/digest-task-otp' into 'develop'lain
Fix digest mix task on OTP releases See merge request pleroma/pleroma!2526
2020-05-15returning partial chainAlexander Strizhakov
2020-05-15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-15Chats: Add updated_at to Schema and docs.lain
2020-05-15[OpenAPI] Mark all not required request fields as nullableEgor Kislitsyn
2020-05-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # mix.lock
2020-05-14[#2497] Added support for :eimp for image resizing.Ivan Tashkinov
2020-05-14Merge branch 'feature/database-configuration-whitelist' into 'develop'rinpatch
Database configuration whitelist See merge request pleroma/pleroma!2522
2020-05-14Merge branch 'bcrypt-auth' into 'develop'lain
Handle bcrypt passwords for Mastodon migration See merge request pleroma/pleroma!2527
2020-05-14Pbkdf2.verify_pass --> AuthenticationPlug.checkpwAlex Gleason
2020-05-14Do not require `description` in `update` actionEgor Kislitsyn
2020-05-14Fix OpenAPI specEgor Kislitsyn
2020-05-14Allow whitelisting whole groupsStephanie Wilde-Hobbs
2020-05-14ChatView: Add update_at field.lain
2020-05-14Style fixesSteph
2020-05-14Add OpenAPISpex for MediaControllerHaelwenn (lanodan) Monnier
2020-05-14Merge branch 'openapi/pleroma-api/accounts' into 'develop'lain
Add OpenAPI spec for PleromaAPI.AccountController See merge request pleroma/pleroma!2528
2020-05-14Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14MastodonAPI: /api/v2/media endpointsHaelwenn (lanodan) Monnier
2020-05-14MRF.StealEmojiPolicy: New PolicyHaelwenn (lanodan) Monnier
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-13Add `pleroma_internal` as an internal fieldAlex Gleason
2020-05-13Merge developRoman Chvanikov
2020-05-13[#2456] OpenAPI-related tweaks. Removed support for `with_relationships` ↵Ivan Tashkinov
param in `GET /api/v1/accounts/search`.
2020-05-13Handle bcrypt passwords for Mastodon migrationAlex Gleason
2020-05-13Add OpenAPI spec for PleromaAPI.AccountControllerEgor Kislitsyn
2020-05-13Chat: Allow posting without content if an attachment is present.lain
2020-05-13[#2456] Changed `embed_relationships` param to `with_relationships`.Ivan Tashkinov
2020-05-13InstanceView: Add pleroma chat messages to nodeinfolain
2020-05-13Fix digest mix task on OTP releasesMichael Weiss
This is based on #2191, credit belongs to @rinpatch.
2020-05-13Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-13Add OpenAPI spec for SuggestionControllerEgor Kislitsyn
2020-05-13[#2456] Post-merge fix.Ivan Tashkinov
2020-05-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
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-13Merge branch 'openapi/statuses' into 'develop'lain
Add OpenAPI spec for StatusController See merge request pleroma/pleroma!2521
2020-05-13Merge branch 'openapi/timelines' into 'develop'lain
Add OpenAPI spec for TimelineController See merge request pleroma/pleroma!2506
2020-05-12Upgrade Comeonin to v5Alex Gleason
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-13Fix formatEgor Kislitsyn
2020-05-13User: Truncate bios when updating a remote user.lain
2020-05-13ActivityPub: Fix non-federating blocks.lain
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 09:25:04 +0000