Mark Felder
102eb4455c
Fix associated test as well
2019-09-12 12:29:08 -05:00
lain
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
2019-09-12 18:59:13 +02:00
lain
05e9776517
PleromaAPIController: Add endpoint to fetch emoji reactions.
2019-09-12 18:48:25 +02:00
Maksim Pechnikov
4f548cb2b7
added test for Ostatus
2019-09-12 10:25:43 +03:00
Mark Felder
74e4c72c4a
Fix double quotes in error logs
...
Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca "", error: nil
2019-09-11 16:16:09 -05:00
kaniini
50269e9cac
Merge branch 'feature/jason-view-render' into 'develop'
...
Use Jason for rendering responses
See merge request pleroma/pleroma!1655
2019-09-11 20:47:25 +00:00
Maksim Pechnikov
007e0c1ce1
added tests
2019-09-11 23:19:06 +03:00
rinpatch
56828abf6d
Use Jason for rendering responses
...
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59)
)
2019-09-11 23:06:31 +03:00
Haelwenn
46ae62d159
Merge branch 'patch-5' into 'develop'
...
Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642
2019-09-11 17:47:19 +00:00
lain
fb7332aec7
Merge branch 'fix/oom-parallel-rendering' into 'develop'
...
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
2019-09-11 11:21:03 +00:00
rinpatch
5a76d5d239
Add extended benchmark
2019-09-11 11:13:17 +03:00
Alex S
e47089cf55
web_cache_ttl description
2019-09-11 09:32:58 +03:00
Alex S
38b29779c3
refactoring
2019-09-11 09:25:33 +03:00
Alex S
be32d90a0c
little refactor
2019-09-11 09:25:33 +03:00
Alex S
5ff12e7df1
some changes
2019-09-11 09:25:33 +03:00
Alex S
aa7fb22008
placeholder for config.md
2019-09-11 09:25:33 +03:00
Alex S
57dc59d98d
little fix
2019-09-11 09:25:33 +03:00
Alex S
6b0e8b73df
bump ex_doc version
2019-09-11 09:25:33 +03:00
Alex S
10827eecad
formatting
2019-09-11 09:25:33 +03:00
Alex S
35757b6d0e
don't add behaviour to suggestions
2019-09-11 09:25:33 +03:00
Alexander Strizhakov
5db2920644
Apply suggestion to config/description.exs
2019-09-11 09:25:33 +03:00
Alexander Strizhakov
65bc9e66ad
Apply suggestion to config/description.exs
2019-09-11 09:25:33 +03:00
Alex S
0624e06a9c
little fix
2019-09-11 09:25:33 +03:00
Alex S
8f5ee7db06
typo fix
2019-09-11 09:25:33 +03:00
Alex S
6721301086
some changes
2019-09-11 09:25:33 +03:00
Alex S
0559c82bdb
fix
2019-09-11 09:25:33 +03:00
Alex S
68e45a327f
changelog
2019-09-11 09:25:33 +03:00
Alex S
a1f2dfb10a
expanding regex sigils to use modifiers
2019-09-11 09:25:33 +03:00
Alex S
511d93fa54
mix docs generates config.md
2019-09-11 09:25:33 +03:00
Alex S
67e4300931
description formatters
2019-09-11 09:25:33 +03:00
Alex S
171cefd889
description.exs
2019-09-11 09:25:33 +03:00
Alex S
ab4960cc7f
deleting old config.md file
2019-09-11 09:25:33 +03:00
Maksim Pechnikov
fcf604fa43
added tests
2019-09-11 07:23:33 +03:00
rinpatch
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
.
Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.
2019-09-10 22:01:45 +03:00
lain
69800055f1
Merge branch 'fix/tests' into 'develop'
...
Fix tests for `Activity.all_by_ids_with_object/1`
See merge request pleroma/pleroma!1652
2019-09-10 18:53:41 +00:00
Egor Kislitsyn
3d12e05f43
Fix Activity.all_by_ids_with_object/1
test
2019-09-11 01:08:37 +07:00
lain
d8b76c79f2
Merge branch 'statuses-by-ids' into 'develop'
...
Add an endpoint to get multiple statuses by IDs
Closes #1240
See merge request pleroma/pleroma!1621
2019-09-10 17:04:12 +00:00
Maksim Pechnikov
a31af93e1d
added tests /activity_pub/transmogrifier.ex
2019-09-10 16:43:10 +03:00
Egor Kislitsyn
30f0cec49a
Add note about limit to the doc
2019-09-10 13:39:45 +07:00
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
2019-09-10 13:39:45 +07:00
Maxim Filippov
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
2019-09-10 01:23:20 +03:00
feld
ceb2e09126
Merge branch 'cache-plug' into 'develop'
...
Add Pleroma.Plugs.Cache
Closes #1174
See merge request pleroma/pleroma!1612
2019-09-09 18:53:09 +00:00
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
feld
bce16f4557
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG (add a note about !1649 )
See merge request pleroma/pleroma!1650
2019-09-09 18:39:44 +00:00
Egor Kislitsyn
e34de00052
Update CHANGELOG (add a note about !1649 )
2019-09-10 01:30:02 +07:00
feld
edbaf78176
Merge branch 'fix/read-inbox' into 'develop'
...
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
2019-09-09 18:21:29 +00:00
Egor Kislitsyn
e0f84d0043
Fix ActivityPubController.read_inbox/2
2019-09-10 01:11:57 +07:00
Ivan Tashkinov
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
2019-09-08 15:00:03 +03:00
Ivan Tashkinov
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-08 08:41:10 +03:00
shadowfacts
e5c6bf3673
Mastodon API: URI encode hashtag name in generated URLs
...
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
2019-09-07 19:50:45 +00:00