aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-17Update otp_en.md - Added creation of initial admin userBradley D. Thornton
2019-07-17Merge branch 'feature/instance-fetch-actor' into 'develop'kaniini
instance fetch service actor See merge request pleroma/pleroma!1440
2019-07-17Merge branch 'feature/http-signatures-keyid' into 'develop'kaniini
http signatures: derive actor from key IDs See merge request pleroma/pleroma!1442
2019-07-17http signatures: derive actor ID from key ID.Ariadne Conill
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-17mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989Ariadne Conill
2019-07-17Merge branch 'password-reset-fix-for-non-test-env' into 'develop'kaniini
Fix password reset for non-test env See merge request pleroma/pleroma!1441
2019-07-17Fix password reset for non-test envEugenij
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-17update changelogAriadne Conill
2019-07-17tests: add test for fetching the internal fetch actorAriadne Conill
2019-07-17activitypub: represent internal fetch actorAriadne Conill
2019-07-17activitypub: introduce internal fetch service actorAriadne Conill
2019-07-17user: add is_internal_user? helper functionAriadne Conill
2019-07-17webfinger: allow resolution of usernames with dots in them (internal actors)Ariadne Conill
2019-07-17activitypub: controller: rework the way the relay actor is presented so the ↵Ariadne Conill
code can be reused
2019-07-17user: refactor get_or_create_instance_user() into ↵Ariadne Conill
get_or_create_service_actor_by_id()
2019-07-17Merge branch 'feature/mention-mrf' into 'develop'kaniini
Add MRF MentionPolicy for dropping posts which mention specific actors See merge request pleroma/pleroma!1439
2019-07-17Add MRF MentionPolicy for dropping posts which mention specific actorsRX14
2019-07-16Merge branch 'feature/1078-password-reset' into 'develop'kaniini
Feature/1078 password reset Closes #1078 See merge request pleroma/pleroma!1431
2019-07-16mastoapi password resetAlexander Strizhakov
added rate limit to password reset configure rate limit in runtime
2019-07-16Merge branch 'tests/upload_filters' into 'develop'kaniini
added tests for Pleroma.Upload.Filter See merge request pleroma/pleroma!1434
2019-07-16added tests for Pleroma.Upload.FilterMaksim
2019-07-16Merge branch '1094-relation-actions-rate-limiting' into 'develop'kaniini
[#1094] Rate-limited follow & unfollow actions. Closes #1094 See merge request pleroma/pleroma!1436
2019-07-16Apply suggestion to docs/config.mdIvan Tashkinov
2019-07-16[#1094] Rate-limited follow & unfollow actions.Ivan Tashkinov
2019-07-16Merge branch 'add-deactivated-to-account-view' into 'develop'kaniini
Add `pleroma.deactivated` to the Account entity (Mastodon API) See merge request pleroma/pleroma!1433
2019-07-16Add `pleroma.deactivated` to the Account entity (Mastodon API)Eugenij
2019-07-16Merge branch 'add-blocked-by-to-relationship' into 'develop'kaniini
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`) See merge request pleroma/pleroma!1429
2019-07-16Add the `blocked_by` attribute to the relationship API (`GET ↵Eugenij
/api/v1/accounts/relationships`)
2019-07-16Merge branch 'feature/addressable-lists' into 'develop'kaniini
Fix typo See merge request pleroma/pleroma!1432
2019-07-16Fix typoEgor Kislitsyn
2019-07-16Merge branch 'bugfix/poll-id-as-string' into 'develop'rinpatch
Status View: Poll ids are strings. See merge request pleroma/pleroma!1430
2019-07-16Mastodon Controller: Fix tests.lain
2019-07-16Status View: Poll ids are strings.lain
All ids in mastodon are strings, in general.
2019-07-15Merge branch 'match-file-name' into 'develop'feld
try to always match the filename for proxy url See merge request pleroma/pleroma!1405
2019-07-15Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'feld
Remove dead link from the installation docs See merge request pleroma/pleroma!1428
2019-07-15Remove dead link from the installation docsEugenij
2019-07-15Merge branch 'tests/mastodon-common-api' into 'develop'kaniini
Add more tests for MastodonAPIController and CommonAPI See merge request pleroma/pleroma!1425
2019-07-15Add more tests for MastodonAPIController and CommonAPISergey Suprunenko
2019-07-15Merge branch 'fix/1091-notifications-query' into 'develop'kaniini
Notifications query fix Closes #1091 See merge request pleroma/pleroma!1427
2019-07-15query fixAlex S
2019-07-15Merge branch 'sha512-crypt' into 'develop'kaniini
detect and use sha512-crypt for stored password hash. See merge request pleroma/pleroma!1422
2019-07-15Merge branch 'develop' into match-file-nameSachin Joshi
# Conflicts: # lib/pleroma/web/media_proxy/media_proxy_controller.ex
2019-07-15formattingMoonman
2019-07-15Merge branch 'update-tzdata' into 'develop'kaniini
Dependencies: Update tzdata and related packages. See merge request pleroma/pleroma!1423
2019-07-15Merge branch 'admin-configure-atom-keys' into 'develop'kaniini
admin configure - atom keys with leading : See merge request pleroma/pleroma!1424
2019-07-15Merge branch 'tests/http_signature' into 'develop'kaniini
tests for Pleroma.Signature See merge request pleroma/pleroma!1426
2019-07-15tests for Pleroma.SignatureMaksim
2019-07-15Merge branch 'feature/addressable-lists' into 'develop'kaniini
[#802] Add addressable lists See merge request pleroma/pleroma!1113
2019-07-15migrating task refactorAlex S
2019-07-15atom keys with leading :Alex S
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:42:00 +0000