Alibek Omarov
e1308f10bd
docs: API: update Mastodon API link
4 vuotta sitten
lain
05ca420c09
Merge branch 'issue/1490' into 'develop'
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
4 vuotta sitten
lain
9b5cd8b1b7
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework
See merge request pleroma/pleroma!2068
4 vuotta sitten
lain
e118d639a0
Merge branch 'fix/captcha-time' into 'develop'
Fix captcha time, which was meant to be 5 minutes
See merge request pleroma/pleroma!2094
4 vuotta sitten
Mark Felder
89243fee8e
Fix captcha time, which was meant to be 5 minutes
4 vuotta sitten
feld
e8b0c7689a
Merge branch 'update/adminfe-20201019' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2093
4 vuotta sitten
Mark Felder
fd3c23af63
Update AdminFE build
4 vuotta sitten
Maksim Pechnikov
70410dfafd
fix create service actor
4 vuotta sitten
rinpatch
fcd5dd259a
Merge branch 'bugfix/smtp-config-examples' into 'develop'
Fix SMTP mailer example
See merge request pleroma/pleroma!2091
4 vuotta sitten
RX14
b55f2563d0
Fix SMTP mailer example
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
4 vuotta sitten
Ivan Tashkinov
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
4 vuotta sitten
rinpatch
ee0c40831e
Merge branch 'update-captcha' into 'develop'
Update `captcha` dependency
Closes #1492
See merge request pleroma/pleroma!2088
4 vuotta sitten
Egor Kislitsyn
520940d3e2
Update `captcha` dependency
4 vuotta sitten
Haelwenn
11e010fc77
Merge branch 'feat/doc-improvements' into 'develop'
Documentation imrpovements
See merge request pleroma/pleroma!2084
4 vuotta sitten
lain
10ce7185c2
Merge branch 'increase-captcha-expiry-time' into 'develop'
Increase CAPTCHA expiration time to 5 minutes
Closes #1491
See merge request pleroma/pleroma!2086
4 vuotta sitten
Egor Kislitsyn
b012e66e4e
Increase CAPTCHA expiration time to 5 minutes
4 vuotta sitten
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
4 vuotta sitten
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
4 vuotta sitten
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
4 vuotta sitten
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
4 vuotta sitten
Mark Felder
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
4 vuotta sitten
feld
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
4 vuotta sitten
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
4 vuotta sitten
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
4 vuotta sitten
Egor Kislitsyn
fc79c69173
Remove `/api/account/register` documentation from pleroma_api.md
4 vuotta sitten
Maxim Filippov
5fc84552d3
Fix all count
4 vuotta sitten
Maxim Filippov
4079d66f00
Expose issue via failing test
4 vuotta sitten
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
4 vuotta sitten
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
4 vuotta sitten
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
4 vuotta sitten
Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
4 vuotta sitten
rinpatch
d23a80e691
Merge branch 'feature/add-event-support' into 'develop'
Add ActivityPub Object Event type support
See merge request pleroma/pleroma!2075
4 vuotta sitten
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
4 vuotta sitten
rinpatch
407449158f
CI: Add a cache policy for test jobs and fix rum tests recompiling
everything
4 vuotta sitten
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>
4 vuotta sitten
Haelwenn
38ad407395
Merge branch 'hide-followers-count' into 'develop'
Hide follower counter when hiding is activated
Closes #1450
See merge request pleroma/pleroma!2072
4 vuotta sitten
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
4 vuotta sitten
lain
804b961d3c
Merge branch 'fix/remove-useless-sleep' into 'develop'
Remove useless sleeping/reduce it
See merge request pleroma/pleroma!2069
4 vuotta sitten
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
4 vuotta sitten
rinpatch
e659fbfbf9
Merge branch 'kocaptcha-default-endpoint' into 'develop'
Add default endpoint to Pleroma.Captcha.Kocaptcha
See merge request pleroma/pleroma!2070
4 vuotta sitten
Egor Kislitsyn
fc484e5ce6
Add Kocaptcha endpoint to config.exs
4 vuotta sitten
Egor Kislitsyn
8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
This reverts commit 82c62c5028
.
4 vuotta sitten
Egor Kislitsyn
82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha
4 vuotta sitten
rinpatch
eae65e3216
formatting
4 vuotta sitten
rinpatch
6ffbfdeeb2
tests: significantly reduce streamer timeout
there is no reason IPC between two processes on the same node should
take 4 seconds
4 vuotta sitten
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.
4 vuotta sitten
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.
4 vuotta sitten
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
4 vuotta sitten
rinpatch
c8046e1080
tests: Replace 2 second sleep with offseting updated_at
4 vuotta sitten
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
4 vuotta sitten