phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • a11ca87f40 Add a migration to remove embeded objects rinpatch 2019-04-18 13:10:38 +03:00
  • 83589ca6a5 Merge branch 'develop' into feature/database-compaction rinpatch 2019-04-18 12:56:38 +03:00
  • ac04311b3f Fix search in TwitterAPI rinpatch 2019-04-18 10:24:06 +03:00
  • 6069d0fd36 Fix object search depending on embeded object rinpatch 2019-04-18 09:28:20 +03:00
  • e31a22043b Fix media timeline depending on embeded object and add some guards rinpatch 2019-04-18 08:31:08 +03:00
  • 2abc09570f Use the preloaded object in tag queries rinpatch 2019-04-18 01:37:04 +03:00
  • 36f78c6dcd activitypub: fix filtering of boosts from blocked users William Pitcock 2019-04-17 22:27:59 +00:00
  • 8c65b69d4a Merge branch 'feature/improve-block-filtering' into 'develop' kaniini 2019-04-17 20:12:44 +00:00
  • 2140e164d7 activitypub: properly filter out transitive activities concerning blocked users William Pitcock 2019-04-17 20:05:09 +00:00
  • 35ac672b8d Remove containment tests from transmogrifier and fix thread visibility solver rinpatch 2019-04-17 17:59:15 +03:00
  • d1eb578a57 Refactor tests that used ActivityPub.fetch_object_from_id rinpatch 2019-04-17 17:03:35 +03:00
  • 4c289e924e Fix delete-by_ap_id to expect not only embeded objects rinpatch 2019-04-17 16:35:01 +03:00
  • 8e4d950f31 Remove updating reply count for embeded objects rinpatch 2019-04-17 15:54:09 +03:00
  • ff8d76c670 Refactor all tests that acessed the embeded object rinpatch 2019-04-17 15:46:59 +03:00
  • c3a2052806 If it's an object struct it is already normalized rinpatch 2019-04-17 15:11:22 +03:00
  • 54b82f236b Fix note count test rinpatch 2019-04-17 15:03:17 +03:00
  • a53b917e7f oof rinpatch 2019-04-17 14:55:26 +03:00
  • ad681877df Make credo happy rinpatch 2019-04-17 14:52:01 +03:00
  • e641651e2b Fix unbookmarking rinpatch 2019-04-17 14:27:02 +03:00
  • e7c3c36766 Update functions in object fetcher for tesla and set up a proper mock for tests rinpatch 2019-04-17 14:21:39 +03:00
  • b09ae02c04 Added some more normalization calls all in mastodon api controller rinpatch 2019-04-17 13:04:58 +03:00
  • 2f0203a4a1 Resolve conflicts Roman Chvanikov 2019-04-17 16:59:05 +07:00
  • 87013f8438 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email Roman Chvanikov 2019-04-17 16:58:08 +07:00
  • 462028688b Fix pinned posts relying on embded objects rinpatch 2019-04-17 12:34:19 +03:00
  • dda4e0e2a8 Fix warnings in object tests rinpatch 2019-04-17 12:27:29 +03:00
  • 627e5a0a49 Merge branch 'develop' into feature/database-compaction rinpatch 2019-04-17 12:22:32 +03:00
  • 8de17c480e Merge branch '788-notify-email-changelog' into 'develop' rinpatch 2019-04-17 09:05:27 +00:00
  • 128aae05f3 [#923] Minor semantic adjustment. Ivan Tashkinov 2019-04-17 11:33:21 +03:00
  • 2198e54d28 changes Alex S 2019-04-17 14:27:51 +07:00
  • 6ac948c5b8 changelog info Alex S 2019-04-17 14:12:45 +07:00
  • 73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop' kaniini 2019-04-16 18:44:07 +00:00
  • 02a53d00c9 Merge branch 'fix/remote-follow-auth' into 'develop' kaniini 2019-04-16 18:40:56 +00:00
  • cde7711b12 Merge branch 'bugfix/relax-spam-protection' into 'develop' Haelwenn 2019-04-16 18:38:11 +00:00
  • 6ddaeb14e2 Merge branch 'patch-2' into 'develop' kaniini 2019-04-16 18:35:58 +00:00
  • 5f31e7ec6b Merge branch 'fix/follow-imports' into 'develop' kaniini 2019-04-16 18:35:38 +00:00
  • d4a749cfb2 Handle new-style mastodon follow lists Normandy 2019-04-16 18:35:38 +00:00
  • 750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox William Pitcock 2019-04-16 18:10:15 +00:00
  • 2472efb4e9
         Add extra_cookie_attrs to changelog Hakurei Reimu 2019-04-16 22:24:24 +08:00
  • 6e26ac10a3 make Pleroma.Endpoint use extra_cookie_attrs in config Hakurei Reimu 2019-04-15 12:33:46 +08:00
  • 10096bbf2b add extra_cookie_attrs option to config Hakurei Reimu 2019-04-15 12:31:37 +08:00
  • 0d4afdc6e6 Merge branch 'deps/bump-exdoc' into 'develop' rinpatch 2019-04-16 11:59:38 +00:00
  • 37da03499e Bump ex_doc rinpatch 2019-04-16 14:53:17 +03:00
  • 498c96d458 Add supervisord configuration Dominik V. Salonen 2019-04-16 07:14:44 +00:00
  • 76999c73a7 Conversation: Add accounts to output. lain 2019-04-15 22:28:42 +02:00
  • 0da985182f Conversation: Return full status object, id is a string. lain 2019-04-15 21:58:58 +02:00
  • c1ebb38d3a Conversation: Also create participations for remote users. lain 2019-04-15 21:45:25 +02:00
  • 776f1e3bdf Merge branch 'remove-footguns' into 'develop' rinpatch 2019-04-15 13:57:38 +00:00
  • 088f378408 Custom Emoji docs: Make it clear that config.exs is not for lewd. lain 2019-04-15 15:51:17 +02:00
  • 4fecd6f9a7 Config.exs: Add big warning so that nobody ever edits it. lain 2019-04-15 15:45:15 +02:00
  • 56956de6fa Merge branch 'fix/status-reblogged' into 'develop' lambda 2019-04-15 10:26:23 +00:00
  • f358295cbe Merge branch 'unfollow-oneself' into 'develop' lambda 2019-04-15 10:24:37 +00:00
  • f896699357 Merge branch 'refactor/remove-inReplyToStatusId' into 'develop' lambda 2019-04-15 10:23:06 +00:00
  • 38926a063a add /api/pleroma/disable_account to docs/api/pleroma_api.md Egor Kislitsyn 2019-04-15 16:39:42 +07:00
  • 27d78dc526 Use User.get_cached_by* eugenijm 2019-04-15 12:37:49 +03:00
  • fd2e31af86 oops rinpatch 2019-04-15 11:59:01 +03:00
  • 5d73dca064 Remove inReplyToStatusId rinpatch 2019-04-15 11:50:36 +03:00
  • 507e7821e3 Handle follow/unfollow directed to themselves eugenijm 2019-04-15 09:44:16 +03:00
  • 8c6d5a6b4d Merge branch 'bugfix/registration-email-pattern' into 'develop' rinpatch 2019-04-14 17:54:32 +00:00
  • dc21181f65 Update updated_at field on notification read Roman Chvanikov 2019-04-14 22:29:05 +07:00
  • e513504e88 Revert "Assert on the success of enqueue before returning" Sadposter 2019-04-14 16:12:54 +01:00
  • 16d8c8b33b Assert on the success of enqueue before returning Sadposter 2019-04-14 16:05:26 +01:00
  • 5e45557751 Always return {atom, _} from try_send_confirmation Sadposter 2019-04-14 16:01:48 +01:00
  • ec42b639a3 fix pattern match on user registration Sadposter 2019-04-14 15:46:54 +01:00
  • 679a8ef629 Assign reblogged in the Mastodon reblog status view eugenijm 2019-04-14 05:15:03 +03:00
  • 0cd4b6024d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email Roman Chvanikov 2019-04-14 14:05:21 +07:00
  • 7304e0ce18 Merge branch 'docs/archlinux-odbc' into 'develop' kaniini 2019-04-14 05:34:17 +00:00
  • 48982169dc
         docs/installation/arch_linux_en.md: Remove useless ODBC Haelwenn (lanodan) Monnier 2019-04-13 22:41:54 +02:00
  • 050339c223 Merge branch 'docs/changelog' into 'develop' Haelwenn 2019-04-13 20:29:05 +00:00
  • 3018d81d87 Put an actual description of the vulnerability and add **Breaking:** to breaking changes rinpatch 2019-04-13 21:17:10 +03:00
  • 371a4aed2c Add User.Info.email_notifications Roman Chvanikov 2019-04-13 17:40:42 +07:00
  • c5d0fffeaf naming fix Alex S 2019-04-13 14:55:42 +07:00
  • c349573791 Merge develop to 788-separate-email-addresses Alex S 2019-04-13 12:24:38 +07:00
  • a64eb2b389 fallback to the old behaviour Alex S 2019-04-13 12:20:36 +07:00
  • 3a805cc35c Add a changelog rinpatch 2019-04-13 00:31:18 +03:00
  • 334b2d78dc Merge branch 'improve-formatter' into 'develop' Haelwenn 2019-04-12 19:25:53 +00:00
  • f9af90c5aa Revert "simplify mentions escape" Egor 2019-04-12 19:25:53 +00:00
  • 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop' lambda 2019-04-12 10:41:09 +00:00
  • d0304b4f92 more tests Egor Kislitsyn 2019-04-12 16:51:28 +07:00
  • dd097a406b add tests Egor Kislitsyn 2019-04-12 16:38:32 +07:00
  • 0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' lambda 2019-04-12 09:34:12 +00:00
  • 57d5ff57d6 Merge branch 'fix/732-password-align' into 'develop' lambda 2019-04-12 09:13:30 +00:00
  • 1b4c4d29a3 Merge branch 'ssl_trusted_cert' into 'develop' lambda 2019-04-12 08:58:46 +00:00
  • 378b964d8e
         installation/download-mastofe-build.sh: Add copyright header Haelwenn (lanodan) Monnier 2019-04-12 07:39:49 +02:00
  • b421dd3dd2
         installation/download-mastofe-build.sh: Add mastofe CI-artifacts download Haelwenn (lanodan) Monnier 2019-04-12 07:32:46 +02:00
  • 30a4318ef1 Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop' kaniini 2019-04-12 02:28:46 +00:00
  • 711ade961e adding destroy multiple for mastofe Alexander Strizhakov 2019-04-12 02:28:46 +00:00
  • 9825a94391 Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop' kaniini 2019-04-12 02:21:32 +00:00
  • e03d24af96 in_reply_to_id - null Alexander Strizhakov 2019-04-12 02:21:32 +00:00
  • 31c06dba5a Merge branch 'fix/hackney_max_body_param' into 'develop' kaniini 2019-04-11 17:54:31 +00:00
  • 4615e56219 Add with_body: true to requests relying on max_body: val Roman Chvanikov 2019-04-12 00:16:15 +07:00
  • d6d5f46bae Update OAuth web template Mark Felder 2019-04-11 16:02:38 +00:00
  • 6f880b1627 Conversation: Fix tests. lain 2019-04-11 13:31:20 +02:00
  • 42d2c8d95b Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop' lambda 2019-04-11 11:24:36 +00:00
  • 36ec8d9694 ActivityPub: Fix specs. lain 2019-04-11 13:20:46 +02:00
  • 46bd5c1d87 fix format Egor Kislitsyn 2019-04-11 17:28:12 +07:00
  • db4badc6aa move user disable into deactivation Egor Kislitsyn 2019-04-11 17:22:42 +07:00
  • 0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account Egor Kislitsyn 2019-04-11 15:51:52 +07:00
  • 51c97d71af
         Update Mastodon Frontend to 2019-04-11 bundle Haelwenn (lanodan) Monnier 2019-04-11 07:29:03 +02:00
  • 38e28b4034 Repo alias no longer needed Mark Felder 2019-04-10 15:18:48 -05:00
  • 3eb18d175b Merge branch 'develop' into mfc-develop Mark Felder 2019-04-10 15:17:46 -05:00