stwf <steven.fuchs@dockyard.com> committed rPUBE48911772bfc7: use different child name.

stwf <steven.fuchs@dockyard.com> committed rPUBE824ca39e2ba4: remove dependencies from mix.lock.

Mark Felder <feld@FreeBSD.org> committed rPUBEd0ecd2b5dd39: Merge branch 'develop' into fix/ci-elixir-version.

AkiraFukushima <h3.poteto@gmail.com> committed rPUBEf83836747d3b: Check client and token in GET /oauth/authorize.

stwf <steven.fuchs@dockyard.com> committed rPUBEcd430ead6fb1: docs.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE2d89c4437956: merge develop.

stwf <steven.fuchs@dockyard.com> committed rPUBE2265fffc5e2b: tighten up timing.

stwf <steven.fuchs@dockyard.com> committed rPUBE419033e139b9: update rate limiter.

stwf <steven.fuchs@dockyard.com> committed rPUBEc6b198b2f524: format.

Maxim Filippov <colixer@gmail.com> committed rPUBEf8b83915ce1c: Remove sporadically failing tests.

Ivan Tashkinov <ivantashkinov@gmail.com> committed rPUBEeeef8d2977a3: Locked `fast_sanitize` to 0.1.0 and fast_html to ~> 0.9.0 to prevent macOS….

Joseph Nuthalapati <njoseph@riseup.net> committed rPUBEf83e618e5eb4: Add documentation for self-hosting kocaptcha.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEb8709a454490: Merge develop.

stwf <steven.fuchs@dockyard.com> committed rPUBE1f47066c1799: credo.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEb0a4d6d02bb2: Merge branch 'develop' into feature/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE48dfc74490f7: Merge develop.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEdea0e9aaef2a: Merge branch 'develop' into feature/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEe8763b8e9e96: Update static files.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE690e9968f927: Cleanup after XMPP tests.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE7fa9d77a4c59: Add SessionAuthenticationNocheckPlug tests.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEd3ef7d5b4f8b: Add OAuthController tests.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEe0daf85ad906: Add MongooseIMController tests.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE22629c2df3a8: Add tests for Pleroma.XMPP.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEbf39715fd1a1: Update docs.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE5ab5d421a8f6: Merge branch 'develop' into dev/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE0ac696a99d14: add converse from cdn.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEef939bd81dc9: Cleanup.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEd97257aeea78: Merge branch 'develop' into feature/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE9f053ef85f29: remove loading converse from cdn.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE43a501bf4cea: small style fix.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEca6c7c20cb04: Merge branch 'develop' into dev/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEb314355a16c8: Merge branch 'develop' into dev/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE91b12048b74b: remove unused files.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE30e53a5f1cc3: Return CSP headers in place.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEf507c04d3355: Fix tests.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEa3bd33e30242: Damn trailformatplug.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE106471ee2788: Check if user is local.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE1fc67267c41c: remove accepts header for xmpp-related routes.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE803bde4ae8d0: Add urls to jid endpoint response.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE412aaed6f6cc: fix prebind url.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE63b88c4d4c5d: Merge branch 'develop' into dev/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE6912b7257924: Merge branch 'develop' into dev/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEbd24a0777ce5: Merge branch 'develop' into dev/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE81f859ae279c: Make urls dynamic.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE63f9e1f81817: check jid.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE6f23a9158a59: move jid check to correct place.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEbfb378a3055c: Normalize XMPP conn module.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE2905998c3bdb: Config xmpp host.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE4cb7db90b5fc: Merge develop.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEdecf6958103d: resolve conflicts.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEa1e6c3ae6009: debug.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE17092b7494f0: Update local converse.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE0e31b48b1ff7: debug.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE2ee2e5e590d8: fix xhr.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE0c2125588fa4: dynamic jid.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE475e2da63ff3: remove stale scripts.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE5b74d2429e90: fix errs.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEbfd283bd8b64: err fix.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE774567e9c183: Merge branch 'develop' into dev/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE5d59c3a42071: fix urls.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE1203a7bfaa0c: switch to develop converse.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEe7b89ebdea2e: made prebind great again.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEbc611aa5176d: wip.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEba229c23cea3: Merge branch 'develop' into dev/xmpp-chat.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE9aae7f37240c: resolve conflicts.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE41315fd66fe8: wip.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEd46d88fb61dc: local converse.js.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEa1f7f9c63475: Merge develop.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE56fb96d53202: fix local converse.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEe14d1428a29d: fix webfonts.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEbaf24c33b70d: logging.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE2c6607ba368d: wip.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEf07485e3263f: logging.

Mark Felder <feld@FreeBSD.org> committed rPUBE758703b175d8: Merge branch 'develop' into docs/remove_activation_status_endpoint.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE9872476ee26f: fix warnings.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE63cdd6a968cd: wip.

Mark Felder <feld@FreeBSD.org> committed rPUBEd040c7373197: Remove deprecated endpoint from docs that is fully removed from backend now.

Mark Felder <feld@FreeBSD.org> committed rPUBE40571ee635b4: Somehow merge went sideways.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEe09f15b0e66c: Fix user.following.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE4c23a8265924: Merge branch 'develop' into feature/stories.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEa829e816fd30: Fix setting user.info.pinned_activities.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE0fd38b937b79: Resolve conflict.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE45b571cb8685: Move stories to a separate controller.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE2a0ad1ef6d70: Move list_user_stories to account controller.

Ivan Tashkinov <ivantashkinov@gmail.com> committed rPUBE69b785c3b391: [#1052] Introduced proper relationship between activities and objects (via non….

Brian <brian@tiuxo.com> committed rPUBEdac942d56aae: Include eldap in mix module cross reference checks.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE2db73bca702f: Add stories endpoints.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEe817bc5a6d84: Use plug to set view in StoryController.

Ivan Tashkinov <ivantashkinov@gmail.com> committed rPUBEb4f4b1d08caa: [#1052] Removed an "empty" test..

Sergey Suprunenko <suprunenko.s@gmail.com> committed rPUBE0b09a28fc524: Restrict thread statuses that contain user's irreversible filters.

Sergey Suprunenko <suprunenko.s@gmail.com> committed rPUBE73b284ae620e: Restrict statuses that contain user's irreversible filters.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE44efed45e822: Merge branch 'develop' into activitypub/configurable-activitypub-actor-type.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE0246311eac4d: update API document.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE30738881fb27: update changelog.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBEc4888a0a1ba8: correct API document.

Sergey Suprunenko <suprunenko.s@gmail.com> committed rPUBE54fa6ab8f6e2: Skip notifications for statuses that contain an irreversible filtered word.

Maxim Filippov <colixer@gmail.com> committed rPUBEda995784ec11: Update admin-fe.

lain <lain@soykaf.club> committed rPUBE8faf8491a2c4: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into….

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE822ce24df7ec: resolve conflict.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE4374bf018b4a: bugfix.