aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-27Add default_scope to /api/v1/update_credentialsrinpatch
2019-04-27Fix bookmarks depending on embeded object and move checking if therinpatch
2019-04-27Merge branch 'feature/bbcode' into 'develop'kaniini
2019-04-27Merge branch 'update/pleroma-fe-20190426' into 'develop'kaniini
2019-04-27update pleroma frontendWilliam Pitcock
2019-04-26tests: fix up for changed bbcode library output and verify html is properly e...William Pitcock
2019-04-26add support for bbcodeWilliam Pitcock
2019-04-26mix: add bbcode dependencyWilliam Pitcock
2019-04-26Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'lambda
2019-04-26Merge branch 'feature/mastoapi-new-config' into 'develop'kaniini
2019-04-25Merge branch 'chore/update-changelog' into 'develop'kaniini
2019-04-25update ChangelogWilliam Pitcock
2019-04-25Merge branch 'feature/mediaproxy-whitelist' into 'develop'kaniini
2019-04-25Add mediaproxy whitelist capabilityMark Felder
2019-04-25Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'Haelwenn
2019-04-25Move settings to Source subentityrinpatch
2019-04-25test fixesAlex S
2019-04-25fixes for testsAlex S
2019-04-25migration without using old field nameAlex S
2019-04-25unusedAlex S
2019-04-25removing useless transactionAlex S
2019-04-25migration optimizationAlex S
2019-04-25changelog file updateAlex S
2019-04-25favourites add bookmark displayAlex S
2019-04-25migrate user.bookmarks to separate tableAlex S
2019-04-25bookmarks in separate tableAlex S
2019-04-25activitypub: transmogrifier: send reject follow if following does not succeedWilliam Pitcock
2019-04-24Fix leaking private configuration parameters in Mastodon and Twitter APIs, an...rinpatch
2019-04-24fix the status notification with special charSachin Joshi
2019-04-23Merge branch 'security/fix-html-class-scrubbing' into 'develop'kaniini
2019-04-23html: lock down allowed class attributes to only those related to microformatsWilliam Pitcock
2019-04-23Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop'kaniini
2019-04-23Extend Mastodon API with public endpoint for getting Favorites timeline of an...Sergey Suprunenko
2019-04-23Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'kaniini
2019-04-23Merge branch 'fix/normalize-activities' into 'develop'kaniini
2019-04-23Merge branch 'develop' into 'develop'kaniini
2019-04-22Merge branch 'add-healthcheck-setting-to-config' into 'develop'kaniini
2019-04-22Add :emoji settings to config.mdilja
2019-04-22added healthcheck setting to instance configAlex S
2019-04-22Add shortcode_globs setting to documentationilja
2019-04-22Add a changelog entry for `pleroma.in_reply_to_account_acct`rinpatch
2019-04-22Add `pleroma.in_reply_to_account_acct` to MastoAPI status entityrinpatch
2019-04-22Replace Object.normalize(activity.data[object] with Object.normalize(acitivty...rinpatch
2019-04-22Merge branch 'fix/emoji-task-docs' into 'develop'rinpatch
2019-04-22Fix unclosed ` and put synopsis into a code block in pleroma.emoji mixrinpatch
2019-04-22Merge branch 'get-cached-everywhere' into 'develop'kaniini
2019-04-22Use `User.get_cached*` everywhereEgor
2019-04-22Merge branch 'feature/826-healthcheck-endpoint' into 'develop'kaniini
2019-04-22Feature/826 healthcheck endpointAlexander Strizhakov
2019-04-22Merge branch 'rework-emoji-management' into 'develop'kaniini