Resolve conflicts
[akkoma] / test /
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 lainMerge branch 'release-docs' into 'develop'
2019-06-27 kaniiniMerge branch 'idempotency-plug' into 'develop'
2019-06-27 kaniiniMerge branch 'fix/admin-configure' into 'develop'
2019-06-27 Alexander Strizhakovdon't delete config settings on admin update
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26...
2019-06-26 Egor KislitsynPolish IdempotencyPlug
2019-06-26 Egor KislitsynAdd Idempotency plug
2019-06-26 HaelwennMerge branch 'fix/handle-wrong-visibility-error' into...
2019-06-26 Sergey SuprunenkoReturn correct response when reply to a direct message...
2019-06-26 kaniiniMerge branch 'refactoring/fix_render_view' into 'develop'
2019-06-26 kaniiniMerge branch 'feature/configurable-pack-extensions...
2019-06-26 rinpatchMerge branch 'issues/1016' into 'develop'
2019-06-25 Maksim Pechnikovadd ignore hosts and TLDs for rich_media
2019-06-25 Maksim Pechnikovadd test
2019-06-24 kaniiniMerge branch 'issues/184' into 'develop'
2019-06-24 Maksim[#184] small refactoring reset password
2019-06-24 kaniiniMerge branch 'feature/rework-user-deletion' into 'develop'
2019-06-24 Sergey SuprunenkoRework user deletion
2019-06-24 kaniiniMerge branch 'conversation-update-on-dm-delete' into...
2019-06-24 EugenijBroadcast conversation update when DM is deleted
2019-06-23 kaniiniMerge branch 'bind-to-localhost' into 'develop'
2019-06-23 kaniiniMerge branch 'rich_media_titles_two' into 'develop'
2019-06-23 kaniiniMerge branch 'admin-config' into 'develop'
2019-06-23 Alex Slog capturing
2019-06-23 Alex Ssupport for config groups
2019-06-22 Alex Ssupport for tuples with more than 2 values
2019-06-22 lainRich Media Parser: Do not return just a title if nothin...
2019-06-22 lainRevert "Revert "Merge branch 'fix/ogp-title' into ...
2019-06-22 rinpatchMerge branch 'mix_sem_ver_version_fix' into 'develop'
2019-06-22 Alex Sfix for int and modules
2019-06-21 rinpatchMerge branch 'develop' into release-docs
2019-06-21 kaniiniMerge branch 'feature/mrf-anti-link-spam' into 'develop'
2019-06-21 rinpatchMerge branch 'fix/use-config-when-possible' into 'develop'
2019-06-21 kaniiniMerge branch 'oauth_secure_redirect' into 'develop'
2019-06-21 kaniiniMerge branch 'revert-6f5a0cc1' into 'develop'
2019-06-21 kaniiniMerge branch 'fix-rate-limit-test' into 'develop'
2019-06-21 feldRevert "Merge branch 'fix/ogp-title' into 'develop'"
2019-06-21 Egor KislitsynFix rate limiter tests
2019-06-21 rinpatchMerge branch 'develop' into release-docs
2019-06-20 rinpatchMerge branch 'fix/config-gen-releases' into 'develop'
2019-06-20 lainMerge branch 'fix/dynamic-configuration' into 'develop'
2019-06-20 Alexander StrizhakovFixes for dynamic configuration
2019-06-20 rinpatchMerge branch 'feature/release-update-script' into ...
2019-06-19 William Pitcockunbreak polls
2019-06-19 William Pitcockimplement anti link spam MRF
2019-06-19 rinpatchMerge branch 'logger-level-for-migration-tasks' into...
2019-06-19 Alexander Strizhakovaliases for mix tasks
2019-06-19 rinpatchMerge branch 'begone-the-dot-hack' into 'develop'
2019-06-19 lainMerge branch 'fix/rich-media-hashtags-again' into ...
2019-06-19 lainMerge branch 'update-frontend-c4fcdc71' into 'develop'
2019-06-18 rinpatchRich Media: Skip Microformats hashtags
2019-06-18 lainMerge branch 'deps/update-auto-linker' into 'develop'
2019-06-18 lainMerge branch 'fix/mastoapi-sanitize-display-name' into...
2019-06-18 Ivan TashkinovAdded more `redirect_uri` checks to prevent redirect...
2019-06-18 rinpatchMastodon API: Sanitize display names
2019-06-17 rinpatchMerge branch 'removing-test-errors' into 'develop'
2019-06-16 HaelwennMerge branch 'fix/sanitize-report-content' into 'develop'
2019-06-16 Alex Scapturing errors
2019-06-16 Alex Ssalmon fix
2019-06-16 rinpatchMerge branch 'issues/570' into 'develop'
2019-06-16 Maksim[#570] add user:notification stream
2019-06-16 rinpatchMerge branch 'fix/991-version-generation' into 'develop'
2019-06-16 rinpatchFix report content stopping to be nullable
2019-06-15 rinpatchCredo fixes
2019-06-15 rinpatchAdd tests for report view
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop'
2019-06-15 lainMerge branch 'update/phoenix-and-plug' into 'develop'
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop'
2019-06-15 rinpatchMerge branch 'feature/add-chat-token-to-masto-api'...
2019-06-15 lainMastodon API: Return the token needed for the chat.
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi...
2019-06-14 kaniiniMerge branch 'feature/905-dynamic-configuration-in...
2019-06-14 Alexander Strizhakovit is changed in compile time
2019-06-14 lainMerge branch 'fix/hashtag-rich-media' into 'develop'
2019-06-14 lainMerge branch 'issues/948-account-search' into 'develop'
2019-06-14 Maksim[#948] /api/v1/account_search added optional parameters...
2019-06-14 rinpatchFix hashtags being picked up by rich media parser
2019-06-14 lainMastodonAPI: Add a way to update the background image.
2019-06-13 rinpatchMerge branch 'develop' into feature/ci-release-build
2019-06-13 lainAccountView: Add user background.
2019-06-13 lainMerge branch 'fix/ogp-title' into 'develop'
2019-06-13 feldMerge branch 'feld/pleroma-fix/ogp-title' into 'fix...
2019-06-13 rinpatchMerge branch 'develop' into feature/ci-release-build
2019-06-13 lainMerge branch 'improve-410-handling' into 'develop'
2019-06-13 Egor KislitsynHandle HTTP 404 response
2019-06-13 Egor KislitsynHandle HTTP "410 Gone" response
2019-06-13 Egor KislitsynImprove <title> fallback; Add a test
2019-06-12 Ivan Tashkinov[#963] No redirect on OOB OAuth authorize request with...
2019-06-12 lainMerge branch 'release-config-import' into 'develop'
2019-06-12 lainMerge branch 'chore/tagpolicy_docs' into 'develop'
2019-06-11 kaniiniMerge branch 'improve-local-content-limit' into 'develop'
2019-06-11 Egor KislitsynAdd option to restrict all users to local content
2019-06-11 lainMerge branch 'feature/rate-limiter' into 'develop'
2019-06-11 Egor KislitsynReplace `MastodonAPIController.account_register/2`...
2019-06-11 Egor KislitsynAdd RateLimiter
2019-06-11 kaniiniMerge branch 'change-containment-default' into 'develop'
2019-06-11 kaniiniMerge branch 'preload-changes' into 'develop'
2019-06-10 lainMerge branch 'feature/releases' into 'develop'
2019-06-10 lainMerge branch 'issue/media-proxy-whitelist' into 'develop'
next