Commit Graph

  • f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions Ivan Tashkinov 2019-10-06 09:30:49 +03:00
  • 9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop' Haelwenn 2019-10-06 04:41:06 +00:00
  • 294e08cb65 Merge branch 'backport/update-activity-fixes' into 'maint/1.1' kaniini 2019-10-05 19:46:23 +00:00
  • 565809592c update changelog Ariadne Conill 2019-10-05 19:32:23 +00:00
  • b97a7709c7 CommonAPI: Create profile updates as public. lain 2019-10-05 14:53:50 +02:00
  • 4d85e07e9e ActivityPub / Transmogrifier: Correctly store incoming Update id. lain 2019-10-05 14:49:45 +02:00
  • 7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop' kaniini 2019-10-05 19:28:53 +00:00
  • 45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop' kaniini 2019-10-05 19:28:29 +00:00
  • 17ff4b43cb Merge branch 'unread-conversation-count' into 'develop' kaniini 2019-10-05 19:28:07 +00:00
  • 8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity eugenijm 2019-10-02 00:37:08 +03:00
  • 0ee6100c8d Merge branch 'update-activity-fixes' into 'develop' kaniini 2019-10-05 15:51:19 +00:00
  • 1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions lain 2019-10-05 15:10:57 +02:00
  • 276a520163 CommonAPI: Create profile updates as public. lain 2019-10-05 14:53:50 +02:00
  • 4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id. lain 2019-10-05 14:49:45 +02:00
  • b1ff66dc5f Add test for handling Announces with inlined object from different origin Thibaut Girka 2019-10-05 12:46:06 +02:00
  • 791d93ff0e Make credo happy Thibaut Girka 2019-10-02 13:46:06 +02:00
  • 977e711e22 Import object from self-Announce whenever possible Thibaut Girka 2019-10-02 13:18:51 +02:00
  • e51c20f28a Merge branch 'revert-5c04e817' into 'develop' kaniini 2019-10-05 10:00:44 +00:00
  • e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" kaniini 2019-10-05 10:00:05 +00:00
  • 6a85f7d1ea Transmogrifier: Extend misskey like compatibility. lain 2019-10-05 10:45:42 +02:00
  • d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions lain 2019-10-05 10:42:29 +02:00
  • 4168ead672 Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1' kaniini 2019-10-04 22:37:45 +00:00
  • 2714caac8b update changelog Ariadne Conill 2019-10-04 21:43:15 +00:00
  • dbd78de176 notification_view.ex: Make sure account isn’t empty Haelwenn (lanodan) Monnier 2019-10-04 06:47:36 +02:00
  • 43be47c161 Merge branch 'backport/hex-flake-id' into 'maint/1.1' kaniini 2019-10-04 22:11:34 +00:00
  • 15513f02d0 Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1' kaniini 2019-10-04 22:01:38 +00:00
  • c19e539d37 changelog Ariadne Conill 2019-10-04 22:00:18 +00:00
  • 67d772dd73 Replace Pleroma.FlakeId with flake_id hex package Egor Kislitsyn 2019-09-18 21:54:31 +07:00
  • 7307d7d676 Track failed proxy urls and don't request them again Sergey Suprunenko 2019-10-01 20:00:27 +00:00
  • 1dd6d81ddf Merge branch 'backport/issue-1296' into 'maint/1.1' kaniini 2019-10-04 21:47:34 +00:00
  • a859abed2e update changelog Ariadne Conill 2019-10-04 21:36:49 +00:00
  • 16a1f95623 removed legacy api: "/objects/:uuid/likes" Maksim Pechnikov 2019-10-04 22:20:53 +03:00
  • 923dff21b3 Merge branch 'backport/undo-fixes' into 'maint/1.1' kaniini 2019-10-04 21:29:01 +00:00
  • 0f1486ed4e update changelog Ariadne Conill 2019-10-04 21:18:38 +00:00
  • a0435dca26 ActivityPub.Utils: Fix undo test. lain 2019-10-04 17:10:49 +02:00
  • b7d2ca0372 ActivityPub: Change addressing of Undo. lain 2019-10-04 16:32:42 +02:00
  • 9c47d8571c Merge branch 'issue/1296' into 'develop' kaniini 2019-10-04 20:07:47 +00:00
  • 83631752af removed legacy api: "/objects/:uuid/likes" Maksim Pechnikov 2019-10-04 22:20:53 +03:00
  • 4d38e48558 Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1' kaniini 2019-10-04 18:23:33 +00:00
  • 3a923be434 Remove entries from develop that were in the section for some reason rinpatch 2019-10-04 21:19:17 +03:00
  • c921e32a44 Add back streaming fix entry rinpatch 2019-10-04 21:17:29 +03:00
  • bfc92946e5 Sync 1.1.0 changelog with develop rinpatch 2019-10-04 21:13:35 +03:00
  • ca6f1644aa Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1' kaniini 2019-10-04 17:39:28 +00:00
  • 222c238e7b Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1' kaniini 2019-10-04 17:39:20 +00:00
  • e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop' kaniini 2019-10-04 17:39:06 +00:00
  • 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop' kaniini 2019-10-04 17:33:18 +00:00
  • 6b7cd7d850 Fix get_cached_by_nickname_or_id not allowing to get local users by nickname rinpatch 2019-10-04 01:05:50 +03:00
  • d9e0108baa tests: add missing ExUnit.CaptureLog Ariadne Conill 2019-10-04 16:45:14 +00:00
  • 17fed5ae52 application: fix up after_supervisor_start removal backport Ariadne Conill 2019-10-04 16:15:54 +00:00
  • e951c547f7 update changelog Ariadne Conill 2019-10-04 15:45:06 +00:00
  • abb967671a streamer: worker: actually use should_send? consistently Ariadne Conill 2019-10-04 15:42:25 +00:00
  • d0e874c7f2 streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist Ariadne Conill 2019-10-04 15:41:55 +00:00
  • 51b317a602 streamer: add missing copyright headers Ariadne Conill 2019-10-04 15:21:45 +00:00
  • 4305ddef0a tests: streamer: add a test for blocked transitive activities Ariadne Conill 2019-10-04 15:17:32 +00:00
  • a2e92a1b8a remove remaining errors from tests Steven Fuchs 2019-09-17 14:44:52 +00:00
  • 7d5f20b50f Revert "Merge branch 'revert-4fabf83a' into 'develop'" Egor Kislitsyn 2019-09-16 17:03:37 +07:00
  • 8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once Maxim Filippov 2019-10-04 19:00:58 +03:00
  • 795ea5dfc2 Move HTTP verb to the header (admin_api.md) Maxim Filippov 2019-10-04 18:58:44 +03:00
  • 75e415d5f4 Merge branch 'fix/extended-nickname-format-default-config' into 'develop' kaniini 2019-10-04 15:53:47 +00:00
  • 99b312cbab Merge branch 'undo-fixes' into 'develop' kaniini 2019-10-04 15:52:41 +00:00
  • dbf5fce67e update changelog Ariadne Conill 2019-10-04 15:45:06 +00:00
  • d1d058bf85 streamer: worker: actually use should_send? consistently Ariadne Conill 2019-10-04 15:42:25 +00:00
  • 5a0c018d2a streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist Ariadne Conill 2019-10-04 15:41:55 +00:00
  • 2417b633ed streamer: add missing copyright headers Ariadne Conill 2019-10-04 15:21:45 +00:00
  • 8325858ed2 tests: streamer: add a test for blocked transitive activities Ariadne Conill 2019-10-04 15:17:32 +00:00
  • 2a7f44acfe ActivityPub.Utils: Fix undo test. lain 2019-10-04 17:10:49 +02:00
  • 43a211bcb1 Transmogrifier: Handle misskey likes with reactions like EmojiReactions. lain 2019-10-04 17:01:04 +02:00
  • 568a995d64 ActivityPub: Change addressing of Undo. lain 2019-10-04 16:32:42 +02:00
  • 31e57cd1b3 Merge branch 'develop' into 'fix/extended-nickname-format-default-config' feld 2019-10-04 14:16:28 +00:00
  • a553ed5427 Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1' rinpatch 2019-10-04 13:23:01 +00:00
  • 1e6aa10168 Remove in-db configuration references from 1.1 rinpatch 2019-10-04 15:51:48 +03:00
  • 27110793a7 Merge branch 'featrue/job-monitor' into 'develop' lain 2019-10-04 12:52:11 +00:00
  • 8e83c8423f Update Changelog. lain 2019-10-04 14:49:59 +02:00
  • 27e914955e Merge branch 'fix/nickname-fail' into 'develop' lain 2019-10-04 11:54:05 +00:00
  • 8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by nickname rinpatch 2019-10-04 01:05:50 +03:00
  • 01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop' lain 2019-10-04 11:28:20 +00:00
  • bc095a27f1 Merge branch 'fix/oauth-controller' into 'develop' lain 2019-10-04 11:27:30 +00:00
  • d3ac4e8083
    Fix OAuthController Egor Kislitsyn 2019-10-04 13:30:46 +07:00
  • 5dc14c89ce
    notification_view.ex: Make sure account isn’t empty Haelwenn (lanodan) Monnier 2019-10-04 06:47:36 +02:00
  • bdf188b2a6 Merge branch 'docs/frontend_configuration' into 'develop' rinpatch 2019-10-03 22:22:47 +00:00
  • e4ab9a05dd
    cheatsheet.md: link to pleroma-fe docs for :frontend_configurations Haelwenn (lanodan) Monnier 2019-10-04 00:10:28 +02:00
  • 06d9df79c5 Mastodon API: Add pleroma.unread_conversation_count to the Account entity eugenijm 2019-10-02 00:37:08 +03:00
  • c9043c6c80 Transmogrifier: Handle incoming Undos for EmojiReactions. lain 2019-10-03 18:37:23 +02:00
  • 4fe2af3b2d Merge branch 'mkdocs-migration-prep' into 'develop' rinpatch 2019-10-03 15:43:03 +00:00
  • b2f2012a4f Remove a test branch from CI rinpatch 2019-10-03 18:42:02 +03:00
  • b8b98ac40f Add missing extended_nickname_format setting to the default config Mark Felder 2019-10-03 10:40:49 -05:00
  • 69784eb75a Add a missing language specification rinpatch 2019-10-03 15:10:04 +03:00
  • b5a43e301e Change docs build/deploy to just trigger a pipeline in the docs repo rinpatch 2019-10-03 14:27:11 +03:00
  • 1cae564b5d Move config task docs to a separate file and mark it as WIP rinpatch 2019-10-03 14:12:57 +03:00
  • e00403af23 Mix tasks: derive moduledoc from doc files rinpatch 2019-10-03 13:59:49 +03:00
  • 6baa037903 Move database maintenance tasks docs to a separate file rinpatch 2019-10-03 11:17:29 +03:00
  • 8e08d5b233 MkDocs does not like if a paragraph doesn't have a newline after it rinpatch 2019-10-03 11:02:07 +03:00
  • 2656f41818 Remove silent mode note as it's no longer relevant rinpatch 2019-10-03 10:57:27 +03:00
  • aefb4dcff5 Cheatsheet: Use note/warning blocks instead of bold text rinpatch 2019-10-03 10:54:41 +03:00
  • e560d65db3 Fix a typo in activity expirations rinpatch 2019-10-03 10:45:40 +03:00
  • 25849157aa Remove fe settings from :instance as they no longer do anything rinpatch 2019-10-03 10:43:38 +03:00
  • 4e70009490 Move bold text in RemoveIp description into a proper warning rinpatch 2019-10-03 10:39:53 +03:00
  • cb162678df Add missing language spec rinpatch 2019-10-03 10:37:34 +03:00
  • 66450f8615 Cheatsheet: Move the deprecated config warning into a warning block rinpatch 2019-10-03 10:36:01 +03:00
  • 2cbe2dcbde Oops rinpatch 2019-10-03 10:31:59 +03:00