summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-26Add list_from endpoint to the pleroma_api docsEkaterina Vaartis
2019-09-26Merge developRoman Chvanikov
2019-09-26Extract timeline actions from `MastodonAPIController` into `TimelineController`Egor Kislitsyn
2019-09-26Cleanup CommonAPIEgor Kislitsyn
2019-09-26Add ActivityDraft.with_valid/2Egor Kislitsyn
2019-09-26Add CommonAPI.ActivityDraftEgor Kislitsyn
2019-09-26Merge branch 'refactor/notification-controller' into 'develop'kaniini
Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646
2019-09-26Merge branch 'feature/return-link-for-password-reset' into 'develop'kaniini
Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
Simplify updating user's `info` See merge request pleroma/pleroma!1712
2019-09-26Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' ↵kaniini
into 'develop' Activitypub/Add `discoverable` parameter in ActivityPub actor See merge request pleroma/pleroma!1641
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26Merge branch 'hex-flake-id' into 'develop'kaniini
Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692
2019-09-26Merge branch 'feature/activities-pagination-by-offset' into 'develop'kaniini
Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714
2019-09-26Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'kaniini
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern See merge request pleroma/pleroma!1716
2019-09-25Merge branch 'hotfix/hackney-1.15.2' into 'develop'rinpatch
mix.lock: Bump hackney to 1.15.2 Closes #1267 See merge request pleroma/pleroma!1717
2019-09-25mix.lock: Bump hackney to 1.15.2Haelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
2019-09-25Merge branch 'support/test' into 'develop'rinpatch
clears `robot.txt` after tests See merge request pleroma/pleroma!1715
2019-09-25Apply suggestion to test/tasks/instance_test.exsMaksim
2019-09-25Merge branch 'emoji-packs-create-dir' into 'develop'rinpatch
When listing emoji packs, be sure to create the directory + add an endpoint to list remote packs since JS can't do that See merge request pleroma/pleroma!1711
2019-09-25Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.exrinpatch
2019-09-25Credo considered harmfulrinpatch
2019-09-25Remove useless with clauserinpatch
2019-09-25Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-25Don't embed the first page in inboxes/outboxes and refactor the views torinpatch
follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.
2019-09-25Fix emoji tags for shareable packs to be "pack:{name}"Ekaterina Vaartis
2019-09-25Fix nodeinfo handlingEkaterina Vaartis
2019-09-25Add an API endpoint for listing remote packsEkaterina Vaartis
2019-09-25Credo fix (remove parens on function definition)vaartis
2019-09-25Move emoji_dir_path & cache_seconds_per_file vaartis
2019-09-25When listing emoji packs, be sure to create the directoryEkaterina Vaartis
2019-09-25clears `robot.txt` after testsMaksim Pechnikov
2019-09-25Merge branch 'issue/1218' into 'develop'lain
[#1218] Issue/1218 See merge request pleroma/pleroma!1609
2019-09-25Replace `Pleroma.FlakeId` with `flake_id` hex packageEgor Kislitsyn
2019-09-25Merge branch 'develop' into issue/1218Maksim Pechnikov
2019-09-25Allow activities pagination via limit/offsetMaxim Filippov
2019-09-24Fix Credo warningsEgor Kislitsyn
2019-09-24Cleanup Pleroma.UserEgor Kislitsyn
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-24Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-24Extract notification actions from `MastodonAPIController` into ↵Egor Kislitsyn
`NotificationController`
2019-09-24Do not return tuple when unneededEgor Kislitsyn
2019-09-24Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-23Merge branch 'feature/force-password-reset' into 'develop'kaniini
Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705
2019-09-23Merge branch 'support-rel-ugc' into 'develop'kaniini
Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679
2019-09-23Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'kaniini
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703
2019-09-23Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'kaniini
added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651
2019-09-23Merge branch 'clean-up-views' into 'develop'kaniini
Clean up views See merge request pleroma/pleroma!1709
2019-09-23Clean up viewsSteven Fuchs
2019-09-23Merge branch 'emoji-pack-json-pretty' into 'develop'kaniini
Also pretty print pack.json See merge request pleroma/pleroma!1710
2019-09-24Also pretty print pack.jsonEkaterina Vaartis
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 09:11:26 +0000