aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-13Merge branch 'openapi/suggestions' into 'develop'lain
Add OpenAPI spec for SuggestionController See merge request pleroma/pleroma!2525
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-13ignore orderAlexander Strizhakov
2020-05-13don't use async with global mocksAlexander Strizhakov
2020-05-13don't use global mocks in setup callbacksAlexander Strizhakov
2020-05-13don't run in async if tests depend on env configAlexander Strizhakov
2020-05-13correct order for publised in assertAlexander Strizhakov
2020-05-13make test fail everytimeAlexander Strizhakov
2020-05-13don't run tests which change env in asyncAlexander Strizhakov
2020-05-13{:error, :enoent} s3 fixAlexander Strizhakov
s3 tests were executed before temp file was uploaded
2020-05-13Merge branch 'upgrade-comeonin' into 'develop'lain
Upgrade Comeonin to v5 See merge request pleroma/pleroma!2523
2020-05-12Upgrade Comeonin to v5Alex Gleason
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-13Fix formatEgor Kislitsyn
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
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-13Add OpenAPI spec for StatusControllerEgor Kislitsyn
2020-05-12Merge branch 'fix/eldap-required' into 'develop'rinpatch
fix eldap being required for non-OTP releases See merge request pleroma/pleroma!2520
2020-05-12Filter config descriptions by config whitelistStephanie Wilde-Hobbs
2020-05-12fix eldap being required for non-OTP releasesrinpatch
2020-05-12[#2456] OpenAPI: added `embed_relationships` param definition.Ivan Tashkinov
2020-05-12Merge branch 'streamer-get-topic' into 'develop'rinpatch
Expand and authorize streams in Streamer directly See merge request pleroma/pleroma!2519
2020-05-12Fix typo in testhref
2020-05-12Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'rinpatch
ActivityPub: Fix non-federating blocks. Closes #1757 See merge request pleroma/pleroma!2514
2020-05-12Merge branch '1748-remote-following-follower-count' into 'develop'rinpatch
Transmogrifier: On incoming follow accept, update follow counts. Closes #1748 See merge request pleroma/pleroma!2515
2020-05-12[#2456] Added support for `embed_relationships` param, nailed down endpoints ↵Ivan Tashkinov
which should support it. Fixed :source_mutes relationships subset fetching.
2020-05-12Add database configuration whitelistStephanie Wilde-Hobbs
2020-05-12Expand and authorize streams in Streamer directlyhref
2020-05-12Merge branch 'otp-version-update-suggestion' into 'develop'lain
Startup: suggest updating OTP when the version is too low for gun See merge request pleroma/pleroma!2518
2020-05-12ChatController: Don't return chats for user you've blocked.lain
2020-05-12Merge branch '1020-honk-announces' into 'develop'lain
Transmogrifier: Add tests for certain announces Closes #1020 See merge request pleroma/pleroma!2516
2020-05-12Startup: suggest updating OTP when the version is too low for gunrinpatch
I've seen quite a few people wonder what to do when presented with this error message.
2020-05-12Merge branch 'giving-up' into 'develop'rinpatch
Give up for now and make gitlab retry failed jobs. See merge request pleroma/pleroma!2517
2020-05-12Give up for now and make gitlab retry failed jobs.lain
2020-05-12Credo fixes.lain
2020-05-12Documention: Add chat message deletion docslain
2020-05-12Chat Controller: Add basic error handling.lain
2020-05-12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms