aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-05-01Merge branch 'update_auto_linker' into 'develop'rinpatch
2019-05-01test fixesAlex S
2019-05-01Update `auto_linker`Egor Kislitsyn
2019-05-01Merging with developAlex S
2019-05-01Fix syntax highlighting + clarify :frontend_configurationxse
2019-05-01add scrubber for html special charSachin Joshi
2019-05-01Merge branch 'develop' into bugfix/web-notification-special-charSachin Joshi
2019-04-30Merge branch 'fix/stream_out-normalize-only-creates' into 'develop'rinpatch
2019-04-30Do not normalize objects in stream_out unless the activity type isrinpatch
2019-04-29Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into...rinpatch
2019-04-29Fix MigrateOldBookmarks migration crashing on deleted activitiesrinpatch
2019-04-29Merge branch 'fix-webpush' into 'develop'rinpatch
2019-04-29WebPush: Use Object.normalize, rewrite tests so they test reality.lain
2019-04-29Merge branch 'fix/add-default-scope-mastoapi' into 'develop'rinpatch
2019-04-28Merge branch 'fix/uploads-folder-issues' into 'develop'kaniini
2019-04-28Merge branch 'regression/rights-only-for-admin' into 'develop'kaniini
2019-04-28Fix `rights` in TwitterAPI's user entity being present only forrinpatch
2019-04-28fix issues with the uploads directoryxse
2019-04-28Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'kaniini
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