8df3a63ce9
Merge branch 'patch-1' into 'develop'
...
Fix code block for admin api document
See merge request pleroma/pleroma!1722
5 years ago
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
5 years ago
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
5 years ago
67a659a096
Merge branch 'chore/changelog-sync' into 'develop'
...
Sync changelogs between master and develop
See merge request pleroma/pleroma!1724
5 years ago
3ec81b816f
Sync changelogs between master and develop
5 years ago
cb282f2ccd
Merge branch 'feature/moderation-log-filters' into 'develop'
...
Moderation log filters
See merge request pleroma/pleroma!1607
5 years ago
39a4892929
Add docs
5 years ago
f249b2381f
Fix code block for admin api document
5 years ago
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
c57ad0a402
Cleanup CommonAPI
5 years ago
de3e90e536
Add ActivityDraft.with_valid/2
5 years ago
eed774d058
Add CommonAPI.ActivityDraft
5 years ago
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
5 years ago
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
59ae9255fb
Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' into 'develop'
...
Activitypub/Add `discoverable` parameter in ActivityPub actor
See merge request pleroma/pleroma!1641
5 years ago
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
5 years ago
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
5 years ago
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
5 years ago
a15b9cbef1
Merge branch 'hotfix/hackney-1.15.2' into 'develop'
...
mix.lock: Bump hackney to 1.15.2
Closes #1267
See merge request pleroma/pleroma!1717
5 years ago
b057f2ae9e
mix.lock: Bump hackney to 1.15.2
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
5 years ago
16487716af
Merge branch 'support/test' into 'develop'
...
clears `robot.txt` after tests
See merge request pleroma/pleroma!1715
5 years ago
dd4263da5a
Apply suggestion to test/tasks/instance_test.exs
5 years ago
98be68e91b
Merge branch 'emoji-packs-create-dir' into 'develop'
...
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
5 years ago
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
f2880d7d29
Credo considered harmful
5 years ago
c7d8ccd0c4
Remove useless with clause
5 years ago
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
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.
5 years ago
1fd9c60f87
Fix emoji tags for shareable packs to be "pack:{name}"
5 years ago
118d6dcdf4
Fix nodeinfo handling
5 years ago
ba9d35a904
Add an API endpoint for listing remote packs
5 years ago
a6e85215e1
Credo fix (remove parens on function definition)
5 years ago
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
5 years ago
cdbe7cd37a
When listing emoji packs, be sure to create the directory
5 years ago
1b2e4a0ae0
clears `robot.txt` after tests
5 years ago
a150664a0a
Merge branch 'issue/1218' into 'develop'
...
[#1218 ] Issue/1218
See merge request pleroma/pleroma!1609
5 years ago
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
60cbea5bb2
Allow activities pagination via limit/offset
5 years ago
035f22f784
Fix Credo warnings
5 years ago
1bea67cb5e
Cleanup Pleroma.User
5 years ago
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
79b25be4e1
Do not return tuple when unneeded
5 years ago
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
kaniini