Commit Graph

  • 2c83eb0b15 Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" Mike Verdone 2019-07-24 17:09:59 +02:00
  • 877575d0da fixup! Update changelog Mike Verdone 2019-07-24 17:07:51 +02:00
  • 2981821db8 squash! Expose expires_at datetime in mastoAPI only for the activity actor Mike Verdone 2019-07-24 16:51:09 +02:00
  • 91d9fdc7de Update changelog to document expiring posts feature Mike Verdone 2019-07-24 13:02:28 +02:00
  • d2da3d30f3 Merge branch 'develop' into feature/digest-email Roman Chvanikov 2019-07-24 16:37:52 +03:00
  • 3cb471ec06 Expose expires_at datetime in mastoAPI only for the activity actor Mike Verdone 2019-07-24 12:43:20 +02:00
  • 36012ef6c1 Require that ephemeral posts live for at least one hour Mike Verdone 2019-07-23 16:33:45 +02:00
  • 704960b3c1 Add support for activity expiration to common and Masto API Mike Verdone 2019-07-22 16:46:20 +02:00
  • 53fad36b57 Merge branch 'develop' into 'develop' lain 2019-07-24 11:28:05 +00:00
  • 378f5f0fbe Add activity expiration worker Mike Verdone 2019-07-22 14:18:58 +02:00
  • 666514194a Add activity expirations table Mike Verdone 2019-07-22 14:16:20 +02:00
  • b729402774 Make test.exs read config in the same way as dev.exs Mike Verdone 2019-07-22 09:10:30 +02:00
  • 8ba7a151ad Cleanup: fix a comment Mike Verdone 2019-07-22 16:45:54 +02:00
  • f5d574f4ed check both item and parent domain blocks sadposter 2019-07-24 11:35:16 +01:00
  • 48bd3be9cb move domain block check to with block Sadposter 2019-07-24 11:11:33 +01:00
  • 4af4f6166b honour domain blocks on streaming notifications Sadposter 2019-07-24 11:09:06 +01:00
  • 0be548b90a Merge branch 'Fix-static-dir-doc' into 'develop' kaniini 2019-07-24 01:59:41 +00:00
  • 9638da43e9 Add text about gitignore aries 2019-07-24 01:50:56 +00:00
  • 9c6357324e Merge branch 'feature/admin-api-user-statuses' into 'develop' kaniini 2019-07-23 23:59:21 +00:00
  • 2ae510ee81 Merge branch 'bugfix/rich-media-splice-url' into 'develop' kaniini 2019-07-23 23:59:06 +00:00
  • d3bdb8e704 rich media: parser: splice the given URL into the result Ariadne Conill 2019-07-23 22:58:31 +00:00
  • f46805bb40 Merge branch 'develop' into feature/admin-api-user-statuses Maxim Filippov 2019-07-24 02:42:28 +03:00
  • 03471151d6 AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) Maxim Filippov 2019-07-24 01:50:09 +03:00
  • 1a751529fb Merge branch 'chore/update-mix-lock' into 'develop' kaniini 2019-07-23 19:59:15 +00:00
  • 0afaf96640 update mix.lock Ariadne Conill 2019-07-23 19:49:36 +00:00
  • bd265acf91 Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop' kaniini 2019-07-23 19:48:34 +00:00
  • 90be91b0e0
    Router: Remove deprecated AdminAPI endpoints Haelwenn (lanodan) Monnier 2019-07-22 13:41:56 +02:00
  • 5230b9ef3d Merge branch 'admin-config-fix' into 'develop' kaniini 2019-07-23 19:17:00 +00:00
  • 5e72554f3c Admin config fix Alexander Strizhakov 2019-07-23 19:17:00 +00:00
  • dd96be5c8b Merge branch 'tests/activity_pub_publisher' into 'develop' kaniini 2019-07-23 19:15:48 +00:00
  • c49a09ed88 tests for Pleroma.Web.ActivityPub.Publisher Maksim 2019-07-23 19:15:48 +00:00
  • 8d3cf7e519 Merge branch 'bugfix/unauthed-liked-by' into 'develop' kaniini 2019-07-23 19:14:43 +00:00
  • ad60837300 Merge branch 'patch-2' into 'develop' kaniini 2019-07-23 19:14:16 +00:00
  • 03d89e182e Merge branch 'fix/subscriber-notifications' into 'develop' kaniini 2019-07-23 19:13:55 +00:00
  • ec7b085b76 Fix test Mark Felder 2019-07-23 13:57:22 -05:00
  • 6a79bb12c3 Fix function Mark Felder 2019-07-23 13:53:05 -05:00
  • 54a161cb7a move unauth'd user blocks?/2 check Sadposter 2019-07-23 19:44:47 +01:00
  • 638f772356 Merge branch 'bugfix/http-signatures-misskey' into 'develop' Haelwenn 2019-07-23 18:39:01 +00:00
  • fd287387a0 Do not notify subscribers for messages from users which are replies to others Mark Felder 2019-07-23 13:14:26 -05:00
  • e7c64f106e signature: properly deduce the actor from misskey key IDs Ariadne Conill 2019-07-23 16:47:22 +00:00
  • 2e697f87f4 Update prometheus_phoenix to v1.3 in order to support phoenix@1.4. oncletom 2019-07-23 15:16:47 +00:00
  • c400565427 fix test names because i cannot type Sadposter 2019-07-23 15:47:17 +01:00
  • 299c0e965b actually reblog on the reblog test Sadposter 2019-07-23 15:38:19 +01:00
  • 7026018c8c Use correct URL for tests Sadposter 2019-07-23 15:31:35 +01:00
  • 452980652d Mix format Sadposter 2019-07-23 15:13:05 +01:00
  • fd1fa5a2ec add tests for unauthed reqs to liked/reblogged_by Sadposter 2019-07-23 15:05:19 +01:00
  • eacf61d823 fix unauthenticated req to favourited/rebloggd_by Sadposter 2019-07-23 15:02:18 +01:00
  • e818381042
    Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1 kPherox 2019-07-23 18:45:04 +09:00
  • 14ab2fd0f4 remove pry Maxim Filippov 2019-07-23 12:30:37 +03:00
  • 1e7d68e8bf Fix the sentence and add the setting example Aries 2019-07-23 09:55:58 +09:00
  • a042a7ac6d Merge branch 'tests/skip-some-tests-on-mac' into 'develop' kaniini 2019-07-22 19:54:22 +00:00
  • 9340896c9e Exclude tests that use :crypt.crypt/2 on macOS Sergey Suprunenko 2019-07-22 19:54:22 +00:00
  • 2951714429 Merge branch 'changelog' into 'develop' kaniini 2019-07-22 19:53:53 +00:00
  • 2442b5c18e changelog Alexander Strizhakov 2019-07-22 19:53:53 +00:00
  • 4a8b522639 Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop' kaniini 2019-07-22 14:33:58 +00:00
  • b70e659304 Feature/1087 wildcard option for blocks Alexander Strizhakov 2019-07-22 14:33:58 +00:00
  • 674ad5e1df Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop' Haelwenn 2019-07-22 11:01:35 +00:00
  • 63924ee712 Fix static_dir docs aries 2019-07-22 18:46:32 +09:00
  • 7271b2a954 Merge branch 'bugfix/muted-user-notif-streaming' into 'develop' kaniini 2019-07-22 02:43:55 +00:00
  • f712ee879a Bugfix: muted/blocked user notification streaming Sadposter 2019-07-22 02:43:55 +00:00
  • 24362cbb3c Merge branch 'tests/improve-test-coverage' into 'develop' kaniini 2019-07-22 02:43:15 +00:00
  • 05b5af8075 Add tests for users tasks and PleromaAuthenticator Sergey Suprunenko 2019-07-22 02:43:15 +00:00
  • b391211aa3 Merge branch 'hide-blocked-from-interaction' into 'develop' kaniini 2019-07-22 02:42:29 +00:00
  • a5d6287ba8 Hide blocked users from interactions Sadposter 2019-07-22 02:42:29 +00:00
  • 56019d53a8 activitypub: publisher: align sharedinbox usage with AP specification rules Ariadne Conill 2019-07-22 02:18:45 +00:00
  • a00aab3402 Merge branch 'fix/rich-media-ttl-fallback' into 'develop' kaniini 2019-07-21 16:05:58 +00:00
  • 3368174785 Fix rich media parser failing when no TTL can be found by image TTL setters rinpatch 2019-07-21 18:22:22 +03:00
  • 1689a11a80 Merge branch 'bugfix/sharedinbox-path-first' into 'develop' kaniini 2019-07-21 04:18:12 +00:00
  • bc6c5c513a router: ensure the AP sharedinbox path is registered first Ariadne Conill 2019-07-21 03:52:06 +00:00
  • afc7708dbe Fix pleroma_job_queue version Roman Chvanikov 2019-07-21 00:01:58 +03:00
  • 196cad46f3 Resolve merge conflicts rinpatch 2019-07-20 22:04:47 +03:00
  • c3ecaea64d Apply suggestion to lib/pleroma/object/fetcher.ex rinpatch 2019-07-20 18:53:00 +00:00
  • d4ee76ab63 Apply suggestion to lib/pleroma/user.ex rinpatch 2019-07-20 18:52:41 +00:00
  • a4647e9804
    fr/LC_MESSAGES/errors.po: Create translation file Haelwenn (lanodan) Monnier 2019-07-20 16:58:53 +02:00
  • 8292331b35 Merge branch 'develop' into feature/digest-email Roman Chvanikov 2019-07-20 16:41:58 +03:00
  • fe548f322e Merge branch '1112-user-insert-conflict-id-preservation' into 'develop' kaniini 2019-07-20 13:09:38 +00:00
  • 6e99e7c774 Merge branch 'tests/mock-sha512-crypt' into 'develop' kaniini 2019-07-20 13:07:51 +00:00
  • 43a7cd27fe [tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest Sergey Suprunenko 2019-07-20 13:07:51 +00:00
  • d0198fe215 [#1112] Preserving id on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint. Ivan Tashkinov 2019-07-20 13:03:34 +03:00
  • ae4fc58589 Remove flavour from userinfo Roman Chvanikov 2019-07-20 01:24:01 +03:00
  • 36049f08ef Merge develop Roman Chvanikov 2019-07-20 01:03:25 +03:00
  • 93df0796f0 Merge branch 'feature/matstodon-statuses-by-name' into 'develop' feld 2019-07-19 21:59:18 +00:00
  • 9169f331b6 Merge branch 'develop' into feature/matstodon-statuses-by-name Mark Felder 2019-07-19 16:55:10 -05:00
  • 33729bbb28 Merge branch 'feature/richmedia-ttl' into 'develop' kaniini 2019-07-19 21:36:36 +00:00
  • c1c64d6d06 Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop' kaniini 2019-07-19 19:33:47 +00:00
  • 9a8eb2c94d mix: add pleroma.user unsubscribe_all_from_instance Ariadne Conill 2019-07-19 19:11:04 +00:00
  • 716afc83ce Merge branch 'refactor/http-signature-plug' into 'develop' kaniini 2019-07-19 16:57:24 +00:00
  • 6561709742 Merge branch 'issue/1110' into 'develop' kaniini 2019-07-19 16:20:23 +00:00
  • c2e2aadc42 #1110 fixed /api/pleroma/healthcheck Maksim 2019-07-19 16:20:23 +00:00
  • 505613f6a7 Merge branch 'patch-2' into 'develop' rinpatch 2019-07-19 10:15:16 +00:00
  • 5c4a555b1d Fix domain for the contact clients.md tom79 2019-07-19 08:40:47 +00:00
  • b0b9eca37d Update clients.md for Fedilab - Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features tom79 2019-07-19 08:39:22 +00:00
  • 581756ccc5 update the docs Sachin Joshi 2019-07-19 11:50:47 +05:45
  • de9906ad56 change the structure of image ttl parsar Sachin Joshi 2019-07-19 11:43:42 +05:45
  • 9570a5be40 Merge branch 'develop' into feature/admin-api-user-statuses Maxim Filippov 2019-07-18 23:38:38 +03:00
  • c947cfec5a mapped signature plug: use user assign like authentication plug Ariadne Conill 2019-07-18 20:31:25 +00:00
  • 16cfee708e Merge branch 'tests/authentication_plug' into 'develop' kaniini 2019-07-18 20:29:51 +00:00
  • f435217e50 tests for Plugs.AuthenticationPlug Maksim 2019-07-18 20:29:51 +00:00
  • 621cacf667 tests: add tests for mapped signature plug Ariadne Conill 2019-07-18 16:28:36 +00:00
  • a8af0ac053 mapped signature plug: fix user lookup Ariadne Conill 2019-07-18 16:27:50 +00:00