summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-02reserve /mediaRin Toshaka
2018-12-31Merge branch 'features/admin-api-user-views' into 'develop'kaniini
User/Account views: Add rights.admin Closes #472 See merge request pleroma/pleroma!589
2018-12-31Merge branch 'docs/admin-api' into 'develop'kaniini
Add docs/Admin-API.md See merge request pleroma/pleroma!611
2018-12-31Merge branch 'maintenance/copyright-2019' into 'develop'kaniini
update copyright years to 2019 See merge request pleroma/pleroma!613
2018-12-31update copyright years to 2019William Pitcock
2018-12-31Add docs/Admin-API.mdHaelwenn (lanodan) Monnier
[ci skip]
2018-12-31Merge branch 'fix/scrubber-cache' into 'develop'lambda
[#481] Store scrubbed posts in Cachex Closes #481 See merge request pleroma/pleroma!610
2018-12-31Fix a typo in user_test.exRin Toshaka
2018-12-31Eh?Rin Toshaka
2018-12-31Move scrubber cache-related functions to Pleroma.HTMLRin Toshaka
2018-12-30Merge branch 'mr/retry-queue' into 'develop'kaniini
Improves RetryQueue behavior See merge request pleroma/pleroma!609
2018-12-31Get default scrubbers from config instead of hardcodedrinpatch
2018-12-31Fix test failurerinpatch
2018-12-30Resolve merge conflictRin Toshaka
2018-12-30Fix comment in object.exRin Toshaka
2018-12-30Merge branch 'activitypub-c2s' into 'develop'kaniini
Activitypub c2s See merge request pleroma/pleroma!608
2018-12-30shame on me for not testing after revertRin Toshaka
2018-12-30Fix formating. Aparently my pre-commit hook broke.Rin Toshaka
2018-12-30Revert some changes in html.exRin Toshaka
2018-12-30Friendship ended with Postgresql now Cachex is my best friendRin Toshaka
2018-12-30Friendship ended with Postgresql now Cachex is my best friendRin Toshaka
2018-12-30Added get_stripped_html_for_object. Renamed a few thingsRin Toshaka
2018-12-30Improves RetryQueue behaviorMichael Loftis
reduces to one single timer firing once a second switches to a parallel worker model
2018-12-30Tidy up the code. Rename key to signatureRin Toshaka
2018-12-30Fix some stupid typosRin Toshaka
2018-12-30Respond with full activity to outbox postsxsdv1
2018-12-30Limit activity types accepted to outbox to only 'Create'sxsdv1
2018-12-30Create activity when client posts to outboxsxsdv1
2018-12-30Implement ActivityPub inbox viewsxsdv1
More or less verbatim copied from the outbox template with only changes to the activities fetched and url reported
2018-12-30Use Object.change instead of Ecto.Changeset.changeRin Toshaka
2018-12-29Wire up stub routes for client calls of activitypub inbox/outboxsxsdv1
Code style: remove wrapping function of outbox
2018-12-29use Kernel.put_in instead of Map.mergeRin Toshaka
2018-12-29Merge branch 'fix_485' into 'develop'Haelwenn
Change 'name' to 'instance_name' so option is used when running non-interactive See merge request pleroma/pleroma!607
2018-12-29I am not sure what's going on anymore so I'll just commit and reset all the ↵Rin Toshaka
other files to HEAD
2018-12-29Merge branch '2018-12-29-update-frontend' into 'develop'lambda
update frontend See merge request pleroma/pleroma!606
2018-12-29update frontendlain
2018-12-29Merge branch 'carrot-bullying' into 'develop'kaniini
Add some hard limits on inserted activities. See merge request pleroma/pleroma!595
2018-12-29Change 'name' to 'instance_name' so option is used when running non-interactivespctrl
2018-12-29Merge branch '483_blocks_import_export' into 'develop'kaniini
[#483] Blocked users list import & export Closes #483 See merge request pleroma/pleroma!603
2018-12-29Merge branch 'support/issue_480' into 'develop'kaniini
[#480] Salmon# fixed publish an activity to remote accounts See merge request pleroma/pleroma!605
2018-12-29Salmon# fixed publish an activity to remote accountsMaksim Pechnikov
2018-12-29[#483] User.get_by_nickname/1: ensured case-insensitive matching for local ↵Ivan Tashkinov
FQN. Added tests.
2018-12-29[#483] User.get_by_nickname/1: ensured case-insensitive matching for local ↵Ivan Tashkinov
FQN. Added tests.
2018-12-29[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified ↵Ivan Tashkinov
local nickname (<nick>@<our_instance_host>).
2018-12-29[#483] Refactored blocks and follows import, added tests.Ivan Tashkinov
2018-12-29Merge branch '471_invalid_accounts_rendering' into 'develop'kaniini
[#471] Prevented rendering of inactive local accounts Closes #471 See merge request pleroma/pleroma!599
2018-12-28Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'kaniini
Security/Drops the sysadmin privilege from the daemon See merge request pleroma/pleroma!604
2018-12-28Security/Drops the sysadmin privilege from the daemonshibayashi
2018-12-28[#483] Blocked users list import (TwitterAPI).Ivan Tashkinov
2018-12-28[#467] Refactored valid / invalid user rendering.Ivan Tashkinov
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-07 04:01:26 +0000