Commit graph

  • 1a751529fb Merge branch 'chore/update-mix-lock' into 'develop' kaniini 2019-07-23 19:59:15 +0000
  • 0afaf96640 update mix.lock Ariadne Conill 2019-07-23 19:49:36 +0000
  • bd265acf91 Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop' kaniini 2019-07-23 19:48:34 +0000
  • 1f8c0953a2 add emojo sadposter 2019-07-23 20:37:04 +0100
  • 90be91b0e0
    Router: Remove deprecated AdminAPI endpoints Haelwenn (lanodan) Monnier 2019-07-22 13:41:56 +0200
  • ef7466921b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-07-23 20:29:00 +0100
  • 5230b9ef3d Merge branch 'admin-config-fix' into 'develop' kaniini 2019-07-23 19:17:00 +0000
  • 5e72554f3c Admin config fix Alexander Strizhakov 2019-07-23 19:17:00 +0000
  • dd96be5c8b Merge branch 'tests/activity_pub_publisher' into 'develop' kaniini 2019-07-23 19:15:48 +0000
  • c49a09ed88 tests for Pleroma.Web.ActivityPub.Publisher Maksim 2019-07-23 19:15:48 +0000
  • 8d3cf7e519 Merge branch 'bugfix/unauthed-liked-by' into 'develop' kaniini 2019-07-23 19:14:43 +0000
  • ad60837300 Merge branch 'patch-2' into 'develop' kaniini 2019-07-23 19:14:16 +0000
  • 03d89e182e Merge branch 'fix/subscriber-notifications' into 'develop' kaniini 2019-07-23 19:13:55 +0000
  • ec7b085b76 Fix test Mark Felder 2019-07-23 13:57:22 -0500
  • 6a79bb12c3 Fix function Mark Felder 2019-07-23 13:53:05 -0500
  • 54a161cb7a move unauth'd user blocks?/2 check Sadposter 2019-07-23 19:44:47 +0100
  • 638f772356 Merge branch 'bugfix/http-signatures-misskey' into 'develop' Haelwenn 2019-07-23 18:39:01 +0000
  • fd287387a0 Do not notify subscribers for messages from users which are replies to others Mark Felder 2019-07-23 13:14:26 -0500
  • e7c64f106e signature: properly deduce the actor from misskey key IDs Ariadne Conill 2019-07-23 16:47:22 +0000
  • 2e697f87f4 Update prometheus_phoenix to v1.3 in order to support phoenix@1.4. oncletom 2019-07-23 15:16:47 +0000
  • c400565427 fix test names because i cannot type Sadposter 2019-07-23 15:47:17 +0100
  • 299c0e965b actually reblog on the reblog test Sadposter 2019-07-23 15:38:19 +0100
  • 7026018c8c Use correct URL for tests Sadposter 2019-07-23 15:31:35 +0100
  • 452980652d Mix format Sadposter 2019-07-23 15:13:05 +0100
  • fd1fa5a2ec add tests for unauthed reqs to liked/reblogged_by Sadposter 2019-07-23 15:05:19 +0100
  • eacf61d823 fix unauthenticated req to favourited/rebloggd_by Sadposter 2019-07-23 15:02:18 +0100
  • e818381042
    Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1 kPherox 2019-07-23 18:45:04 +0900
  • 14ab2fd0f4 remove pry Maxim Filippov 2019-07-23 12:30:37 +0300
  • 1e7d68e8bf Fix the sentence and add the setting example Aries 2019-07-23 09:55:58 +0900
  • a042a7ac6d Merge branch 'tests/skip-some-tests-on-mac' into 'develop' kaniini 2019-07-22 19:54:22 +0000
  • 9340896c9e Exclude tests that use :crypt.crypt/2 on macOS Sergey Suprunenko 2019-07-22 19:54:22 +0000
  • 2951714429 Merge branch 'changelog' into 'develop' kaniini 2019-07-22 19:53:53 +0000
  • 2442b5c18e changelog Alexander Strizhakov 2019-07-22 19:53:53 +0000
  • 4a8b522639 Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop' kaniini 2019-07-22 14:33:58 +0000
  • b70e659304 Feature/1087 wildcard option for blocks Alexander Strizhakov 2019-07-22 14:33:58 +0000
  • 674ad5e1df Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop' Haelwenn 2019-07-22 11:01:35 +0000
  • 63924ee712 Fix static_dir docs aries 2019-07-22 18:46:32 +0900
  • 3b5aba6f91 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-07-22 09:22:18 +0100
  • 7271b2a954 Merge branch 'bugfix/muted-user-notif-streaming' into 'develop' kaniini 2019-07-22 02:43:55 +0000
  • f712ee879a Bugfix: muted/blocked user notification streaming Sadposter 2019-07-22 02:43:55 +0000
  • 24362cbb3c Merge branch 'tests/improve-test-coverage' into 'develop' kaniini 2019-07-22 02:43:15 +0000
  • 05b5af8075 Add tests for users tasks and PleromaAuthenticator Sergey Suprunenko 2019-07-22 02:43:15 +0000
  • b391211aa3 Merge branch 'hide-blocked-from-interaction' into 'develop' kaniini 2019-07-22 02:42:29 +0000
  • a5d6287ba8 Hide blocked users from interactions Sadposter 2019-07-22 02:42:29 +0000
  • 56019d53a8 activitypub: publisher: align sharedinbox usage with AP specification rules Ariadne Conill 2019-07-22 02:18:45 +0000
  • d564e780db Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-07-22 01:18:03 +0100
  • e11058c20c add user show task sadposter 2019-07-22 01:17:59 +0100
  • a00aab3402 Merge branch 'fix/rich-media-ttl-fallback' into 'develop' kaniini 2019-07-21 16:05:58 +0000
  • 3368174785 Fix rich media parser failing when no TTL can be found by image TTL setters rinpatch 2019-07-21 18:22:22 +0300
  • 1689a11a80 Merge branch 'bugfix/sharedinbox-path-first' into 'develop' kaniini 2019-07-21 04:18:12 +0000
  • bc6c5c513a router: ensure the AP sharedinbox path is registered first Ariadne Conill 2019-07-21 03:52:06 +0000
  • afc7708dbe Fix pleroma_job_queue version Roman Chvanikov 2019-07-21 00:01:58 +0300
  • 196cad46f3 Resolve merge conflicts rinpatch 2019-07-20 22:04:47 +0300
  • c3ecaea64d Apply suggestion to lib/pleroma/object/fetcher.ex rinpatch 2019-07-20 18:53:00 +0000
  • d4ee76ab63 Apply suggestion to lib/pleroma/user.ex rinpatch 2019-07-20 18:52:41 +0000
  • a4647e9804
    fr/LC_MESSAGES/errors.po: Create translation file Haelwenn (lanodan) Monnier 2019-07-20 16:58:53 +0200
  • 8292331b35 Merge branch 'develop' into feature/digest-email Roman Chvanikov 2019-07-20 16:41:58 +0300
  • 234b2b8edb update gab rewrite sadposter 2019-07-20 14:36:13 +0100
  • c2737d13df Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-07-20 14:28:30 +0100
  • ed1ce20c5a add email util tasks sadposter 2019-07-20 14:28:25 +0100
  • fe548f322e Merge branch '1112-user-insert-conflict-id-preservation' into 'develop' kaniini 2019-07-20 13:09:38 +0000
  • 6e99e7c774 Merge branch 'tests/mock-sha512-crypt' into 'develop' kaniini 2019-07-20 13:07:51 +0000
  • 43a7cd27fe [tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest Sergey Suprunenko 2019-07-20 13:07:51 +0000
  • 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 +0300
  • ae4fc58589 Remove flavour from userinfo Roman Chvanikov 2019-07-20 01:24:01 +0300
  • 36049f08ef Merge develop Roman Chvanikov 2019-07-20 01:03:25 +0300
  • 93df0796f0 Merge branch 'feature/matstodon-statuses-by-name' into 'develop' feld 2019-07-19 21:59:18 +0000
  • 9169f331b6 Merge branch 'develop' into feature/matstodon-statuses-by-name Mark Felder 2019-07-19 16:55:10 -0500
  • 33729bbb28 Merge branch 'feature/richmedia-ttl' into 'develop' kaniini 2019-07-19 21:36:36 +0000
  • c1c64d6d06 Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop' kaniini 2019-07-19 19:33:47 +0000
  • 9a8eb2c94d mix: add pleroma.user unsubscribe_all_from_instance Ariadne Conill 2019-07-19 19:11:04 +0000
  • 716afc83ce Merge branch 'refactor/http-signature-plug' into 'develop' kaniini 2019-07-19 16:57:24 +0000
  • 6561709742 Merge branch 'issue/1110' into 'develop' kaniini 2019-07-19 16:20:23 +0000
  • c2e2aadc42 #1110 fixed /api/pleroma/healthcheck Maksim 2019-07-19 16:20:23 +0000
  • 505613f6a7 Merge branch 'patch-2' into 'develop' rinpatch 2019-07-19 10:15:16 +0000
  • 5c4a555b1d Fix domain for the contact clients.md tom79 2019-07-19 08:40:47 +0000
  • 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 +0000
  • 581756ccc5 update the docs Sachin Joshi 2019-07-19 11:50:47 +0545
  • de9906ad56 change the structure of image ttl parsar Sachin Joshi 2019-07-19 11:43:42 +0545
  • 9570a5be40 Merge branch 'develop' into feature/admin-api-user-statuses Maxim Filippov 2019-07-18 23:38:38 +0300
  • c947cfec5a mapped signature plug: use user assign like authentication plug Ariadne Conill 2019-07-18 20:31:25 +0000
  • 16cfee708e Merge branch 'tests/authentication_plug' into 'develop' kaniini 2019-07-18 20:29:51 +0000
  • f435217e50 tests for Plugs.AuthenticationPlug Maksim 2019-07-18 20:29:51 +0000
  • 621cacf667 tests: add tests for mapped signature plug Ariadne Conill 2019-07-18 16:28:36 +0000
  • a8af0ac053 mapped signature plug: fix user lookup Ariadne Conill 2019-07-18 16:27:50 +0000
  • 5ea0cd69f7 mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite) Ariadne Conill 2019-07-18 16:01:21 +0000
  • cdf0038d0f mix: update http signatures dependency Ariadne Conill 2019-07-18 15:51:58 +0000
  • 184fa61fb3 plugs: add MappedSignatureToIdentityPlug Ariadne Conill 2019-07-18 15:38:45 +0000
  • 18d8d12d53 signature: make key_id_to_actor_id() public Ariadne Conill 2019-07-18 15:35:42 +0000
  • 88d064d80e http signature plug: remove redundant checks handled by HTTPSignatures library Ariadne Conill 2019-07-18 15:06:58 +0000
  • f9a0014681 Merge branch 'feature/signed-object-fetches' into 'develop' kaniini 2019-07-18 13:27:50 +0000
  • 1485d75f3c Merge branch 'tests/uploads' into 'develop' kaniini 2019-07-18 12:30:18 +0000
  • b6b748d3e7 tests for Uploader with webhook Maksim 2019-07-18 12:30:18 +0000
  • e2c39e1cc0 Merge branch 'fix-howto_mediaproxy' into 'develop' kaniini 2019-07-18 12:29:26 +0000
  • 129078eddc Fix redirect setting not working aries 2019-07-18 21:08:31 +0900
  • 7bb50bfccc update changelog Ariadne Conill 2019-07-17 23:07:53 +0000
  • 1345e0c2bf tests: add tests for signed object fetches Ariadne Conill 2019-07-17 22:58:52 +0000
  • 0e502cb836 Merge branch 'patch-2' into 'develop' kaniini 2019-07-17 23:03:46 +0000
  • cffe8229a5 Update clients.md - added Homepage for Fedilab Android app tallship 2019-07-17 23:03:46 +0000
  • a51ee5fae5 Merge branch 'patch-3' into 'develop' kaniini 2019-07-17 23:03:30 +0000