summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-10Merge branch 'hotfix/fix_undefined_summary' into 'develop'kaniini
transmogrifier.ex: Add fix_summary/1 See merge request pleroma/pleroma!1039
2019-04-10Merge branch 'notification-pleroma-settings' into 'develop'kaniini
Notification controls Closes #738 See merge request pleroma/pleroma!988
2019-04-10transmogrifier.ex: Add fix_summary/1Haelwenn (lanodan) Monnier
MRF.KeywordPolicy assumes that summary is present in a activity, and this would probably simplify code elsewhere too anyway.
2019-04-09Merge branch 'mastoapi/plaintext-statuses' into 'develop'rinpatch
Provide plaintext representations of content/cw in MastoAPI Closes #787 See merge request pleroma/pleroma!1035
2019-04-09Merge branch 'bugfix/follower_count' into 'develop'lambda
update the follower count when a follower is blocked See merge request pleroma/pleroma!1033
2019-04-09update the follower count when a follower is blockedSachin Joshi
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-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-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 'feature/prometheus' into 'develop'feld
Upstream: Metrics and debugging See merge request pleroma/pleroma!1020
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
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-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
2019-04-02Merge branch 'bugfix/wrong-date-format' into 'develop'lambda
Support activities with dates in the Unix timestamp format Closes #763 See merge request pleroma/pleroma!1004
2019-04-02Merge branch 'feature/fake-statuses' into 'develop'lambda
Add fake status submit See merge request pleroma/pleroma!995
2019-04-02Merge remote-tracking branch 'origin/develop' into fix-slow-relationshipslain
2019-04-02ActivityPub Utils: Greatly speed up the follow / block activity fetching.lain
2019-04-02Merging develop into feature/770-add-emoji-tagsAlex S
Conflict test/web/twitter_api/util_controller_test.exs
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-04 21:16:51 +0000