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.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBEba75f055a712: remove redundant null fallback farther.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE4311e9ee7d24: add NOT NULL to actor_type column.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBEd27056fbfe66: remove redundant fallback for actor_type.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE41b6015d8604: format again.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE70005116be7c: update test.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBEc6b9cf29e0a2: formatting.

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

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBEa9d1afca3a90: configurable activitypub actor.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBEe50e38c55f33: add actor_type into mastodon api.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBEf0ec158db7a3: add actor_type into users table and model.

Alexander <alex.strizhakov@gmail.com> committed rPUBE9e950b43eb0f: separate field with_media to activities.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBE384bf90d2073: Merge branch 'develop' into issues/1239.

Alexander <alex.strizhakov@gmail.com> committed rPUBEf75926292a5d: removing index.

Alexander <alex.strizhakov@gmail.com> committed rPUBE6d4e4ce0093b: more activities after media post.

Alexander <alex.strizhakov@gmail.com> committed rPUBE9934559b2e33: naming.

Alexander <alex.strizhakov@gmail.com> committed rPUBE86ff2eeb539c: params changes.

Alexander <alex.strizhakov@gmail.com> committed rPUBE0790ee7868d5: query fix.

Alexander <alex.strizhakov@gmail.com> committed rPUBE5f3b09b3ab75: separate generating activities with attachment.

Alexander <alex.strizhakov@gmail.com> committed rPUBEac6d45337a5e: with index.

Alexander <alex.strizhakov@gmail.com> committed rPUBE733f72221fcd: benchmarks without index.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBEbcd7bf7af937: Merge branch 'develop' into issues/1239.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBE5cb9a2eaa174: Merge branch 'develop' into issues/1239.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBE603f4302a816: fix test.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBE8042a2cc1e80: Merge branch 'develop' into issues/1239.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBE7b9187a2ff33: Merge branch 'develop' into issues/1239.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBE30c53cab5ca2: Merge branch 'develop' into issues/1239.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBE6f6bf617299d: Merge branch 'develop' into issues/1239.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBE1614afca9acb: add tests.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBEaba1ec985ede: moved moderation log to Task.async.

Maksim Pechnikov <parallel588@gmail.com> committed rPUBEa265c1f2dde3: move Moderationlog to background task.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBEb6c126711f88: update CHANGELOG.

Mark Felder <feld@FreeBSD.org> committed rPUBEfdb101c6b1c9: Merge branch 'develop' into feature/attachments-cleanup.

Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp> committed rPUBE6e318ffa6be1: remove MDII uploader.

Kevin Wallace <doof@doof.net> committed rPUBE349bb26901da: Use Pleroma, not WebFinger, hostname for gopher links.

Kevin Wallace <doof@doof.net> committed rPUBE5ec37f65fd83: Allow using different webfinger domain than url hostname.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE506e3991142c: Merge branch 'develop' into feature/attachments-cleanup.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE5ec5d1ee0fc6: Fix deletion in subfolders.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEa8fa56a80fab: Merge branch 'develop' into feature/attachments-cleanup.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE2b70c1b57586: Update CHANGELOG.

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

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

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE3ef337e4854d: Merge branch 'develop' into feature/attachments-cleanup.

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

Roman Chvanikov <chvanikoff@pm.me> committed rPUBEe7927a202b13: Merge branch 'develop' into feature/attachments-cleanup.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE8cdae4b2ac1b: Unify file deletion.

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE84692179aa14: Add all delete methods.

Alexander Strizhakov <alex.strizhakov@gmail.com> committed rPUBE7bc2bfb52fe3: manual migration for update exisitng activities (authored by Alexander <alex.strizhakov@gmail.com>).

Roman Chvanikov <chvanikoff@pm.me> committed rPUBE95d103112543: Implement local file removing.