Commit graph

  • c077dc7af5 Initial doc about storing remote media Mark Felder 2019-10-22 11:52:21 -0500
  • d4270397dc Marker: added unread_count field Maksim Pechnikov 2019-10-22 13:42:59 +0300
  • 4f9dad053b tago sadposter 2019-10-22 09:15:46 +0100
  • 85b9992f86 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-10-22 09:12:39 +0100
  • 6281e4795a Merge branch 'feature/push-subject-for-dm' into 'develop' kaniini 2019-10-21 23:50:01 +0000
  • 0c628fafc5 Spelling Mark Felder 2019-10-21 18:35:43 -0500
  • 2cbb3f2364 Add tests for the subject of push notifications Mark Felder 2019-10-21 18:34:20 -0500
  • 6712b6e4de Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' rinpatch 2019-10-21 16:44:17 +0000
  • 2dbee29cf5 Do not include notifications from blocked users when with_muted is set rinpatch 2019-10-21 12:38:35 +0300
  • ce750dbab5 Merge branch 'feature/masto_api_markers' into 'develop' kaniini 2019-10-21 09:26:17 +0000
  • 7c7f90bc4f [#1304] Merged develop, handled User.Info.invisible. Ivan Tashkinov 2019-10-21 11:58:22 +0300
  • 478f0883eb
    Fix benchmarks Egor Kislitsyn 2019-10-21 15:55:28 +0700
  • 31d6ef6f92 update changelog Maksim Pechnikov 2019-10-21 11:53:11 +0300
  • 243719a965 Merge branch 'develop' into feature/masto_api_markers Maksim Pechnikov 2019-10-21 11:32:28 +0300
  • a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation Ivan Tashkinov 2019-10-21 11:05:09 +0300
  • f726d953d5
    Fix typos Egor Kislitsyn 2019-10-21 14:56:39 +0700
  • 2ebe8c416a Merge branch 'feature/activitypub-semantics' into 'develop' kaniini 2019-10-21 07:54:48 +0000
  • e37d4b2ddf
    Revert "Skip deactivated users in followers import" Egor Kislitsyn 2019-10-21 14:52:52 +0700
  • c6fba62666
    Fix Relay Egor Kislitsyn 2019-10-21 14:19:31 +0700
  • 75da202ab7 [#1304] Typo fix. Ivan Tashkinov 2019-10-21 10:20:28 +0300
  • 4ea1a61b00
    Merge branch 'develop' into refactor/following-relationships Egor Kislitsyn 2019-10-21 14:19:15 +0700
  • ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation Ivan Tashkinov 2019-10-20 22:29:56 +0300
  • c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation Ivan Tashkinov 2019-10-20 20:43:18 +0300
  • 62e3d76a45 Merge branch 'chore/add-missing-websub-drop-migration' into 'develop' kaniini 2019-10-20 11:04:22 +0000
  • b4cbf0568b [#1304] Analysis issue fix. Ivan Tashkinov 2019-10-20 13:58:27 +0300
  • e8843974cb [#1304] Moved remaining fields from User.Info to User. Misc. fixes / improvements. Ivan Tashkinov 2019-10-20 13:42:42 +0300
  • 34754938ba add missing migration to drop websub table Ariadne Conill 2019-10-20 10:39:03 +0000
  • 05c58eaece change Maksim's test description Ariadne Conill 2019-10-19 23:23:13 +0000
  • ba92522c69 tests: add test to ensure invisible actors are rendered with the invisible hint set to true Ariadne Conill 2019-10-19 17:53:52 +0000
  • 52d56ed705 tests: add test verifying the relay user is invisible Ariadne Conill 2019-10-19 17:50:17 +0000
  • c9280b9730 rework to use properties instead of compound typing, per SocialCG Ariadne Conill 2019-10-19 17:46:24 +0000
  • 189a288925 fix test Maksim Pechnikov 2019-10-14 09:31:08 +0300
  • 9694d51437 added test fo Pleroma.Web.MastodonAPI.StatusController Maksim Pechnikov 2019-10-14 09:09:32 +0300
  • 80d3912a56 test: activitypub: use User.invisible?/1 for testing invisibility Ariadne Conill 2019-10-08 20:59:43 +0000
  • ef659331b0 implement invisible support for remote users Ariadne Conill 2019-10-05 20:41:33 +0000
  • 95871cb462 user: implement User.invisible?/1 Ariadne Conill 2019-10-05 20:11:43 +0000
  • 1469a084d4 relay: set invisible to true Ariadne Conill 2019-10-05 20:06:31 +0000
  • e7333db72a user info: add invisible field Ariadne Conill 2019-10-05 20:06:03 +0000
  • 1311884a1d Merge branch 'chore/fixup-testsuite-import' into 'develop' kaniini 2019-10-19 23:20:38 +0000
  • cd90735a4b tests: ostatus controller tests: fix sporadic compilation failure Ariadne Conill 2019-10-19 23:16:15 +0000
  • f01dbc450c Merge branch 'feature/mastofe-pwa' into 'develop' Haelwenn 2019-10-19 20:11:58 +0000
  • cec4b00140 Merge branch 'mark-all-conversations-as-read' into 'develop' Haelwenn 2019-10-19 19:55:16 +0000
  • 289f011e0a Merge branch 'develop-version-bump' into 'develop' rinpatch 2019-10-19 19:13:00 +0000
  • f94e28e8b6 mix.exs: Bump version for develop builds rinpatch 2019-10-19 21:59:04 +0300
  • f1381d68e7 StatusControllerTest: Capture log. lain 2019-10-19 14:46:14 +0200
  • 52ed2f8f2d Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read eugenijm 2019-10-11 06:40:58 +0300
  • df3c2dfd8b Add documentation for PWA manifest configuration. KokaKiwi 2019-10-19 12:11:25 +0200
  • 638457ba94 MastoFE: Add PWA manifest. KokaKiwi 2019-10-11 14:48:01 +0200
  • fd6d05dc45 Merge branch 'mix-emoji-task-pack-json' into 'develop' rinpatch 2019-10-19 08:51:03 +0000
  • dcb23a85b6 Merge branch 'develop' into feature/push-subject-for-dm Mark Felder 2019-10-18 17:56:15 -0500
  • 152caef51d Direct messages should provide a distinct push notification subject Mark Felder 2019-10-18 17:51:34 -0500
  • 5c6c3026ea Merge branch 'patch-1' into 'develop' rinpatch 2019-10-18 22:29:04 +0000
  • 9b26d1608f Merge branch 'release/1.1.2' into 'stable' rinpatch 2019-10-18 21:44:14 +0000
  • 59d447d555 pleroma_ctl: Fix attempting to use RPC for config generation rinpatch 2019-10-19 00:37:39 +0300
  • 1a063c92ab Bump version to 1.1.2 in mix.exs rinpatch 2019-10-19 00:40:23 +0300
  • 0341f6f779 Merge branch 'fix/pleroma-ctl-rpc' into 'develop' rinpatch 2019-10-18 21:40:07 +0000
  • 901bf0fb8c pleroma_ctl: Fix attempting to use RPC for config generation rinpatch 2019-10-19 00:37:39 +0300
  • c25a81b173 Merge branch 'feature/relay-list' into 'develop' kaniini 2019-10-18 16:51:04 +0000
  • 019147f115 Merge branch 'develop' into feature/relay-list Maxim Filippov 2019-10-18 18:35:58 +0200
  • 4053a82f41 Merge branch 'feature/ostatus-removal' into 'develop' kaniini 2019-10-18 16:04:57 +0000
  • c2ae6310dc tests: mastodon api: fix broken test that used OStatus Ariadne Conill 2019-10-18 15:46:46 +0000
  • 44e64af5e7 object: containment: simplify the pattern match for OStatus testsuite hack Ariadne Conill 2019-10-18 15:39:15 +0000
  • e99fdfc32d object: containment: only allow OStatus references in test suite environment Ariadne Conill 2019-10-18 15:34:36 +0000
  • a8eb1f0975 tests: mastodon search: search for an account that is visible via activitypub, not ostatus Ariadne Conill 2019-10-18 04:14:26 +0000
  • 3c785b85a6 object: fetcher: fix up formatting Ariadne Conill 2019-10-18 04:08:25 +0000
  • dbfdb1f6e3 add some missing tesla fixtures Ariadne Conill 2019-10-18 03:58:28 +0000
  • bae96de273 activitypub: tag containment checks for better error tracing Ariadne Conill 2019-10-18 03:57:32 +0000
  • 7295a05cee object: containment: also allow OStatus object IDs through when comparing origins Ariadne Conill 2019-10-18 03:56:31 +0000
  • a177f22e02 object: fetcher: improve error reporting Ariadne Conill 2019-10-18 03:41:38 +0000
  • bf2107743f object: containment: don't try to contain ostatus objects Ariadne Conill 2019-10-18 03:26:50 +0000
  • 85ddcaf418 tests: fix up signature tests Ariadne Conill 2019-10-18 02:56:02 +0000
  • 700c654208 tests: fix relay tests Ariadne Conill 2019-10-18 02:52:08 +0000
  • 6f110fc04c object fetcher: fix up error handling Ariadne Conill 2019-10-18 02:42:25 +0000
  • af9aa8e358 tests: simplify object fetching and containment tests Ariadne Conill 2019-10-18 00:51:53 +0000
  • 597cb8897b tests: remove some more ostatus tests Ariadne Conill 2019-10-18 00:37:13 +0000
  • 48059c03c9 fix up some tests Ariadne Conill 2019-10-18 00:30:01 +0000
  • d379b48769 kill almost all of the OStatus module Ariadne Conill 2019-10-17 23:37:21 +0000
  • 6a1f4c5145 federator: remove OStatus incoming document support Ariadne Conill 2019-10-17 23:15:09 +0000
  • 835ad52378 remove Salmon module Ariadne Conill 2019-10-17 23:09:15 +0000
  • beb9861f9d router: disconnect Salmon Ariadne Conill 2019-10-17 23:07:54 +0000
  • a7b92bba68 webfinger: stop pulling Salmon data out of WebFinger Ariadne Conill 2019-10-17 23:07:20 +0000
  • c00ae10af8 feed: don't advertise salmon endpoint Ariadne Conill 2019-10-17 23:06:53 +0000
  • adb639db56 publisher: move remote_users() from Salmon module Ariadne Conill 2019-10-17 23:05:45 +0000
  • 4f82e42e4e websub: remove entirely Ariadne Conill 2019-10-17 22:57:37 +0000
  • b16a460916 federator: remove websub stuff Ariadne Conill 2019-10-17 22:53:45 +0000
  • 25b7ff56c3 application: don't start Federator.init/1 anymore Ariadne Conill 2019-10-17 22:52:46 +0000
  • c6de0cbb4a config: disable Websub and Salmon publisher modules Ariadne Conill 2019-10-17 22:31:20 +0000
  • 4e270964d7 update changelog Ariadne Conill 2019-10-17 22:29:28 +0000
  • 223c0c0136 Merge branch 'fix/changelog-typo' into 'develop' rinpatch 2019-10-18 13:00:33 +0000
  • c2f1cc4f16 Fix wrong list level in the changelog rinpatch 2019-10-18 15:56:14 +0300
  • 153f652d41 Merge branch 'chore/develop-changelog-sync' into 'develop' rinpatch 2019-10-18 12:47:45 +0000
  • 09c1e7a82e Sync the changelog from stable and collapse the API sections rinpatch 2019-10-18 15:34:29 +0300
  • 30a59ae97d Merge branch 'backport/develop-safe-jsonb' into 'develop' rinpatch 2019-10-18 12:42:09 +0000
  • b085cd2660 Add a test for safe_jsonb_set rinpatch 2019-10-18 14:33:51 +0300
  • 39e996528c Fix a migration wiping user info of users that don't have any mutes rinpatch 2019-10-18 14:11:30 +0300
  • 6b9c5e4696 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-10-18 13:12:58 +0100
  • 1eec8d3dee frontend sadposter 2019-10-18 13:12:53 +0100
  • bb73f100b8 Merge branch 'release/1.1.1' into 'stable' rinpatch 2019-10-18 12:08:03 +0000
  • c00b55bc80 Add a changelog entry for user search refactoring rinpatch 2019-10-18 14:57:13 +0300
  • eca86330b4 Remove a failing search test due to it being unrealistic While the case tested (lain@ple) gives wrong ordering due to using only trigram to order, it almost never happens in reality. In reality it would be either lain (in which case it's fine to list the user with lain in display name first), or @lain@pleroma.soykaf.com/lain@pleroma.soykaf.com (which is handled fine as well) rinpatch 2019-10-16 15:09:39 +0300