Commit graph

  • 0f1486ed4e update changelog Ariadne Conill 2019-10-04 21:18:38 +0000
  • a0435dca26 ActivityPub.Utils: Fix undo test. lain 2019-10-04 17:10:49 +0200
  • b7d2ca0372 ActivityPub: Change addressing of Undo. lain 2019-10-04 16:32:42 +0200
  • 9c47d8571c Merge branch 'issue/1296' into 'develop' kaniini 2019-10-04 20:07:47 +0000
  • 83631752af removed legacy api: "/objects/:uuid/likes" Maksim Pechnikov 2019-10-04 22:20:53 +0300
  • 4d38e48558 Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1' kaniini 2019-10-04 18:23:33 +0000
  • 3a923be434 Remove entries from develop that were in the section for some reason rinpatch 2019-10-04 21:19:17 +0300
  • c921e32a44 Add back streaming fix entry rinpatch 2019-10-04 21:17:29 +0300
  • bfc92946e5 Sync 1.1.0 changelog with develop rinpatch 2019-10-04 21:13:35 +0300
  • ca6f1644aa Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1' kaniini 2019-10-04 17:39:28 +0000
  • 222c238e7b Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1' kaniini 2019-10-04 17:39:20 +0000
  • e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop' kaniini 2019-10-04 17:39:06 +0000
  • 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop' kaniini 2019-10-04 17:33:18 +0000
  • 6b7cd7d850 Fix get_cached_by_nickname_or_id not allowing to get local users by nickname rinpatch 2019-10-04 01:05:50 +0300
  • d9e0108baa tests: add missing ExUnit.CaptureLog Ariadne Conill 2019-10-04 16:45:14 +0000
  • 17fed5ae52 application: fix up after_supervisor_start removal backport Ariadne Conill 2019-10-04 16:15:54 +0000
  • e951c547f7 update changelog Ariadne Conill 2019-10-04 15:45:06 +0000
  • abb967671a streamer: worker: actually use should_send? consistently Ariadne Conill 2019-10-04 15:42:25 +0000
  • 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 +0000
  • 51b317a602 streamer: add missing copyright headers Ariadne Conill 2019-10-04 15:21:45 +0000
  • 4305ddef0a tests: streamer: add a test for blocked transitive activities Ariadne Conill 2019-10-04 15:17:32 +0000
  • a2e92a1b8a remove remaining errors from tests Steven Fuchs 2019-09-17 14:44:52 +0000
  • 7d5f20b50f Revert "Merge branch 'revert-4fabf83a' into 'develop'" Egor Kislitsyn 2019-09-16 17:03:37 +0700
  • 8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once Maxim Filippov 2019-10-04 19:00:58 +0300
  • 795ea5dfc2 Move HTTP verb to the header (admin_api.md) Maxim Filippov 2019-10-04 18:58:44 +0300
  • 75e415d5f4 Merge branch 'fix/extended-nickname-format-default-config' into 'develop' kaniini 2019-10-04 15:53:47 +0000
  • 99b312cbab Merge branch 'undo-fixes' into 'develop' kaniini 2019-10-04 15:52:41 +0000
  • dbf5fce67e update changelog Ariadne Conill 2019-10-04 15:45:06 +0000
  • d1d058bf85 streamer: worker: actually use should_send? consistently Ariadne Conill 2019-10-04 15:42:25 +0000
  • 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 +0000
  • 2417b633ed streamer: add missing copyright headers Ariadne Conill 2019-10-04 15:21:45 +0000
  • 8325858ed2 tests: streamer: add a test for blocked transitive activities Ariadne Conill 2019-10-04 15:17:32 +0000
  • 2a7f44acfe ActivityPub.Utils: Fix undo test. lain 2019-10-04 17:10:49 +0200
  • 43a211bcb1 Transmogrifier: Handle misskey likes with reactions like EmojiReactions. lain 2019-10-04 17:01:04 +0200
  • 568a995d64 ActivityPub: Change addressing of Undo. lain 2019-10-04 16:32:42 +0200
  • 31e57cd1b3 Merge branch 'develop' into 'fix/extended-nickname-format-default-config' feld 2019-10-04 14:16:28 +0000
  • a553ed5427 Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1' rinpatch 2019-10-04 13:23:01 +0000
  • 1e6aa10168 Remove in-db configuration references from 1.1 rinpatch 2019-10-04 15:51:48 +0300
  • 27110793a7 Merge branch 'featrue/job-monitor' into 'develop' lain 2019-10-04 12:52:11 +0000
  • 8e83c8423f Update Changelog. lain 2019-10-04 14:49:59 +0200
  • 27e914955e Merge branch 'fix/nickname-fail' into 'develop' lain 2019-10-04 11:54:05 +0000
  • 8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by nickname rinpatch 2019-10-04 01:05:50 +0300
  • 01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop' lain 2019-10-04 11:28:20 +0000
  • bc095a27f1 Merge branch 'fix/oauth-controller' into 'develop' lain 2019-10-04 11:27:30 +0000
  • 8550e0ff0a stickers sadposter 2019-10-04 12:04:31 +0100
  • 59e6b48553 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-10-04 11:48:39 +0100
  • 76c84720f7 stickers sadposter 2019-10-04 11:48:31 +0100
  • d3ac4e8083
    Fix OAuthController Egor Kislitsyn 2019-10-04 13:30:46 +0700
  • 5dc14c89ce
    notification_view.ex: Make sure account isn’t empty Haelwenn (lanodan) Monnier 2019-10-04 06:47:36 +0200
  • bdf188b2a6 Merge branch 'docs/frontend_configuration' into 'develop' rinpatch 2019-10-03 22:22:47 +0000
  • e4ab9a05dd
    cheatsheet.md: link to pleroma-fe docs for :frontend_configurations Haelwenn (lanodan) Monnier 2019-10-04 00:10:28 +0200
  • 06d9df79c5 Mastodon API: Add pleroma.unread_conversation_count to the Account entity eugenijm 2019-10-02 00:37:08 +0300
  • c9043c6c80 Transmogrifier: Handle incoming Undos for EmojiReactions. lain 2019-10-03 18:37:23 +0200
  • 4fe2af3b2d Merge branch 'mkdocs-migration-prep' into 'develop' rinpatch 2019-10-03 15:43:03 +0000
  • b2f2012a4f Remove a test branch from CI rinpatch 2019-10-03 18:42:02 +0300
  • b8b98ac40f Add missing extended_nickname_format setting to the default config Mark Felder 2019-10-03 10:40:49 -0500
  • 69784eb75a Add a missing language specification rinpatch 2019-10-03 15:10:04 +0300
  • b5a43e301e Change docs build/deploy to just trigger a pipeline in the docs repo rinpatch 2019-10-03 14:27:11 +0300
  • 1cae564b5d Move config task docs to a separate file and mark it as WIP rinpatch 2019-10-03 14:12:57 +0300
  • e00403af23 Mix tasks: derive moduledoc from doc files rinpatch 2019-10-03 13:59:49 +0300
  • 6baa037903 Move database maintenance tasks docs to a separate file rinpatch 2019-10-03 11:17:29 +0300
  • 8e08d5b233 MkDocs does not like if a paragraph doesn't have a newline after it rinpatch 2019-10-03 11:02:07 +0300
  • 2656f41818 Remove silent mode note as it's no longer relevant rinpatch 2019-10-03 10:57:27 +0300
  • aefb4dcff5 Cheatsheet: Use note/warning blocks instead of bold text rinpatch 2019-10-03 10:54:41 +0300
  • e560d65db3 Fix a typo in activity expirations rinpatch 2019-10-03 10:45:40 +0300
  • 25849157aa Remove fe settings from :instance as they no longer do anything rinpatch 2019-10-03 10:43:38 +0300
  • 4e70009490 Move bold text in RemoveIp description into a proper warning rinpatch 2019-10-03 10:39:53 +0300
  • cb162678df Add missing language spec rinpatch 2019-10-03 10:37:34 +0300
  • 66450f8615 Cheatsheet: Move the deprecated config warning into a warning block rinpatch 2019-10-03 10:36:01 +0300
  • 2cbe2dcbde Oops rinpatch 2019-10-03 10:31:59 +0300
  • b4ca864c6b Move user tasks docs to a separate file rinpatch 2019-10-03 10:15:24 +0300
  • 8fd47a4a5a Use consistent command signature rinpatch 2019-10-03 09:38:24 +0300
  • f5372bfb4a Fix up some headings rinpatch 2019-10-03 09:36:35 +0300
  • d39ccc2e7f Move uploads task docs to a separate file rinpatch 2019-10-03 09:35:21 +0300
  • 808d0a0170 Move relay docs to a separate file rinpatch 2019-10-03 09:10:31 +0300
  • 6435ba83cd Move instance CLI task docs to a text file rinpatch 2019-10-03 09:02:48 +0300
  • a54739a530 Improve styling of CLI tasks rinpatch 2019-10-03 08:51:57 +0300
  • 869ea2ab90 Move digest email docs to a separate file and improve styling rinpatch 2019-10-03 01:09:51 +0300
  • bd9c7807fb Move emoji task docs to a separate file rinpatch 2019-10-03 01:03:47 +0300
  • 2767c413fb Remove a reference to inline docs since everything it describes is described in the cheatsheet already and add A TODO rinpatch 2019-10-03 00:36:18 +0300
  • 0ba5c1a9d7 Fix more links rinpatch 2019-10-03 00:22:14 +0300
  • b8e5e46fa8 Fix references to other pages rinpatch 2019-10-03 00:18:32 +0300
  • 74d682a09e Remove Small customizations as it's contents have been integrated into static_dir.md rinpatch 2019-10-03 00:00:53 +0300
  • 838ff12ec5 Remove "General tips for customizing Pleroma FE" because it's no longer relevant and we have actual fe docs now rinpatch 2019-10-02 23:58:57 +0300
  • 03e1898917 Rename "Configuration" to "Configuration Cheat Sheet" and explain a bit about how Pleroma Configuration works rinpatch 2019-10-02 23:54:55 +0300
  • acc62f327d Rename some directories because MkDocs uses them for categories rinpatch 2019-10-02 23:28:45 +0300
  • 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-10-02 20:42:40 +0300
  • 0e41951eab Pleroma API Readme: Document unreaction endpoint. lain 2019-10-02 18:20:40 +0200
  • 4cb603e1df PleromaAPI: Add unreacting. lain 2019-10-02 18:19:16 +0200
  • 391c736292 PleromaAPI: Fix emoji_reactions_by lain 2019-10-02 18:13:10 +0200
  • e0c68eeb02
    Move :favourites and :bookmarks actions to StatusController Egor Kislitsyn 2019-10-02 18:27:01 +0700
  • 7f2bc57725
    Move follows, mutes and blocks actions to AccountController Egor Kislitsyn 2019-10-01 17:15:58 +0700
  • c5e937b156 Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop' rinpatch 2019-10-02 14:17:21 +0000
  • 9b68aab8b3
    Fix credo warning Egor Kislitsyn 2019-10-02 21:12:01 +0700
  • 9cfe9a57c5 CommonAPI: Add unreactions. lain 2019-10-02 15:38:57 +0200
  • d3c404af12
    Add MastoFEController Egor Kislitsyn 2019-10-02 20:05:14 +0700
  • dfe5c958eb ActivityPub: Add undo for emoji reactions. lain 2019-10-02 15:08:20 +0200
  • 1c6e1055c8
    Add CustomEmojiController Egor Kislitsyn 2019-10-02 19:16:34 +0700
  • 557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions lain 2019-10-02 13:27:55 +0200
  • 433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop' kaniini 2019-10-02 10:46:14 +0000