summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
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-08renaming expire_at -> expires_atAlex S
keyword style change
2019-04-07Add check on activity visibility in sub notificationSadposter
2019-04-07credo fixAlex S
2019-04-07added docs to docs/api/admin_api.mdAlex S
code style and little renamings
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-06little channgesAlex S
2019-04-06Document subscription endpoints, fix typosSadposter
Also adds a quick error case on the subscription endpoints to avoid 500s
2019-04-06Merge branch 'feature/prometheus' into 'develop'feld
Upstream: Metrics and debugging See merge request pleroma/pleroma!1020
2019-04-06code styleAlex S
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-05Redirect to the referer url after mastofe authorizationSergey Suprunenko
2019-04-05Redundant Repo.get_by usage was recently removed from the codebaseMark Felder
2019-04-05Add user following / unfollowing to the admin api.Roger Braun
2019-04-05Change relationship direction of subscriptionsSadposter
2019-04-05Move subscriptions endpoint to be under /pleromaSadposter
2019-04-05Add subscribed status to user viewSadposter
Added in pleroma extensions, but can be moved whenever
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-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-04[#923] OAuth consumer controller tests. Misc. improvements.Ivan Tashkinov
2019-04-04Code readability tweakMark Felder
2019-04-04[#1] fix telemetryEgor Kislitsyn
2019-04-04Set up telemetry and prometheushref
2019-04-04Improve Transmogrifier.upgrade_user_from_ap_id/2Egor Kislitsyn
2019-04-04mastodon_api_controller.ex: Add pleroma-tan to initial_stateHaelwenn (lanodan) Monnier
2019-04-03Merge branch 'feature/robotstxt' into 'develop'lambda
Generate permissive or restrictive robots.txt in the config generator See merge request pleroma/pleroma!1012
2019-04-03Generate permissive or restrictive robots.txt in the config generatorSachin Joshi
2019-04-02Fix preview not being usable in form datarinpatch
2019-04-02Merge branch 'fix-slow-relationships' into 'develop'Haelwenn
ActivityPub Utils: Greatly speed up the follow / block activity fetching. See merge request pleroma/pleroma!1011