aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-05-03Standardize construction of websocket URLfeld
2019-05-03MastodonApi: Bump api level.lain
2019-05-03Streamer: Stream out Conversations/Participations.lain
2019-05-03Fix embeded relationships in Mastodon APIrinpatch
2019-05-02Merge branch 'iss-849' into 'develop'lambda
2019-05-02Add oauth plug tests for url and body parametersAkiraFukushima
2019-05-02fix: Add mix deps.get before unit-testingAkiraFukushima
2019-05-02Parse access_token from body parameters and URL parametersAkiraFukushima
2019-05-01Fix testsRoman Chvanikov
2019-05-01Merge remote-tracking branch 'origin/develop' into conversations_threelain
2019-05-01Merge branch 'support/oauth' into 'develop'lambda
2019-05-01Refactored Pleroma.Web.Auth.AuthenticatorMaksim
2019-05-01Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'rinpatch
2019-05-01Remove redundant ensure_scrubbed_htmlrinpatch
2019-05-01Merge branch 'features/download-mastofe-build' into 'develop'lambda
2019-05-01Merge branch 'bugfix/web-notification-special-char' into 'develop'lambda
2019-05-01Merge branch 'harmonize_return_types_in_user_module' into 'develop'lambda
2019-05-01Merge branch 'docs/fix-config.md' into 'develop'rinpatch
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