fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-29 12:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
6563 commits 27 branches 108 tags 316 MiB
Commit graph

6563 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sadposter c400565427 fix test names because i cannot type 2019-07-23 15:47:17 +01:00
Sadposter 299c0e965b actually reblog on the reblog test 2019-07-23 15:38:19 +01:00
Sadposter 7026018c8c Use correct URL for tests 2019-07-23 15:31:35 +01:00
Sadposter 452980652d Mix format 2019-07-23 15:13:05 +01:00
Sadposter fd1fa5a2ec add tests for unauthed reqs to liked/reblogged_by 2019-07-23 15:08:41 +01:00
Sadposter eacf61d823 fix unauthenticated req to favourited/rebloggd_by 2019-07-23 15:08:33 +01:00
kPherox e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1 2019-07-23 19:47:27 +09:00
Maxim Filippov 14ab2fd0f4 remove pry 2019-07-23 12:30:37 +03:00
Aries 1e7d68e8bf Fix the sentence and add the setting example 2019-07-23 09:55:58 +09:00
kaniini a042a7ac6d Merge branch 'tests/skip-some-tests-on-mac' into 'develop' 
Exclude tests that use :crypt.crypt/2 on macOS

See merge request pleroma/pleroma!1470
 2019-07-22 19:54:22 +00:00
Sergey Suprunenko 9340896c9e Exclude tests that use :crypt.crypt/2 on macOS 2019-07-22 19:54:22 +00:00
kaniini 2951714429 Merge branch 'changelog' into 'develop' 
changelog

See merge request pleroma/pleroma!1469
 2019-07-22 19:53:53 +00:00
Alexander Strizhakov 2442b5c18e changelog 2019-07-22 19:53:53 +00:00
kaniini 4a8b522639 Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop' 
Feature/1087 wildcard option for blocks

Closes #1087

See merge request pleroma/pleroma!1467
 2019-07-22 14:33:58 +00:00
Alexander Strizhakov b70e659304 Feature/1087 wildcard option for blocks 2019-07-22 14:33:58 +00:00
Haelwenn 674ad5e1df Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop' 
activitypub: publisher: align sharedinbox usage with AP specification rules

See merge request pleroma/pleroma!1464
 2019-07-22 11:01:35 +00:00
aries 63924ee712 Fix static_dir docs 2019-07-22 18:46:32 +09:00
kaniini 7271b2a954 Merge branch 'bugfix/muted-user-notif-streaming' into 'develop' 
Bugfix: muted/blocked user notification streaming

Closes #1105

See merge request pleroma/pleroma!1461
 2019-07-22 02:43:55 +00:00
Sadposter f712ee879a Bugfix: muted/blocked user notification streaming 2019-07-22 02:43:55 +00:00
kaniini 24362cbb3c Merge branch 'tests/improve-test-coverage' into 'develop' 
Add tests for users tasks and PleromaAuthenticator

See merge request pleroma/pleroma!1462
 2019-07-22 02:43:15 +00:00
Sergey Suprunenko 05b5af8075 Add tests for users tasks and PleromaAuthenticator 2019-07-22 02:43:15 +00:00
kaniini b391211aa3 Merge branch 'hide-blocked-from-interaction' into 'develop' 
Hide blocked users from interactions

See merge request pleroma/pleroma!1463
 2019-07-22 02:42:29 +00:00
Sadposter a5d6287ba8 Hide blocked users from interactions 2019-07-22 02:42:29 +00:00
Ariadne Conill 56019d53a8 activitypub: publisher: align sharedinbox usage with AP specification rules 
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification.  Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
 2019-07-22 02:38:31 +00:00
kaniini a00aab3402 Merge branch 'fix/rich-media-ttl-fallback' into 'develop' 
Fix rich media parser failing when no TTL can be found by image TTL setters

See merge request pleroma/pleroma!1460
 2019-07-21 16:05:58 +00:00
rinpatch 3368174785 Fix rich media parser failing when no TTL can be found by image TTL 
setters
 2019-07-21 18:22:22 +03:00
kaniini 1689a11a80 Merge branch 'bugfix/sharedinbox-path-first' into 'develop' 
router: ensure the AP sharedinbox path is registered first

See merge request pleroma/pleroma!1458
 2019-07-21 04:18:12 +00:00
Ariadne Conill bc6c5c513a router: ensure the AP sharedinbox path is registered first 2019-07-21 03:52:06 +00:00
Roman Chvanikov afc7708dbe Fix pleroma_job_queue version 2019-07-21 00:01:58 +03:00
rinpatch 196cad46f3 Resolve merge conflicts 2019-07-20 22:04:47 +03:00
rinpatch c3ecaea64d Apply suggestion to lib/pleroma/object/fetcher.ex 2019-07-20 18:53:00 +00:00
rinpatch d4ee76ab63 Apply suggestion to lib/pleroma/user.ex 2019-07-20 18:52:41 +00:00
Roman Chvanikov 8292331b35 Merge branch 'develop' into feature/digest-email 2019-07-20 16:41:58 +03:00
kaniini fe548f322e Merge branch '1112-user-insert-conflict-id-preservation' into 'develop' 
[#1112] Preserving `id` on user insert conflict

Closes #1112

See merge request pleroma/pleroma!1456
 2019-07-20 13:09:38 +00:00
kaniini 6e99e7c774 Merge branch 'tests/mock-sha512-crypt' into 'develop' 
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest

Closes #1114

See merge request pleroma/pleroma!1455
 2019-07-20 13:07:51 +00:00
Sergey Suprunenko 43a7cd27fe [tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest 2019-07-20 13:07:51 +00:00
Ivan Tashkinov d0198fe215 [#1112] Preserving id on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint. 2019-07-20 13:03:34 +03:00
Roman Chvanikov ae4fc58589 Remove flavour from userinfo 2019-07-20 01:24:01 +03:00
Roman Chvanikov 36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
feld 93df0796f0 Merge branch 'feature/matstodon-statuses-by-name' into 'develop' 
Feature/matstodon statuses by name

See merge request pleroma/pleroma!1211
 2019-07-19 21:59:18 +00:00
Mark Felder 9169f331b6 Merge branch 'develop' into feature/matstodon-statuses-by-name 2019-07-19 16:55:10 -05:00
kaniini 33729bbb28 Merge branch 'feature/richmedia-ttl' into 'develop' 
add the rich media ttl based on image exp time

See merge request pleroma/pleroma!1438
 2019-07-19 21:36:36 +00:00
kaniini c1c64d6d06 Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop' 
mix: add pleroma.user unsubscribe_all_from_instance

See merge request pleroma/pleroma!1454
 2019-07-19 19:33:47 +00:00
Ariadne Conill 9a8eb2c94d mix: add pleroma.user unsubscribe_all_from_instance 2019-07-19 19:25:29 +00:00
kaniini 716afc83ce Merge branch 'refactor/http-signature-plug' into 'develop' 
http signature plug: separation of concerns

See merge request pleroma/pleroma!1449
 2019-07-19 16:57:24 +00:00
kaniini 6561709742 Merge branch 'issue/1110' into 'develop' 
#1110 fixed /api/pleroma/healthcheck

Closes #1110

See merge request pleroma/pleroma!1453
 2019-07-19 16:20:23 +00:00
Maksim c2e2aadc42 #1110 fixed /api/pleroma/healthcheck 2019-07-19 16:20:23 +00:00
rinpatch 505613f6a7 Merge branch 'patch-2' into 'develop' 
Update clients.md for Fedilab

See merge request pleroma/pleroma!1452
 2019-07-19 10:15:16 +00:00
tom79 5c4a555b1d Fix domain for the contact clients.md 2019-07-19 08:40:47 +00:00
tom79 b0b9eca37d Update clients.md for Fedilab 
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
 2019-07-19 08:39:22 +00:00