eugenijm
|
fe5e0b7846
|
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
|
5 years ago |
|
Maksim Pechnikov
|
d4ed3a35b8
|
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
|
5 years ago |
|
Haelwenn
|
f95a2b2cda
|
Merge branch 'issue/733' into 'develop'
[#733] added test for Ostatus
See merge request pleroma/pleroma!1657
|
5 years ago |
|
rinpatch
|
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 |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
5 years ago |
|
Ekaterina Vaartis
|
b585134c90
|
Get the nodeinfo address from the well-known
|
5 years ago |
|
Ekaterina Vaartis
|
a1325d5fd9
|
Change path from nodeinfo to metadata->features
|
5 years ago |
|
Ekaterina Vaartis
|
36f2275dc9
|
A feature for shareable emoji packs, use it in download_from & tests
|
5 years ago |
|
Ekaterina Vaartis
|
74fb6d8647
|
Move EmojiAPIController from EmojiAPI to PleromaAPI
|
5 years ago |
|
Ekaterina Vaartis
|
6cd651a38b
|
Make the emoji controller api more RESTy
|
5 years ago |
|
Ekaterina Vaartis
|
7c784128fd
|
Change emoji api responses to JSON
|
5 years ago |
|
Ekaterina Vaartis
|
9eb2ee4df0
|
Allow importing old (emoji.txt / plain) packs from the filesystem
|
5 years ago |
|
Ekaterina Vaartis
|
f5131540dc
|
Add a way to create emoji packs via an endpoint
|
5 years ago |
|
Ekaterina Vaartis
|
8dbdd5c280
|
Allow uploading new emojis to packs from URLs
|
5 years ago |
|
Ekaterina Vaartis
|
9afe7258dd
|
Implememt emoji pack file updating + write tests
|
5 years ago |
|
Ekaterina Vaartis
|
9dc9689144
|
Add tests for pack metadata updating
|
5 years ago |
|
Ekaterina Vaartis
|
adf31d596e
|
Add tests for downloading from fallback url
|
5 years ago |
|
Ekaterina Vaartis
|
2a94eca096
|
Change YAML to JSON
|
5 years ago |
|
Ekaterina Vaartis
|
2d4b8f3d20
|
Add an endpoint for deleting emoji packs
|
5 years ago |
|
Ekaterina Vaartis
|
7e4c8b56ea
|
Add tests for emoji pack sharing
|
5 years ago |
|
feld
|
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 |
|
feld
|
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 |
|
feld
|
220afadc55
|
Merge branch 'restore-tests' into 'develop'
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
|
5 years ago |
|
Haelwenn
|
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 |
|
rinpatch
|
a12aeb09c4
|
Cleanup uploads after the tests are finished
|
5 years ago |
|
rinpatch
|
eb87a86b5b
|
Preserve internal fields when reinjecting
|
5 years ago |
|
rinpatch
|
84a40f6f26
|
Capture log in object refetch tests
|
5 years ago |
|
rinpatch
|
7ef575d11e
|
Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
|
5 years ago |
|
Alex S
|
4faf2b1555
|
post for creating invite tokens in admin api
|
5 years ago |
|
Ivan Tashkinov
|
b17f217bf3
|
[#1234] Addressed code analysis issue.
|
5 years ago |
|
Ivan Tashkinov
|
01c1078015
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
|
5 years ago |
|
Maksim Pechnikov
|
0447c42715
|
Merge branch 'develop' into issue/733
|
5 years ago |
|
Ivan Tashkinov
|
76068873db
|
[#1234] Defined admin OAuth scopes, refined other scopes. Added tests.
|
5 years ago |
|
rinpatch
|
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 |
|
Maksim Pechnikov
|
7dd51652f9
|
Merge branch 'develop' into issue/733
|
5 years ago |
|
rinpatch
|
95a4a19417
|
Merge branch 'support/tests' into 'develop'
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
|
5 years ago |
|
Steven Fuchs
|
80c5c3495b
|
remove remaining errors from tests
|
5 years ago |
|
Roman Chvanikov
|
e9f69a3eb7
|
Move pleroma_api controllers into controllers sub-folders
|
5 years ago |
|
Roman Chvanikov
|
7d1773bc6b
|
Rename SubscriptionNotificationController list and get actions to index and show
|
5 years ago |
|
Roman Chvanikov
|
015597c2ab
|
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
|
5 years ago |
|
eugenijm
|
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 |
|
Roman Chvanikov
|
6042e21b25
|
Move subscription notifications to a separate controller
|
5 years ago |
|
Roman Chvanikov
|
76c3e290fc
|
Merge develop
|
5 years ago |
|
Maxim Filippov
|
df15ed13d1
|
Merge branch 'develop' into feature/moderation-log-filters
|
5 years ago |
|
Maxim Filippov
|
219dca1b00
|
Merge branch 'develop' into feature/return-total-for-reports
|
5 years ago |
|
Egor Kislitsyn
|
96816ceaa2
|
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
|
5 years ago |
|
rinpatch
|
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 |
|
kaniini
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
5 years ago |
|
Steven Fuchs
|
aab264db82
|
Streamer refactoring
|
5 years ago |
|
kaniini
|
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 |
|
Egor Kislitsyn
|
ca88e37a8f
|
Fix a race condition in tests
|
5 years ago |
|
Egor Kislitsyn
|
43f17c2e67
|
Restore tests for `change_password` and `delete_account`
|
5 years ago |
|
Maksim Pechnikov
|
d75bc728e7
|
Merge branch 'develop' into issue/733
|
5 years ago |
|
Ivan Tashkinov
|
efbc2edba1
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
Ivan Tashkinov
|
e6f43a831b
|
[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
|
5 years ago |
|
Maksim Pechnikov
|
8751809e1e
|
Merge branch 'develop' into support/tests
|
5 years ago |
|
Ivan Tashkinov
|
610236d6be
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
|
5 years ago |
|
rinpatch
|
62bbba80f3
|
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
Truncate remote user fields
See merge request pleroma/pleroma!1619
|
5 years ago |
|
Roman Chvanikov
|
d7457c9165
|
Merge branch 'develop' into refactor/subscription
|
5 years ago |
|
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
5 years ago |
|
Egor Kislitsyn
|
b870ae08fd
|
Fix `Activity.all_by_actor_and_id/2` test
|
5 years ago |
|
rinpatch
|
a78a7ee455
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
85b6144ffd
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
5c5ebd3861
|
Mastodon API: Respect post privacy in favourited/reblogged endpoints
|
5 years ago |
|
lain
|
a9b78f55e3
|
Merge branch 'capture-test-errors' into 'develop'
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
|
5 years ago |
|
rinpatch
|
ba70a8cae6
|
Merge branch 'develop' into feature/delivery-tracking
|
5 years ago |
|
stwf
|
25a64a4aa0
|
Capture test error messages where appropriate
|
5 years ago |
|
Roman Chvanikov
|
0bd2b85edb
|
Separate Subscription Notifications from regular Notifications
|
5 years ago |
|
lain
|
53a3ad6043
|
Merge branch 'cleanup-activity' into 'develop'
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
|
5 years ago |
|
Haelwenn
|
0d9609894f
|
Merge branch 'feature/change-email' into 'develop'
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
|
5 years ago |
|
rinpatch
|
f884987ace
|
Merge branch 'admin-config-description' into 'develop'
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
|
5 years ago |
|
Maksim Pechnikov
|
bc3e8c033b
|
fix formatting
|
5 years ago |
|
Maksim Pechnikov
|
ec5aaf5bd7
|
fix tests
|
5 years ago |
|
rinpatch
|
fb96facc32
|
Remove unused functions and fix credo issues
|
5 years ago |
|
rinpatch
|
ce23529d91
|
Use delivery info when federating deletes
|
5 years ago |
|
Egor Kislitsyn
|
25d8216804
|
Add email change endpoint
|
5 years ago |
|
Egor Kislitsyn
|
5bfbad13ad
|
Add more tests for Pleroma.Activity
|
5 years ago |
|
Egor Kislitsyn
|
39dc9b470c
|
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
|
5 years ago |
|
Maksim Pechnikov
|
d8a178274b
|
fix Activity.get_by_id
|
5 years ago |
|
Maksim
|
58b17196fa
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
5 years ago |
|
Maksim Pechnikov
|
2b40e57a72
|
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
|
5 years ago |
|
Maksim Pechnikov
|
936951826e
|
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
|
5 years ago |
|
rinpatch
|
769fb778d4
|
Track object/create activity fetches
|
5 years ago |
|
Mark Felder
|
102eb4455c
|
Fix associated test as well
|
5 years ago |
|
Maksim Pechnikov
|
4f548cb2b7
|
added test for Ostatus
|
5 years ago |
|
Maksim Pechnikov
|
007e0c1ce1
|
added tests
|
5 years ago |
|
Alex S
|
a1f2dfb10a
|
expanding regex sigils to use modifiers
|
5 years ago |
|
Maksim Pechnikov
|
fcf604fa43
|
added tests
|
5 years ago |
|
Egor Kislitsyn
|
3d12e05f43
|
Fix `Activity.all_by_ids_with_object/1` test
|
5 years ago |
|
Maksim Pechnikov
|
a31af93e1d
|
added tests /activity_pub/transmogrifier.ex
|
5 years ago |
|
Egor Kislitsyn
|
b40b10b53d
|
Add an endpoint to get multiple statuses by IDs
|
5 years ago |
|
Maxim Filippov
|
d1abf7a358
|
Merge branch 'develop' into feature/moderation-log-filters
|
5 years ago |
|
minibikini
|
11e12b5761
|
Add Pleroma.Plugs.Cache
|
5 years ago |
|
Egor Kislitsyn
|
e0f84d0043
|
Fix `ActivityPubController.read_inbox/2`
|
5 years ago |
|
Ivan Tashkinov
|
b63faf9819
|
[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
|
5 years ago |
|
Maksim Pechnikov
|
39f99dc6cd
|
Merge branch 'develop' into support/tests
|
5 years ago |
|
Maksim Pechnikov
|
ab2f21e470
|
tests for mastodon_api_controller.ex
|
5 years ago |
|
Maksim Pechnikov
|
eb74c3d5c7
|
Merge branch 'develop' into issue/1218
|
5 years ago |
|
Ivan Tashkinov
|
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 |
|
rinpatch
|
896ffabe37
|
Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI
See merge request pleroma/pleroma!1605
|
5 years ago |
|
Haelwenn
|
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 |
|
rinpatch
|
b312ca3d52
|
Mastodon API Poll view: Fix handling of polls without an end date
|
5 years ago |
|
Ivan Tashkinov
|
79cf629e1a
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
Maxim Filippov
|
af746fa4a8
|
Return total for reports
|
5 years ago |
|
Maxim Filippov
|
3542ca6702
|
Merge branch 'develop' into feature/moderation-log-filters
|
5 years ago |
|
Sadposter
|
2975da284b
|
truncate remote user bio/display name
|
5 years ago |
|
Maksim Pechnikov
|
8cbad5500c
|
add tests for activity_pub/utils.ex
|
5 years ago |
|
rinpatch
|
3face45467
|
Mastodon API: Add `pleroma.thread_muted` to Status entity
Needed for pleroma-fe!941
|
5 years ago |
|
rinpatch
|
c2b6c1b089
|
Extend `/api/pleroma/notifications/read` to mark multiple notifications
as read and make it respond with Mastoapi entities
|
5 years ago |
|
rinpatch
|
cc1d1ee406
|
Mastdon API: Add ability to get a remote account by nickname to
`/api/v1/accounts/:id`
|
5 years ago |
|
Ivan Tashkinov
|
eb17cc17a1
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Maxim Filippov
|
b15cfd80ef
|
Return "total" optionally
|
5 years ago |
|
Maxim Filippov
|
a4c5f71e93
|
Return total from pagination + tests
|
5 years ago |
|
Ivan Tashkinov
|
b49085c156
|
[#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
|
5 years ago |
|
Sadposter
|
e73685834c
|
add mandatory fields for user update
|
5 years ago |
|
Sadposter
|
05c935c396
|
mix format
|
5 years ago |
|
Sadposter
|
35ef470d00
|
truncate fields for remote users instead
|
5 years ago |
|
Maxim Filippov
|
6c2fd1b78b
|
Fix tests
|
5 years ago |
|
Ivan Tashkinov
|
a90ea8ba15
|
[#1149] Addressed code review comments (code style, jobs pruning etc.).
|
5 years ago |
|
Ivan Tashkinov
|
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 |
|
rinpatch
|
9cabc02864
|
Remove a useless import
|
5 years ago |
|
rinpatch
|
dbfcba85ec
|
Add a changelog entry for twitterapi removal and fix credo issues
|
5 years ago |
|
rinpatch
|
64410497d2
|
Remove TwitterAPI representers
|
5 years ago |
|
rinpatch
|
985122cc03
|
Remove Activity, User and Notification views from TwitterAPI
|
5 years ago |
|
rinpatch
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
5 years ago |
|
Maksim Pechnikov
|
6ef0103ca0
|
added Emoji struct
|
5 years ago |
|
Maxim Filippov
|
f182f0f6bd
|
Add ability to search moderation logs
|
5 years ago |
|
Maksim Pechnikov
|
d8098d142a
|
added Emoji.Formatter
|
5 years ago |
|
Maksim Pechnikov
|
d7808b5db4
|
added code\path fields without html tags in ets
|
5 years ago |
|
Maksim Pechnikov
|
cef2e980b1
|
division emoji.ex on loader.ex and emoji.ex
|
5 years ago |
|
Haelwenn
|
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 |
|
lain
|
66519f2100
|
Merge branch 'list-controller' into 'develop'
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
|
5 years ago |
|
Maxim Filippov
|
5e4fde1d3d
|
Filter logs by date
|
5 years ago |
|
Maksim Pechnikov
|
00abe099cd
|
added tests for ActivityPub.like\unlike
|
5 years ago |
|
rinpatch
|
eb1739c596
|
Remove most of TwitterAPIController
|
5 years ago |
|
lain
|
3da65292b3
|
Transmogrifier: Fix follow handling when the actor is an object.
|
5 years ago |
|
Maxim Filippov
|
c338224c93
|
Fix sporadic test
|
5 years ago |
|
Egor Kislitsyn
|
019ced0558
|
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
|
5 years ago |
|
Egor Kislitsyn
|
30510ade0e
|
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
|
5 years ago |
|
Egor Kislitsyn
|
3b1b631c2a
|
Add validation in Pleroma.List.create/2
|
5 years ago |
|
kPherox
|
eb75ea502d
|
Update test for custom fields when content-type urlencoded
|
5 years ago |
|
kaniini
|
6dc24422dc
|
Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
|
5 years ago |
|
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
5 years ago |
|
kaniini
|
503139b343
|
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
|
5 years ago |
|
kPherox
|
b8777b01ae
|
Update test for custom fields when name empty string
|
5 years ago |
|
kPherox
|
d74efde94e
|
Update test for custom profile fields
|
5 years ago |
|
lain
|
5e7098cf69
|
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
20c3f613d8
|
HttpRequestMock: Remove useless `error = error`
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
f3b1266273
|
user_test.exs: fix rel=me tests
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
211e163770
|
Implement missing mocks for rel=me
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
e22737ffb5
|
HttpRequestMock: Improve non-implemented error message
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
18668447d2
|
HttpRequestMock: Log mock errors as warnings
|
5 years ago |
|
kPherox
|
45e21a9df4
|
Rename fields to fields_attributes
|
5 years ago |
|
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
5 years ago |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
5 years ago |
|
Maksim Pechnikov
|
654d291b6d
|
update tests
|
5 years ago |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
5 years ago |
|
Maksim Pechnikov
|
73bcbf4fa3
|
add tests
|
5 years ago |
|
Ivan Tashkinov
|
71700ea6d4
|
[#1149] Updated docs & tests.
|
5 years ago |
|
Ivan Tashkinov
|
c29686309e
|
[#1149] Upgraded `oban` from 0.6.0 to 0.7.1.
|
5 years ago |
|
Maksim Pechnikov
|
399ca9133b
|
fix test
|
5 years ago |
|
Maksim Pechnikov
|
f95b67c933
|
Merge branch 'develop' into issue/1177
|
5 years ago |
|
Ivan Tashkinov
|
7101ba1a21
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
Ivan Tashkinov
|
256ff09aa8
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
5 years ago |
|
Maksim Pechnikov
|
64bfb41c55
|
fixed unfollow for relay actor
|
5 years ago |
|
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
5 years ago |
|
Ariadne Conill
|
76bb3572dd
|
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
|
5 years ago |
|
lain
|
74f7f308f8
|
Merge branch 'fix/admin-api-user-deletion' into 'develop'
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
|
5 years ago |
|
lain
|
8340fe8fcc
|
Merge branch 'digest-template' into 'develop'
Improve digest email template
See merge request pleroma/pleroma!1565
|
5 years ago |
|
lain
|
ef43016b2c
|
Merge branch 'feature/custom-fields' into 'develop'
Add custom profile fields
See merge request pleroma/pleroma!1488
|
5 years ago |
|
lain
|
d2c9befc64
|
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Sergey Suprunenko
|
75a5dd41ee
|
Add more tests for Database tasks and DigestEmailWorker
|
5 years ago |
|
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
5 years ago |
|
lain
|
49ae3191df
|
Merge branch 'hotfix/user_unfollow' into 'develop'
[#1177] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
|
5 years ago |
|
Maksim Pechnikov
|
e652cef76b
|
removes duplicates from relay subscription list
|
5 years ago |
|
Ariadne Conill
|
a2fdc32368
|
tests: activitypub: fix typo
|
5 years ago |
|
kaniini
|
475fcb3e6c
|
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
|
5 years ago |
|
kaniini
|
18c8c8d176
|
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
|
5 years ago |
|
Sadposter
|
58c1391c4d
|
use commonAPI in tests
|
5 years ago |
|
Sadposter
|
94e336d9d5
|
clear follow requests when blocking a user
|
5 years ago |
|
Maksim Pechnikov
|
3315a2a1c3
|
fixed User.unfollow with synchronization external user
|
5 years ago |
|
lain
|
7ab2dbbdb6
|
Merge branch 'pleroma-conversations' into 'develop'
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
|
5 years ago |
|
Mark Felder
|
6a3b1a526e
|
max_body_size -> max_body_length, as it should be
|
5 years ago |
|
rinpatch
|
a4a3e3becd
|
Hide muted theads from home/public timelines unless `with_muted` is set
|
5 years ago |
|
Maxim Filippov
|
ec969eec51
|
Merge branch 'develop' into 'fix/admin-api-user-deletion'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Maxim Filippov
|
2b94ae3b39
|
Do not check if actor is active when deleting a user
|
5 years ago |
|
Ivan Tashkinov
|
8778c16dac
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
Ivan Tashkinov
|
a180c1360e
|
[#1149] Oban mailer job. Adjusted tests.
|
5 years ago |
|
stwf
|
d81f63845a
|
Implement Pleroma.Stats as GenServer
|
5 years ago |
|
stwf
|
51bdf0cab6
|
use default child_specs
|
5 years ago |
|
lain
|
d3af9e19ed
|
Conversations: Load relations in one query.
|
5 years ago |
|
Egor Kislitsyn
|
4b7f1c6995
|
Improve digest email template
|
5 years ago |
|
lain
|
560dbad538
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
5 years ago |
|
Egor Kislitsyn
|
e457fcc479
|
Add `:max_remote_account_fields` config option
|
5 years ago |
|
Egor Kislitsyn
|
f7bbf99caa
|
Use info.fields instead of source_data for remote users
|
5 years ago |
|
Egor Kislitsyn
|
2c35d4b0b0
|
Add configurable account field name length limit
|
5 years ago |
|
Egor Kislitsyn
|
db3c05f6b4
|
Add configurable account field value length limit
|
5 years ago |
|
Egor Kislitsyn
|
7d6f8a7fd7
|
Linkify custom fields values in ActivityPub.UserViewx
|
5 years ago |
|
Egor Kislitsyn
|
5178f960c3
|
Support user attachment update in Transmogrifier
|
5 years ago |
|
Egor Kislitsyn
|
88598c9baf
|
Add profile custom fields to ActivityPub.UserView
|
5 years ago |
