nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7902 commits 2 branches 0 tags 272 MiB
Commit graph

7902 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksim Pechnikov 54c9db38c8 Merge branch 'develop' into issue/1383 2019-12-21 20:38:59 +03:00
rinpatch c51e93978e Merge branch 'feature/custom-runtime-modules' into 'develop' 
Add support for custom modules at runtime

Closes #1448

See merge request pleroma/pleroma!2039
 2019-12-21 11:56:24 +00:00
rinpatch 7447c80e33 Merge branch 'revert-a54aa5af' into 'develop' 
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"

Closes #1488

See merge request pleroma/pleroma!2083
 2019-12-21 11:49:35 +00:00
Maxim Filippov e71a13ad57 Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" 
This reverts merge request !2076
 2019-12-21 11:41:19 +00:00
feld 0193b0862f Merge branch 'fix/twitter-card-without-attachments' into 'develop' 
Posts without media attachments should get the Summary TwitterCard

See merge request pleroma/pleroma!2082
 2019-12-20 22:40:52 +00:00
Mark Felder 06ae56a3ae Posts without media attachments should get the Summary TwitterCard 2019-12-20 16:32:04 -06:00
feld a54aa5af43 Merge branch 'feature/status-counts-by-scope' into 'develop' 
Stats: return status counts by scope

See merge request pleroma/pleroma!2076
 2019-12-20 16:30:26 +00:00
feld 60819fd973 Merge branch 'fix/remote-user-no-follower-counter' into 'develop' 
Do not crash when remote user follower and following counters are hidden

See merge request pleroma/pleroma!2077
 2019-12-20 16:30:00 +00:00
Haelwenn c7848b6326 Merge branch 'remove-outdated-doc' into 'develop' 
Remove `/api/account/register` documentation from pleroma_api.md

Closes #1486

See merge request pleroma/pleroma!2078
 2019-12-20 13:24:24 +00:00
Egor Kislitsyn fc79c69173
Remove /api/account/register documentation from pleroma_api.md 2019-12-20 19:47:44 +07:00
Maxim Filippov 5fc84552d3 Fix all count 2019-12-19 19:52:55 +03:00
Maxim Filippov 4079d66f00 Expose issue via failing test 2019-12-19 19:47:36 +03:00
Egor Kislitsyn 432b3067d4
Do not crash when remote user follower and following counters are hidden 2019-12-19 19:26:46 +07:00
Maxim Filippov 404a9ccb9a Stats: return status counts by scope 2019-12-18 23:17:34 +03:00
rinpatch d23a80e691 Merge branch 'feature/add-event-support' into 'develop' 
Add ActivityPub Object Event type support

See merge request pleroma/pleroma!2075
 2019-12-17 15:31:10 +00:00
rinpatch 086250ac5b Merge branch 'ci/rum-testing-no-recompilation' into 'develop' 
CI: Add a cache policy for test jobs and fix rum tests recompiling everything

See merge request pleroma/pleroma!2074
 2019-12-17 15:29:38 +00:00
rinpatch 407449158f CI: Add a cache policy for test jobs and fix rum tests recompiling 
everything
 2019-12-17 18:24:16 +03:00
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support 
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-17 16:16:21 +01:00
Haelwenn 38ad407395 Merge branch 'hide-followers-count' into 'develop' 
Hide follower counter when hiding is activated

Closes #1450

See merge request pleroma/pleroma!2072
 2019-12-17 06:43:15 +00:00
Egor Kislitsyn 8f79f433bc
Hide follower counter when hiding is activated 2019-12-17 13:34:07 +07:00
lain 804b961d3c Merge branch 'fix/remove-useless-sleep' into 'develop' 
Remove useless sleeping/reduce it

See merge request pleroma/pleroma!2069
 2019-12-16 17:07:13 +00:00
Egor Kislitsyn b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules 2019-12-16 22:34:21 +07:00
rinpatch e659fbfbf9 Merge branch 'kocaptcha-default-endpoint' into 'develop' 
Add default endpoint to Pleroma.Captcha.Kocaptcha

See merge request pleroma/pleroma!2070
 2019-12-16 13:08:00 +00:00
Egor Kislitsyn fc484e5ce6
Add Kocaptcha endpoint to config.exs 2019-12-16 19:35:10 +07:00
Egor Kislitsyn 8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" 
This reverts commit 82c62c5028.
 2019-12-16 19:33:51 +07:00
Egor Kislitsyn 82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha 2019-12-16 15:32:33 +07:00
rinpatch eae65e3216 formatting 2019-12-16 01:37:33 +03:00
rinpatch 6ffbfdeeb2 tests: significantly reduce streamer timeout 
there is no reason IPC between two processes on the same node should
take 4 seconds
 2019-12-16 01:22:01 +03:00
rinpatch 54029fe212 tests: remove a useless sleep in rate limiter tests 
It was used to check that authenticated and unauthenticated users have
different limits. Instead of sleeping a super low limit for
unauthenticated users was set, preventing them from doing 5 requests in
the first place.
 2019-12-16 01:03:13 +03:00
rinpatch 137a3d220b tests: remove a useless 1 second sleep 
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
 2019-12-16 00:51:59 +03:00
rinpatch 814a99c80f tests: remove a useless 3 second sleep 
the ids favs use are accurate down to a microsecond, there is no need
for it
 2019-12-16 00:50:39 +03:00
rinpatch c8046e1080 tests: Replace 2 second sleep with offseting updated_at 2019-12-16 00:50:15 +03:00
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44:10 +03:00
Haelwenn 8efacfed67 Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop' 
Publisher: check out a connection for inserting publish_one jobs

See merge request pleroma/pleroma!2063
 2019-12-13 14:58:35 +00:00
rinpatch bcd16676a7 Publisher: check out a connection for inserting publish_one jobs 
Related to #1474, federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
 2019-12-13 14:27:10 +03:00
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-13 01:51:52 +07:00
lain 2f31cef71f Merge branch 'feature/native-captcha' into 'develop' 
Add native captcha and enable it by default.

Closes #1017 and #1405

See merge request pleroma/pleroma!2060
 2019-12-12 18:43:21 +00:00
lain 8ad6d2784c Merge branch 'uguu' into 'develop' 
Update frontend

See merge request pleroma/pleroma!2062
 2019-12-12 16:40:39 +00:00
lain 756a029edf Update frontend 2019-12-12 17:05:22 +01:00
lain f44794d273 Merge branch '1427-oauth-graceful-admin-scope' into 'develop' 
[#1427] Graceful clearance of OAuth admin scopes for non-admin users

Closes #1427

See merge request pleroma/pleroma!2061
 2019-12-12 13:26:39 +00:00
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). 
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
 2019-12-12 16:00:06 +03:00
Egor Kislitsyn 470a3a678d Add Kocaptcha endpoint to the test config 2019-12-12 18:04:52 +07:00
Egor Kislitsyn e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
lain 79532a7f7c Merge branch 'revert-bca1512d' into 'develop' 
Revert "Merge branch 'admin-scope-support-code' into 'develop'"

See merge request pleroma/pleroma!2059
 2019-12-12 09:46:16 +00:00
lain 2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'" 
This reverts merge request !2055
 2019-12-12 09:37:02 +00:00
lain 68a667a465 Merge branch 'test-timeout' into 'develop' 
Fix intermittent failures in federated testing

See merge request pleroma/pleroma!2058
 2019-12-12 09:31:50 +00:00
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' 
AdminAPI: Merge account views for list instance statuses

See merge request pleroma/pleroma!2054
 2019-12-12 09:28:27 +00:00
Egor Kislitsyn c6f2735ffa Remove runtime modules config example 2019-12-12 14:37:57 +07:00
feld 2aa609db8a Merge branch 'feature/report-notes' into 'develop' 
AdminAPI: Add report notes

See merge request pleroma/pleroma!2031
 2019-12-11 23:45:44 +00:00
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00