summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-07-09[#878] Uncommented test statement.Ivan Tashkinov
2019-07-09[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activ...Ivan Tashkinov
2019-07-09Merge branch 'docs/more-mastodon-api' into 'develop'kaniini
2019-07-09Docs/more mastodon apifeld
2019-07-09Merge branch 'feature/allow-user-query-via-id' into 'develop'kaniini
2019-07-09Merge branch 'remove-avatar-header' into 'develop'kaniini
2019-07-09Merge branch 'develop' into feature/allow-user-query-via-idMark Felder
2019-07-09Merge branch 'fix/1019-correct-count-remote-users' into 'develop'kaniini
2019-07-09Fix/1019 correct count remote usersAlexander Strizhakov
2019-07-09Merge branch 'remove-swift' into 'develop'kaniini
2019-07-09Merge branch 'test-coverage' into 'develop'kaniini
2019-07-09reverse proxy testsAlexander Strizhakov
2019-07-09Merge branch 'features/sec-websocket-protocol-header' into 'develop'kaniini
2019-07-09Merge branch 'enable-ogp-by-default' into 'develop'Haelwenn
2019-07-09Merge branch 'proxy-error' into 'develop'feld
2019-07-09Add test for URLs with Unicode characters tooMark Felder
2019-07-09Merge branch 'test-speedup' into 'develop'Haelwenn
2019-07-09Remove duplicated test. New one is more comprehensive.Mark Felder
2019-07-09Merge branch 'develop' into proxy-errorMark Felder
2019-07-09CapitalizeMark Felder
2019-07-09Test that all ASCII encoded characters are preservedMark Felder
2019-07-09Merge branch '161-incoming-replies-depth-limit' into 'develop'rinpatch
2019-07-09Apply suggestion to docs/config.mdIvan Tashkinov
2019-07-09Merge branch 'fix/966-local-user-search' into 'develop'lain
2019-07-09change for local user searchAlexander Strizhakov
2019-07-09Testing: Don't federate in testing.lain
2019-07-08Merge branch 'fix/relationships-in-statuses' into 'develop'Haelwenn
2019-07-08[#878] Formatting fix.Ivan Tashkinov
2019-07-08[#878] Refactored assumptions on embedded object presence in tests. Adjusted ...Ivan Tashkinov
2019-07-08Add a changelog entry for changing the defaultsrinpatch
2019-07-08Formattingrinpatch
2019-07-08Improve wording in CHANGELOG.mdrinpatch
2019-07-08Enable OpenGraph and TwitterCard by defaultrinpatch
2019-07-08FallbackRedirector: Do not crash on Metadata rendering errorsrinpatch
2019-07-08OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistentrinpatch
2019-07-08Mastodon API: Fix embedded relationships not being rendered inside of statusesrinpatch
2019-07-07make sure the url used by proxy is same as origin urlSachin Joshi
2019-07-07mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol headerHaelwenn (lanodan) Monnier
2019-07-07MastoAPI Streaming: Keep compatibility with access_tokenHaelwenn (lanodan) Monnier
2019-07-06MastoAPI streaming: Replace access_token with Sec-WebSocket-ProtocolKokaKiwi
2019-07-06Fix docsMaxim Filippov
2019-07-06Apply suggestion to CHANGELOG.mdIvan Tashkinov
2019-07-06Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-rep...Ivan Tashkinov
2019-07-05Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'rinpatch
2019-07-05Admin API: Allow querying user by IDMaxim Filippov
2019-07-05Merge branch 'issue/1043' into 'develop'Haelwenn
2019-07-05[#1043] fix search accounts.Maksim
2019-07-05tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dirHaelwenn (lanodan) Monnier
2019-07-03Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'rinpatch
2019-07-03Expose `skip_thread_containment` in nodeinfoEugenij