flisk/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
6604 commits 1 branch 76 tags 308 MiB
Commit graph

6604 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaniini
475fcb3e6c Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop' 
Clear follow requests when blocking a user

See merge request pleroma/pleroma!1583
 2019-08-18 21:59:22 +00:00
kaniini
18c8c8d176 Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop' 
Hide muted theads from home/public timelines unless `with_muted` is set

See merge request pleroma/pleroma!1575
 2019-08-18 21:57:55 +00:00
Sadposter
58c1391c4d use commonAPI in tests 2019-08-18 22:54:40 +01:00
Sadposter
94e336d9d5 clear follow requests when blocking a user 2019-08-18 20:30:57 +01:00
Mark Felder
cb222b72b3 Add changelog entry too 2019-08-16 10:28:07 -05:00
Mark Felder
ef82f868d9 Formatting 2019-08-16 10:00:18 -05:00
Maksim Pechnikov
3315a2a1c3 fixed User.unfollow with synchronization external user 2019-08-16 15:58:42 +03:00
lain
7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop' 
Extended Pleroma Conversations

See merge request pleroma/pleroma!1535
 2019-08-16 12:55:33 +00:00
Egor Kislitsyn
158231cd20 Add configurable colors and logo for the digest template 2019-08-16 18:32:25 +07:00
Mark Felder
6a3b1a526e max_body_size -> max_body_length, as it should be 2019-08-15 15:34:41 -05:00
rinpatch
0f24edcd8d Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop' 
Fix OAuth cleanup worker unconditionally starting

See merge request pleroma/pleroma!1578
 2019-08-15 17:51:30 +00:00
rinpatch
fba3c16d20 Fix OAuth cleanup worker unconditionally starting 
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
 2019-08-15 20:36:20 +03:00
kaniini
1c8f58a30e Merge branch 'features/formatting-sub_sup' into 'develop' 
html.ex: Allow sub and sup elements by default

Closes #1191

See merge request pleroma/pleroma!1572
 2019-08-15 17:34:16 +00:00
lain
aefb9cdee8 Merge branch 'feature/parallel-rendering' into 'develop' 
Parallelize template rendering

See merge request pleroma/pleroma!1576
 2019-08-15 15:51:11 +00:00
rinpatch
1ad71592ad Parallelize template rendering 2019-08-15 18:05:50 +03:00
rinpatch
a4a3e3becd Hide muted theads from home/public timelines unless with_muted is set 2019-08-15 17:37:30 +03:00
lain
9fb71ce7f4 Merge branch 'cache-follow-state' into 'develop' 
Cache follow state

Closes #1180

See merge request pleroma/pleroma!1573
 2019-08-15 14:06:27 +00:00
Maxim Filippov
ec969eec51 Merge branch 'develop' into 'fix/admin-api-user-deletion' 
# Conflicts:
#   CHANGELOG.md
 2019-08-14 22:45:32 +00:00
Maxim Filippov
b27fafe161 Fix CHANGELOG entry 2019-08-15 01:42:43 +03:00
Maxim Filippov
2b94ae3b39 Do not check if actor is active when deleting a user 2019-08-15 01:35:29 +03:00
rinpatch
27b747546a Merge branch 'fix/stats-send-after' into 'develop' 
Collect stats immediately after init

See merge request pleroma/pleroma!1574
 2019-08-14 22:10:44 +00:00
rinpatch
e8a8d50138 Collect stats immediately after init 2019-08-15 01:01:13 +03:00
rinpatch
bd5ad0af78 Cache follow state 2019-08-15 00:47:30 +03:00
rinpatch
a9e75fa6a4 Add a task to benchmark timeline rendering 2019-08-15 00:43:02 +03:00
Haelwenn (lanodan) Monnier
a6a814420d
html.ex: Allow sub and sup elements by default 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
 2019-08-14 22:49:13 +02:00
rinpatch
31d576de0c Merge branch 'misc-otp-issues' into 'develop' 
Misc OTP issues

See merge request pleroma/pleroma!1567
 2019-08-14 19:22:15 +00:00
rinpatch
dc902ad3df Merge branch 'fix/http-signatures-post' into 'develop' 
activitypub: publisher: add (request-target) to http signature when POSTing

See merge request pleroma/pleroma!1569
 2019-08-14 19:16:52 +00:00
kaniini
1754f8ce6d Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex 2019-08-14 19:05:44 +00:00
rinpatch
4be71c91e0 Merge branch 'fix/mrf-describe-keyword-lists' into 'develop' 
MRF: fix up unserializable option lists in describe implementations

See merge request pleroma/pleroma!1568
 2019-08-14 19:03:39 +00:00
Ariadne Conill
5bb418a90d activitypub: publisher: add (request-target) to http signature when POSTing 2019-08-14 19:01:51 +00:00
Ariadne Conill
626e094589 MRF: fix up unserializable option lists in describe implementations 2019-08-14 18:54:17 +00:00
Ivan Tashkinov
8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-14 21:44:50 +03:00
Ivan Tashkinov
a180c1360e [#1149] Oban mailer job. Adjusted tests. 2019-08-14 21:42:21 +03:00
stwf
c43152f6c1 fix formatting 2019-08-14 14:01:11 -04:00
stwf
d81f63845a Implement Pleroma.Stats as GenServer 2019-08-14 11:59:33 -04:00
stwf
574856ef01 streamline Streamer pings 2019-08-14 11:58:32 -04:00
stwf
15ef521009 Isolate OAuth.Token.CleanWorker 2019-08-14 11:57:50 -04:00
stwf
51bdf0cab6 use default child_specs 2019-08-14 11:55:17 -04:00
lain
4a5b0965a0 Merge branch 'fix/revert-tzdata-1.8' into 'develop' 
Switch to pre-1.8 version of tzdata.

Closes #1183

See merge request pleroma/pleroma!1566
 2019-08-14 15:07:03 +00:00
lain
d3af9e19ed Conversations: Load relations in one query. 2019-08-14 17:01:11 +02:00
rinpatch
6a101f0361 Switch to pre-1.8 version of tzdata. 
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately
tzdata issues bugfix releases for pre-1.8.0 version.
 2019-08-14 17:05:21 +03:00
Egor Kislitsyn
c9970feee2 Fix compatibility with Elixir 1.8 2019-08-14 21:03:25 +07:00
lain
f73212b2a3 Conversation: Render new participation on update. 2019-08-14 15:56:15 +02:00
lain
df81abb68c Conversations: Use correct oauth paths for extended api. 2019-08-14 15:55:43 +02:00
Egor Kislitsyn
4b7f1c6995 Improve digest email template 2019-08-14 20:46:05 +07:00
lain
560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-14 15:30:40 +02:00
Egor Kislitsyn
a2e1db5632 Increase max account fields limits 2019-08-14 14:58:38 +07:00
Egor Kislitsyn
672fcbc7b7 Limit custom fields for old remote users 2019-08-14 14:58:06 +07:00
Egor Kislitsyn
e457fcc479 Add :max_remote_account_fields config option 2019-08-14 14:58:06 +07:00
Egor Kislitsyn
f7bbf99caa Use info.fields instead of source_data for remote users 2019-08-14 14:52:54 +07:00