aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-09-18Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.exIvan Tashkinov
2019-09-18[#1234] Added changelog entry, removed admin OAuth scopes.Ivan Tashkinov
2019-09-18Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions
2019-09-18namingsAlex S
2019-09-18little fixesAlex S
2019-09-18post for creating invite tokens in admin apiAlex S
2019-09-17markdown.ex: put two-spaces before the description-newlineHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: end suggestions list with a newlineHaelwenn (lanodan) Monnier
Otherwise we end up with suggestion on the same level as the childs Markdown is a fuck…
2019-09-17markdown.ex: \n\n on >1 suggestions, 2-spaces on oneHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: Make suggestion(s) plural only if on >1Haelwenn (lanodan) Monnier
2019-09-17description.exs: remove empty strings on descriptionsHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: do not fail if there is no childrenHaelwenn (lanodan) Monnier
2019-09-17docs/markdown.ex: do no print empty suggestionsHaelwenn (lanodan) Monnier
2019-09-17[#1234] Undone reordering-related changes in router.ex.Ivan Tashkinov
2019-09-17Admin API: Return link alongside with token on password resetMaxim Filippov
2019-09-17[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17docs/markdown.ex: child header as "- key (type): description"Haelwenn (lanodan) Monnier
2019-09-17Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-17[#1234] Defined admin OAuth scopes, refined other scopes. Added tests.Ivan Tashkinov
2019-09-17Merge branch 'feature/return-total-for-reports' into 'develop'rinpatch
Admin API: Return total for reports See merge request pleroma/pleroma!1628
2019-09-17Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-17Fix notification warningsSteven Fuchs
2019-09-17Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'Haelwenn
Fix `Transmogrifier.upgrade_user_from_ap_id/1` See merge request pleroma/pleroma!1677
2019-09-17Merge branch 'support/tests' into 'develop'rinpatch
add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627
2019-09-17remove remaining errors from testsSteven Fuchs
2019-09-17Refactor SubscriptionNotificationViewRoman Chvanikov
2019-09-17Move pleroma_api controllers into controllers sub-foldersRoman Chvanikov
2019-09-17Rename SubscriptionNotificationController list and get actions to index and showRoman Chvanikov
2019-09-17Cleanup PleromaAPIControllerRoman Chvanikov
2019-09-17Apply suggestion to lib/pleroma/web/router.exRoman Chvanikov
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17[#1260] Rate-limiting for create authentication and related requests.Ivan Tashkinov
2019-09-17Mastodon API: Add a setting to hide follow/follower count from the user view ↵eugenijm
(`hide_follows_count` and `hide_followers_count`)
2019-09-17Update oban to 0.8.1rinpatch
This version uses a different locking mechanism, which gets rid of `WARNING: you don't own a lock of type ShareLock` log spam
2019-09-16Move subscription notifications to a separate controllerRoman Chvanikov
2019-09-16Code style fixesRoman Chvanikov
2019-09-16Merge developRoman Chvanikov
2019-09-16Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
2019-09-16Fix `Transmogrifier.upgrade_user_from_ap_id/1`Egor Kislitsyn
2019-09-16Merge branch 'develop' into feature/return-total-for-reportsMaxim Filippov
2019-09-16Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-09-16Revert "Merge branch 'streamer-refactoring' into 'develop'"kaniini
This reverts merge request !1653
2019-09-16Streamer refactoringSteven Fuchs
2019-09-16Merge branch 'feature/delivery-tracking' into 'develop'kaniini
Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661
2019-09-16Merge branch 'feature/optimize_rich_media_parser' into 'develop'kaniini
added prepare html for RichMedia.Parser See merge request pleroma/pleroma!1672
2019-09-16Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-15[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex # lib/pleroma/web/router.ex
2019-09-15[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).Ivan Tashkinov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 01:49:44 +0000