summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-05Document the admin API endpoints for controlling follow/unfollowMark Felder
2019-04-05Add user following / unfollowing to the admin api.Roger Braun
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 19:03:47 +0000