summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-29Merge branch 'refactor/use-constants' into 'develop'lain
refactoring: begin to use constants See merge request pleroma/pleroma!1500
2019-07-29Merge branch 'mailer-enabled-nodeinfo' into 'develop'kaniini
Add `mailerEnabled` to the NodeInfo metadata See merge request pleroma/pleroma!1502
2019-07-29Add `mailerEnabled` to the NodeInfo metadataEugenij
2019-07-29Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'kaniini
Redirect not logged-in users to the MastoFE login page on private instances Closes #1045 See merge request pleroma/pleroma!1503
2019-07-29Redirect not logged-in users to the MastoFE login page on private instancesSergey Suprunenko
2019-07-29Merge branch 'tests/ostatus_controller' into 'develop'kaniini
added tests for OstatusController See merge request pleroma/pleroma!1501
2019-07-29added tests for OstatusControllerMaksim
2019-07-29constants: add as_public constant and use it everywhereAriadne Conill
2019-07-29mix: add ex_const dependencyAriadne Conill
2019-07-28Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'kaniini
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Closes #1104 See merge request pleroma/pleroma!1498
2019-07-28transmogrifier: use User.delete() instead of handrolled user deletion code ↵Ariadne Conill
for remote users Closes #1104
2019-07-28Merge branch 'confirmation-resend' into 'develop'kaniini
add account confirmation email resend in mastodon api See merge request pleroma/pleroma!1492
2019-07-28add account confirmation email resend in mastodon apiSachin Joshi
2019-07-28Merge branch 'fix/user_update_and_set_cache' into 'develop'kaniini
fixed User.update_and_set_cache for stale user See merge request pleroma/pleroma!1493
2019-07-28fixed User.update_and_set_cache for stale userMaksim
2019-07-28Merge branch 'develop' into 'develop'kaniini
Fix HTTP sig tweak on KeyId See merge request pleroma/pleroma!1496
2019-07-28Merge branch 'feature/hackney-303-redirect' into 'develop'kaniini
Handle 303 redirects Closes #1127 See merge request pleroma/pleroma!1497
2019-07-28Handle 303 redirectsSergey Suprunenko
2019-07-28Fix HTTP sig tweak on KeyIdThomas Sileo
2019-07-26Merge branch 'issue/1097' into 'develop'rinpatch
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/ See merge request pleroma/pleroma!1495
2019-07-26[#1097] added redirect: /pleroma/admin -> /pleroma/admin/Maksim
2019-07-26Merge branch 'changelog/1484-base_url-remove-media' into 'develop'Haelwenn
Changelog: !1484 base_url removed /media/ See merge request pleroma/pleroma!1494
2019-07-26CHANGELOG.md: Add entry for !1484Haelwenn (lanodan) Monnier
Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484 [ci skip]
2019-07-25Merge branch 'tests/filter_dedupe' into 'develop'kaniini
fixed test for elixir 1.7.4 See merge request pleroma/pleroma!1487
2019-07-25fixed test for elixir 1.7.4Maksim
2019-07-24Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'kaniini
Fix remote follow from /ostatus_subscribe Closes #1103 See merge request pleroma/pleroma!1472
2019-07-24Merge branch 'fix/put-correct-activity-url' into 'develop'kaniini
Show the url advertised in the Activity in the Status JSON response Closes #1077 See merge request pleroma/pleroma!1485
2019-07-24Show the url advertised in the Activity in the Status JSON responseSergey Suprunenko
2019-07-25Add WebFinger test for AP-only accountkPherox
2019-07-24Merge branch 'fix/Upload_base_url' into 'develop'kaniini
Fix/upload base url See merge request pleroma/pleroma!1484
2019-07-24Do not prepend /media/ when using base_urlfeld
This ensures admin has full control over the path where media resides.
2019-07-25Change to not require `magic-public-key` on WebFingerkPherox
2019-07-24Merge branch 'tests/web_finger' into 'develop'kaniini
tests WebFinger See merge request pleroma/pleroma!1483
2019-07-24tests WebFingerMaksim
2019-07-24Merge branch 'domain-blocking-relationship-api' into 'develop'kaniini
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships) See merge request pleroma/pleroma!1481
2019-07-24Add `domain_blocking` to the relationship API (GET ↵Eugenij
/api/v1/accounts/relationships)
2019-07-24Merge branch 'develop' into 'develop'lain
Honour domain blocks on streamed notifications/statuses See merge request pleroma/pleroma!1482
2019-07-24check both item and parent domain blockssadposter
2019-07-24move domain block check to with blockSadposter
2019-07-24honour domain blocks on streaming notificationsSadposter
2019-07-24Merge branch 'Fix-static-dir-doc' into 'develop'kaniini
Fix static_dir docs See merge request pleroma/pleroma!1465
2019-07-24Add text about gitignorearies
2019-07-23Merge branch 'feature/admin-api-user-statuses' into 'develop'kaniini
Admin API: Endpoint for fetching latest user's statuses See merge request pleroma/pleroma!1413
2019-07-23Merge branch 'bugfix/rich-media-splice-url' into 'develop'kaniini
rich media: parser: splice the given URL into the result See merge request pleroma/pleroma!1480
2019-07-23rich media: parser: splice the given URL into the resultAriadne Conill
2019-07-24Merge branch 'develop' into feature/admin-api-user-statusesMaxim Filippov
2019-07-24AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see ↵Maxim Filippov
private statuses)
2019-07-23Merge branch 'chore/update-mix-lock' into 'develop'kaniini
update mix.lock See merge request pleroma/pleroma!1478
2019-07-23update mix.lockAriadne Conill
2019-07-23Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'kaniini
Router: Remove deprecated AdminAPI endpoints See merge request pleroma/pleroma!1466
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 22:03:05 +0000