89243fee8e
Fix captcha time, which was meant to be 5 minutes
5 years ago
e8b0c7689a
Merge branch 'update/adminfe-20201019' into 'develop'
...
Update AdminFE build
See merge request pleroma/pleroma!2093
5 years ago
fd3c23af63
Update AdminFE build
5 years ago
70410dfafd
fix create service actor
5 years ago
fcd5dd259a
Merge branch 'bugfix/smtp-config-examples' into 'develop'
...
Fix SMTP mailer example
See merge request pleroma/pleroma!2091
5 years ago
180f257ced
Update CHANGELOG.md
5 years ago
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.
5 years ago
0b6d1292d2
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
5 years ago
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
ee0c40831e
Merge branch 'update-captcha' into 'develop'
...
Update `captcha` dependency
Closes #1492
See merge request pleroma/pleroma!2088
5 years ago
520940d3e2
Update `captcha` dependency
5 years ago
933dc12043
added code of mr#2067
5 years ago
11e010fc77
Merge branch 'feat/doc-improvements' into 'develop'
...
Documentation imrpovements
See merge request pleroma/pleroma!2084
5 years ago
385356aad0
fix oauth scopes for AdminApi#reports_update
5 years ago
10ce7185c2
Merge branch 'increase-captcha-expiry-time' into 'develop'
...
Increase CAPTCHA expiration time to 5 minutes
Closes #1491
See merge request pleroma/pleroma!2086
5 years ago
b012e66e4e
Increase CAPTCHA expiration time to 5 minutes
5 years ago
bdd71669da
update test
5 years ago
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
5 years ago
5b84156013
moved remote follow in separate controller
5 years ago
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
5 years ago
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
5 years ago
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
5 years ago
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
5 years ago
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
5 years ago
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
5 years ago
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
5 years ago
7bd0bca2ab
fixed remote follow
5 years ago
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
5 years ago
fc79c69173
Remove `/api/account/register` documentation from pleroma_api.md
5 years ago
b7811dfb7b
Instead allow a dedicated benchmark config
5 years ago
50638525db
Merge branch 'develop' into config/benchmark
5 years ago
5fc84552d3
Fix all count
5 years ago
4079d66f00
Expose issue via failing test
5 years ago
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
5 years ago
34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
404a9ccb9a
Stats: return status counts by scope
5 years ago
d23a80e691
Merge branch 'feature/add-event-support' into 'develop'
...
Add ActivityPub Object Event type support
See merge request pleroma/pleroma!2075
5 years ago
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
5 years ago
407449158f
CI: Add a cache policy for test jobs and fix rum tests recompiling
...
everything
5 years ago
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>
5 years ago
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
38ad407395
Merge branch 'hide-followers-count' into 'develop'
...
Hide follower counter when hiding is activated
Closes #1450
See merge request pleroma/pleroma!2072
5 years ago
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
804b961d3c
Merge branch 'fix/remove-useless-sleep' into 'develop'
...
Remove useless sleeping/reduce it
See merge request pleroma/pleroma!2069
5 years ago
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
e659fbfbf9
Merge branch 'kocaptcha-default-endpoint' into 'develop'
...
Add default endpoint to Pleroma.Captcha.Kocaptcha
See merge request pleroma/pleroma!2070
5 years ago
Mark Felder