logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
DateCommit messageAuthorFiles+-
Bump AdminFEHaelwenn (lanodan) Monnier119+164-893
activity_pub_controller.ex: upload_media, logging and bad request on missing paramsHaelwenn (lanodan) Monnier1+7-2
update MastoFEHaelwenn (lanodan) Monnier441+1566-628
mix.exs: custom source_urlHaelwenn (lanodan) Monnier1+2-3
mix.deps: Change auto_linker to my branchHaelwenn (lanodan) Monnier6+22-15
rebase.sh: script (legacy)Haelwenn (lanodan) Monnier1+6-0
[PleromaFE] Update frontendHaelwenn (lanodan) Monnier34+551-516
upgrade.sh: CreateHaelwenn (lanodan) Monnier3+42-1
Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop'Haelwenn1+30-25
Merge branch 'feature/native-captcha' into 'develop'lain9+69-4
Merge branch 'uguu' into 'develop'lain37+333-1146
Merge branch '1427-oauth-graceful-admin-scope' into 'develop'lain2+57-44
Merge branch 'revert-bca1512d' into 'develop'lain104+365-898
Merge branch 'test-timeout' into 'develop'lain1+3-1
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'lain2+43-1
Merge branch 'feature/report-notes' into 'develop'feld15+272-151
Merge branch 'issue/1411' into 'develop'feld6+127-42
Merge branch 'chore/fast_sanitize_bump' into 'develop'rinpatch1+2-2
Merge branch 'admin-scope-support-code' into 'develop'rinpatch104+898-365
Merge branch 'domain-block-precedence' into 'develop'rinpatch4+70-3
Merge branch '1427-oauth-admin-scopes' into 'develop'lain3+56-10
Merge branch 'fix/unsubscribe-route' into 'develop'feld1+3-0
Merge branch '1427-oauth-admin-scopes' into 'develop'lain15+289-63
Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'lain9+35-5
Merge branch 'fix/load_config' into 'develop'rinpatch2+83-1
Merge branch 'fix/prefer-url-over-search' into 'develop'rinpatch2+8-3
Merge branch 'user-timelines-changelog' into 'develop'rinpatch1+1-0
Merge branch 'fix/otp-parsers' into 'develop'lain2+22-8
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'lain2+166-62
Merge branch 'fix/user-list-task' into 'develop'lain1+3-3
Merge branch 'issue/1342' into 'develop'lain16+273-48
Merge branch 'fix/oauth-compile-time' into 'develop'lain2+3-6
Merge branch 'feature/otp-configurable-scrubbers' into 'develop'lain8+231-214
Merge branch 'feat/docs-otp-source-picker' into 'develop'rinpatch9+238-83
Merge branch 'move-api-docs' into 'develop'rinpatch1+1-0
Merge branch 'fix/clause-never-matches' into 'develop'rinpatch3+3-1
Merge branch 'improve-move-notificaions-api' into 'develop'rinpatch7+54-10
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'rinpatch3+58-1
Merge branch 'feature/1455-chat-character-limit' into 'develop'rinpatch7+42-3
Merge branch 'fix/mrf-delete' into 'develop'lain7+32-6
Merge branch '1335-user-api-id-fields-relations' into 'develop'lain34+764-264
Merge branch 'feature/admin-api-render-whole-status' into 'develop'feld7+196-122
Merge branch 'fix_test' into 'develop'lain1+3-0
Merge branch 'feature/move-activity' into 'develop'lain24+354-51
Merge branch 'update-floki' into 'develop'rinpatch2+1-2
Merge branch 'remove-info-from-users' into 'develop'rinpatch5+14-27
Merge branch 'hide-relation-for-friendica' into 'develop'rinpatch5+75-4
Merge branch 'benchmarks/favourites_timeline' into 'develop'rinpatch3+52-1
Merge branch 'fix/extract_first_external_url' into 'develop'lain2+12-0
Merge branch 'bugfix/1447-set-following' into 'develop'rinpatch1+53-0
Merge branch 'chore/manual-benchmark' into 'develop'rinpatch1+1-0
Merge branch 'use-pg12-in-ci' into 'develop'lain1+1-1
Merge branch 'fed-testing-updates' into 'develop'lain6+285-6
Merge branch 'cleanup-tests-output' into 'develop'lain3+7-1
Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'kaniini2+10-2
Merge branch 'remove-user-info' into 'develop'lain4+23-94
Merge branch 'feature/direct_conversation_id_web_push' into 'develop'lain3+19-9
Merge branch 'fix/prod-syslog-level' into 'develop'feld1+1-0
Merge branch 'fix/ap-disable-remote-render' into 'develop'lain6+48-99
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'feld5+81-0
Merge branch 'fix/update-reports-old-format' into 'develop'feld2+8-1
Merge branch 'feature/useragent-override' into 'develop'rinpatch4+30-3
Merge branch 'fix/release-envvars' into 'develop'rinpatch1+2-2
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain8+197-30
Merge branch 'list-users' into 'develop'rinpatch3+24-0
Merge branch 'revert-5c6c3026' into 'develop'rinpatch1+1-1
Merge branch 'fix/mix-task-logging' into 'develop'lain5+12-4
Merge branch 'issue/1348' into 'develop'lain10+143-17
Merge branch 'fix/user-following-count' into 'develop'lain2+34-27
Merge branch 'remove-useless-warning' into 'develop'lain1+8-14
Merge branch 'fix/sporadic-tests' into 'develop'lain2+2-2
Merge branch 'fix-docker-build' into 'develop'lain1+0-1
Merge branch 'chore/bump-fe' into 'develop'rinpatch15+114-98
Merge branch 'feature/admin-api/support-token-header' into 'develop'lain4+58-19
Merge branch 'docs/remove_activation_status_endpoint' into 'develop'feld1+0-8
Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch1+2-2
Merge branch 'chore/changelog-sync-' into 'develop'rinpatch1+19-0
Merge branch 'nodeinfo-fields-limit' into 'develop'kaniini2+33-0
Merge branch 'mix-task-warning' into 'develop'rinpatch1+3-0
Merge branch 'bugfix/1395-email-activation' into 'develop'rinpatch6+36-4
Merge branch 'feature/mrf-object-age-policy' into 'develop'lain5+219-0
Merge branch 'fix/conversations-rendering' into 'develop'rinpatch1+4-1
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'feld11+605-133
Merge branch 'ci/disable-trace' into 'develop'rinpatch1+2-2
Merge branch 'reactions' into 'develop'rinpatch19+1400-3
Merge branch 'static-fe-object-id' into 'develop'lain2+69-6
Merge branch 'fix-rate-limiter-test' into 'develop'lain1+1-1
Merge branch 'fix-docs-formatting' into 'develop'rinpatch1+24-14
Merge branch 'static-remote-redirect' into 'develop'lain2+7-2
Merge branch 'bugfix/1360-actorless-posts' into 'develop'rinpatch2+12-0
Merge branch 'fix/docs-static-fe-category' into 'develop'rinpatch1+8-8
Merge branch 'nodeinfo-federation-enabled' into 'develop'feld2+25-0
Merge branch 'feature/static-fe' into 'develop'kaniini16+685-0
Merge branch 'fix-dokku-2' into 'develop'lain1+1-0
Merge branch 'patch-1' into 'develop'rinpatch1+1-1
Merge branch 'chore/changelog-1940' into 'develop'rinpatch1+1-0
Merge branch 'update-ci' into 'develop'lain1+4-4
Merge branch 'update-docs' into 'develop'lain2+11-3
Merge branch 'iss-1376' into 'develop'lain2+40-1
Merge branch 'fix/1399' into 'develop'lain3+6-2
Merge branch 'new-rate-limiter' into 'develop'lain16+450-260
Merge branch 'disable-attachment-links' into 'develop'lain2+3-2
Merge branch 'issue/1339' into 'develop'lain10+90-58
Merge branch 'refactor/readme' into 'develop'lain1+28-65
Merge branch 'refactor/cheatsheet' into 'develop'kaniini1+432-442
Merge branch 'chore/update-fe' into 'develop'rinpatch18+262-200
Merge branch 'bugfix/containment-no-id' into 'develop'rinpatch2+17-3
Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop'rinpatch1+2-2
Merge branch 'chore/add-multifetch' into 'develop'kaniini1+1-0
Merge branch 'chore/bump-fast-sanitize-again' into 'develop'rinpatch1+2-2
Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch3+5-6
Merge branch 'recipients-filter' into 'develop'kaniini4+88-0
Merge branch 'fix/unwrapped-object-return' into 'develop'rinpatch1+1-1
Merge branch 'fix/trailing-format-plug-oauth' into 'develop'rinpatch1+2-1
Merge branch 'changelog-cleanup' into 'develop'rinpatch1+4-16
Merge branch 'fix/saner-static-cache-control' into 'develop'rinpatch2+2-2
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'feld6+26-8
Merge branch 'fix/object-reinject-set-cache' into 'develop'rinpatch2+18-1
Merge branch 'ci/remove-docs-build' into 'develop'Haelwenn1+0-16
Merge branch 'chore/bump-htmlentities' into 'develop'rinpatch2+2-2
Merge branch 'failing-search-fixes' into 'develop'rinpatch2+1-18
Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'lain6+45-6
Merge branch 'transmogrifier-test-errors' into 'develop'lain1+16-5
Merge branch 'missing-tesla-mocks' into 'develop'lain3+38-8
Merge branch 'chore/update-fast-sanitize' into 'develop'kaniini2+3-3
Merge branch 'faster-user-deactivation' into 'develop'kaniini1+6-1
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'lain8+179-41
Merge branch 'chore/update-fast-sanitize' into 'develop'kaniini1+1-1
Merge branch 'bugfix/streamer-follows' into 'develop'rinpatch2+19-1
Merge branch 'feature/omit-relay-user' into 'develop'kaniini3+44-1
Merge branch 'feature/fast_sanitize' into 'develop'kaniini10+142-138
Merge branch 'fix/migration-schema' into 'develop'Haelwenn1+3-3
Merge branch 'fix/moderation-log-crash' into 'develop'kaniini1+76-0
Merge branch 'fix-recipients-from-activity' into 'develop'kaniini2+45-21
Merge branch 'refactor/db-add-defaults' into 'develop'lain1+68-0
Merge branch 'fix/blocked-follows' into 'develop'rinpatch1+112-0
Merge branch 'fix/migrations-same-module-name' into 'develop'rinpatch1+1-1
Merge branch 'fix-follow-requests' into 'develop'rinpatch3+55-0
Merge branch 'fix/migration' into 'develop'lain1+0-2
Merge branch 'refactor/following-relationships' into 'develop'lain33+537-248
Merge branch 'improve-user-info-migration' into 'develop'kaniini2+75-64
Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'kaniini1+46-0
Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'kaniini1+25-0
Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'kaniini1+19-0
Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'kaniini1+17-0
Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'kaniini1+15-0
Merge branch 'refactor/db-not-null-constraints-for-activities' into 'develop'kaniini1+17-0
Merge branch 'readme-pg-contrib' into 'develop'kaniini1+1-1
Merge branch 'conversation-read-status-for-blocking-user' into 'develop'kaniini5+175-11
Merge branch 'remove-unsed-info-fields-fn' into 'develop'rinpatch1+0-48
Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop'kaniini1+7-3
Merge branch 'object-fetch-errors' into 'develop'kaniini2+10-1
Merge branch 'fix/readme' into 'develop'kaniini1+1-1
Merge branch '1304-user-info-deprecation' into 'develop'feld87+1383-1339
Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop'kaniini3+105-21
Merge branch 'chore/add-single-value-deserialization-tests' into 'develop'kaniini1+44-0
Merge branch 'feature/push-subject-for-dm' into 'develop'kaniini2+34-5
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'rinpatch2+16-11
Merge branch 'feature/masto_api_markers' into 'develop'kaniini10+353-0
Merge branch 'feature/activitypub-semantics' into 'develop'kaniini15+168-10
Merge branch 'chore/add-missing-websub-drop-migration' into 'develop'kaniini1+8-0
Merge branch 'chore/fixup-testsuite-import' into 'develop'kaniini1+0-1
Merge branch 'feature/mastofe-pwa' into 'develop'Haelwenn7+114-1
Merge branch 'mark-all-conversations-as-read' into 'develop'Haelwenn7+72-0
Merge branch 'develop-version-bump' into 'develop'rinpatch1+1-1
Merge branch 'mix-emoji-task-pack-json' into 'develop'rinpatch1+15-13
Merge branch 'patch-1' into 'develop'rinpatch1+1-1
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'rinpatch2+6-2
Merge branch 'feature/relay-list' into 'develop'kaniini7+124-7
Merge branch 'feature/ostatus-removal' into 'develop'kaniini56+100-3889
Merge branch 'fix/changelog-typo' into 'develop'rinpatch1+1-1
Merge branch 'chore/develop-changelog-sync' into 'develop'rinpatch1+70-37
Merge branch 'backport/develop-safe-jsonb' into 'develop'rinpatch6+42-8
Merge branch 'cleanup/deprecated_config_upload' into 'develop'rinpatch2+4-32
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'kaniini1+7-0
Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'feld7+91-13
Merge branch 'user-search-experiments' into 'develop'lain2+63-129
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'feld9+357-120
Merge branch 'benchmark-finishing' into 'develop'lain10+853-4
Merge branch 'exclude-visibilities-for-timelines' into 'develop'feld9+295-42
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'rinpatch1+1-1
Merge branch 'master-to-stable' into 'develop'rinpatch15+22-17
Merge branch 'incoming-id-fixes' into 'develop'lain5+48-33
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'rinpatch1+2-4
Merge branch 'pleroma-ctl-enchancements' into 'develop'Haelwenn1+65-29
Merge branch 'unicode-search' into 'develop'kaniini2+28-5
Merge branch 'webfinger-mocks' into 'develop'kaniini8+246-0
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'lain3+25-1
Merge branch 'feature/count-statuses-task' into 'develop'lain3+62-0
Merge branch 'chore/format-migrations' into 'develop'rinpatch94+406-265
Merge branch 'chore/bump-fe-122323f3' into 'develop'rinpatch28+253-204
Merge branch 'bugfix/exclude-replies' into 'develop'kaniini2+3-2
Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'kaniini17+513-251
Merge branch 'chore/context-cleanups' into 'develop'kaniini1+1-6
Merge branch 'mrf/simple_policy/check_actor' into 'develop'kaniini3+25-6
Merge branch '1260-rate-limited-auth-actions' into 'develop'Haelwenn5+16-2
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn36+721-267
Merge branch 'fix/bad-migration' into 'develop'kaniini1+1-12
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'kaniini9+35-21
Merge branch 'fix/report-email' into 'develop'feld3+4-3
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn2+69-6
Merge branch 'split-masto-api/leftovers' into 'develop'kaniini7+140-160
Merge branch 'accept-embedded-announce-object' into 'develop'kaniini5+145-1
Merge branch 'unread-conversation-count' into 'develop'kaniini12+218-10
Merge branch 'update-activity-fixes' into 'develop'kaniini6+17-6
Merge branch 'revert-5c04e817' into 'develop'kaniini11+10-207
Merge branch 'issue/1296' into 'develop'kaniini5+0-142
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'kaniini7+81-22
Merge branch 'user-info-unread-direct-conversation' into 'develop'kaniini11+207-10
Merge branch 'fix/extended-nickname-format-default-config' into 'develop'kaniini2+3-1
Merge branch 'undo-fixes' into 'develop'kaniini3+15-8
Merge branch 'featrue/job-monitor' into 'develop'lain7+171-5
Merge branch 'fix/nickname-fail' into 'develop'lain3+59-1
Merge branch 'bugfix/notification-nil-actor' into 'develop'lain2+38-28
Merge branch 'fix/oauth-controller' into 'develop'lain1+1-1
Merge branch 'docs/frontend_configuration' into 'develop'rinpatch1+1-1
Merge branch 'mkdocs-migration-prep' into 'develop'rinpatch48+1640-1647
Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'rinpatch14+325-285
Merge branch 'split-masto-api/instance' into 'develop'kaniini6+140-113
Merge branch 'accept-embedded-announce-object' into 'develop'kaniini2+35-0
Merge branch 'get_announce_visibility-name' into 'develop'kaniini1+3-3
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'kaniini3+38-7
Merge branch 'split-masto-api/auth' into 'develop'kaniini5+215-173
Merge branch 'features/private-reblogs' into 'develop'kaniini9+115-9
Merge branch 'update/admin-fe-20191001' into 'develop'kaniini70+136-136
Merge branch 'feature/expose-attachment-size' into 'develop'feld3+11-2
Merge branch 'feature/track-reverse-proxy-failures' into 'develop'feld4+80-9
Merge branch 'split-masto-api/apps' into 'develop'kaniini6+103-82
Merge branch 'split-masto-api/suggestions' into 'develop'kaniini5+156-133
Merge branch 'split-masto-api/media' into 'develop'kaniini5+136-116
Merge branch 'split-masto-api/polls' into 'develop'kaniini11+454-419
Merge branch 'compact-undos' into 'develop'kaniini3+72-0
Merge branch 'ci/build-otp-maint' into 'develop'kaniini1+1-0
Merge branch 'split-masto-api/mascots' into 'develop'kaniini5+116-93
Merge branch 'update/admin-fe-20190930' into 'develop'kaniini69+140-133
Merge branch 'split-masto-api/accounts' into 'develop'kaniini31+2306-2296
Merge branch 'fix/report-controller-test' into 'develop'kaniini1+1-1
Merge branch 'features/apc2s-media-upload' into 'develop'kaniini6+79-3
Merge branch 'split-masto-api/reports' into 'develop'kaniini6+106-96
Merge branch 'split-masto-api/conversations' into 'develop'kaniini6+116-106
Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop'kaniini1+16-0
Merge branch 'feature/scrobbling' into 'develop'kaniini16+458-3
Merge branch 'revert/subscription-refactoring' into 'develop'rinpatch14+11-709
Merge branch 'feature/follow-requests-count' into 'develop'kaniini3+92-0
Merge branch 'chores/1691-breaking-change' into 'develop'Haelwenn2+3-3
Merge branch 'chore/update-docs' into 'develop'Haelwenn1+4-4
Merge branch 'tests/mastodon_api_controller.ex' into 'develop'Haelwenn10+402-139
Merge branch 'bugfix/post-empty-status' into 'develop'Haelwenn2+6-3
Merge branch 'fix/empty-attachment-statuses' into 'develop'rinpatch2+23-1
Merge branch 'remote-ip' into 'develop'Haelwenn10+187-4
Merge branch 'split-masto-api/follow-requests' into 'develop'kaniini5+133-106
Merge branch 'split-masto-api/domain-blocks' into 'develop'kaniini5+80-57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'kaniini7+287-283
Merge branch 'split-masto-api/filters' into 'develop'kaniini5+214-195
Merge branch 'fix/subscription-notification-view' into 'develop'kaniini1+3-3
Merge branch 'refactor/status-controller' into 'develop'kaniini15+1469-1404
Merge branch 'refactor/subscription' into 'develop'kaniini14+708-9
Merge branch 'patch-2' into 'develop'kaniini1+28-5
Merge branch 'update/docs-jp' into 'develop'kaniini1+67-68
Merge branch 'list-packs-docs' into 'develop'kaniini1+9-0
Merge branch 'patch-1' into 'develop'kaniini1+1-0
Merge branch 'refactor/common_api' into 'develop'kaniini4+400-270
Merge branch 'refactor/timeline-controller' into 'develop'kaniini6+438-409
Merge branch 'chore/changelog-sync' into 'develop'rinpatch1+6-1
Merge branch 'feature/moderation-log-filters' into 'develop'feld8+343-105
Merge branch 'refactor/notification-controller' into 'develop'kaniini5+361-343
Merge branch 'feature/return-link-for-password-reset' into 'develop'kaniini4+19-3
Merge branch 'refactor/user' into 'develop'kaniini13+309-526
Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' into 'develop'kaniini8+29-9
Merge branch 'hex-flake-id' into 'develop'kaniini25+35-262
Merge branch 'feature/activities-pagination-by-offset' into 'develop'kaniini4+32-7
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'kaniini6+89-87
Merge branch 'hotfix/hackney-1.15.2' into 'develop'rinpatch1+2-2
Merge branch 'support/test' into 'develop'rinpatch1+10-1
Merge branch 'emoji-packs-create-dir' into 'develop'rinpatch4+104-39
Merge branch 'issue/1218' into 'develop'lain15+514-424
Merge branch 'feature/force-password-reset' into 'develop'kaniini12+147-0
Merge branch 'support-rel-ugc' into 'develop'kaniini12+58-46
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'kaniini4+21-3
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'kaniini5+448-210
Merge branch 'clean-up-views' into 'develop'kaniini8+81-42
Merge branch 'emoji-pack-json-pretty' into 'develop'kaniini1+1-1
Merge branch 'develop' into 'develop'rinpatch4+24-6
Merge branch 'update-adminfe/2019-09-23' into 'develop'rinpatch69+178-98
Merge branch 'better-emoji-packs' into 'develop'rinpatch19+1192-15
Merge branch 'config/update-mongoose' into 'develop'Haelwenn1+6-2
Merge branch 'conversation-docs' into 'develop'rinpatch1+2-1
Merge branch 'docs/clients-update' into 'develop'Haelwenn1+2-2
Merge branch 'outbox_pagination' into 'develop'lain2+25-1
Merge branch 'direct_conversation_id_on_status_creation' into 'develop'rinpatch3+10-2
Merge branch 'issue/733' into 'develop'Haelwenn4+68-67
Merge branch 'chores/bump-copyright-year' into 'develop'rinpatch95+95-95
Merge branch 'hide-follower-following-count' into 'develop'feld9+117-21
Merge branch 'admin_api_invite_tokens' into 'develop'feld5+54-44
Merge branch 'restore-tests' into 'develop'feld1+105-0
Merge branch 'chore/refetch-poll-changelog-update' into 'develop'rinpatch1+2-0
Merge branch 'fix/test-upload-cleanup' into 'develop'Haelwenn1+5-0
Merge branch 'feature/poll-refresh' into 'develop'Haelwenn10+186-13
Merge branch 'bugfix/docs-formatting' into 'develop'Haelwenn3+97-278
Merge branch 'chore/changelog-separate-1.1' into 'develop'Haelwenn1+62-30
Merge branch 'feature/bump-elixir-verstion' into 'develop'rinpatch2+2-1
Merge branch 'deps/update-tesla' into 'develop'feld2+2-2
Merge branch 'support/package_versions' into 'develop'rinpatch1+1-1
Merge branch 'feature/return-total-for-reports' into 'develop'rinpatch5+15-5
Merge branch 'fix-notification-warnings' into 'develop'rinpatch1+5-1
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'Haelwenn1+1-1
Merge branch 'support/tests' into 'develop'rinpatch4+341-119
Merge branch 'eliminate-test-errors' into 'develop'rinpatch3+62-25
Merge branch 'deps/update-oban' into 'develop'rinpatch4+17-6
Merge branch 'update-fields-limit' into 'develop'Haelwenn3+4-4
Merge branch 'fix/develop' into 'develop'rinpatch27+1361-920
Merge branch 'fix/signed-fetch-inclusion-test' into 'develop'rinpatch1+2-2
Merge branch 'revert-4fabf83a' into 'develop'kaniini27+920-1361
Merge branch 'streamer-refactoring' into 'develop'kaniini27+1361-920
Merge branch 'feature/delivery-tracking' into 'develop'kaniini10+287-6
Merge branch 'feature/optimize_rich_media_parser' into 'develop'kaniini3+7-3
Merge branch 'fix/race-in-tests' into 'develop'kaniini1+1-1
Merge branch '1149-oban-job-queue' into 'develop'rinpatch69+1784-1532
Merge branch 'config-changes' into 'develop'rinpatch4+705-5
Merge branch 'fix/truncate-remote-user-fields' into 'develop'rinpatch3+85-21
Merge branch 'fix-tests' into 'develop'rinpatch1+6-2
Merge branch 'security/fav-reblog-access-control' into 'develop'rinpatch3+56-2
Merge branch 'capture-test-errors' into 'develop'lain6+71-37
Merge branch 'refactor/add_link_headers' into 'develop'lain3+50-100
Merge branch 'cleanup-activity' into 'develop'lain6+159-268
Merge branch 'feature/change-email' into 'develop'Haelwenn7+176-2
Merge branch 'admin-config-description' into 'develop'rinpatch12+3107-714
Merge branch 'fix/admin-api-docs' into 'develop'kaniini1+7-3
Merge branch 'fix/error-log-double-quotes' into 'develop'Haelwenn2+3-3
Merge branch 'feature/jason-view-render' into 'develop'kaniini3+67-64
Merge branch 'patch-5' into 'develop'Haelwenn1+1-1
Merge branch 'fix/oom-parallel-rendering' into 'develop'lain3+23-35
Merge branch 'fix/tests' into 'develop'lain1+6-2
Merge branch 'statuses-by-ids' into 'develop'lain7+55-0
Merge branch 'cache-plug' into 'develop'feld11+457-7
Merge branch 'update-changelog' into 'develop'feld1+1-0
Merge branch 'fix/read-inbox' into 'develop'feld2+40-15
Merge branch 'chore/query-optimization' into 'develop'kaniini2+6-6
Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'rinpatch1+6-5
Merge branch 'so-long-twitterapi' into 'develop'rinpatch20+79-5148
Merge branch 'update-frontend-e75ac9dd' into 'develop'rinpatch29+240-208
Merge branch 'hotifx/emoji-trailing' into 'develop'rinpatch1+2-1
Merge branch 'feature/mastoapi-accounts-external' into 'develop'Haelwenn5+131-24
Merge branch 'fix/endless-poll-handling' into 'develop'rinpatch6+46-11
Merge branch 'fix/safe-render-notifications' into 'develop'rinpatch2+2-1
Merge branch 'dockerfile-touchups' into 'develop'rinpatch2+3-3
Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'Haelwenn4+24-2
Merge branch 'feature/mastoapi-read-notifications' into 'develop'Haelwenn7+109-45
Merge branch 'feature/pagination-total' into 'develop'rinpatch3+97-0
Merge branch 'iss-930-media' into 'develop'feld1+7-7
Merge branch 'fix/antifollowbot-and-relays' into 'develop'kaniini2+9-4
Merge branch 'fix-osada-follow' into 'develop'Haelwenn6+87-2
Merge branch 'list-controller' into 'develop'lain24+2117-2018
Merge branch 'tests/activity_pub' into 'develop'lain8+299-123
Merge branch 'fix-typo' into 'develop'lain1+1-1
Merge branch 'fix/sporadic-test' into 'develop'rinpatch1+1-2
Merge branch 'disable-rate-limiter' into 'develop'kaniini2+3-10
Merge branch 'issue/1177' into 'develop'kaniini10+144-41
Merge branch 'feature/moderation-log' into 'develop'kaniini11+1187-41
Merge branch 'fix-all-custom-fields-deleted' into 'develop'kaniini2+12-2
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'lain3+24-33
Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'rinpatch1+12-6
Merge branch 'admin-create-users' into 'develop'lain6+222-22
Merge branch 'activity-expiration' into 'develop'kaniini19+328-18
Merge branch 'fix-default-config-account_field' into 'develop'kaniini2+4-4
Merge branch 'fix/add-likes-index-objects' into 'develop'kaniini2+8-0
Merge branch 'support/tests' into 'develop'feld4+7-1
Merge branch 'improve-ap-routes-rate-limit' into 'develop'lain1+4-1
Merge branch 'rate-limit-ap-routes' into 'develop'lain3+6-2
Merge branch 'chore/fix-flakey-aws-test' into 'develop'kaniini1+2-1
Merge branch 'fix/admin-api-user-deletion' into 'develop'lain3+14-6
Merge branch 'digest-template' into 'develop'lain8+664-63
Merge branch 'feature/custom-fields' into 'develop'lain18+365-27
Merge branch 'fix/reverse-proxy-body-too-large' into 'develop'lain3+13-4
Merge branch 'tests/database-digest-tests' into 'develop'lain4+82-0
Merge branch 'support/test_helpers' into 'develop'lain40+210-417
Merge branch 'hotfix/user_unfollow' into 'develop'lain4+83-20
Merge branch 'chore/fix-ap-muted-tests' into 'develop'kaniini1+4-4
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'kaniini2+19-0
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'kaniini5+60-10
Merge branch 'pleroma-conversations' into 'develop'lain24+655-99
Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'rinpatch1+0-1
Merge branch 'features/formatting-sub_sup' into 'develop'kaniini1+2-0
Merge branch 'feature/parallel-rendering' into 'develop'lain3+48-12
Merge branch 'cache-follow-state' into 'develop'lain5+58-6
Merge branch 'fix/stats-send-after' into 'develop'rinpatch1+1-1
Merge branch 'misc-otp-issues' into 'develop'rinpatch14+136-187
Merge branch 'fix/http-signatures-post' into 'develop'rinpatch2+3-1
Merge branch 'fix/mrf-describe-keyword-lists' into 'develop'rinpatch4+7-3
Merge branch 'fix/revert-tzdata-1.8' into 'develop'lain2+2-2
Merge branch 'backport/describe-api-changelog' into 'develop'rinpatch1+2-0
Merge branch 'preload-user-timelines' into 'develop'kaniini1+1-0
Merge branch 'get-context-optimizations' into 'develop'kaniini2+11-5
Merge branch 'feature/mrf-vocabulary' into 'develop'rinpatch5+169-0
Merge branch 'feature/mrf-describe' into 'develop'kaniini21+176-50
Merge branch 'length-limit-bio' into 'develop'rinpatch5+30-18
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'Haelwenn3+46-12
Merge branch 'feature/nicer-safe-render-errors' into 'develop'kaniini1+2-2
Merge branch 'test/web_activity_pub_relay' into 'develop'kaniini2+76-3
Merge branch 'test/web_mastodon_api' into 'develop'kaniini4+243-65
Merge branch 'feature/remove-disable-blocks' into 'develop'kaniini4+3-6
Merge branch 'update/admin-fe' into 'develop'rinpatch31+88-78
Merge branch 'chore/changelog-update' into 'develop'rinpatch1+1-0
Merge branch 'fix/fix-type-depth' into 'develop'rinpatch1+6-4
Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'kaniini3+21-6
Merge branch 'fix/hide-follows-counters' into 'develop'kaniini3+37-2
Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'kaniini5+98-40
Merge branch 'test/pleroma_uploaders' into 'develop'kaniini5+87-2
Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'kaniini3+5-2
Merge branch 'feature/uploader_s3' into 'develop'rinpatch4+100-6
Merge branch 'feature/digest-email' into 'develop'lain33+660-17
Merge branch 'patch-3' into 'develop'rinpatch1+2-2
Merge branch 'fix/object-reembeds' into 'develop'Haelwenn6+7-26
Merge branch 'issue/1150' into 'develop'kaniini5+764-7
Merge branch 'test/common_api_utils.ex' into 'develop'kaniini2+276-43
Merge branch 'report-email-from-remote-user' into 'develop'kaniini3+15-2
Merge branch 'feature/relay-list-task' into 'develop'kaniini2+21-0
Merge branch 'fix/wrong-next-key-likes-json' into 'develop'kaniini3+55-6
Merge branch 'patch-2' into 'develop'kaniini1+1-1
Merge branch 'remove-longfox-emoji-set' into 'develop'kaniini30+3-28
Merge branch 'develop' into 'develop'kaniini2+3-3
Merge branch 'bugfix/password-reset-link-styling' into 'develop'kaniini1+5-0
Merge branch 'patch-2' into 'develop'kaniini1+1-1
Merge branch 'admin-fixes' into 'develop'kaniini4+52-5
Merge branch 'fix/search-space-error' into 'develop'kaniini2+13-1
Merge branch 'fix/with-reject-nil-clause' into 'develop'kaniini2+19-0
Merge branch 'official-docker-support' into 'develop'kaniini4+133-0
Merge branch 'docfix/mix_task_options' into 'develop'Haelwenn1+2-2
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'feld4+51-56
Merge branch 'feature/hide-follows-remote' into 'develop'lain12+326-89
Merge branch 'fix/semver-violations' into 'develop'kaniini2+19-5
Merge branch 'cleanup-tests' into 'develop'rinpatch1+3-0
Merge branch 'chore/changelog-update' into 'develop'kaniini1+1-0
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'kaniini2+12-0
Merge branch 'test/web_common_api_utils' into 'develop'kaniini4+41-1
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'kaniini6+63-11
Merge branch 'test/twitter/util_controller' into 'develop'kaniini4+505-95
Merge branch 'admin-changes' into 'develop'kaniini6+74-1
Merge branch 'security/remote-follow-commonapi' into 'develop'kaniini1+2-5
Merge branch 'revert-83508418' into 'develop'kaniini2+5-8
Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'Haelwenn2+8-5
Merge branch 'refactor/use-constants' into 'develop'lain28+107-90
Merge branch 'mailer-enabled-nodeinfo' into 'develop'kaniini2+2-0
Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'kaniini3+17-1
Merge branch 'tests/ostatus_controller' into 'develop'kaniini2+570-200
Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'kaniini3+60-14
Merge branch 'confirmation-resend' into 'develop'kaniini6+72-1
Merge branch 'fix/user_update_and_set_cache' into 'develop'kaniini2+25-1
Merge branch 'develop' into 'develop'kaniini1+1-1
Merge branch 'feature/hackney-303-redirect' into 'develop'kaniini1+1-0
Merge branch 'issue/1097' into 'develop'rinpatch3+81-65
Merge branch 'changelog/1484-base_url-remove-media' into 'develop'Haelwenn1+1-0
Merge branch 'tests/filter_dedupe' into 'develop'kaniini1+1-1
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'kaniini5+43-6
Merge branch 'fix/put-correct-activity-url' into 'develop'kaniini6+83-1
Merge branch 'fix/Upload_base_url' into 'develop'kaniini2+36-19
Merge branch 'tests/web_finger' into 'develop'kaniini7+141-24
Merge branch 'domain-blocking-relationship-api' into 'develop'kaniini4+28-10
Merge branch 'develop' into 'develop'lain2+24-0
Merge branch 'Fix-static-dir-doc' into 'develop'kaniini2+53-27
Merge branch 'feature/admin-api-user-statuses' into 'develop'kaniini7+110-6
Merge branch 'bugfix/rich-media-splice-url' into 'develop'kaniini4+17-13
Merge branch 'chore/update-mix-lock' into 'develop'kaniini1+4-4
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'kaniini1+0-13
Merge branch 'admin-config-fix' into 'develop'kaniini4+26-4
Merge branch 'tests/activity_pub_publisher' into 'develop'kaniini7+198-131
Merge branch 'bugfix/unauthed-liked-by' into 'develop'kaniini2+30-0
Merge branch 'patch-2' into 'develop'kaniini1+1-1
Merge branch 'fix/subscriber-notifications' into 'develop'kaniini2+29-0
Merge branch 'bugfix/http-signatures-misskey' into 'develop'Haelwenn2+27-9
Merge branch 'tests/skip-some-tests-on-mac' into 'develop'kaniini3+17-28
Merge branch 'changelog' into 'develop'kaniini1+3-0
Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'kaniini7+244-18
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'Haelwenn3+154-2
Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'kaniini3+68-11
Merge branch 'tests/improve-test-coverage' into 'develop'kaniini5+139-44
Merge branch 'hide-blocked-from-interaction' into 'develop'kaniini2+44-2
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'kaniini2+3-2
Merge branch 'bugfix/sharedinbox-path-first' into 'develop'kaniini1+6-6
Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'kaniini2+2-1
Merge branch 'tests/mock-sha512-crypt' into 'develop'kaniini5+75-39
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'feld3+6-2
Merge branch 'feature/richmedia-ttl' into 'develop'kaniini8+222-1
Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'kaniini1+18-0
Merge branch 'refactor/http-signature-plug' into 'develop'kaniini8+153-50
Merge branch 'issue/1110' into 'develop'kaniini2+79-17
Merge branch 'patch-2' into 'develop'rinpatch1+3-3
Merge branch 'tests/authentication_plug' into 'develop'kaniini2+35-13
Merge branch 'feature/signed-object-fetches' into 'develop'kaniini6+80-6
Merge branch 'tests/uploads' into 'develop'kaniini5+147-15
Merge branch 'fix-howto_mediaproxy' into 'develop'kaniini1+3-1
Merge branch 'patch-2' into 'develop'kaniini1+1-0
Merge branch 'patch-3' into 'develop'kaniini1+8-0
Merge branch 'feature/instance-fetch-actor' into 'develop'kaniini11+103-17
Merge branch 'feature/http-signatures-keyid' into 'develop'kaniini4+22-11
Merge branch 'password-reset-fix-for-non-test-env' into 'develop'kaniini5+10-8
Merge branch 'feature/mention-mrf' into 'develop'kaniini4+121-0
Merge branch 'feature/1078-password-reset' into 'develop'kaniini8+90-6
Merge branch 'tests/upload_filters' into 'develop'kaniini7+186-29
Merge branch '1094-relation-actions-rate-limiting' into 'develop'kaniini3+12-0
Merge branch 'add-deactivated-to-account-view' into 'develop'kaniini4+16-0
Merge branch 'add-blocked-by-to-relationship' into 'develop'kaniini3+85-19
Merge branch 'feature/addressable-lists' into 'develop'kaniini1+1-1
Merge branch 'bugfix/poll-id-as-string' into 'develop'rinpatch3+3-3
Merge branch 'match-file-name' into 'develop'feld2+17-1
Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'feld6+0-6
Merge branch 'tests/mastodon-common-api' into 'develop'kaniini6+289-50
Merge branch 'fix/1091-notifications-query' into 'develop'kaniini1+1-1
Merge branch 'sha512-crypt' into 'develop'kaniini4+21-6
Merge branch 'update-tzdata' into 'develop'kaniini2+4-3
Merge branch 'admin-configure-atom-keys' into 'develop'kaniini4+59-20
Merge branch 'tests/http_signature' into 'develop'kaniini4+116-24
Merge branch 'feature/addressable-lists' into 'develop'kaniini18+374-54
Merge branch 'tests/media_proxy' into 'develop'kaniini7+351-267
Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'kaniini3+17-1
Merge branch 'security/ir-generic-containment' into 'develop'kaniini5+46-0
Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'kaniini1+0-403
Merge branch 'bugfix/llal-object-containment' into 'develop'kaniini3+65-7
Merge branch 'feature/1072-muting-notifications' into 'develop'kaniini13+390-64
Merge branch 'rich_media_parsers_configurable' into 'develop'kaniini4+13-8
Merge branch 'feature/mrf-transparency-filter' into 'develop'kaniini5+51-1
Merge branch '1041-status-actions-rate-limit' into 'develop'kaniini6+155-27
Merge branch 'fix/hackney-global-options' into 'develop'Haelwenn5+8-7
Merge branch 'fix/ap-hide-follows' into 'develop'Haelwenn6+160-32
Merge branch 'tests/web_metadata' into 'develop'kaniini5+185-42
Merge branch 'fix/pleroma-extensions' into 'develop'kaniini4+17-18
Merge branch 'url-parser-proxy' into 'develop'kaniini2+5-18
Merge branch 'search-limit-offset-type' into 'develop'kaniini8+193-62
Merge branch 'admin-configure' into 'develop'kaniini7+665-274
Merge branch 'fix/1019-refactor' into 'develop'kaniini17+132-342
Merge branch 'chore/mailmap' into 'develop'kaniini1+2-0
Merge branch 'fix/1005-idna-domains' into 'develop'kaniini6+133-3
Merge branch 'features/mastoapi-emoji-categories' into 'develop'Haelwenn3+5-1
Merge branch 'feature/render-mentions-for-tags' into 'develop'kaniini4+73-5
Merge branch 'localization' into 'develop'kaniini31+1544-243
Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'kaniini3+168-94
Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'rinpatch1+12-13
Merge branch 'feature/disable_send_emails' into 'develop'kaniini10+200-8
Merge branch 'feature/send-delete-user-activity' into 'develop'kaniini6+152-34
Merge branch 'release/listener' into 'develop'kaniini4+105-71
Merge branch 'fix/license-attribution' into 'develop'kaniini64+256-0
Merge branch 'tests/mrf_policy' into 'develop'kaniini14+524-97
Merge branch '878-activity-object-decoupling-in-tests' into 'develop'rinpatch17+168-137
Merge branch 'docs/more-mastodon-api' into 'develop'kaniini2+9-1
Merge branch 'feature/allow-user-query-via-id' into 'develop'kaniini3+5-4
Merge branch 'remove-avatar-header' into 'develop'kaniini6+237-0
Merge branch 'fix/1019-correct-count-remote-users' into 'develop'kaniini16+564-7
Merge branch 'remove-swift' into 'develop'kaniini85+67-190
Merge branch 'test-coverage' into 'develop'kaniini13+901-386
Merge branch 'features/sec-websocket-protocol-header' into 'develop'kaniini3+21-4
Merge branch 'enable-ogp-by-default' into 'develop'Haelwenn5+26-2
Merge branch 'proxy-error' into 'develop'feld2+25-33
Merge branch 'test-speedup' into 'develop'Haelwenn9+70-10
Merge branch '161-incoming-replies-depth-limit' into 'develop'rinpatch11+187-83
Merge branch 'fix/966-local-user-search' into 'develop'lain2+36-1
Merge branch 'fix/relationships-in-statuses' into 'develop'Haelwenn3+38-2
Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'rinpatch1+1-1
Merge branch 'issue/1043' into 'develop'Haelwenn5+252-190
Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'rinpatch2+5-1
Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop'feld1+18-6
Merge branch 'handle-search-timeout' into 'develop'rinpatch2+15-4
Merge branch '1048-semver-format-compliance' into 'develop'Haelwenn2+31-22
Merge branch 'admin-report-view-user-fallback' into 'develop'kaniini2+19-1
Merge branch 'fix/changelog' into 'develop'rinpatch1+2-2
Merge branch 'fix/docs-dry-run' into 'develop'Haelwenn1+2-2
Merge branch 'ci-improvements' into 'develop'Haelwenn2+10-0
Merge branch 'chore/changelog-update' into 'develop'Haelwenn2+7-1
Merge branch 'issue/1033' into 'develop'feld70+151-103
Merge branch 'filter-user-statuses-by-hashtag' into 'develop'rinpatch3+19-0
Merge branch 'issues/1026' into 'develop'rinpatch5+58-6
Merge branch 'fix/pin-unlisted' into 'develop'Haelwenn3+9-2
Merge branch 'my-develop' into 'develop'rinpatch1+1-1
Merge branch 'revert/tags-releases-develop' into 'develop'rinpatch1+1-1
Merge branch 'fix/no-untagged-builds-master' into 'develop'rinpatch1+1-1
Merge branch 'fix/release-docs-path-warning' into 'develop'rinpatch1+2-0
Merge branch 'patch-3' into 'develop'rinpatch1+1-1
Merge branch 'patch-2' into 'develop'rinpatch1+1-1
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'kaniini4+100-28
Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'kaniini4+106-0
Merge branch 'develop' into 'develop'rinpatch6+36-32
Merge branch 'release/1.0' into 'develop'lain2+2-2
Merge branch 'release-docs' into 'develop'lain9+494-23
Merge branch '2019-06-29-pleromafe' into 'develop'lain10+93-93
Merge branch 'fix/syslog-tag' into 'develop'kaniini2+2-1
Merge branch 'idempotency-plug' into 'develop'kaniini4+200-23
Merge branch 'fix/admin-configure' into 'develop'kaniini4+15-7
Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'rinpatch336+490-473
Merge branch 'fix/handle-wrong-visibility-error' into 'develop'Haelwenn3+171-167
Merge branch 'refactoring/fix_render_view' into 'develop'kaniini1+1-1
Merge branch 'feature/configurable-pack-extensions' into 'develop'kaniini4+7-2
Merge branch 'issues/1016' into 'develop'rinpatch8+102-30
Merge branch 'issues/184' into 'develop'kaniini16+205-123
Merge branch 'feature/rework-user-deletion' into 'develop'kaniini5+99-38
Merge branch 'conversation-update-on-dm-delete' into 'develop'kaniini2+124-1
Merge branch 'modify-config.md-for-S3' into 'develop'rinpatch1+7-0
Merge branch 'update/adminfe' into 'develop'feld24+87-72
Merge branch 'bind-to-localhost' into 'develop'kaniini2+2-0
Merge branch 'rich_media_titles_two' into 'develop'kaniini4+1552-8
Merge branch 'admin-config' into 'develop'kaniini13+400-70
Merge branch 'docs/remove-tootdon' into 'develop'Haelwenn1+0-7
Merge branch 'feature/rum-config-generator' into 'develop'Haelwenn3+20-2
Merge branch 'mix_sem_ver_version_fix' into 'develop'rinpatch1+1-1
Merge branch 'fix/ecto-tasks-release' into 'develop'rinpatch5+20-1
Merge branch 'bugfix/simple-notifications-for-non-create-activities' into 'develop'rinpatch1+8-2
Merge branch 'chore/update-bbcode' into 'develop'kaniini2+2-2
Merge branch 'fix/fallback-config' into 'develop'rinpatch1+1-1
Merge branch 'feature/mrf-anti-link-spam' into 'develop'kaniini4+190-0
Merge branch 'fix/use-config-when-possible' into 'develop'rinpatch1+5-1
Merge branch 'oauth_secure_redirect' into 'develop'kaniini2+153-43
Merge branch 'revert-6f5a0cc1' into 'develop'kaniini3+8-59
Merge branch 'fix-rate-limit-test' into 'develop'kaniini1+2-2
Merge branch 'move-sample-configs' into 'develop'rinpatch4+6-5
Merge branch 'fix/config-gen-releases' into 'develop'rinpatch13+207-187
Merge branch 'fix/dynamic-configuration' into 'develop'lain5+8-7
Merge branch 'feature/release-update-script' into 'develop'rinpatch4+123-29
Merge branch 'user_sign_out_mix_task' into 'develop'rinpatch1+19-0
Merge branch 'logger-level-for-migration-tasks' into 'develop'rinpatch7+210-7
Merge branch 'begone-the-dot-hack' into 'develop'rinpatch3+16-10
Merge branch 'fix/rich-media-hashtags-again' into 'develop'lain2+17-1
Merge branch 'update-frontend-c4fcdc71' into 'develop'lain41+565-216
Merge branch 'deps/update-auto-linker' into 'develop'lain4+7-3
Merge branch 'fix/mastoapi-sanitize-display-name' into 'develop'lain3+11-1
Merge branch 'feature/pleroma-ctl-rpc' into 'develop'Haelwenn1+11-4
Merge branch 'removing-test-errors' into 'develop'rinpatch4+38-4
Merge branch 'fix/sanitize-report-content' into 'develop'Haelwenn2+107-1
Merge branch 'issues/570' into 'develop'rinpatch6+130-31
Merge branch 'fix/991-version-generation' into 'develop'rinpatch1+14-2
Merge branch 'fix-for-new-isntances' into 'develop'lain1+2-1
Merge branch 'bugfix/980-polls-double-vote' into 'develop'lain1+15-1
Merge branch 'update/phoenix-and-plug' into 'develop'lain3+6-12
Merge branch '963_oob_oauth_redirect_fix' into 'develop'kaniini5+133-61
Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'rinpatch5+25-3
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'rinpatch7+332-274
Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'kaniini32+940-52
Merge branch 'fix-rate-limit-test' into 'develop'rinpatch1+1-1
Merge branch 'fix/hashtag-rich-media' into 'develop'lain2+54-1
Merge branch 'issues/948-account-search' into 'develop'lain8+300-181
Merge branch 'patch-2' into 'develop'lain1+4-0
Merge branch '986-document-how-to-disable-rate-limiting' into 'develop'lain1+9-2
Merge branch 'feature/ci-release-build' into 'develop'lain1+102-0
Merge branch 'release-move-out-application-dir' into 'develop'lain1+3-0
Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop'rinpatch1+2-2
Merge branch 'remove-prometheus-nif' into 'develop'rinpatch2+0-2
Merge branch 'fix/ogp-title' into 'develop'lain3+59-8
Merge branch 'improve-410-handling' into 'develop'lain2+32-5
Merge branch 'release-config-import' into 'develop'lain1+15-0
Merge branch 'chore/tagpolicy_docs' into 'develop'lain1+1-0
Merge branch 'update_auto_linker' into 'develop'lain3+3-3
Merge branch 'remove-search-result-order' into 'develop'lain1+1-2
Merge branch 'improve-local-content-limit' into 'develop'kaniini7+58-38
Merge branch 'better-default-parameters-for-suggestion' into 'develop'lain2+5-5
Merge branch 'feature/rate-limiter' into 'develop'lain12+218-125
Merge branch 'update-plug' into 'develop'lain1+1-1
Merge branch 'change-containment-default' into 'develop'kaniini3+4-2
Merge branch 'preload-changes' into 'develop'kaniini2+5-2
Merge branch 'fix/warnings-in-migration' into 'develop'lain1+0-20
Merge branch 'feature/releases' into 'develop'lain13+213-57
Merge branch 'issue/media-proxy-whitelist' into 'develop'lain2+91-26
Merge branch 'prod-loglevel-warn' into 'develop'lain2+2-1
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'lain2+17-1
Merge branch 'bugfix/959-emoji-loading' into 'develop'rinpatch1+3-1
Merge branch 'fix/replace-mix-env' into 'develop'kaniini8+13-9
Merge branch 'fix/mix-tasks-ensure-no-endpoints-are-served' into 'develop'kaniini1+2-1
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'kaniini1+120-85
Merge branch 'fix-search' into 'develop'rinpatch3+32-2
Merge branch 'improve-search' into 'develop'rinpatch7+72-10
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'kaniini9+143-35
Merge branch 'improve-search' into 'develop'kaniini10+305-178
Merge branch 'fix-stuck-follows' into 'develop'rinpatch4+120-60
Merge branch 'oauth_consumer_support_code' into 'develop'lain4+36-3
Merge branch 'explicit-addressing' into 'develop'kaniini9+191-12
Merge branch 'remove-tag-warning' into 'develop'Haelwenn1+2-1
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'Haelwenn2+14-0
Merge branch 'issue/941' into 'develop'lain17+249-40
Merge branch 'emoji-loader-fix' into 'develop'Haelwenn1+13-1
Merge branch 'fix/fetch-votes-restrict-create' into 'develop'lain3+54-7
Merge branch 'fix/poll-performance' into 'develop'kaniini1+1-1
Merge branch 'feature/nodeinfo-polls' into 'develop'kaniini1+2-0
Merge branch 'feature/mrf-subchain' into 'develop'kaniini6+95-2
Merge branch 'fix/mock-errors-in-tests' into 'develop'kaniini2+26-0
Merge branch 'generic-fe-settings' into 'develop'kaniini7+108-3
Merge branch 'ueberauth_config_extension' into 'develop'kaniini3+24-9
Merge branch 'update-oauth-template-css-fix' into 'develop'kaniini4+73-25
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'kaniini1+7-0
Merge branch 'fix/tag-timeline-missing-index' into 'develop'lambda1+8-0
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'rinpatch21+1015-60
Merge branch 'fix-dokku' into 'develop'rinpatch1+1-2
Merge branch 'align-mastodon-conversations' into 'develop'lambda2+11-2
Merge branch 'chore/ci-speedup' into 'develop'rinpatch1+1-2
Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'kaniini1+2-4
Merge branch 'feature/notification-control-part-2' into 'develop'kaniini8+84-42
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'kaniini2+7-0
Merge branch 'bugfix/remove-others-follower-collections' into 'develop'kaniini3+86-24
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'kaniini6+5-96
Merge branch 'add-missing-mock' into 'develop'kaniini1+2-0
Merge branch 'dokku' into 'develop'Haelwenn5+77-0
Merge branch 'doc/mongoose-im-config' into 'develop'feld1+932-0
Merge branch 'fix/mastodon-user-search' into 'develop'lambda1+1-1
Merge branch 'hotfix/leaking-lists' into 'develop'lambda5+88-17
Merge branch 'fix/install-guide' into 'develop'feld2+2-2
Merge branch 'fix/install-guide' into 'develop'feld9+9-9
Merge branch 'fix/ogp-missing-data' into 'develop'feld8+87-23
Merge branch 'use-pleroma-config' into 'develop'lambda18+78-149
Merge branch 'revert-57e58d26' into 'develop'kaniini1+6-14
Merge branch 'fix/mastodon-search-limit' into 'develop'lambda1+1-1
Merge branch 'issue/936' into 'develop'lambda1+96-80
Merge branch 'feature/search-authenticated-only' into 'develop'kaniini1+14-6
Merge branch 'varnish-improvements' into 'develop'feld1+35-35
Merge branch 'respect-proxy-settings-federation' into 'develop'kaniini1+2-0
Merge branch 'refactor/die-httpoison-die' into 'develop'lambda15+29-67
Merge branch 'fix/mrf-simple' into 'develop'kaniini3+20-2
Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'kaniini2+16-66
Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'kaniini2+7-5
Merge branch 'feature/static-headers' into 'develop'kaniini2+37-2
Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'lambda3+10-4
Merge branch 'feature/mrf-user-filter' into 'develop'kaniini7+133-9
Merge branch 'ssh-fixes' into 'develop'kaniini3+4-3
Merge branch 'fix/prune-objects-times-out' into 'develop'rinpatch1+1-1
Merge branch 'issue/699' into 'develop'lambda8+132-21
Merge branch 'feature/object-pruning' into 'develop'lambda7+97-3
Merge branch 'bring-ecto-back-to-mainline' into 'develop'lambda2+2-5
Merge branch 'refactor/keys' into 'develop'lambda14+133-124
Merge branch 'bugfix/account_view_source.note' into 'develop'rinpatch2+4-4
Merge branch 'mongooseim-support' into 'develop'kaniini6+118-0
Merge branch 'fix/api-fallback' into 'develop'kaniini4+62-2
Merge branch 'bugfix/dm-being-truncated' into 'develop'kaniini2+10-1
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'kaniini2+2-1
Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'kaniini1+11-8
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'kaniini6+61-3
Merge branch 'feature/user-configurable-mascot' into 'develop'kaniini10+197-1
Merge branch 'doc/mrf-simple-report-removal' into 'develop'kaniini1+6-3
Merge branch 'feature/mrf-simple-report-filtering' into 'develop'kaniini3+41-1
Merge branch 'feature/mrf-always-nsfw' into 'develop'rinpatch6+50-5
Merge branch 'feature/http-ua-header-always' into 'develop'Haelwenn4+13-2
Merge branch 'rum-index' into 'develop'rinpatch6+105-12
Merge branch 'ecto_sql_update' into 'develop'lambda5+12-9
Merge branch 'update-tzdata' into 'develop'lambda1+1-1
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'lambda1+1-1
Merge branch 'fix/902-random-compile-failing' into 'develop'rinpatch15+36-35
Merge branch 'fix/mrf-tag-typo' into 'develop'kaniini3+194-2
Merge branch 'feature/890-add-report-uri' into 'develop'kaniini7+126-84
Merge branch 'feature/task-update-following' into 'develop'feld6+110-3
Merge branch 'feature/admin-api-reports' into 'develop'feld16+945-20
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'feld3+40-10
Merge branch 'conversations-import' into 'develop'rinpatch8+79-10
Merge branch 'feature/sql-thread-sat' into 'develop'lambda9+105-42
Merge branch 'feature/896-toggling-confirmation' into 'develop'rinpatch6+80-2
Merge branch 'docs/update_debian_instructions' into 'develop'kaniini2+4-2
Merge branch 'chore/docs-update' into 'develop'kaniini1+4-4
Merge branch 'fix/slow-federation' into 'develop'kaniini1+1-1
Merge branch 'fix/public-option-not-working' into 'develop'kaniini4+108-7
Merge branch 'chore/extricate-http-signatures' into 'develop'lambda11+49-309
Merge branch 'prevent-public-answers' into 'develop'kaniini6+81-41
Merge branch 'cleanup' into 'develop'lambda1+1-2
Merge branch 'ci/coverage' into 'develop'lambda3+5-1
Merge branch 'legacy-fe-config' into 'develop'rinpatch5+6-80
Merge branch 'fix/raise-registration-api-ratelimit' into 'develop'lambda3+9-7
Merge branch 'fix-the-build' into 'develop'lambda1+2-2
Merge branch 'fix/gopher' into 'develop'lambda1+3-3
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'lambda4+89-55
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'kaniini2+24-2
Merge branch 'refactor/oauth_controller_response' into 'develop'lambda4+136-64
Merge branch 'feature/disable-account' into 'develop'kaniini14+202-37
Merge branch 'changelog/adminfe' into 'develop'rinpatch1+1-0
Merge branch 'bump-mastoapi' into 'develop'kaniini1+1-1
Merge branch 'refactor/jason' into 'develop'kaniini6+13-13
Merge branch 'feature/federator-behaviours' into 'develop'lambda14+378-222
Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'kaniini27+476-66
Merge branch 'filter-irreversible' into 'develop'kaniini4+12-1
Merge branch 'mascot/pleroma-tan-shy' into 'develop'lambda2+8-0
Merge branch 'fix/unfollows-not-working' into 'develop'rinpatch2+39-1
Merge branch 'update-changelog' into 'develop'rinpatch1+1-0
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'kaniini2+23-28
Merge branch 'fix/readme-release' into 'develop'kaniini1+1-1
Merge branch 'uniform-admin-api-url' into 'develop'kaniini3+74-54
Merge branch 'feature/adminfe' into 'develop'Haelwenn63+831-1
Merge branch 'fix/retweet-language' into 'develop'lambda2+3-3
Merge branch 'improve/gitignore' into 'develop'Haelwenn1+4-0
Merge branch 'feature/761-add-users-filtration' into 'develop'kaniini10+551-256
Merge branch 'fix/851-emoji-redirect-follow' into 'develop'lambda1+12-4
Merge branch 'refactor/oauth_scopes' into 'develop'lambda5+86-35
Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'kaniini8+106-33
Merge branch 'docs/MRF-modules' into 'develop'kaniini14+28-3
Merge branch 'conversations_three' into 'develop'lambda16+710-34
Merge branch 'unused-config-parameter' into 'develop'rinpatch2+3-5
Merge branch 'fix/ex_doc-source-links' into 'develop'rinpatch1+3-3
Merge branch 'issue_800' into 'develop'lambda15+564-89
Merge branch 'feature/bbs' into 'develop'lambda8+275-2
Merge branch 'feature/845-improve-status-deletion' into 'develop'lambda9+40-21
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'rinpatch1+8-8
Merge branch 'fix-search-speed' into 'develop'rinpatch5+38-1
Merge branch 'bugfix/emoji-size' into 'develop'lambda16+139-32
Merge branch 'fix/replace-ws' into 'develop'lambda2+2-3
Merge branch 'iss-849' into 'develop'lambda3+32-1
Merge branch 'support/oauth' into 'develop'lambda5+96-40
Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'rinpatch1+0-8
Merge branch 'features/download-mastofe-build' into 'develop'lambda1+45-0
Merge branch 'bugfix/web-notification-special-char' into 'develop'lambda2+32-5
Merge branch 'harmonize_return_types_in_user_module' into 'develop'lambda10+54-46
Merge branch 'docs/fix-config.md' into 'develop'rinpatch1+28-12
Merge branch 'update_auto_linker' into 'develop'rinpatch2+2-2
Merge branch 'fix/stream_out-normalize-only-creates' into 'develop'rinpatch1+2-1
Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop'rinpatch1+1-1
Merge branch 'fix-webpush' into 'develop'rinpatch2+57-39
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'rinpatch3+14-0
Merge branch 'fix/uploads-folder-issues' into 'develop'kaniini2+3-1
Merge branch 'regression/rights-only-for-admin' into 'develop'kaniini2+13-10
Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'kaniini5+54-10
Merge branch 'feature/bbcode' into 'develop'kaniini5+41-1
Merge branch 'update/pleroma-fe-20190426' into 'develop'kaniini35+177-115
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'lambda10+182-56
Merge branch 'feature/mastoapi-new-config' into 'develop'kaniini9+234-110
Merge branch 'chore/update-changelog' into 'develop'kaniini1+3-0
Merge branch 'feature/mediaproxy-whitelist' into 'develop'kaniini4+43-20
Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'Haelwenn2+50-4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'kaniini2+96-4
Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop'kaniini7+294-3
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'kaniini4+4-1
Merge branch 'fix/normalize-activities' into 'develop'kaniini6+7-7
Merge branch 'develop' into 'develop'kaniini2+10-0
Merge branch 'add-healthcheck-setting-to-config' into 'develop'kaniini3+10-3
Merge branch 'fix/emoji-task-docs' into 'develop'rinpatch1+4-4
Merge branch 'get-cached-everywhere' into 'develop'kaniini42+255-229
Merge branch 'feature/826-healthcheck-endpoint' into 'develop'kaniini7+120-0
Merge branch 'rework-emoji-management' into 'develop'kaniini144+423-128
Merge branch 'docs/posting_formatted' into 'develop'rinpatch1+1-0
Merge branch '923_oauth_controller_refactoring_p2' into 'develop'lambda2+36-10
Merge branch 'fix/mastoapi-status-view' into 'develop'kaniini4+19-7
Merge branch 'fix/follow-with-reblogs' into 'develop'kaniini4+67-16
Merge branch 'patch-1' into 'develop'kaniini1+1-0
Merge branch 'patch-2' into 'develop'Haelwenn1+296-0
Merge branch 'feature/database-compaction' into 'develop'kaniini37+762-577
Merge branch 'feature/805-server-rendered-rel-me-links' into 'develop'lambda6+38-3
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'lambda10+153-138
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'Haelwenn2+29-0
Merge branch 'fix/mastoapi-search-unauth' into 'develop'kaniini2+8-1
Merge branch 'feature/improve-block-filtering' into 'develop'kaniini2+24-1
Merge branch '788-notify-email-changelog' into 'develop'rinpatch1+1-0
Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini12+133-17
Merge branch 'fix/remote-follow-auth' into 'develop'kaniini4+13-10
Merge branch 'bugfix/relax-spam-protection' into 'develop'Haelwenn3+40-4
Merge branch 'patch-2' into 'develop'kaniini1+22-0
Merge branch 'fix/follow-imports' into 'develop'kaniini2+21-1
Merge branch 'deps/bump-exdoc' into 'develop'rinpatch2+6-6
Merge branch 'remove-footguns' into 'develop'rinpatch2+39-1
Merge branch 'fix/status-reblogged' into 'develop'lambda2+44-7
Merge branch 'unfollow-oneself' into 'develop'lambda2+52-3
Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'lambda10+56-42
Merge branch 'bugfix/registration-email-pattern' into 'develop'rinpatch1+2-0
Merge branch 'docs/archlinux-odbc' into 'develop'kaniini1+1-2
Merge branch 'docs/changelog' into 'develop'Haelwenn3+92-9
Merge branch 'improve-formatter' into 'develop'Haelwenn4+37-14
Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda15+39-22
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'lambda4+38-37
Merge branch 'fix/732-password-align' into 'develop'lambda2+21-9
Merge branch 'ssl_trusted_cert' into 'develop'lambda1+1-1
Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'kaniini4+67-2
Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop'kaniini2+49-2
Merge branch 'fix/hackney_max_body_param' into 'develop'kaniini2+4-2
Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'lambda500+1915-65318
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda14+996-105
Merge branch 'feature/user-status-subscriptions' into 'develop'lambda13+257-2
Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda3+34-14
Merge branch 'hotfix/fix_undefined_summary' into 'develop'kaniini1+16-0
Merge branch 'notification-pleroma-settings' into 'develop'kaniini10+217-14
Merge branch 'mastoapi/plaintext-statuses' into 'develop'rinpatch3+32-7
Merge branch 'bugfix/follower_count' into 'develop'lambda2+19-0
Merge branch 'use-jobs-in-webpush' into 'develop'lambda6+21-45
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda4+11-21
Merge branch 'twitter_oauth' into 'develop'lambda24+1047-121
Merge branch 'feature/697-language-tag-metadata' into 'develop'lambda2+16-1
Merge branch 'feature/770-add-emoji-tags' into 'develop'lambda15+270-28
Merge branch 'scheduled-activities' into 'develop'lambda17+788-10
Merge branch 'fix/deactivated-user-error' into 'develop'feld2+32-0
Merge branch 'fix/failed-legacy-test' into 'develop'feld1+10-8
Merge branch 'feature/prometheus' into 'develop'feld7+87-0
Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'Haelwenn3+90-6
Merge branch 'revert-8607ae68' into 'develop'rinpatch1+1-1
Merge branch 'test-coverage' into 'develop'rinpatch1+1-1
Merge branch 'feature/admin-api-follow' into 'develop'feld4+90-0
Merge branch 'hotfix/html-sanitization' into 'develop'lambda4+22-15
Merge branch 'feature/quack' into 'develop'feld4+28-3
Merge branch 'fix/add-oauth-token-indexes' into 'develop'lambda1+9-0
Merge branch 'features/pleroma-tan-mastofe' into 'develop'lambda1+2-1
Merge branch 'feature/robotstxt' into 'develop'lambda2+36-0
Merge branch 'update-autolinker' into 'develop'lambda2+2-2
Merge branch 'fix/preview-not-working-with-form-data' into 'develop'lambda2+2-2
Merge branch 'fix-slow-relationships' into 'develop'Haelwenn3+34-16
Merge branch 'bugfix/wrong-date-format' into 'develop'lambda2+46-2
Merge branch 'feature/fake-statuses' into 'develop'lambda7+141-27
Merge branch 'bugfix/share-mastodon' into 'develop'lambda6+503-16
Merge branch 'remove-user-activities' into 'develop'lambda4+51-16
Merge branch 'get_by_id' into 'develop'lambda8+19-40
Merge branch 'features/pleroma-tan' into 'develop'lambda7+878-0
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'lambda6+352-235
Merge branch 'get_by_id' into 'develop'lambda29+155-161
Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'lambda3+34-1
Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'lambda1+33-35
Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'rinpatch1+1-0
Merge branch 'fix/default-mail-adapter' into 'develop'lambda1+2-0
Merge branch 'documentation-improvements' into 'develop'lambda6+54-21
Merge branch 'update-readme' into 'develop'rinpatch1+5-3
Merge branch 'fix/job-queue-doc' into 'develop'lambda1+6-1
Merge branch 'pleroma_job_queue' into 'develop'lambda11+24-283
Merge branch 'sayonara-gitlab-wiki' into 'develop'lambda31+2444-149
Merge branch 'feature/deploy-docs' into 'develop'lambda1+37-0
Merge branch 'bugfix/migration-less_replies_count' into 'develop'kaniini1+0-48
Merge branch 'admin-api-user-show' into 'develop'lambda4+62-0
Merge branch 'feature/more-user-filters' into 'develop'lambda7+256-87
Merge branch 'fix-reblog-tests' into 'develop'lambda1+15-1
Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'rinpatch1+7-2
Merge branch 'apps-verify-credentials' into 'develop'lambda4+103-10
Merge branch 'fix/ap-icon' into 'develop'lambda3+42-12
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'lambda2+24-0
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'lambda3+12-10
Merge branch 'replies-count' into 'develop'lambda6+235-1
Merge branch 'refactor/remove-activity-representer' into 'develop'lambda3+46-202
Merge branch 'fix/notification-id-index' into 'develop'rinpatch1+7-0
Merge branch 'bugfix/missing-announces' into 'develop'rinpatch2+24-6
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'kaniini1+9-4
Merge branch 'fix/mastoapi-liked' into 'develop'kaniini1+4-2
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'rinpatch1+18-5
Merge branch 'fix/eldap-warnings' into 'develop'rinpatch2+7-0
Merge branch 'feature/object-normalize-preload' into 'develop'kaniini17+223-52
Merge branch 'hotfix/null-content' into 'develop'rinpatch1+2-0
Merge branch 'safe-mentions' into 'develop'lambda2+26-0
Merge branch 'fix/use-union-all' into 'develop'kaniini2+18-5
Merge branch 'reports/fix-remote-reporting-emails' into 'develop'kaniini1+7-3
Merge branch 'safe-mentions' into 'develop'kaniini9+102-9
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'kaniini10+71-58
Merge branch 'feature/move-search-to-db' into 'develop'kaniini1+39-44
Merge branch 'feature/gopher-dstport' into 'develop'rinpatch2+3-1
Merge branch 'ecto-3-migration' into 'develop'rinpatch16+41-32
Merge branch 'imageoptim' into 'develop'kaniini201+1-1
Merge branch '2019-03-20-update-frontend' into 'develop'lambda34+137-116
Merge branch 'fix/search-users-for-admin' into 'develop'kaniini2+25-15
Merge branch 'bugfix/activitypub-public' into 'develop'kaniini3+89-9
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'kaniini3+10-11
Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'kaniini1+8-0
Merge branch 'masto-api-notifications' into 'develop'kaniini6+204-58
Merge branch 'fix-initial-posts' into 'develop'rinpatch1+4-1
Merge branch 'add-is-seen-mastodon-api-doc' into 'develop'rinpatch1+6-0
Merge branch 'feature/allow-link-rel-attribute' into 'develop'kaniini4+24-2
Merge branch 'feature/federated-flags' into 'develop'kaniini5+91-13
Merge branch 'feature/oauth-me' into 'develop'lambda2+7-3
Merge branch 'feature/reblog-muting' into 'develop'kaniini11+138-4
Merge branch 'bugfix/ldap-test-fix' into 'develop'kaniini1+5-3
Merge branch 'mark-notifications-as-read' into 'develop'kaniini5+62-0
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'kaniini1+19-1
Merge branch 'feature/openldap-support' into 'develop'kaniini6+375-6
Merge branch 'enable-dedupe-by-default' into 'develop'kaniini2+2-2
Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'kaniini3+9-3
Merge branch 'mastoapi/mime_type' into 'develop'Haelwenn3+10-2
Merge branch 'notifications-is-seen' into 'develop'kaniini4+179-50
Merge branch 'robotstxt' into 'develop'kaniini7+192-2
Merge branch 'fix/filename-mangling' into 'develop'kaniini7+70-6
Merge branch 'hotfix/delete-activities' into 'develop'rinpatch1+1-1
Merge branch 'admin-api-account-view-namespace' into 'develop'kaniini3+30-30
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'kaniini2+31-11
Merge branch 'mastofe-content-types' into 'develop'kaniini1+2-1
Merge branch 'unify-accept-reject-unfollow' into 'develop'kaniini4+42-46
Merge branch 'features/add-credo-to-ci' into 'develop'lambda123+381-353
Merge branch 'feature/add-roles-to-users-admin-api' into 'develop'kaniini3+30-10
Merge branch 'masto-api-followers-following' into 'develop'kaniini3+151-4
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'kaniini3+18-3
Merge branch 'add-activity-id-to-push-messages' into 'develop'kaniini1+8-2
Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop'rinpatch1+1-1
Merge branch 'add-local-field-to-status' into 'develop'lambda3+18-3
Merge branch 'feat/style-oauth-login-page' into 'develop'lambda2+130-45
Merge branch 'broadcast-activity-id-on-deletion' into 'develop'lambda6+40-14
Merge branch 'fix/roma-links-clients-md' into 'develop'lambda1+4-4
Merge branch 'patch-2' into 'develop'rinpatch1+6-6
Merge branch 'bugfix/tesla-safety' into 'develop'kaniini5+30-28
Merge branch 'fix-tlsv1.3' into 'develop'kaniini2+15-1
Merge branch 'delete-status' into 'develop'kaniini2+25-1
Merge branch 'fetch-posts-on-first-federation' into 'develop'kaniini5+149-10
Merge branch 'update-mastofe/glitch-soc-2019-03-07' into 'develop'kaniini331+489-461
Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'rinpatch2+24-3
Merge branch 'update/pleroma-fe-20190307' into 'develop'kaniini19+101-70
Merge branch 'bugfix/delete-activity-audience' into 'develop'rinpatch2+23-1
Merge branch 'preserve-link-headers' into 'develop'lambda2+37-0
Merge branch 'chore/merge-search-into-list-users' into 'develop'kaniini5+89-89
Merge branch 'bugfix/connect-src-https' into 'develop'kaniini1+6-3
Merge branch 'bugfix/rel-me_list' into 'develop'kaniini4+29-1
Merge branch 'feature/647' into 'develop'kaniini14+648-220
Merge branch 'features/masto_fe-config' into 'develop'kaniini2+4-1
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'Haelwenn2+9-6
Merge branch 'add-admin-to-node-info' into 'develop'rinpatch2+5-5
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'Haelwenn2+76-0
Merge branch 'feature/add-status-text-to-notifications' into 'develop'kaniini6+98-23
Merge branch 'fix/like-adressing' into 'develop'kaniini2+72-3
Merge branch 'unify-follow' into 'develop'kaniini3+17-22
Merge branch 'dm-visibility-for-blocking-users' into 'develop'kaniini4+72-16
Merge branch 'muting' into 'develop'kaniini1+5-2
Merge branch 'remove-todo-txt' into 'develop'rinpatch1+0-12
Merge branch 'features/bio_rel_me' into 'develop'kaniini7+171-1
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'kaniini10+329-75
Merge branch 'get-follow-requests-sql' into 'develop'kaniini2+21-8
Merge branch 'atomic-note-count-updates' into 'develop'kaniini1+57-32
Merge branch 'count-only-public-statuses' into 'develop'kaniini3+94-2
Merge branch 'remove-follow-request-count' into 'develop'kaniini6+4-53
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'lambda4+54-1
Merge branch 'bugfix/oauth-scopes-join' into 'develop'rinpatch2+8-6
Merge branch 'hotfix/http-date-header' into 'develop'kaniini1+1-1
Merge branch 'default-tags-for-existing-users' into 'develop'kaniini1+9-0
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'lambda1+1-9
Merge branch 'feature/cowboy2' into 'develop'lambda4+31-31
Merge branch 'customizable_auth' into 'develop'href5+57-52
Merge branch 'with-mutes' into 'develop'kaniini10+58-287
Merge branch 'customizable_auth' into 'develop'href4+61-8
Merge branch 'speedup-follow-requests' into 'develop'kaniini2+17-2
Merge branch 'deactivated-in-user-view' into 'develop'kaniini2+14-0
Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'lambda2+73-4
Merge branch 'fix/formatter' into 'develop'kaniini3+20-4
Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'kaniini2+163-63
Merge branch 'auto_linker' into 'develop'kaniini10+213-292
Merge branch 'feature/more-actions-to-admin-api' into 'develop'kaniini4+39-0
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'kaniini1+5-2
Merge branch 'nginx-cfg' into 'develop'Haelwenn1+2-2
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'kaniini1+1-3
Merge branch 'add-apache-cache-config' into 'develop'kaniini1+18-0
Merge branch 'card-handling' into 'develop'kaniini12+195-72
Merge branch 'fix/meck' into 'develop'kaniini1+1-1
Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'href1+11-0
Merge branch 'fix/twittercards' into 'develop'kaniini7+223-72
Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'kaniini2+29-7
Merge branch 'bugfix/httpsig-sign-date' into 'develop'lambda3+11-2
Merge branch 'bugfix/as2-accept-json' into 'develop'lambda3+78-8
Merge branch '2019-02-21-update-frontend' into 'develop'lambda21+1053-77
Merge branch 'feature/improve-error-logging' into 'develop'lambda2+16-4
Merge branch 'feature/reports' into 'develop'kaniini18+347-5
Merge branch 'nicer-share-urls' into 'develop'kaniini2+9-2
Merge branch '468_oauth2_scopes' into 'develop'lambda24+735-219
Merge branch 'muting' into 'develop'lambda9+205-22
Merge branch 'set-activation-status-admin-api' into 'develop'kaniini4+65-0
Merge branch 'set-cache-on-user-tag-update' into 'develop'lambda1+1-1
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'lambda1+6-1
Merge branch 'fix/ap_id-unique_constraint' into 'develop'lambda1+1-0
Merge branch 'feature/jobs' into 'develop'kaniini16+370-152
Merge branch 'patch-image-description' into 'develop'kaniini2+18-2
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'kaniini6+109-1
Merge branch 'features/flavour-switching' into 'develop'kaniini6+95-5
Merge branch 'follow-request-count' into 'develop'kaniini9+91-18
Merge branch 'csv-export' into 'develop'kaniini2+12-1
Merge branch 'docs/add-clients-to-ex_doc' into 'develop'lambda1+1-0
Merge branch 'docker-speedup' into 'develop'lambda2+4-3
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'lambda3+19-2
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'lambda2+49-26
Merge branch 'welcome-message' into 'develop'rinpatch5+56-1
Merge branch 'bugfix/oauth-token-padding' into 'develop'lambda4+12-6
Merge branch 'hellthread-filter-fix' into 'develop'rinpatch3+113-23
Merge branch 'bugfix/actor-containment' into 'develop'rinpatch3+12-4
Merge branch 'bugfix/activitypub-reserialization' into 'develop'lambda2+67-7
Merge branch 'fix/mediaproxy-s3' into 'develop'href2+22-0
Merge branch 'fix/credo-issues-test' into 'develop'kaniini30+109-52
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'Haelwenn2+36-14
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'kaniini4+68-8
Merge branch 'feature/better-login-errors' into 'develop'kaniini2+30-0
Merge branch 'mass-follow-fixes' into 'develop'rinpatch2+6-3
Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'kaniini1+2-0
Merge branch 'bugfix/mdii-uploader' into 'develop'kaniini1+1-1
Merge branch 'feature/csp_mastofe-dev' into 'develop'kaniini2+19-3
Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'Haelwenn1+2-2
Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'Haelwenn1+11-0
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'kaniini2+138-22
Merge branch 'feature/thread-muting' into 'develop'rinpatch9+170-2
Merge branch 'feature/rich-media-limits' into 'develop'lambda1+8-1
Merge branch 'revert-e0de0fcf' into 'develop'lambda4+19-53
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'kaniini371+557-564
Merge branch 'feather_mention' into 'develop'kaniini1+4-0
Merge branch 'fix/credo-issues' into 'develop'kaniini73+396-227
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'kaniini2+6-5
Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'lambda1+5-4
Merge branch 'docs/pleroma-clients' into 'develop'lambda2+84-14
Merge branch 'object-creation' into 'develop'rinpatch4+53-19
Merge branch 'follow-enhancements' into 'develop'kaniini2+12-11
Merge branch 'add-media-path-to-caddy-cache' into 'develop'lambda1+5-0
Merge branch 'feature/keyword-policy' into 'develop'lambda5+222-0
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'lambda1+3-3
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'lambda1+5-4
Merge branch 'oauth2_strengthening' into 'develop'lambda2+9-9
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'kaniini1+0-1
Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'kaniini1+3-3
Merge branch 'rename-followings' into 'develop'kaniini9+27-27
Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn2+59-2
Merge branch 'add-admin-and-moderator-fields' into 'develop'kaniini5+78-9
Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'Haelwenn2+21-1
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch1+2-0
Merge branch '2019-02-06-update-frontend' into 'develop'lambda21+84-77
Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'rinpatch1+4-14
Merge branch 'fix-dm-index' into 'develop'kaniini2+31-1
Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini2+9-0
Merge branch 'testfix/twitter-api' into 'develop'kaniini1+1-1
Merge branch 'feature/split-hide-network-v2' into 'develop'kaniini10+90-45
Merge branch 'bugfix/rich-media-image-nil' into 'develop'kaniini2+7-2
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'lambda1+2-0
Merge branch 'patch-2' into 'develop'lambda1+1-0
Merge branch 'bugfix/rich-media-nil' into 'develop'lambda1+2-0
Merge branch 'feature/mrf-tag' into 'develop'Haelwenn2+173-0
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'rinpatch1+4-1
Merge branch 'mime-riff' into 'develop'kaniini1+9-1
Merge branch 'fix/rich-media-relative-path' into 'develop'rinpatch1+14-3
Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch4+47-11
Merge branch 'mogrify-orient' into 'develop'kaniini2+3-3
Merge branch '589-fix-cache' into 'develop'lambda8+51-19
Merge branch '582_federation_retirement_optimization' into 'develop'kaniini8+178-43
Merge branch 'fix/oauth-page-responsiveness' into 'develop'rinpatch1+2-1
Merge branch 'revert-0a82a7e6' into 'develop'kaniini10+45-88
Merge branch 'hotfix/object-normalize-cache' into 'develop'href1+2-2
Merge branch 'streaming-api-url-fix' into 'develop'href2+5-1
Merge branch 'develop' into 'develop'href3+85-8
Merge branch 'bugfix/get_list_return_404' into 'develop'Haelwenn1+4-1
Merge branch 'feature/split-hide-network' into 'develop'kaniini10+88-45
Merge branch 'serve-sw-pleroma.js' into 'develop'lambda2+2-2
Merge branch 'fix-rich-media-toggle' into 'develop'lambda1+1-1
Merge branch '534_federation_targets_reachability' into 'develop'href24+775-115
Merge branch 'docs/pleroma-api-invite-token' into 'develop'Haelwenn1+1-0
Merge branch 'user-follow-all-unique' into 'develop'kaniini2+23-1
Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda4+4948-13
Merge branch 'develop' into 'develop'kaniini1+1-1
Merge branch 'fix/rich-media-disable-in-config' into 'develop'kaniini3+7-1
Merge branch 'revert-4d3655c4' into 'develop'lambda5+0-1240
Merge branch 'spc-fix-3' into 'develop'kaniini5+1240-0
Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn9+162-11
Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'Haelwenn551+1417-659
Merge branch 'add-wiki-reference-to-readme' into 'develop'kaniini1+28-27
Merge branch 'multiple-hackney-pools' into 'develop'lambda3+3-3
Merge branch '2019-1-30-update-frontend' into 'develop'lambda36+140-93
Merge branch 'multiple-hackney-pools' into 'develop'kaniini8+86-12
Merge branch 'better-following' into 'develop'kaniini3+38-29
Merge branch 'docs/fix-frontend_config' into 'develop'Haelwenn1+1-1
Merge branch 'docs/fix-frontend_config' into 'develop'kaniini1+2-2
Merge branch 'docs/fix-pleroma-api-title' into 'develop'lambda1+1-5
Merge branch 'bugfix/fix-rejects' into 'develop'kaniini2+21-2
Merge branch 'hj-happiness-improvement' into 'develop'kaniini8+159-19
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'Haelwenn17+159-131
Merge branch 'app-list-changes' into 'develop'kaniini1+8-5
Merge branch 'safe-render-activities' into 'develop'Haelwenn1+0-1
Merge branch 'oauth-login-failure-bug' into 'develop'href2+27-1
Merge branch 'patch-2' into 'develop'Haelwenn1+1-1
Merge branch 'notice-404-to-fe' into 'develop'rinpatch2+7-4
Merge branch 'safe-render-activities' into 'develop'lambda3+29-2
Merge branch 'discard-invalid-likes' into 'develop'kaniini1+5-5
Merge branch 'hotfix/favorites-index' into 'develop'kaniini1+8-0
Merge branch 'flake-random-worker-id' into 'develop'kaniini1+3-18
Merge branch 'docs/emoji-endpoint-similarities' into 'develop'rinpatch1+1-0
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'kaniini4+108-4
Merge branch 'features/masto-account-view-rights' into 'develop'Haelwenn2+9-3
Merge branch 'hardening/mastodon-rich-media' into 'develop'Haelwenn1+10-2
Merge branch 'webpush-endpoint-size' into 'develop'kaniini1+9-0
Merge branch 'flake-from-int' into 'develop'kaniini2+5-0
Merge branch 'join-in-preloads' into 'develop'kaniini2+10-3
Merge branch 'features/mastoapi-cards' into 'develop'kaniini6+70-12
Merge branch 'documentation/mastalab' into 'develop'kaniini1+1-0
Merge branch 'bugfix/content_nil_lenght_check' into 'develop'kaniini2+12-1
Merge branch 'oembed_provider' into 'develop'kaniini13+476-22
Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'lambda10+25-25
Merge branch 'fix/tusky-dm' into 'develop'kaniini9+79-52
Merge branch 'classic-flakeids' into 'develop'kaniini21+542-37
Merge branch 'update/pleroma-fe-20190125' into 'develop'kaniini16+67-66
Merge branch 'fix-activity_visibility-autovacuum' into 'develop'kaniini1+37-0
Merge branch 'feature/mrf-anti-followbot' into 'develop'href2+114-0
Merge branch 'fix/hide-network-setting' into 'develop'kaniini2+5-0
Merge branch 's3-namespace' into 'develop'kaniini1+9-1
Merge branch 'fix-info-id' into 'develop'href1+9-0
Merge branch 'rename/pleroma_activity_consistency' into 'develop'lambda20+57-64
Merge branch 'mr/20190122-activity-visibility-update' into 'develop'href1+36-0
Merge branch 'fix/activity_get_by_id' into 'develop'Haelwenn1+4-0
Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'lambda2+12-1
Merge branch 'uploader-controller' into 'develop'kaniini3+63-4
Merge branch 'fix-buggy-test' into 'develop'rinpatch1+2-2
Merge branch 'proxy-no-default-plug-cache' into 'develop'lambda1+18-5
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'lambda2+6-7
Merge branch 'feature/dm-sanity' into 'develop'lambda8+186-4
Merge branch 'bugfix/gen_signing_salt' into 'develop'rinpatch2+4-1
Merge branch '116-send-delete-event' into 'develop'kaniini3+44-10
Merge branch 'add-custom-emoji-test' into 'develop'lambda1+7-0
Merge branch '2019-1-20-update-frontend' into 'develop'lambda20+70-70
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'lambda7+230-41
Merge branch 'bugfix/improve-boost-targeting' into 'develop'kaniini5+32-13
Merge branch '491_full_mentions_in_user_bio' into 'develop'kaniini5+45-15
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'kaniini3+15-5
Merge branch 'bad-copy-paste' into 'develop'kaniini1+1-1
Merge branch 'attachment-links' into 'develop'kaniini4+11-3
Merge branch 'change-mix-location' into 'develop'kaniini1+13-5
Merge branch 'resilient-user-view-2' into 'develop'kaniini4+57-14
Merge branch 'feature/improve-microformats' into 'develop'lambda7+37-27
Merge branch '518_instance_stats_fix' into 'develop'lambda2+24-7
Merge branch 'bugfix/websub-hardening' into 'develop'lambda2+13-0
Merge branch 'bugfix/tesla-query-params' into 'develop'lambda2+9-1
Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'lambda1+3-2
Merge branch 'bugfix/upload_with_question_mark' into 'develop'rinpatch2+22-1
Merge branch 'media-url-escape' into 'develop'rinpatch2+16-1
Merge branch 'load-all-dms' into 'develop'lambda1+0-10
Merge branch 'feature/add-oembed-parser' into 'develop'kaniini5+77-1
Merge branch 'activitypub-likes' into 'develop'kaniini8+200-3
Merge branch 'fix-nginx-caching' into 'develop'kaniini1+3-1
Merge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'kaniini1+29-0
Merge branch 'bugfix/favourites-link-header' into 'develop'lambda2+34-4
Merge branch 'bugfix/pinned-statuses' into 'develop'kaniini2+24-0
Merge branch 'fix-spellign' into 'develop'scarlett1+1-1
Merge branch 'fix-varnish-chunked' into 'develop'kaniini1+51-25
Merge branch 'activitypub-dereference-activity-id' into 'develop'kaniini3+57-14
Merge branch 'feature/add-twitter-card-parser' into 'develop'kaniini6+72-27
Merge branch 'twapi-follower-pagination' into 'develop'kaniini3+83-8
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'Haelwenn2+50-2
Merge branch 'feature/pinned-posts' into 'develop'kaniini19+370-14
Merge branch 'mass-follow' into 'develop'kaniini2+31-4
Merge branch 'dm-optimizations' into 'develop'kaniini3+95-14
Merge branch 'fix-alphasort' into 'develop'kaniini1+21-21
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'rinpatch1+1-1
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'lambda4+20-7
Merge branch 'hotfix/media-proxy-uri' into 'develop'kaniini3+97-12
Merge branch 'autofollow' into 'develop'rinpatch4+38-2
Merge branch 'features/syslog_logger' into 'develop'kaniini4+19-2
Merge branch 'spc-fix-2' into 'develop'kaniini2+10-5
Merge branch 'resilient-user-view' into 'develop'kaniini3+52-1
Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop'lambda2+26-5
Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop'kaniini2+43-1
Merge branch 'fix/user-search-null-name' into 'develop'kaniini2+11-1
Merge branch 'fix_486' into 'develop'kaniini1+8-2
Merge branch 'activitypub-tombstone-fix' into 'develop'kaniini3+29-0
Merge branch 'emoji-in-summary' into 'develop'scarlett4+34-5
Merge branch 'feature/rich-media-cachex' into 'develop'rinpatch2+19-1
Merge branch 'fix/html-cache-content-collision' into 'develop'kaniini3+21-28
Merge branch 'feature/rich-media' into 'develop'kaniini9+179-1
Merge branch 'activitypub-c2s-delete-activity' into 'develop'kaniini2+101-17
Merge branch 'mr/retry-queue-remove-fold' into 'develop'kaniini1+1-2
Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'kaniini1+1-7
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'kaniini1+1-0
Merge branch 'captcha' into 'develop'rinpatch10+125-97
Merge branch 'fix-chat' into 'develop'rinpatch1+13-0
Merge branch 'fix/reserve-media-username' into 'develop'rinpatch1+2-1
Merge branch 'pool-usage' into 'develop'kaniini4+9-12
Merge branch 'configurable-federator' into 'develop'rinpatch4+27-14
Merge branch '2019-1-1-update-frontend' into 'develop'lambda19+69-69
Merge branch 'cleanup/admin-api-useless-if' into 'develop'lambda1+2-7
Merge branch 'features/admin-api-user-views' into 'develop'kaniini3+19-6
Merge branch 'docs/admin-api' into 'develop'kaniini3+105-3
Merge branch 'maintenance/copyright-2019' into 'develop'kaniini137+137-137
Merge branch 'fix/scrubber-cache' into 'develop'lambda6+70-9
Merge branch 'mr/retry-queue' into 'develop'kaniini2+202-24
Merge branch 'activitypub-c2s' into 'develop'kaniini5+186-7
Merge branch 'fix_485' into 'develop'Haelwenn1+1-1
Merge branch '2018-12-29-update-frontend' into 'develop'lambda20+78-74
Merge branch 'carrot-bullying' into 'develop'kaniini4+29-1
Merge branch '483_blocks_import_export' into 'develop'kaniini8+173-19
Merge branch 'support/issue_480' into 'develop'kaniini3+18-4
Merge branch '471_invalid_accounts_rendering' into 'develop'kaniini3+86-61
Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'kaniini1+2-0
Merge branch 'fix/no-attachment-links' into 'develop'kaniini1+1-1
Merge branch 'fix/public-timeline-auth' into 'develop'kaniini2+61-1
Merge branch '396_elixir_1.7' into 'develop'Haelwenn2+3-3
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'kaniini9+53-13
Merge branch 'reserve-user-names' into 'develop'kaniini5+61-3
Merge branch 'feature/exclude_reblogs' into 'develop'kaniini5+74-0
Merge branch 'fix/ci-set-mix-env-globally' into 'develop'Haelwenn1+5-4
Merge branch 'legal-boilerplate' into 'develop'lambda224+896-0
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'lambda7+97-14
Merge branch 'hotfix/activity-without-content' into 'develop'lambda1+5-3
Merge branch 'feature/hellthread-mitigation' into 'develop'kaniini3+23-0
Merge branch 'ci-test-fix' into 'develop'lambda1+2-2
Merge branch '114_email_confirmation' into 'develop'kaniini21+398-24
Merge branch 'support/issue_413' into 'develop'kaniini2+16-9
Merge branch 'fix/readme-md-config-typo' into 'develop'kaniini1+1-1
Merge branch 'readme' into 'develop'kaniini1+4-4
Merge branch 'documentation/copy-pleroma-api' into 'develop'kaniini4+100-3
Merge branch 'userless-admin' into 'develop'kaniini4+78-2
Merge branch 'fix/ci-cache-improved' into 'develop'lambda1+2-0
Merge branch 'fix/formatter-ignore-html-chars' into 'develop'lambda2+15-3
Merge branch 'feature/new-user-routes' into 'develop'lambda1+2-2
Merge branch 'new-routes-integration' into 'develop'lambda19+68-68
Merge branch 'ci-test-fix' into 'develop'lambda1+2-0
Merge branch 'runtime-static-plug' into 'develop'lambda7+107-3
Merge branch '2018-12-17-update-frontend' into 'develop'lambda30+118-103
Merge branch 'fix-test' into 'develop'lambda1+6-1
Merge branch '459_fix_user_profile_crash' into 'develop'lambda1+4-1
Merge branch 'support/issue_449' into 'develop'lambda2+22-1
Merge branch 'captcha' into 'develop'lambda12+288-25
Merge branch 'fix-tags' into 'develop'lambda3+20-3
Merge branch 'test-mix-tasks' into 'develop'lambda5+370-13
Merge branch 'phoenix14' into 'develop'lambda16+500-211
Merge branch 'testfix/webfinger-jrd' into 'develop'lambda2+14-1
Merge branch 'netbsd-script' into 'develop'scarlett1+57-0
Merge branch 'develop' into 'develop'Haelwenn3+114-0
Merge branch 'fix/masto-put-settings' into 'develop'eal3+23-4
Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'eal1+1-0
Merge branch 'bugfix/webfinger-jrd' into 'develop'lambda2+38-0
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'lambda1+6-0
Merge branch 'tests-warning-as-errors' into 'develop'lambda1+1-6
Merge branch 'feature/mix-task-instance-port-specification' into 'develop'lambda2+11-7
Merge branch 'fix/issue_433' into 'develop'href7+49-11
Merge branch '114_email_invites' into 'develop'href7+145-2
Merge branch 'fix/issue_272' into 'develop'href2+49-2
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'href8+154-110
Merge branch 'feature/file-size-checking' into 'develop'href1+8-0
Merge branch '114_user_registration_emails' into 'develop'href13+169-2
Merge branch 'fix/double-rt-or-fav' into 'develop'lambda2+44-2
Merge branch 'fix/qvitter-fav-object' into 'develop'lambda2+9-0
Merge branch '2018-12-13-update-frontend' into 'develop'lambda37+1307-107
Merge branch 'username-underscores' into 'develop'lambda4+23-9
Merge branch 'fix/mix-tasks-set-user-info' into 'develop'lambda1+26-17
Merge branch 'fix/nginx-safari' into 'develop'lambda1+5-0
Merge branch 'support/issue_442' into 'develop'kaniini32+204-184
Merge branch 'new-fe-options' into 'develop'scarlett3+14-2
Merge branch '2018-12-10-update-frontend' into 'develop'lambda19+66-65
Merge branch 'fix_empty_bio_crash' into 'develop'lambda2+23-2
Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'lambda1+9-2
Merge branch 'fix/config-md-typos' into 'develop'lambda1+3-3
Merge branch 'support/bugfix_272' into 'develop'lambda2+66-49
Merge branch 'fix/theora-detection-read-bytes' into 'develop'lambda1+1-1
Merge branch 'anonymize-filter-text' into 'develop'lambda2+27-3
Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'lambda58+240-288
Merge branch 'angristan-docker' into 'develop'Haelwenn1+1-1
Merge branch 'fix/add-upload.ex' into 'develop'lambda1+98-0
Merge branch 'fix/nodeinfo-nil-features' into 'develop'lambda1+22-17
Merge branch 'fix/media-proxy-url-encoded' into 'develop'lambda3+51-2
Merge branch 'fix/typo-relay-ex' into 'develop'lambda1+1-1
Merge branch 'fix/gopher-respect-ip' into 'develop'lambda1+1-1
Merge branch 'media-proxy-follow-redirect' into 'develop'lambda1+1-1
Merge branch '394_user_tags' into 'develop'lambda10+168-7
Merge branch 'emoji-alphabetical-ordering' into 'develop'lambda1+1-1
Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'lambda1+5-1
Merge branch 'fix/typo-in-relay-doc' into 'develop'lambda1+1-1
Merge branch 'fix/add-common.ex' into 'develop'eal1+24-0
Merge branch 'refactor/mix-tasks' into 'develop'kaniini21+568-573
Merge branch 'fix/mastodon-api-settings' into 'develop'kaniini3+10-7
Merge branch 'correct-and-improve-http-options' into 'develop'kaniini8+20-27
Merge branch 're-mrf' into 'develop'kaniini2+41-0
Merge branch 'feature/compat/push-subscriptions' into 'develop'kaniini15+291-10
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'kaniini11+180-46
Merge branch 'follower-hiding' into 'develop'kaniini7+241-13
Merge branch 'dev_vald_fe/data_tag' into 'develop'kaniini7+31-23
Merge branch 'support/oauth_fetch_token' into 'develop'lambda2+112-18
Merge branch 'fix/mix-tasks-userinfo' into 'develop'lambda3+27-23
Merge branch 'bugfix/408' into 'develop'lambda2+13-0
Merge branch 'optional-retry-queue' into 'develop'kaniini1+9-1
Merge branch 'feature/integration_tesla' into 'develop'kaniini37+1067-923
Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'lambda1+1-1
Merge branch 'fix/parse-user-bio' into 'develop'lambda7+64-20
Merge branch 'fix-media-proxy-defaults' into 'develop'lambda1+2-2
Merge branch 'update-pleroma-frontend' into 'develop'kaniini14+60-58
Merge branch 'user_info_fixes_again' into 'develop'Haelwenn4+11-3
Merge branch 'validate-user-info' into 'develop'kaniini46+634-405
Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'lambda1+5-6
Merge branch 'feature/anonymize-filenames' into 'develop'kaniini2+24-0
Merge branch 'feature/reverse-proxy' into 'develop'kaniini31+1217-423
Merge branch 'config-delete' into 'develop'lambda2+29-0
Merge branch 'supervisor-order' into 'develop'lambda2+42-35
Merge branch 'bugfix/server-true-in-prod' into 'develop'kaniini1+0-1
Merge branch 'enable-ci-cache' into 'develop'lambda1+5-0
Merge branch 'fix-list-stream-privacy' into 'develop'lambda2+110-2
Merge branch 'revert-02e43d44' into 'develop'kaniini1+0-2
Merge branch 'chore/mix-lock-update' into 'develop'kaniini1+2-0
Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'kaniini1+1-1
Merge branch 'ogg-theora-detection' into 'develop'kaniini1+7-1
Merge branch 'feature/mrf-user-allowlist' into 'develop'Haelwenn3+42-0
Merge branch 'fix/pleromafe-title' into 'develop'kaniini1+3-1
Merge branch 'bugfix/csp-no-https' into 'develop'kaniini1+5-1
Merge branch 'add-manifest-src-to-csp' into 'develop'Haelwenn1+1-0
Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'kaniini3+84-13
Merge branch 'feature/admin-api' into 'develop'kaniini9+412-14
Merge branch 'feature/improve-version' into 'develop'kaniini6+58-13
Merge branch 'runtime-fixes' into 'develop'kaniini9+26-22
Merge branch 'feature/retry-queue' into 'develop'Haelwenn5+150-25
Merge branch 'fix/mediaproxy-empty-url' into 'develop'kaniini2+117-2
Merge branch 'update/pleroma-fe-20181118' into 'develop'kaniini13+58-58
Merge branch 'security/as2-object-render-hardening' into 'develop'lambda2+52-1
Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop'lambda2+41-3
Merge branch 'security/spoofing-hardening' into 'develop'lambda7+195-17
Merge branch 'security/actor-containment' into 'develop'lambda7+107-7
Merge branch 'feature/uploader-mdii' into 'develop'kaniini2+30-0
Merge branch 'bugfix/dm-timeline-scope' into 'develop'kaniini2+10-3
Merge branch 'feature/pleromafe-usersearch' into 'develop'lambda5+42-2
Merge branch 'bugfix/csp-remove-form-action' into 'develop'kaniini1+0-1
Merge branch 'fix/test' into 'develop'lambda1+2-0
Merge branch 'fix-media-proxy-filename' into 'develop'lambda2+2-2
Merge branch 'update/pleroma-fe-20181114' into 'develop'kaniini16+73-59
Merge branch 'twitter-api-direct-messages' into 'develop'kaniini5+75-2
Merge branch 'media-proxy-safety' into 'develop'lambda3+46-5
Merge branch 'security/cookie-hardening' into 'develop'lambda1+6-1
Merge branch 'add-MIX_ENV-to-systemd-example' into 'develop'lambda1+1-0
Merge branch 'whalebird' into 'develop'lambda1+2-1
Merge branch 'twitter-api-null-display-name' into 'develop'scarlett2+13-2
Merge branch 'feature/csp-plug' into 'develop'kaniini10+155-52
Merge branch 'update-readme' into 'develop'Haelwenn1+3-1
Merge branch 'fix-list-streaming' into 'develop'kaniini1+7-3
Merge branch 'bugfix/corsplug-config' into 'develop'kaniini2+14-10
Merge branch 'bugfix/oauth-padding' into 'develop'kaniini1+3-0
Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'lambda3+71-1
Merge branch 'feature/documentation' into 'develop'kaniini17+198-137
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'kaniini3+46-4
Merge branch 'bugfix/local-jsonld-context' into 'develop'kaniini3+28-3
Merge branch 'tests/prismo-url-map' into 'develop'kaniini4+83-0
Merge branch 'bugfix/no-cc-mentions' into 'develop'lambda7+204-38
Merge branch 'feature/jsonld-context-cleanup' into 'develop'kaniini2+2-13
Merge branch 'small-jsonld-refactor' into 'develop'lambda4+9-22
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'kaniini5+116-0
Merge branch 'runtime-config' into 'develop'kaniini18+191-163
Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'lambda1+6-0
Merge branch 'patch-2' into 'develop'kaniini1+0-1
Merge branch 'unify-mastodon-oauth' into 'develop'kaniini4+52-49
Merge branch 'runtime-router' into 'develop'kaniini11+183-35
Merge branch 'remove-config-agent' into 'develop'lambda7+61-26
Merge branch 'use-the-same-example-domain-and-use-it-as-variable' into 'develop'kaniini3+36-24
Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'kaniini1+1-1
Merge branch 'runtime-emojis' into 'develop'lambda5+205-126
Merge branch 'tests-for-emtpy-content' into 'develop'kaniini1+18-0
Merge branch 'feature/cors-again' into 'develop'kaniini3+4-1
Merge branch 'bugfix/harden_status_output' into 'develop'Haelwenn1+4-4
Merge branch 'hashtag-search-case-sensitivity-test' into 'develop'lambda1+11-2
Merge branch 'fix_hashtag_search' into 'develop'lambda1+1-0
Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'lambda2+17-0
Merge branch 'hotfix/prismo-twitterapi' into 'develop'Haelwenn1+1-1
Merge branch 'feature/as2-page-support' into 'develop'kaniini4+4-4
Merge branch 'bugfix/filter-id' into 'develop'kaniini3+110-11
Merge branch 'feature/relay-tests' into 'develop'kaniini9+125-8
Merge branch 'bugfix/prismo.news_article_url' into 'develop'Haelwenn2+23-1
Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini7+59-15
Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini4+41-5
Merge branch 'bugfix/caching-activity-delete' into 'develop'Haelwenn1+2-1
Merge branch 'bugfix/allow-self-like' into 'develop'kaniini1+0-2
Merge branch 'allow-abbr' into 'develop'kaniini1+2-0
Merge branch 'reactivate' into 'develop'kaniini5+20-5
Merge branch 'feature/upload-limits' into 'develop'kaniini6+103-56
Merge branch 'feature/s3-force-media-proxy' into 'develop'kaniini3+17-4
Merge branch 'bugfix/mediaproxy-leaks-2-electric-boogaloo' into 'develop'kaniini1+2-0
Merge branch 'bugfix/mediaproxy-leaks' into 'develop'kaniini2+5-4
Merge branch 'feature/unsubscribe-user-task' into 'develop'kaniini1+32-0
Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'kaniini1+3-2
Merge branch 'psql-setup-cleanup' into 'develop'kaniini1+2-5
Merge branch 'update-pleroma-frontend' into 'develop'kaniini15+76-56
Merge branch 'feature/broken-thread-filtering' into 'develop'kaniini4+85-1
Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'kaniini1+1-1
Merge branch 'bugfix/fd-exhaustion' into 'develop'kaniini1+2-1
Merge branch 'bugfix/unshared-inbox-check' into 'develop'kaniini1+5-0
Merge branch 'feature/nodeinfo-frontend-config' into 'develop'kaniini1+20-4
Merge branch 'finmoji-optional' into 'develop'kaniini2+10-3
Merge branch 'bugfix/user-inbox-bcc' into 'develop'kaniini4+74-3
Merge branch 'bugfix/ap-uri-user-search' into 'develop'kaniini1+2-0
Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'Haelwenn2+30-6
Merge branch 'feature/add-in-reply-to-profileurl' into 'develop'kaniini5+20-14
Merge branch 'feature/in-reply-to-screen-name' into 'develop'kaniini5+28-0
Merge branch 'update-pleroma-frontend' into 'develop'kaniini14+59-56
Merge branch 'security/add-security-directives-to-systemd-example' into 'develop'kaniini1+10-0
Merge branch 'bugfix/html-scrub-comments' into 'develop'kaniini1+2-4
Merge branch 'new-frontend-options' into 'develop'kaniini2+6-2
Merge branch 'pleroma-list-belongs' into 'develop'eal4+46-0
Merge branch 'bugfix/html-scrub-schemes' into 'develop'kaniini3+34-31
Merge branch 'bugfix/osada-mention' into 'develop'kaniini5+153-1
Merge branch 'import-maybe-direct-follow' into 'develop'Haelwenn1+1-1
Merge branch 'feature/markdown-enable-tags' into 'develop'kaniini1+1-0
Merge branch 'security/clear-oauth-with-password' into 'develop'kaniini5+77-2
Merge branch 'security/fix-local-locked-accounts' into 'develop'kaniini2+19-1
Merge branch 'bugfix/length-enforce-subjects' into 'develop'kaniini1+2-1
Merge branch 'feature/mrf-transparency-opt-out' into 'develop'Haelwenn2+19-14
Merge branch 'security/follow-always-async' into 'develop'kaniini7+53-32
Merge branch 'patch-2' into 'develop'kaniini1+1-1
Merge branch 'update-pleroma-frontend' into 'develop'kaniini13+55-55
Merge branch 'revert-d31bbb1c' into 'develop'kaniini10+93-9
Merge branch 'feature/nodeinfo_federation_info' into 'develop'kaniini1+29-1
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'kaniini1+1-1
Merge branch 'bugfix/magnet-links' into 'develop'Haelwenn2+11-10
Merge branch 'feature/twitter_api/fields' into 'develop'Haelwenn2+43-5
Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'kaniini1+3-0
Merge branch 'security/ap-unsigned-create' into 'develop'kaniini1+17-7
Merge branch 'bugfix/kroeg' into 'develop'kaniini8+185-47
Merge branch 'fix/s3/filenames-with-spaces' into 'develop'kaniini1+5-1
Merge branch 'update/pleroma-fe-20180922' into 'develop'kaniini13+55-55
Merge branch 'feature/html-scrub-policy-tests' into 'develop'kaniini2+82-0
Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'kaniini2+10-5
Merge branch 'feature/rich-text-optout-backend' into 'develop'kaniini10+68-26
Merge branch 'feature/dynamic-user-refresh' into 'develop'kaniini4+47-30
Merge branch 'task-204-on-options-request' into 'develop'kaniini1+8-0
Merge branch 'bump-mastofe-2018-09-20' into 'develop'Haelwenn3069+6204-3199
Merge branch 'feature/mastodon_api_2.5.0' into 'develop'Haelwenn6+15-8
twitter api: fix mimetype fallback when attachments use a URI instead of a URL objectWilliam Pitcock1+1-1
mastodon api: default attachment type to image if one is not presentWilliam Pitcock1+1-1
Merge branch 'fix/fake-filters' into 'develop'Haelwenn2+0-6
Merge branch 'feature/mediaproxy-inline-images' into 'develop'kaniini2+48-3
Merge branch 'feature/mrf-scrub' into 'develop'kaniini3+32-1
Merge branch 'update-pleroma-frontend' into 'develop'kaniini13+55-55
Merge branch 'feature/html-scrub-policy' into 'develop'kaniini9+162-22
Merge branch 'patch-3' into 'develop'Haelwenn2+3-2
Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'kaniini1+3-2
Merge branch 'refactor/mrf-pattern-matching' into 'develop'kaniini2+88-92
Merge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop'kaniini1+7-4
Merge branch 'bugfix/test-circular-reference' into 'develop'kaniini1+7-3
Merge branch 'update/pleroma-fe-20180909' into 'develop'kaniini20+61-65
Merge branch 'suggestion-api-restriction' into 'develop'kaniini3+4-1
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'lambda21+595-240
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'kaniini2+7-2
Merge branch 'improve-server-config-examples' into 'develop'kaniini4+65-23
Merge branch 'feature/custom_media_url' into 'develop'kaniini2+8-2
Merge branch 'fix/tusk' into 'develop'kaniini4+12-2
Merge branch 'fix/test-failure-due-to/306' into 'develop'lambda1+1-1
Merge branch 'fix/sign-in-with-toot' into 'develop'Haelwenn4+18-3
Merge branch 'feature/staff-discovery-api' into 'develop'kaniini4+39-0
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'kaniini11+435-5
Merge branch 'report-chat-and-gopher-support' into 'develop'kaniini1+5-1
Merge branch 'nil-bio-emojis' into 'develop'kaniini2+13-1
Merge branch 'patch-2' into 'develop'Haelwenn1+2-0
Merge branch 'hotfix_broken_likes' into 'develop'kaniini2+29-1
Merge branch 'security/emoji-xss' into 'develop'kaniini4+19-3
Merge branch 'security/activitypub-spoofing' into 'develop'kaniini5+58-0
Merge branch 'feature/disable-config-management' into 'develop'Haelwenn2+35-25
Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'kaniini1+9-29
Merge branch 'verify-credentials-default-scope' into 'develop'kaniini3+28-3
Merge branch 'revert-a26d5e6b' into 'develop'lambda7+7-78
Merge branch 'bugfix/s3-configuration' into 'develop'kaniini1+3-1
Merge branch 'update/pleroma-fe-20180831' into 'develop'kaniini16+62-60
Merge branch 'update/pleroma-fe-config-20180831' into 'develop'kaniini2+4-0
Merge branch 'feature/rich-text' into 'develop'kaniini7+78-7
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'kaniini1+7-0
Merge branch 'backendhack' into 'develop'kaniini10+227-109
migrations: add index creation migration and recipients_to/cc removal migrationWilliam Pitcock2+18-0
activity: drop recipients_to/recipients_cc fieldsWilliam Pitcock2+2-6
migrations: drop filler migrationWilliam Pitcock1+0-25
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.William Pitcock1+4-4
Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop'Haelwenn1+8-2
streamer: contain list updates in the same way as we do with the database queryWilliam Pitcock1+19-2
mastodon api: use bounded AP object graph query to enforce containment of private statusesWilliam Pitcock1+7-2
activitypub: allow querying the activity/object graph bounded to a specific to/cc setWilliam Pitcock1+21-0
test: add testcase proving lists system does not leak non-public postsWilliam Pitcock1+24-0
migrations: add migration to fill in recipients_to/recipients_cc fieldsWilliam Pitcock1+25-0
activity: add recipients_to and recipients_cc fieldsWilliam Pitcock3+31-5
installation/pleroma.nginx: Add Content-Security-PolicyHaelwenn (lanodan) Monnier1+1-0
Merge branch 'feature/s3' into 'develop'kaniini5+70-2
Revert "enable scope options and such"William Pitcock1+2-2
enable scope options and suchWilliam Pitcock1+2-2
formattingWilliam Pitcock1+1-1
user: fix up notification last calculation [NOT related to upstream]William Pitcock1+6-1
Merge branch 'feature/relay' into 'develop'lambda13+202-7
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'lambda3+44-7
Merge branch 'feature/emoji-in-local-users' into 'develop'kaniini5+61-2
Merge branch 'bugfix/formatting' into 'develop'kaniini1+5-2
Merge branch 'tests/notification-smoketests' into 'develop'kaniini1+121-0
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'kaniini1+7-2
Merge branch 'login-with-email' into 'develop'kaniini1+10-2
Merge branch 'update-pleroma-frontend' into 'develop'kaniini36+60-1069
Merge branch 'improve-example-caddyfile' into 'develop'kaniini1+33-5
Merge branch 'remove-unused-settings' into 'develop'kaniini2+0-7
Merge branch 'feature/twitterapi-object-description' into 'develop'kaniini2+8-4
Merge branch 'update/pleroma-fe-20180824' into 'develop'kaniini17+59-58
Merge branch 'feature/tls-sni-support' into 'develop'kaniini1+24-1
Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'kaniini2+30-1
Merge branch 'config/fe-collapse-subject' into 'develop'kaniini2+5-2
Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"kaniini1+1-2
Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'kaniini1+2-1
Merge branch 'fix/suggestions-api-error-handling' into 'develop'kaniini1+8-1
Merge branch 'develop' into 'develop'Haelwenn1+22-0
Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'kaniini2+18-0
Run mix formatHaelwenn (lanodan) Monnier1+2-1
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nilHaelwenn (lanodan) Monnier1+1-1
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videosHaelwenn (lanodan) Monnier1+1-1
Merge branch 'feature/peertube_2' into 'develop'kaniini10+106-32
Merge branch 'sanitize-bio' into 'develop'kaniini2+3-2
Merge branch 'twitter-api-bios' into 'develop'kaniini4+25-16
Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'kaniini1+1-1
Merge branch 'update/pleroma-fe-20180821' into 'develop'kaniini13+23-23
Merge branch 'fix/redirect-on-user-fetch' into 'develop'eal1+1-1
Merge branch 'update/pleroma-fe-20180820' into 'develop'kaniini30+128-113
Merge branch 'update/pleroma-fe-20180818' into 'develop'kaniini17+58-58
Merge branch 'develop' into 'develop'kaniini1+1-1
Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'kaniini1+5-2
Merge branch 'bugfix/mix-lock' into 'develop'kaniini1+9-9
Merge branch 'patch-2' into 'develop'kaniini1+17-17
Merge branch 'dev-lanodan-url-regex' into 'develop'kaniini3+42-6
Merge branch 'mastofe/system-font' into 'develop'kaniini1+1-1
Merge branch 'bugfix/federation-kroeg' into 'develop'kaniini5+95-1
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'kaniini3+48-7
Merge branch 'fix/normalize-file-extension' into 'develop'kaniini3+40-13
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'lambda4+53-1
formattinglain1+4-3
Fix for elixir 1.7.lain1+2-2
update frontendlain30+102-79
Update Mastofe.lain192+363-1606
Merge branch 'feature/invites' into 'develop'lambda6+177-14
Merge branch 'fix/remote-follow-errormessage' into 'develop'lambda1+9-0
Merge branch 'bugfix/gopher-empty-lines' into 'develop'lambda1+2-2
Merge branch 'emoji-in-account-view' into 'develop'lambda4+78-4
Merge branch 'bugfix/fix-gopher-server-i' into 'develop'lambda1+1-1
Merge branch 'bugfix/duplicate-follow-requests' into 'develop'lambda1+1-0
Merge branch 'feature/camelcase-hashtags' into 'develop'lambda1+2-2
Merge branch 'bugfix/digest-legacy-compat' into 'develop'lambda1+5-1
Merge branch 'security/digest-signature-validation' into 'develop'lambda4+29-2
Merge branch 'feature/filter_exif' into 'develop'lambda5+35-2
Merge branch 'tests/plume' into 'develop'lambda5+47-13
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'lambda2+38-6
Merge branch 'feature/fe-configuration' into 'develop'lambda4+36-3
Merge branch 'feature/media-description' into 'develop'lambda6+41-8
Merge branch 'feature/object-normalization' into 'develop'lambda12+28-34
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'lambda1+6-5
Merge branch 'bugfix/activitypub-object-actor' into 'develop'lambda1+18-2
Merge branch 'feature/message-summary' into 'develop'lambda4+8-4
Merge branch 'feature/default-scope' into 'develop'lambda4+24-6
Merge branch 'feature/article-support' into 'develop'lambda6+58-22
Merge branch 'feature/auto-shortcodes' into 'develop'lambda2+24-1
Merge branch 'bugfix/status-url-field' into 'develop'lambda1+1-2
Merge branch 'bugfix/x509-public-key' into 'develop'lambda2+2-2
Merge branch 'features/initial-state_rights' into 'develop'lambda1+3-0
Merge branch 'fix/mutes.json-emptyarray' into 'develop'lambda3+25-0
Merge branch 'feature/configurable-blocks' into 'develop'lambda4+45-7
Merge branch 'feature/application-xml-mime' into 'develop'lambda1+1-0
Merge branch 'features/glitch-soc-frontend' into 'develop'lambda5+67-2
Merge branch 'feature/mrf-simple-accept-lists' into 'develop'lambda3+16-3
Merge branch 'features/column_media_streaming' into 'develop'lambda2+18-2
Merge branch 'bugfix/block-follow-relationships' into 'develop'lambda4+109-5
Merge branch 'feature/exclude-replies-filter' into 'develop'lambda2+18-0
Merge branch 'bugfix/as2-contentmap' into 'develop'lambda3+89-0
Merge branch 'patch-2' into 'develop'lambda1+2-0
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'lambda3+99-3
Merge branch 'bugfix/mastofe_thread_render' into 'develop'eal2+4-4
Fix typolain1+1-1
Merge branch 'fix/missing-file-extension' into 'develop'lambda2+37-5
Merge branch 'fix/mp3-recognition' into 'develop'lambda1+3-0
Merge branch 'patch-2' into 'develop'lambda1+0-1
Merge branch 'bugfix/mrf-orphaning' into 'develop'lambda1+13-8
Merge branch 'feature/twitterapi-unrepeat' into 'develop'lambda9+63-16
Merge branch 'bugfix/oauth2-param-name' into 'develop'lambda1+13-1
Merge branch 'bugfix/oauth-password-with-email' into 'develop'lambda1+1-1
Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'lambda1+30-15
Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'lambda1+1-1
Merge branch 'bugfix/webfinger-refactoring' into 'develop'lambda1+6-24
update frontendlain18+60-58
set_moderator: ensureall applications are started.eal1+1-1
Merge branch 'patch-2' into 'develop'lambda1+0-0
Merge branch 'develop' into 'develop'lambda4+112-44
Merge branch 'feature/list-streaming' into 'develop'lambda6+56-3
Merge branch 'feature/locked-accounts-part-1' into 'develop'lambda12+474-11
Merge branch 'patch-2' into 'develop'lambda1+13-3
Merge branch 'fix/mix-task-caching' into 'develop'eal1+1-1
Merge branch 'feature/domain-blocks' into 'develop'lambda7+115-3
Merge branch 'users' into 'develop'lambda2+17-10
Merge branch 'feature/rejectnonpublic' into 'develop'lambda1+29-0
Merge branch 'mastopost' into 'develop'lambda1+10-1
Merge branch 'bugfix/locked-account-regression' into 'develop'lambda3+27-3
Merge branch 'feature/quarantine' into 'develop'lambda2+16-1
Merge branch 'import' into 'develop'lambda3+52-37
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'lambda3+8-4
Merge branch 'fix/oauth-http-basic' into 'develop'lambda3+156-14
Merge branch 'fix/emoji-picker' into 'develop'eal1+1-0
Merge branch 'develop' into 'develop'lambda1+18-0
Better error handling for OstatusController.lain2+108-37
Better error handling for ActivityPubControllerlain3+11-8
Better error handling for MastodonApiController.lain2+24-4
Better error handling in TwitterApiController.lain5+54-14
Revert "Update Mastofe."lain182+1580-360
Update Mastofe.lain182+360-1580
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+11-5
Fix url guessing attacks.lain4+74-4
Merge branch 'fix/dm-timeline-activities' into 'develop'eal1+3-1
Merge branch 'patch-3' into 'develop'lambda1+1-0
Merge branch 'fix/link-headers' into 'develop'lambda1+32-10
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+6-4
Only return certain activities in TwitterAPI mentions.lain1+5-0
Fix user topic streaming.lain1+1-1
Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into developlain8+158-8
There are no symbols in JSON.lain1+1-1
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into developlain13+327-30
Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'lambda2+9-2
Merge branch 'feature/blocks-deny-refollow' into 'develop'lambda2+29-15
Merge branch 'bugfix/follow-query-overhead' into 'develop'lambda2+15-5
Merge branch 'feature/lists' into 'develop'lambda8+439-2
Merge branch 'feature/incoming-remote-unfollow' into 'develop'lambda18+475-62
update frontendlain9+17-17
Merge branch 'feature/change-password' into 'develop'lambda5+106-6
More efficient queries.lain2+5-3
Don't save double tags in AP objects we createlain2+14-1
Merge branch 'feature/deps-migration' into 'develop'lambda10+42-49
Repair some access-control headers required for third-party webclientsNiklas Poslovski1+2-2
Merge branch 'nipos-develop' into developlain1+1-0
Merge branch 'feature/clarify-http-sig-error' into 'develop'lambda1+1-1
Merge branch 'bugfix/webfinger-statusnet' into 'develop'lambda4+18-1
Actually fix missing alias.lain1+1-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+1-1
Add missing alias.lain1+1-0
More fixes.lain1+2-1
Fix specs.lain1+2-1
update frontendlain38+284-36
Return visilility in twitter api, too.lain2+5-3
Return private / direct posts on user timelines, too.lain4+60-25
update frontendlain9+17-17
Merge branch 'feature/account-deletion' into 'develop'lambda5+66-0
Merge branch 'feature/undo-like-federation' into 'develop'lambda9+125-10
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'lambda4+29-0
Merge branch 'feature/remote-user-deactivation' into 'develop'lambda2+27-0
Fix linking problem.lain2+8-0
Merge branch 'bugfix/hubzilla-compat' into 'develop'lambda11+126-14
Fix User search.lain5+54-13
update frontendlain20+62-57
Fix format.lain1+4-1
Modify sort index for activities.lain1+9-0
Revert "Remove 'unlisted' handling for now."lain2+1-3
Remove 'unlisted' handling for now.lain2+3-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain14+280-26
Unlisted fetching: Reverse logiclain1+1-1
Merge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into developlain2+23-1
Merge branch 'patch-2' into 'develop'lambda1+10-0
Merge branch 'feld-varnish' into 'develop'lambda1+2-3
Merge branch 'feature/chain-policies' into 'develop'lambda5+33-3
Merge branch 'no-self-notification' into 'develop'lambda3+12-2
Merge branch 'patch-1' into 'develop'lambda1+0-1
More warning fixes.lain6+15-7
Merge branch 'feld-varnish' into 'develop'lambda1+2-8
Merge branch 'feld-warnings' into 'develop'lambda30+97-107
Merge branch 'fix/unsafe-variables' into 'develop'lambda5+50-35
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+9-0
Streamer: Don't send out stream events for blocked users.lain2+83-14
Unify wss uri generation.lain1+1-1
Idempotency: Use special cache, keep for 6 hours.lain3+30-7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+69-0
update frontendlain1+2-2
Don't expire idempotency cache for five minutes.lain2+6-0
MastodonAPI: Support idempotency key.lain2+32-3
update frontendlain10+20-19
Fix format.lain2+10-12
Merge branch 'patch-bio' into 'develop'lambda2+18-1
Insert object after being rewritten.lain1+5-3
Merge branch 'fix/blocked-user-boosts' into 'develop'lambda2+23-1
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'lambda1+2-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+1-1
Resurrect instance specific panel.lain1+1-1
Optionally deactivate public timelines.lain2+22-13
Align local bio limits to remote limit.lain1+1-1
Merge branch 'gitignore' into 'develop'lambda1+5-0
Fix formatting.lain1+12-4
Merge branch 'feature/message-rewrite-facility' into 'develop'lambda5+93-2
Update .gitlab-ci.ymllambda1+1-0
Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into developlain3+31-1
Merge branch 'favicon_tag' into 'develop'lambda1+1-1
update frontendlain9+17-17
update frontendlain10+18-18
Small cleanup.lain3+9-3
Merge branch 'develop' into fix/note-count-not-updatinglain2+19-9
Update note count in ActivityPub.create.eal3+15-16
Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'lambda2+3-2
Merge branch 'readme-update' into 'develop'lambda1+10-4
Merge branch 'nginx-certbot-doc' into 'develop'lambda1+10-1
Formatting fixes.lain6+24-11
add formatterlain1+3-0
.lain1+1-3
.lain1+1-0
..lain1+1-0
Update CI.lain1+1-1
Make search use id index too.lain1+1-1
Formatting.lain4+48-22
Add format checking to CI.lain1+6-0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain6+194-3
fix againlain1+1-1
fix againlain1+1-1
Fix generate configlain1+0-8
Revert "Ask for proxy URL if proxy enabled."eal2+1-9
Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'lambda1+1-0
rm_user: also ensure that cache is running.eal1+1-1
Merge branch 'fix/rm-user-task' into 'develop'lambda1+2-2
Merge branch 'fix/login-with-username-or-email' into 'develop'lambda5+11-4
update frontendlain29+192-76
Update README.mdlambda1+4-0
Merge branch 'mix_task_rm_user' into 'develop'lambda1+14-0
Merge branch 'develop' into 'develop'lambda2+19-3
update frontendlain17+57-57
update frontendlain31+131-110
Merge branch 'feld-hackneyupdate' into 'develop'lambda2+9-8
Fix register_user task.lain1+1-1
Order masto searches by date.lain1+34-30
Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'lambda71+404-111
Merge branch 'feld-varnish' into 'develop'lambda1+0-4
Merge branch 'patch-1' into 'develop'lambda1+24-25
Merge branch 'bugfix/user-search-with-at-sign' into 'develop'lambda1+3-0
Merge branch 'develop' into 'develop'lambda1+24-11
Merge branch 'develop' into 'develop'lambda1+27-0
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'lambda2+3-1
Merge branch 'fix/persisted-mastofe-settings' into 'develop'lambda2+19-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+15-9
Only search in public data for now.lain3+9-0
Update Readme.lain1+9-0
Accept port number in urls.lain2+8-1
MastodonAPI search: return only create activities.lain1+4-0
Delete Caddyfilelambda1+0-5
Merge branch 'develop' into 'develop'lambda2+2-2
TwitterAPI: Don't put follows into the public tls.lain1+2-2
Handle + in links.lain2+8-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain89+142-133
Use user url in mention if we have it.lain2+11-3
Load all users at once in timelines.lain5+94-30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+5-1
Use context_ids directly if we have them.lain3+6-12
Generates contexts and ids on insertion time.lain3+42-4
Pre-fetch conversation ids.lain2+63-2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain298+1709-139309
Fail faster.lain2+62-11
Fix some test stuff.lain2+14-10
Add mock.lain2+4-1
Respond to proper ActivityPub type.lain1+2-1
Use correct linefeed.lain1+1-1
Small fix.lain1+1-1
Fix typo.lain1+1-1
Modify newlines.lain1+1-1
Remove inspect.lain1+0-1
Proper info.lain1+7-2
No tabs.lain1+1-0
Don't fetch anything except ap_id for follower / following collections.lain3+119-19
Gopher: Add like / repeat count.lain1+6-1
Add gopher server.lain3+148-0
update frontendlain12+17-17
Remove unused ActivityRepresenter module.lain4+25-290
TwitterApiController: Use ActivityView.lain3+56-21
TwApi ActivityView: Add delete activities.lain2+46-1
TwApi ActivityView: Add follows.lain2+52-1
Format the code.lain111+5013-2871
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+9-2
TwApi ActivityView: Add announces.lain2+59-0
TwApi ActivityView: Add Like rendering.lain2+66-2
Add ActivityViewTest.lain1+49-0
Fix TwApi reply visibility.lain1+2-2
Clean up prod.exs a bit.lain1+1-5
Don't go through all available emoji.lain3+8-10
Add basic activity view.lain3+79-7
Return version in instance endpoint, set version to 0.9.0.lain2+3-3
Fix migration.lain1+8-0
Drop index for 'local', it confuses the query planner.lain1+7-0
Reduce OP fetching queries.lain3+46-11
Don't try to fetch OP if none is there.lain2+13-1
More Jason changes.lain8+36-36
Add missing types.lain1+1-0
Switch to Jason for json handling.lain4+11-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+3-3
Update dependencies.lain1+39-37
Speed up follower query.lain2+2-1
Add index for user follower address.lain1+8-0
Fix atom feed pagination.lain1+4-1
Fix follower collection id.lain1+1-1
Return "audio" info in mastodon api.lain1+1-0
Merge branch 'feature/oauth-token-password' into 'develop'lambda1+21-0
Merge branch 'bugfix/activitypub-hashtags' into 'develop'lambda3+89-0
Fix tests.lain2+9-2
Unify user fetching.lain1+2-1
Fetch the same data from json webfinger as from xml webfinger.lain4+32-3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+5-22
Fix hashtags.lain4+115-58
Strip html from emoji stuff.lain2+7-1
For outgoing objects, fake mastodon style ap id for ostatus.lain2+24-0
Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpointslain10+133-52
activitypub: add outbox endpointWilliam Pitcock3+63-0
activitypub: add restrict_limitWilliam Pitcock1+7-0
activitypub: implement following/followers endpointsWilliam Pitcock4+118-15
Fetch relayed messages from source while we don't have linked data sigs.lain1+2-1
Merge branch 'feld-varnish' into 'develop'lambda1+132-0
Merge branch 'patch-README' into 'develop'lambda1+1-0
Merge branch 'feld-mastoweb5000' into 'develop'lambda3+3-5
Merge branch 'feld-Logger' into 'develop'lambda12+22-22
Use connection pools.lain5+9-5
Only fetch if it's http.lain2+6-3
mastodon api tests: invalidate user cache prior to importing a test replyWilliam Pitcock1+3-0
mastodon api: fix rendering the mentions JSONWilliam Pitcock1+2-2
activitypub transmogrifier: rewrite non-http URLs using the object's external URLWilliam Pitcock2+33-0
Do more jobs by default.lain1+1-1
Only push to still valid websub subscriptions.lain1+2-1
Merge branch 'andarna/pleroma-develop' into developlain2+4-0
Fix Mastodon emojis.lain1+37-0
Ignore incoming empty chat messages.lain1+8-5
Don't validate on missing public key.lain3+9-0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+22-6
More signature debugging.lain4+73-27
update frontendlain9+16-16
Restrict activity fixing more.lain1+2-1
Update pleroma.nginxlambda1+2-0
Merge branch 'feature/activitypub' into 'develop'lambda79+3493-169
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+6-5
Add way to disable federation.lain3+27-14
Moderator READMElain1+6-0
Add moderator task.lain1+27-0
Add password reset task.lain2+25-0
Allow moderators to delete posts.lain1+1-1
Add moderator function.lain2+22-5
Add missing support file.lain1+6-0
Make test output easier to read.lain19+82-86
Fix some test warnings.lain2+7-7
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into developlain3+19-2
update frontendlain1+4-0
update frontendlain14+53-52
update frontendRoger Braun14+21-23
UtilController: Fix statusnet config api compatibility.Roger Braun1+1-1
Merge branch 'develop' into 'develop'lambda3+20-0
Merge branch 'fix/config-disable-chat' into 'develop'lambda4+14-3
Fix compile errors on 1.4.5Roger Braun2+0-2
update frontendRoger Braun18+57-57
Update required Elixir version in READMEeal1+1-1
Merge branch 'fix/no-image-upload-filetype' into 'develop'eal1+1-1
Merge branch 'move-backend-images' into 'develop'lambda6+15-15
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun11+63-15
Update frontend.Roger Braun14+23-21
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun5+36-2
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into developRoger Braun3+6-2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun31+31-0
Fix incoming Pleroma CWs. Closes #96.Roger Braun1+1-2
Update frontend.Roger Braun17+56-56
Fix config.Roger Braun1+1-1
Update frontend.Roger Braun14+23-21
Stats: Make less crashy and improve query.Roger Braun1+7-8
Merge branch 'feature/remote-follow' into 'develop'lambda7+98-1
Revert "Add remote follow pages."eal5+0-92
Revert "Add remote follow path to webfinger."eal2+1-6
Add remote follow pages.eal5+92-0
Add remote follow path to webfinger.eal2+6-1
Merge branch 'fix/background-profile-fetch' into 'develop'lambda2+7-5
Merge branch 'default-pictures' into 'develop'eal8+24-20
Merge branch 'prod.exs' into 'develop'eal1+6-3
Merge branch 'fix/pleroma.nginx' into 'develop'eal1+0-2
Merge branch 'stats-daemon' into 'develop'lambda5+54-7
Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'eal2+15-1
Unlink follow import process from the one processing request.eal1+1-1
Merge branch 'media-proxy-fix-encoding' into 'develop'lambda1+0-1
Merge branch 'media-proxy' into 'develop'lambda10+152-11
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developLain Iwakura3+39-7
Fix timelines in subway tooter.Lain Iwakura3+7-2
MastoAPI: Fix always-sensitive bugs.Lain Iwakura3+5-5
Send out salmons before websub.Lain Iwakura1+3-3
Merge branch 'feature/follow-import' into 'develop'lambda2+27-1
Fix some more tests.eal2+5-3
Fix tests.eal2+4-4
Merge branch 'fix/tootdon-mentions' into 'develop'lambda1+1-1
Merge branch 'feature/user_deletion' into developRoger Braun9+175-26
Merge branch 'fix/linkify' into 'develop'lambda3+22-3
Merge branch 'fix/mastoapi-attachment-linking' into 'develop'lambda3+8-3
Merge branch 'postgresetup' into 'develop'lambda4+18-7
Add websocket upgrade to example nginx config.eal1+3-0
Merge branch 'feature/chat' into 'develop'lambda23+124-60
Merge branch 'fix/odd-passwords' into 'develop'lambda1+1-1
OStatus: Add user bio as summary fieldRoger Braun2+2-0
Add count index for local users.Lain Iwakura1+7-0
MastodonAPI: Add proper user count.Lain Iwakura3+22-1
Merge branch 'salmon-native-keys' into 'develop'lambda1+22-9
Return xml notice at /notice path.Lain Iwakura3+24-0
Merge branch 'patch-1' into 'develop'eal1+1-1
Update frontend.Roger Braun13+21-21
More readme updates.Lain Iwakura1+7-1
Add mix deps.get back to readme.Lain Iwakura1+2-0
Add configuration generation tool, update readme.Lain Iwakura4+40-51
MastodonUI login: Show error message on error.Roger Braun2+8-1
untoot.Roger Braun1+2-3
Merge branch 'develop' into 'develop'lambda2+150-0
Update README.mdlambda1+1-1
Update frontend.Roger Braun17+55-55
Merge branch 'fix/self-follow' into 'develop'eal2+2-0
Merge branch 'fix/mastoapi-attachment-count' into 'develop'eal1+1-1
Make /api/friends/ids test deterministic.eal1+2-2
Treat internal emoji like external.Roger Braun4+12-9
MastoAPI: Add max_toot_chars.Roger Braun1+2-1
Merge branch 'fix/self-follow' into 'develop'lambda6+26-14
Federator Queue: Add seperate in/out queues.Roger Braun1+24-9
MastodonAPI: Streaming fixes.Roger Braun1+13-7
Update frontend.Roger Braun21+67-67
MastodonAPI: Add sign out.Roger Braun2+11-4
Fix flakey test.Roger Braun1+1-1
MastoAPI: Only return create activties in contexts.Roger Braun1+1-0
Merge branch 'feature/fix-warnings' into 'develop'lambda26+89-94
Merge branch 'formatting-fixes' into 'develop'lambda4+9-7
Merge branch 'fix/mastofe-login-redirect' into 'develop'eal1+1-1
Merge branch 'sensitive-content-bit' into 'develop'eal3+14-2
Don't start streamer during tests.Roger Braun1+1-1
MastoAPI: Implement all streaming functions.Roger Braun7+73-6
MastodonAPI: Stream fixes.Roger Braun3+13-3
Merge branch 'feature/masto-styled-login-page' into 'develop'lambda2+69-7
Add custom emoji to Mastodon UI initial state.Roger Braun1+8-3
Add mastodon emoji folder.Roger Braun2662+2661-0
MastoAPI: Make attachment ids strings.Roger Braun2+3-3
Merge branch 'twitterapi-bitlbee' into 'develop'lambda3+39-0
Merge branch 'twitterapi-show-user' into 'develop'lambda3+54-0
Merge branch 'api-links' into 'develop'lambda1+1-1
Merge branch 'mastoapi-media-timeline' into 'develop'lambda2+30-0
Update frontend.Roger Braun16+40-20
MastoAPI: Fix repeat api bug.Roger Braun2+3-4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun7+347-24
Add Mastodon frontend.Roger Braun170+206703-5
MastoAPI: Websocket streaming for federated timeline.Roger Braun2+44-6
MastoAPI: Basic streaming.Roger Braun6+155-1
MastoAPI: Fix reblog emojis.Roger Braun2+2-1
Handle existing redirect params.Roger Braun1+2-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun7+74-7
MastoAPI: Use string ids everywhere.Roger Braun4+18-17
Add actor column to activities.Roger Braun5+32-5
Re-fetch user data on salmon decode error.Roger Braun3+62-5
Merge branch 'following-you-in-user-view' into 'develop'lambda2+41-8
Look through whole db for user timelines.Roger Braun3+3-1
Update frontend.Roger Braun13+20-19
Merge branch 'blocks-in-user-view' into 'develop'lambda2+39-0
Merge branch 'twitter-api-blocks' into 'develop'lambda5+115-0
Merge branch 'mastodon-emoji-endpoint' into 'develop'lambda4+15-2
Merge branch 'authenticated-profile-fetching' into 'develop'lambda2+6-3
Update frontend.Roger Braun9+14-15
Update fronted.Roger Braun17+54-49
Allow self-rt.Roger Braun1+0-1
Linkify fixes.Roger Braun2+16-2
Revert "Longer timeouts for user fetching."Roger Braun2+3-7
Longer timeouts for user fetching.Roger Braun2+7-3
Merge branch 'fix-tootdon-oauth' into 'develop'lambda2+11-1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun12+190-21
Fix bug when no posts are in the db.Roger Braun2+3-1
MastoAPI: Fix mentions always being for an anonymous user.Roger Braun1+3-3
update gitlab ciRoger Braun1+3-4
Read variable for testing db.Roger Braun1+1-1
Update .gitlab-ci.ymllambda1+2-2
Update .gitlab-ci.ymllambda1+1-1
Update .gitlab-ci.ymllambda1+2-4
Add gitlab-ci.ymllambda1+27-0
Handle empty terms / tags.Roger Braun2+4-1
Federate out content warnings.Roger Braun2+9-1
Allow using cws in mastodon api.Roger Braun2+4-3
Update README.Roger Braun1+1-1
Update README.Roger Braun1+1-1
Fix specs.Roger Braun2+9-9
MastoAPI: Include CW.Roger Braun3+3-2
TwitterAPI: Display cws.Roger Braun2+9-2
Save cws in the activitypub data.Roger Braun4+15-9
Avoid potentially slow count queries for user note count.Roger Braun4+26-2
Only search through last 100_000 activities for fetches.Roger Braun1+9-0
Merge branch 'feature/mastodon-api-fixes' into developRoger Braun4+11-10
Merge branch 'feld/pleroma-feld-mastodon-usersearch' into developRoger Braun21+130-57
Return nil for nil object requests.Roger Braun1+1-0
Use index in basic activity query.Roger Braun1+2-2
Speed up deletion and related queries.Roger Braun3+17-3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+14-3
MastoAPI: Add emoji output.Roger Braun3+17-3
Revert "Simplify query."Roger Braun1+5-2
Add password reset.Roger Braun10+127-0
Simplify query.Roger Braun1+2-5
Don't reject already accepted subscriptions.Roger Braun2+5-4
Remove tag links for now, they break some regular links.Roger Braun1+1-1
Add tag links.Roger Braun2+16-5
More commits remaining [...]