cffe8229a5
Update clients.md - added Homepage for Fedilab Android app
2019-07-17 23:03:46 +00:00
a51ee5fae5
Merge branch 'patch-3' into 'develop'
...
Update otp_en.md - Added creation of initial admin user
See merge request pleroma/pleroma!1445
2019-07-17 23:03:30 +00:00
cdecef2a08
Update otp_en.md - Added creation of initial admin user
2019-07-17 22:35:16 +00:00
1e48af9acf
Merge branch 'feature/instance-fetch-actor' into 'develop'
...
instance fetch service actor
See merge request pleroma/pleroma!1440
2019-07-17 19:45:40 +00:00
60b54ee64a
Merge branch 'feature/http-signatures-keyid' into 'develop'
...
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
2019-07-17 19:44:14 +00:00
f84fb340b7
http signatures: derive actor ID from key ID.
...
Almost all AP servers return their key ID as the actor URI with #main-key
added. Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
2019-07-17 19:18:19 +00:00
1e3aff6ef1
mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989
2019-07-17 19:00:26 +00:00
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
2019-07-17 18:09:31 +00:00
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.
2019-07-17 18:09:31 +00:00
c119835102
update changelog
2019-07-17 17:49:21 +00:00
3d23a12d75
tests: add test for fetching the internal fetch actor
2019-07-17 17:48:08 +00:00
cf9cb953d5
activitypub: represent internal fetch actor
2019-07-17 17:34:57 +00:00
d930e5d5c3
activitypub: introduce internal fetch service actor
2019-07-17 17:14:08 +00:00
62e5ff624e
user: add is_internal_user? helper function
2019-07-17 17:12:42 +00:00
0a6f6e1b5b
webfinger: allow resolution of usernames with dots in them (internal actors)
2019-07-17 16:59:29 +00:00
a9d6a12bb3
activitypub: controller: rework the way the relay actor is presented so the code can be reused
2019-07-17 16:33:08 +00:00
4885473be2
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
2019-07-17 16:03:05 +00:00
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
2019-07-17 15:28:41 +00:00
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
2019-07-17 15:16:55 +01:00
0bbc0f0cf4
Merge branch 'feature/1078-password-reset' into 'develop'
...
Feature/1078 password reset
Closes #1078
See merge request pleroma/pleroma!1431
2019-07-16 21:44:50 +00:00
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
2019-07-16 21:44:50 +00:00
33fbb638cd
Merge branch 'tests/upload_filters' into 'develop'
...
added tests for Pleroma.Upload.Filter
See merge request pleroma/pleroma!1434
2019-07-16 21:35:43 +00:00
21e3f9ac69
added tests for Pleroma.Upload.Filter
2019-07-16 21:35:43 +00:00
4ac269a2c3
Merge branch '1094-relation-actions-rate-limiting' into 'develop'
...
[#1094 ] Rate-limited follow & unfollow actions.
Closes #1094
See merge request pleroma/pleroma!1436
2019-07-16 21:35:12 +00:00
2ba07b63f4
Apply suggestion to docs/config.md
2019-07-16 16:59:02 +00:00
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
2019-07-16 19:18:30 +03:00
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
2019-07-16 11:14:46 +00:00
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
2019-07-16 11:14:46 +00:00
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
2019-07-16 11:04:11 +00:00
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
2019-07-16 11:04:11 +00:00
cf7ca1db0e
Merge branch 'feature/addressable-lists' into 'develop'
...
Fix typo
See merge request pleroma/pleroma!1432
2019-07-16 10:49:24 +00:00
70439494af
Fix typo
2019-07-16 14:56:07 +07:00
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
2019-07-16 06:06:22 +00:00
7a24def473
Mastodon Controller: Fix tests.
2019-07-16 14:01:18 +09:00
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
2019-07-16 12:47:40 +09:00
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
2019-07-15 22:04:58 +00:00
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
2019-07-15 21:43:04 +00:00
345a38778e
Remove dead link from the installation docs
2019-07-15 21:43:04 +00:00
d80bcd270d
Merge branch 'tests/mastodon-common-api' into 'develop'
...
Add more tests for MastodonAPIController and CommonAPI
See merge request pleroma/pleroma!1425
2019-07-15 19:47:23 +00:00
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
2019-07-15 19:47:23 +00:00
30d7e22784
Merge branch 'fix/1091-notifications-query' into 'develop'
...
Notifications query fix
Closes #1091
See merge request pleroma/pleroma!1427
2019-07-15 19:46:31 +00:00
33fd4c0ed7
query fix
2019-07-15 20:53:52 +03:00
ee5250ae56
Merge branch 'sha512-crypt' into 'develop'
...
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
2019-07-15 16:13:17 +00:00
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
2019-07-15 21:30:56 +05:45
105f437ce9
formatting
2019-07-15 08:36:51 -07:00
6aa5b39837
Merge branch 'update-tzdata' into 'develop'
...
Dependencies: Update tzdata and related packages.
See merge request pleroma/pleroma!1423
2019-07-15 13:02:59 +00:00
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
2019-07-15 13:01:58 +00:00
11b71c6a70
Merge branch 'tests/http_signature' into 'develop'
...
tests for Pleroma.Signature
See merge request pleroma/pleroma!1426
2019-07-15 13:01:22 +00:00
c32384c1ea
tests for Pleroma.Signature
2019-07-15 13:01:22 +00:00
d725ccfd3a
Merge branch 'feature/addressable-lists' into 'develop'
...
[#802 ] Add addressable lists
See merge request pleroma/pleroma!1113
2019-07-15 13:00:33 +00:00
tallship
kaniini
Eugenij
RX14
Alexander Strizhakov
Maksim
Ivan Tashkinov
Ivan Tashkinov
Egor Kislitsyn
rinpatch
lain
feld
Sergey Suprunenko
Sachin Joshi
Moonman