kaniini
348307ec19
Merge branch 'password-reset-fix-for-non-test-env' into 'develop'
...
Fix password reset for non-test env
See merge request pleroma/pleroma!1441
5 years ago
Eugenij
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
5 years ago
Ariadne Conill
c119835102
update changelog
5 years ago
Ariadne Conill
3d23a12d75
tests: add test for fetching the internal fetch actor
5 years ago
Ariadne Conill
cf9cb953d5
activitypub: represent internal fetch actor
5 years ago
Ariadne Conill
d930e5d5c3
activitypub: introduce internal fetch service actor
5 years ago
Ariadne Conill
62e5ff624e
user: add is_internal_user? helper function
5 years ago
Ariadne Conill
0a6f6e1b5b
webfinger: allow resolution of usernames with dots in them (internal actors)
5 years ago
Ariadne Conill
a9d6a12bb3
activitypub: controller: rework the way the relay actor is presented so the code can be reused
5 years ago
Ariadne Conill
4885473be2
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
5 years ago
kaniini
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
5 years ago
RX14
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
5 years ago
kaniini
0bbc0f0cf4
Merge branch 'feature/1078-password-reset' into 'develop'
...
Feature/1078 password reset
Closes #1078
See merge request pleroma/pleroma!1431
5 years ago
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
kaniini
33fbb638cd
Merge branch 'tests/upload_filters' into 'develop'
...
added tests for Pleroma.Upload.Filter
See merge request pleroma/pleroma!1434
5 years ago
Maksim
21e3f9ac69
added tests for Pleroma.Upload.Filter
5 years ago
kaniini
4ac269a2c3
Merge branch '1094-relation-actions-rate-limiting' into 'develop'
...
[#1094 ] Rate-limited follow & unfollow actions.
Closes #1094
See merge request pleroma/pleroma!1436
5 years ago
Sachin Joshi
18234cc44e
add the rich media ttl based on image exp time
5 years ago
Ivan Tashkinov
2ba07b63f4
Apply suggestion to docs/config.md
5 years ago
Ivan Tashkinov
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
5 years ago
Roman Chvanikov
e7c175c943
Use PleromaJobQueue for scheduling
5 years ago
Roman Chvanikov
9bca70b10a
Merge develop
5 years ago
kaniini
d3b9222761
Merge branch 'add-deactivated-to-account-view' into 'develop'
...
Add `pleroma.deactivated` to the Account entity (Mastodon API)
See merge request pleroma/pleroma!1433
5 years ago
Eugenij
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
kaniini
a0d71d3ccf
Merge branch 'add-blocked-by-to-relationship' into 'develop'
...
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
See merge request pleroma/pleroma!1429
5 years ago
Eugenij
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
kaniini
cf7ca1db0e
Merge branch 'feature/addressable-lists' into 'develop'
...
Fix typo
See merge request pleroma/pleroma!1432
5 years ago
Egor Kislitsyn
70439494af
Fix typo
5 years ago
rinpatch
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
5 years ago
lain
7a24def473
Mastodon Controller: Fix tests.
5 years ago
lain
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
5 years ago
Mark Felder
46c7c53fbb
Add changelog entry for Mastodon API change
5 years ago
Mark Felder
ffb4eb9779
Merge branch 'develop' into feature/matstodon-statuses-by-name
5 years ago
feld
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
5 years ago
feld
03bcb40883
Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'
...
Remove dead link from the installation docs
See merge request pleroma/pleroma!1428
5 years ago
Eugenij
345a38778e
Remove dead link from the installation docs
5 years ago
kaniini
d80bcd270d
Merge branch 'tests/mastodon-common-api' into 'develop'
...
Add more tests for MastodonAPIController and CommonAPI
See merge request pleroma/pleroma!1425
5 years ago
Sergey Suprunenko
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
5 years ago
kaniini
30d7e22784
Merge branch 'fix/1091-notifications-query' into 'develop'
...
Notifications query fix
Closes #1091
See merge request pleroma/pleroma!1427
5 years ago
Alex S
33fd4c0ed7
query fix
5 years ago
kaniini
ee5250ae56
Merge branch 'sha512-crypt' into 'develop'
...
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
5 years ago
Sachin Joshi
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
5 years ago
Moonman
105f437ce9
formatting
5 years ago
kaniini
6aa5b39837
Merge branch 'update-tzdata' into 'develop'
...
Dependencies: Update tzdata and related packages.
See merge request pleroma/pleroma!1423
5 years ago
kaniini
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
5 years ago
kaniini
11b71c6a70
Merge branch 'tests/http_signature' into 'develop'
...
tests for Pleroma.Signature
See merge request pleroma/pleroma!1426
5 years ago
Maksim
c32384c1ea
tests for Pleroma.Signature
5 years ago
kaniini
d725ccfd3a
Merge branch 'feature/addressable-lists' into 'develop'
...
[#802 ] Add addressable lists
See merge request pleroma/pleroma!1113
5 years ago
Alex S
b8607c151c
migrating task refactor
5 years ago
Alex S
c66044b923
atom keys with leading :
5 years ago