summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06admin api endpoints for invitesAlex S
2019-04-06token -> invite renamingAlex S
2019-04-06twitter api registrationAlex S
fix for twitter api tests
2019-04-06generating tokens with mixAlex S
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
2019-04-05Use --cover option when running CI testsoptikfluffel
2019-04-05Merge branch 'feature/admin-api-follow' into 'develop'feld
Feature/admin api follow See merge request pleroma/pleroma!1026
2019-04-05We actually want the user id not nickname in the test...Mark Felder
2019-04-05Also remove Repo functions in the testsMark Felder
2019-04-05Redundant Repo.get_by usage was recently removed from the codebaseMark Felder
2019-04-05Add index on subscribersSadposter
2019-04-05Document the admin API endpoints for controlling follow/unfollowMark Felder
2019-04-05Add user following / unfollowing to the admin api.Roger Braun
2019-04-05Mix format everythingSadposter
2019-04-05Don't use twitterAPI for subscription testsSadposter
2019-04-05Change relationship direction of subscriptionsSadposter
2019-04-05Move subscriptions endpoint to be under /pleromaSadposter
2019-04-05Add subscription key to one test I forgot aboutSadposter
2019-04-05Format subscriptions related stuffSadposter
2019-04-05Add subscribed status to user viewSadposter
Added in pleroma extensions, but can be moved whenever
2019-04-05Add tests for subscriptionsSadposter
2019-04-05Make subscriptions the same direction as blocksSadposter
That being, user - subscribes to -> users, rather than user - has subscribers -> users
2019-04-05Fix subscription endpoint return formatsSadposter
2019-04-05Add notification checksSadposter
2019-04-05Add API endpoints and user column for subscriptionSadposter
2019-04-05fix credoEgor Kislitsyn
2019-04-05Merge branch 'hotfix/html-sanitization' into 'develop'lambda
Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi See merge request pleroma/pleroma!1022
2019-04-05Use PleromaJobQueue in Pleroma.Web.PushEgor Kislitsyn
2019-04-05Refactor html caching functions to have a key instead of a module, use more ↵rinpatch
correct terminology and fix summaries in mastoapi
2019-04-05[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.Ivan Tashkinov
2019-04-05[#923] OAuthController#callback adjustments (with tests).Ivan Tashkinov
2019-04-04[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-04-04Merge branch 'develop' into feature/prometheusMark Felder
2019-04-04Merge branch 'feature/quack' into 'develop'feld
Add ability to ship logs to a Slack channel See merge request pleroma/pleroma!1014
2019-04-04Add ability to ship logs to a Slack channelfeld
2019-04-04[#923] OAuth consumer controller tests. Misc. improvements.Ivan Tashkinov
2019-04-04Code readability tweakMark Felder
2019-04-04Clean merge crumbsMark Felder
2019-04-04Serve metrics at `/api/pleroma/app_metrics`href
2019-04-04Document PrometheusMark Felder
2019-04-04[#1] fix telemetryEgor Kislitsyn
2019-04-04Set up telemetry and prometheushref
2019-04-04Add reconhref
2019-04-04Improve Transmogrifier.upgrade_user_from_ap_id/2Egor Kislitsyn
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 14:14:07 +0000