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
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
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
5 years ago
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
5 years ago
e1d2d69c87
Clean up views
5 years ago
494bb6bac6
updated tests
5 years ago
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
5 years ago
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
5 years ago
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
5 years ago
2ad50583f0
Document and test /api/ap/whoami
5 years ago
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
72a01f1350
Use router helper to generate reset password link
5 years ago
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
5 years ago
9aca2cc95d
Add test for correct AP outbox pagination
5 years ago
95c948110c
Add `rel="ugc"` to hashtags and mentions
5 years ago
cf3041220a
Add support for `rel="ugc"`
5 years ago
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
5 years ago
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
5 years ago
b585134c90
Get the nodeinfo address from the well-known
5 years ago
a1325d5fd9
Change path from nodeinfo to metadata->features
5 years ago
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
5 years ago
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
5 years ago
6cd651a38b
Make the emoji controller api more RESTy
5 years ago
7c784128fd
Change emoji api responses to JSON
5 years ago
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
5 years ago
f5131540dc
Add a way to create emoji packs via an endpoint
5 years ago
8dbdd5c280
Allow uploading new emojis to packs from URLs
5 years ago
9afe7258dd
Implememt emoji pack file updating + write tests
5 years ago
9dc9689144
Add tests for pack metadata updating
5 years ago
adf31d596e
Add tests for downloading from fallback url
5 years ago
2a94eca096
Change YAML to JSON
5 years ago
2d4b8f3d20
Add an endpoint for deleting emoji packs
5 years ago
7e4c8b56ea
Add tests for emoji pack sharing
5 years ago
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
5 years ago
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
5 years ago
220afadc55
Merge branch 'restore-tests' into 'develop'
...
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
5 years ago
56286447ee
Merge branch 'fix/test-upload-cleanup' into 'develop'
...
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
5 years ago
a12aeb09c4
Cleanup uploads after the tests are finished
5 years ago
eb87a86b5b
Preserve internal fields when reinjecting
5 years ago
84a40f6f26
Capture log in object refetch tests
5 years ago
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
4faf2b1555
post for creating invite tokens in admin api
5 years ago
0447c42715
Merge branch 'develop' into issue/733
5 years ago
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
5 years ago
7dd51652f9
Merge branch 'develop' into issue/733
5 years ago
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
5 years ago
80c5c3495b
remove remaining errors from tests
5 years ago
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
5 years ago
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
5 years ago
015597c2ab
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
5 years ago
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
6042e21b25
Move subscription notifications to a separate controller
5 years ago
76c3e290fc
Merge develop
5 years ago
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
e8120944d8
Fix signed fetch inclusion publisher test
...
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
5 years ago
ca88e37a8f
Fix a race condition in tests
5 years ago
43f17c2e67
Restore tests for `change_password` and `delete_account`
5 years ago
d75bc728e7
Merge branch 'develop' into issue/733
5 years ago
8751809e1e
Merge branch 'develop' into support/tests
5 years ago
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
5 years ago
d7457c9165
Merge branch 'develop' into refactor/subscription
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
b870ae08fd
Fix `Activity.all_by_actor_and_id/2` test
5 years ago
a78a7ee455
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
85b6144ffd
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
a9b78f55e3
Merge branch 'capture-test-errors' into 'develop'
...
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
5 years ago
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
5 years ago
25a64a4aa0
Capture test error messages where appropriate
5 years ago
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
5 years ago
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
5 years ago
bc3e8c033b
fix formatting
5 years ago
ec5aaf5bd7
fix tests
5 years ago
fb96facc32
Remove unused functions and fix credo issues
5 years ago
ce23529d91
Use delivery info when federating deletes
5 years ago
25d8216804
Add email change endpoint
5 years ago
5bfbad13ad
Add more tests for Pleroma.Activity
5 years ago
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
5 years ago
d8a178274b
fix Activity.get_by_id
5 years ago
58b17196fa
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
936951826e
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
769fb778d4
Track object/create activity fetches
5 years ago
102eb4455c
Fix associated test as well
5 years ago
4f548cb2b7
added test for Ostatus
5 years ago
007e0c1ce1
added tests
5 years ago
a1f2dfb10a
expanding regex sigils to use modifiers
5 years ago
fcf604fa43
added tests
5 years ago
3d12e05f43
Fix `Activity.all_by_ids_with_object/1` test
5 years ago
a31af93e1d
added tests /activity_pub/transmogrifier.ex
5 years ago
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
e0f84d0043
Fix `ActivityPubController.read_inbox/2`
5 years ago
39f99dc6cd
Merge branch 'develop' into support/tests
5 years ago
ab2f21e470
tests for mastodon_api_controller.ex
5 years ago
eb74c3d5c7
Merge branch 'develop' into issue/1218
5 years ago
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
5 years ago
fe7cf44c40
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
...
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
5 years ago
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
af746fa4a8
Return total for reports
5 years ago
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
2975da284b
truncate remote user bio/display name
5 years ago
8cbad5500c
add tests for activity_pub/utils.ex
5 years ago
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
5 years ago
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
5 years ago
b15cfd80ef
Return "total" optionally
5 years ago
a4c5f71e93
Return total from pagination + tests
5 years ago
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
e73685834c
add mandatory fields for user update
5 years ago
05c935c396
mix format
5 years ago
35ef470d00
truncate fields for remote users instead
5 years ago
6c2fd1b78b
Fix tests
5 years ago
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
9cabc02864
Remove a useless import
5 years ago
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
5 years ago
64410497d2
Remove TwitterAPI representers
5 years ago
985122cc03
Remove Activity, User and Notification views from TwitterAPI
5 years ago
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
5 years ago
6ef0103ca0
added Emoji struct
5 years ago
f182f0f6bd
Add ability to search moderation logs
5 years ago
d8098d142a
added Emoji.Formatter
5 years ago
d7808b5db4
added code\path fields without html tags in ets
5 years ago
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
5 years ago
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
5 years ago
66519f2100
Merge branch 'list-controller' into 'develop'
...
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
5 years ago
5e4fde1d3d
Filter logs by date
5 years ago
00abe099cd
added tests for ActivityPub.like\unlike
5 years ago
eb1739c596
Remove most of TwitterAPIController
5 years ago
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
kaniini