summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-21Fix Credo warningRoman Chvanikov
2019-04-21Refactor conversation function in MastodonAPIController to use a ViewRoman Chvanikov
2019-04-21Add accounts and last_status to conversation read responseRoman Chvanikov
2019-04-21Refactor query to return only 1 message instead of 20Roman Chvanikov
2019-04-15Conversation: Add accounts to output.lain
2019-04-15Conversation: Return full status object, id is a string.lain
2019-04-15Conversation: Also create participations for remote users.lain
Needed to get the participating user list.
2019-04-11Conversation: Fix tests.lain
2019-04-11ActivityPub: Fix specs.lain
2019-04-10Conversations: Tidying up.lain
2019-04-10Conversations: Make tests run.lain
2019-04-10Participations: Add sort index.lain
2019-04-10Participations: Add last activity.lain
2019-04-10Participation: Get for a user.lain
2019-04-10Conversations: Create or bump on inserting a dm.lain
2019-04-10Participations: Add marking as read and unread.lain
2019-04-10Conversation: Add Conversations and Participations.lain
2019-04-10Conversations: Fix specs.lain
2019-04-08Merge remote-tracking branch 'origin/develop' into ↵lain
features/mastoapi/2.6.0-conversations
2019-04-08Merge branch 'features/mastoapi/2.6.0-conversations' of ↵lain
git.pleroma.social:pleroma/pleroma into features/mastoapi/2.6.0-conversations
2019-04-08Merge branch 'use-jobs-in-webpush' into 'develop'lambda
Use PleromaJobQueue in Pleroma.Web.Push See merge request pleroma/pleroma!1023
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda
Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019
2019-04-08Merge branch 'twitter_oauth' into 'develop'lambda
OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923
2019-04-08Merge branch 'feature/697-language-tag-metadata' into 'develop'lambda
adding language tag See merge request pleroma/pleroma!1034
2019-04-08adding language tagAlexander Strizhakov
2019-04-08Merge branch 'feature/770-add-emoji-tags' into 'develop'lambda
Feature/770 add emoji tags See merge request pleroma/pleroma!998
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08AdminApiControllerTest unused variables fix.Ivan Tashkinov
2019-04-08Merge branch 'develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # docs/config.md # test/support/factory.ex
2019-04-08Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'lambda
# Conflicts: # config/config.exs # docs/config.md
2019-04-08Merge branch 'scheduled-activities' into 'develop'lambda
Scheduled activities See merge request pleroma/pleroma!989
2019-04-07[#923] Removed <br> elements from auth forms, adjusted docs, minor auth ↵Ivan Tashkinov
settings refactoring.
2019-04-06Merge branch 'fix/deactivated-user-error' into 'develop'feld
Return 403 for deactivated user on token request Closes #785 See merge request pleroma/pleroma!1031
2019-04-06Add scheduler for sending scheduled activities to the queueeugenijm
2019-04-06Added limits and media attachments for scheduled activities.eugenijm
2019-04-06Handle `scheduled_at` on status creation.eugenijm
2019-04-06Add scheduled activitieseugenijm
2019-04-06Return 403 on oauth token exchange for a deactivated usereugenijm
2019-04-06Merge branch 'fix/failed-legacy-test' into 'develop'feld
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS See merge request pleroma/pleroma!1030
2019-04-06Merge branch 'feature/prometheus' into 'develop'feld
Upstream: Metrics and debugging See merge request pleroma/pleroma!1020
2019-04-06Pin recon dependency to 2.4.0Mark Felder
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-05Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'Haelwenn
Redirect to the referer url after mastofe authorization Closes #717 See merge request pleroma/pleroma!1025
2019-04-05Redirect to the referer url after mastofe authorizationSergey Suprunenko
2019-04-05Mock :crypt.crypt/2 because otherwise the test fails on Mac OSSergey Suprunenko
2019-04-05Merge branch 'revert-8607ae68' into 'develop'rinpatch
Revert "Merge branch 'test-coverage' into 'develop'" See merge request pleroma/pleroma!1028
2019-04-05Revert "Merge branch 'test-coverage' into 'develop'"rinpatch
This reverts merge request !1027
2019-04-05Merge branch 'test-coverage' into 'develop'rinpatch
Use --cover option when running CI tests See merge request pleroma/pleroma!1027
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 20:01:04 +0000