Maksim
96493da7bd
Apply suggestion to test/web/media_proxy/invalidation_test.exs
4 years ago
Maksim
078d687e6e
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
4 years ago
Maksim
2991aae4c4
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
4 years ago
Maksim
11b22a4229
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
4 years ago
Maksim
6d33a3a51b
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim
793a53f1ec
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim
1b45bc7b2a
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
4 years ago
Haelwenn
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
4 years ago
Alexander Strizhakov
b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
4 years ago
Alexander Strizhakov
3c2cee33ad
moving custom ecto types in context folders
4 years ago
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
4 years ago
Alexander Strizhakov
e1603ac8fe
fix attemps to merge map
4 years ago
Alexander Strizhakov
23decaab81
fix for updated hackney
...
warning: :hackney_connect.partial_chain/1 is undefined or private
4 years ago
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
4 years ago
lain
015f9258a9
Transmogrifier: Extract user update handling tests.
4 years ago
lain
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
4 years ago
stwf
faba1a6e33
fix tests
4 years ago
Maksim Pechnikov
579763126f
Merge branch 'develop' into issue/1855
4 years ago
Egor Kislitsyn
bd63089a63
Fix tests
4 years ago
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Maksim Pechnikov
62b8c31b7a
added tests
4 years ago
lain
b7df7436c8
Conversations: Return last dm for conversation, not last message.
4 years ago
Maksim Pechnikov
2e8a236cef
fix invalidates media url's
4 years ago
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
4 years ago
href
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn
520367d6fd
Fix atom leak in Rich Media Parser
4 years ago
Mark Felder
26f710b9e3
Merge branch 'develop' into preload-data
4 years ago
Haelwenn
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
4 years ago
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
4 years ago
Mark Felder
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
4 years ago
Maksim Pechnikov
f9dcf15ecb
added admin api for MediaProxy cache invalidation
4 years ago
Ivan Tashkinov
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
Haelwenn (lanodan) Monnier
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
4 years ago
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Ivan Tashkinov
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
lain
5d87405b51
ActivityPubTest: Update test for atomized parameters.
4 years ago
Thibaut Girka
570123ae21
Add test
4 years ago
rinpatch
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
4 years ago
lain
600e2ea073
ActivityPubTest: Make test easier to understand.
4 years ago
lain
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
4 years ago
Egor Kislitsyn
3dd1de61a7
Add `url` field to AdminAPI.AccountView
4 years ago
lain
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
4 years ago
lain
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
e1bc37d118
MigrationHelper: Move notification backfilling to own module.
4 years ago
Roman Chvanikov
604a83ae3e
merge develop
4 years ago
Egor Kislitsyn
d44843e677
Restrict ActivityExpirationPolicy to Notes only
4 years ago
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
lain
d192492658
Merge branch 'openapi/admin/relay' into 'develop'
...
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
4 years ago
lain
c450b248cc
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
...
Delete outgoing pending follow requests on user deletion
See merge request pleroma/pleroma!2631
4 years ago
lain
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
89b85f6529
ChatController: Remove nonsensical pagination.
4 years ago
lain
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
fe2a5d0614
ChatController: Make last_read_id mandatory.
4 years ago
Sergey Suprunenko
8d9e586887
Delete pending follow requests on user deletion
4 years ago
lain
801e668a97
ChatController: Add `last_read_id` option to mark_as_read.
4 years ago
lain
2cdaac4330
SideEffects: Move streaming of chats to after the transaction.
4 years ago
lain
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
4 years ago
Haelwenn (lanodan) Monnier
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
4 years ago
lain
9189b489ee
Migrations: Move Notification migration code to helper
4 years ago
lain
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
4 years ago
lain
4e8c0eecd5
WebPush: Don't break on contentless chat messages.
4 years ago
Egor Kislitsyn
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
4 years ago
lain
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn
d74985af23
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
4 years ago
lain
115d08a754
Pipeline: Add a side effects step after the transaction finishes
...
This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously.
4 years ago
lain
0efa8aa0b9
Transmogrifier: For follows, create notifications last.
...
As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.
This is a bit hacky but it will be properly rewritten using the
pipeline soon.
4 years ago
lain
cc8a7dc205
SideEffects / ChatView: Add an unread cache.
...
This is to prevent wrong values in the stream.
4 years ago
lain
aa2ac76510
Notification: Don't break on figuring out the type of old EmojiReactions
4 years ago
lain
d44da91bbf
SubscriptionOperation: Let chat mentions through.
4 years ago
Egor Kislitsyn
317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
4 years ago
lain
74edd4f391
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
56dfa0e0fb
Transmogrifier: Update notification after accepting.
4 years ago
lain
9a53f619e0
Apply suggestion to test/chat_message_reference_test.exs
4 years ago
lain
41503b1673
Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs
4 years ago
lain
00748e9650
ChatMessageReferences: Change seen -> unread
4 years ago
stwf
a42d135cce
test fix
4 years ago
minibikini
b57e4ad1ab
Merge branch 'develop' into 'openapi/admin/relay'
...
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
4 years ago
lain
b952f3f379
WebPush: Push out chat message notications.
4 years ago
lain
5d7dda883e
SideEffectsTest: More tests.
4 years ago
Egor Kislitsyn
a8132690bd
Fix credo
4 years ago
Egor Kislitsyn
70f054b083
Merge branch 'develop' into openapi/admin/relay
4 years ago
Egor Kislitsyn
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
4 years ago
stwf
3b8180d7d1
add status_net/config
4 years ago
stwf
dbcc1b105e
encode data properly
4 years ago
stwf
29ae5bb771
preload data into index.html
4 years ago
lain
b3407344d3
ChatController: Add function to mark single message as read.
4 years ago
lain
c020fd4352
ChatMessageReferenceView: Return read status as `unread`.
4 years ago
Egor Kislitsyn
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
4 years ago
Egor Kislitsyn
9d572f2f66
Move report actions to AdminAPI.ReportController
4 years ago
lain
fb4ae9c720
Streamer, SideEffects: Stream out ChatMessageReferences
...
Saves us a few calles to fetch things from the DB that we already
have.
4 years ago
lain
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
4 years ago
lain
2591745fc2
ChatMessageReferences: Move tests
4 years ago
lain
f3ccd50a33
ChatMessageReferences: Adjust views
4 years ago
lain
aa22fce8f4
ChatMessageReference: Introduce and switch in chat controller.
4 years ago
feld
6c1c2cddec
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
...
[#1794 ] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
4 years ago
Egor Kislitsyn
68cb152a08
Merge branch 'develop' into openapi/admin/relay
4 years ago
lain
879304dcd9
Merge branch 'replies-domain-block' into 'develop'
...
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
4 years ago
lain
5da38c15cd
Merge branch 'openapi/admin/oauth-apps' into 'develop'
...
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
4 years ago
lain
022d975a39
Merge branch 'openapi/admin/invites' into 'develop'
...
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
4 years ago
lain
38dce485c4
Notification: Add function to backfill notification types
4 years ago
lain
904295d53b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
37542a9dfa
Activity: Remove notifications-related functions.
4 years ago
lain
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
4 years ago
lain
cd2abcc0e3
Merge branch 'fix/invisible-repeats' into 'develop'
...
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
4 years ago
lain
805ab86933
Notifications: Make notifications save their type.
4 years ago
rinpatch
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
4 years ago
lain
d111eae798
Merge branch 'feature/status-by-id-account-view' into 'develop'
...
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
4 years ago
lain
8e1db6a835
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alexander Strizhakov
19f468c5bc
replies filtering for blocked domains
4 years ago
rinpatch
6fb900a496
Merge branch 'user-updates' into 'develop'
...
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
4 years ago
Alexander Strizhakov
7e6ec778d9
exclude replies on blocked domains
4 years ago
lain
af9090238e
CommonAPI: Newlines -> br for chat messages.
4 years ago
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
lain
8ff3425828
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
d4d4b92f75
TimelineController: Only return `Create` in public timelines.
4 years ago
lain
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
4 years ago
Haelwenn
e96765df6b
Merge branch 'chore/bump-hackney' into 'develop'
...
mix.lock: update hackney to 1.16.0
Closes #1612
See merge request pleroma/pleroma!2614
4 years ago
Roman Chvanikov
b973d0b2f0
Fix config setting to not affect other tests
4 years ago
rinpatch
0cb7b0ea84
hackney adapter helper: support tlsv1.3 and remove custom opts
...
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
4 years ago
lain
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
8bdf18d7c1
CommonAPI: Linkify chat messages.
4 years ago
lain
2c9465cc51
SafeText: Let through basic html.
4 years ago
lain
b004c427a0
Merge branch 'conversation-pagination' into 'develop'
...
Conversation pagination
See merge request pleroma/pleroma!2601
4 years ago
Steven Fuchs
6d4b80822b
Conversation pagination
4 years ago
Ivan Tashkinov
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
4 years ago
Ivan Tashkinov
78c80a261a
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
4 years ago
Roman Chvanikov
0a83af330b
fix unused var warning
4 years ago
Ivan Tashkinov
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
4 years ago
kPherox
9ca978494f
Add test for stream boosts of mastodon user
4 years ago
Haelwenn (lanodan) Monnier
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
4 years ago
Haelwenn (lanodan) Monnier
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain
863c02b25d
SideEffects: Stream out chat messages.
4 years ago
lain
c86a88edec
Streamer: Add a chat message stream.
4 years ago
lain
9848978109
Merge branch 'fix-relay-repeat-notification' into 'develop'
...
Fix relay repeat notification
See merge request pleroma/pleroma!2590
4 years ago
lain
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
396bc69aee
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
...
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
4 years ago
Egor Kislitsyn
06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
4 years ago
Egor Kislitsyn
d1ee3527ef
Move config actions to AdminAPI.ConfigController
4 years ago
Mark Felder
4c82f657c5
Formatting
4 years ago
lain
1d30608e20
Merge branch 'fix/1557-gets-local-pack' into 'develop'
...
get-packs for local generated pack
Closes #1557
See merge request pleroma/pleroma!2604
4 years ago
lain
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
4 years ago
Alexander Strizhakov
ae05792d2a
get-packs for local generated pack
4 years ago
Mark Felder
9eea800026
Refactor notification settings
4 years ago
rinpatch
455a402c8a
HTTP Security plug: rewrite &csp_string/0
...
- Directives are now separated with ";" instead of " ;",
according to https://www.w3.org/TR/CSP2/#policy-parsing
the space is optional
- Use an IO list, which at the end gets converted to a binary as
opposed to ++ing a bunch of arrays with binaries together and joining
them to a string. I doubt it gives any significant real world advantage,
but the code is cleaner and now I can sleep at night.
- The static part of csp is pre-joined to a single binary at compile time.
Same reasoning as the last point.
4 years ago
rinpatch
8f6d428880
AccountView: Use mediaproxy URLs for emojis
...
Also use atom keys in emoji maps instead of binaries
Closes #1810
4 years ago
rinpatch
78c46fb7ba
MediaProxy test: use config macros instead of directly putting values
...
They were not properly cleaned later and caused trouble for another tests
4 years ago
kPherox
48fd9be65a
Exclude post actor from to of relay announce
4 years ago
rinpatch
d35be02e70
Merge branch 'refactor-add-mention-step-one' into 'develop'
...
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
4 years ago
rinpatch
91f73a7592
Merge branch 'notification-fixes' into 'develop'
...
Notification performance fixes
See merge request pleroma/pleroma!2595
4 years ago
lain
b8e029b5ea
Notification: Actually preload objects.
4 years ago
Alexander Strizhakov
3249141588
validate actor type
4 years ago
rinpatch
3601c0015c
Merge branch '1808-pleroma-sucks' into 'develop'
...
Resolve "Don't fail message ingestions when we can't update a user"
Closes #1808
See merge request pleroma/pleroma!2576
4 years ago
Egor Kislitsyn
fca48154a2
Add AdminAPI.InviteView
4 years ago
Egor Kislitsyn
2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
4 years ago
Egor Kislitsyn
95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
4 years ago
lain
644195e31e
Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'
...
[#1501 ] Made user feed contain public and unlisted activities
Closes #1501
See merge request pleroma/pleroma!2584
4 years ago
Alexander Strizhakov
8f08384d80
another view for account in admin-fe status_show
4 years ago
Ivan Tashkinov
d7a57004ef
[ #1501 ] Made user feed contain public and unlisted activities.
4 years ago
Egor Kislitsyn
e32b7ae044
Skip failing `:crypt` test on mac
4 years ago
Egor Kislitsyn
0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
4 years ago
lain
dbd07d29a3
Streamer: Don't crash on streaming chat notifications
4 years ago
lain
2c25087d20
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
6bd7070b00
Transmogrifier: Use a simpler way to get mentions.
4 years ago
Egor Kislitsyn
cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
4 years ago
lain
f20dff451e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
4 years ago
lain
5d5db7e5b7
StealEmojiPolicyTest: Clean up.
4 years ago
lain
2dff376041
StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
aeb0875025
StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain
ec470c4c77
Merge branch 'openapi/admin/status' into 'develop'
...
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
4 years ago
lain
3bec0d2e50
Factory: Set users to be ap_enabled by default.
4 years ago
lain
0c970a9d44
UserTest: Add test for user refreshing.
4 years ago
lain
d0c26956da
User: Don't error out if we want to refresh a user but can't
4 years ago
rinpatch
7bc2ec0aa2
Merge branch 'mastodon-migration-compat' into 'develop'
...
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
4 years ago
lain
ddbbefeb2e
Merge branch 'feature/configure-filename-truncate' into 'develop'
...
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
4 years ago
Roman Chvanikov
cc82229ba7
Add filename_display_max_length config
4 years ago
lain
91c8467582
OStatusController: Add Mastodon activity compat route.
4 years ago
lain
355aa3bdc7
ActivityPubController: Add Mastodon activity compat route.
4 years ago
lain
8a4bd9e5d1
OStatusController: Add Mastodon compatibility route for objects.
4 years ago
rinpatch
1fa7aa9fc5
Merge branch 'emoji-react-better-errors' into 'develop'
...
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
4 years ago
Egor Kislitsyn
ba106aa9c8
Fix notifications mark as read API
4 years ago
lain
ca755f9a73
ActivityPubController: Add Mastodon compatibility route.
4 years ago
lain
bcb549531f
EmojiReactionController: Return more appropriate error.
4 years ago
Haelwenn
7b02bfca51
Merge branch 'announce-validator' into 'develop'
...
Announce validator
See merge request pleroma/pleroma!2567
4 years ago
Haelwenn
a57e7f3503
Merge branch '1113-op-mentioning' into 'develop'
...
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
4 years ago
Ivan Tashkinov
3a1e810aaa
[ #2497 ] Customized `exexec` launch to support root operation (currently required by Gitlab CI).
4 years ago
lain
e0d1a942a6
Merge branch 'issue/1707' into 'develop'
...
[#1707 ] fixed `mix pleroma.instance gen`
See merge request pleroma/pleroma!2565
4 years ago
lain
ab1154e13f
Merge branch 'admin-logo-upload' into 'develop'
...
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
4 years ago
lain
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
4 years ago
lain
f166316f50
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
...
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
4 years ago
lain
283fb1e05b
Merge branch 'issue/749' into 'develop'
...
[#749 ] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
4 years ago
Egor Kislitsyn
45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
4 years ago
lain
c4a5cead51
UploadTest: Fix test.
4 years ago
lain
cc0d462e91
Attachments: Have the mediaType on the root, too.
4 years ago
lain
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
bf1b221f94
Credo fixes for the credo god.
4 years ago
lain
cdc6ba8d7b
AnnounceValidator: Check for announcability
4 years ago
lain
c76267afb9
Credo fixes.
4 years ago
lain
23e248694d
Announcements: Fix all tests.
4 years ago
lain
d9d425708e
SideEffects: Builed out Announce effects.
4 years ago
Egor Kislitsyn
9de9760aa6
Move status actions to AdminAPI.StatusController
4 years ago
Maksim Pechnikov
9bc5e18ade
rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
4 years ago
eugenijm
b7fc61e17b
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
4 years ago
Maksim Pechnikov
c96f425cb0
fixed `mix pleroma.instance gen`
4 years ago
Ivan Tashkinov
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain
39031f4860
Pipeline: Don't federate if federation is disabled.
4 years ago
lain
e42bc5f557
Announcements: Handle through common pipeline.
4 years ago
lain
265746b21f
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
...
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
4 years ago
lain
c7cdc553ff
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
4 years ago
lain
423ea497bb
Merge branch 'feature/1734-user-deletion' into 'develop'
...
User deletion
Closes #1734
See merge request pleroma/pleroma!2493
4 years ago
lain
eb5f428565
CommonAPI: Change public->private implicit addressing.
...
This will not add the OP to the `to` field anymore when going from
public to private.
4 years ago
Egor Kislitsyn
5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
4 years ago
Egor Kislitsyn
f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
4 years ago
Egor Kislitsyn
9a5de0f454
Move reaction actions to EmojiReactionController
4 years ago
Egor Kislitsyn
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
4 years ago
Haelwenn
94ba5a7802
Merge branch 'exposed-background-image' into 'develop'
...
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
4 years ago
lain
6dd1575c64
Merge branch 'issue/1509' into 'develop'
...
[#1509 ] purge media from cache after delete
See merge request pleroma/pleroma!2539
4 years ago
Haelwenn
5a149e5788
Merge branch 'openapi/pleroma-api/scrobble' into 'develop'
...
Add OpenAPI spec for PleromaAPI.ScrobbleController
See merge request pleroma/pleroma!2559
4 years ago
lain
2328eff09c
UserTest: Hide warning in tests.
4 years ago
Egor Kislitsyn
6609714d66
Move Scrobble views to ScrobbleView
4 years ago
Egor Kislitsyn
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
4 years ago
Haelwenn
58ccd2bbfd
Merge branch 'openapi/pleroma-api/mascot' into 'develop'
...
Add OpenAPI spec for MascotController
See merge request pleroma/pleroma!2553
4 years ago
Maksim Pechnikov
41f8f17260
fix api/v1/accounts/update_credentials
4 years ago
Maksim Pechnikov
5f0a3ac74d
added tests
4 years ago
lain
d19c716770
AttachmentValidator: Handle empty mediatypes
4 years ago
Egor Kislitsyn
fe5d423b43
Add OpenAPI spec for MascotController
4 years ago
Egor Kislitsyn
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
4 years ago
lain
be4db41d71
ChatMessageValidator: Allow one message in an array, too.
4 years ago
lain
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
aef31c69df
Rename EmojiAPIController to EmojiPackController
4 years ago
Egor Kislitsyn
8bde8dfec2
Cleanup Pleroma.Emoji.Pack
4 years ago
Egor Kislitsyn
6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
4 years ago
lain
0d5bce018d
AnnounceValidator: Validate for existing announce
4 years ago
lain
17a8342c1e
ObjectValidators: Add basic Announce validator.
4 years ago
lain
63ab2743ce
TransmogrifierTest: Fix tests.
4 years ago
lain
7d381b16b7
Transmogrifier Test: Extract Announce handling.
4 years ago
Alexander Strizhakov
215daabdb4
copyright update
4 years ago
lain
188b32145e
InstanceView: Expose background image link.
...
This will make it easier for more clients to support this feature.
4 years ago
lain
96f7b1b140
Merge branch 'show-media-endpoint-fixes' into 'develop'
...
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
4 years ago
Roman Chvanikov
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Alexander Strizhakov
0321a3e078
test naming fix
4 years ago
Alexander Strizhakov
1671864d88
return :visible instead of boolean
4 years ago
Alexander Strizhakov
b1aa402229
removing 410 status
4 years ago
Alexander Strizhakov
e7bc2f980c
account visibility
4 years ago
Ivan Tashkinov
9b76565264
MediaController: enforced owner-only access in :show action.
...
Improved error response on denied access (now 403). Adjusted tests.
4 years ago
lain
baf051a59e
SideEffects: Don't update unread count for actor in chatmessages.
4 years ago
lain
9c17109765
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
8bfd9710ae
Pleroma Authenticator: Also update passwords here.
4 years ago
lain
bfdd90f6d7
AuthenticationPlug: Also update crypt passwords.
4 years ago
lain
baef35bcc8
Authentication Plug: Update bcrypt password on login.
4 years ago
lain
4b28d812cf
Merge branch 'restricted-relations-embedding' into 'develop'
...
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
4 years ago
Ivan Tashkinov
af9dfdce6b
MediaController OAuth scope assignments fix.
...
Typo fix (`def get_media` instead of `def show`).
4 years ago
lain
d96f8f17e8
Merge branch 'features/mastoapi_v2_media' into 'develop'
...
MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439
4 years ago
lain
d15aa9d950
Merge branch 'develop' into 'remove-twitter-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
4 years ago
Ivan Tashkinov
978ccf8f97
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain
2dcb26a6e5
CommonAPI: Unblock a user even if we don't have an activity.
4 years ago
Alexander Strizhakov
3c29f4f957
returning partial chain
4 years ago
lain
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
e4b12494d7
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
rinpatch
e455ca3f3e
Merge branch 'feature/database-configuration-whitelist' into 'develop'
...
Database configuration whitelist
See merge request pleroma/pleroma!2522
4 years ago
lain
4157c459b8
Merge branch 'bcrypt-auth' into 'develop'
...
Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527
4 years ago
Egor Kislitsyn
bb03dfdb03
Do not require `description` in `update` action
4 years ago
Egor Kislitsyn
0f885b4b86
Fix OpenAPI spec
4 years ago
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups
4 years ago
lain
3342846ac2
ChatView: Add update_at field.
4 years ago
Haelwenn (lanodan) Monnier
cb363f0183
MastodonAPI: /api/v2/media endpoints
4 years ago
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
4 years ago
Roman Chvanikov
8a383707ae
Merge develop
4 years ago
Alex Gleason
9cbf17d59f
Handle bcrypt passwords for Mastodon migration
4 years ago
Egor Kislitsyn
6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController
4 years ago
lain
da550be066
Merge branch 'fix/1742-random-failing-tests' into 'develop'
...
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
4 years ago
lain
0f0acc740d
Chat: Allow posting without content if an attachment is present.
4 years ago
lain
06cad239e5
InstanceView: Add pleroma chat messages to nodeinfo
4 years ago
lain
3cff4e24cd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
bcadbf964a
Add OpenAPI spec for SuggestionController
4 years ago
Ivan Tashkinov
fd2fb2bb2e
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
4 years ago
lain
156c8a5088
Merge branch 'openapi/statuses' into 'develop'
...
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
4 years ago
lain
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
4 years ago
Alexander Strizhakov
fbe3d3aa5f
ignore order
4 years ago
Alexander Strizhakov
2c356a4bac
don't use async with global mocks
4 years ago
Alexander Strizhakov
12635bc156
don't use global mocks in setup callbacks
4 years ago
Alexander Strizhakov
b962b24e6f
don't run in async if tests depend on env config
4 years ago
Alexander Strizhakov
ec27f346ee
correct order for publised in assert
4 years ago
Alexander Strizhakov
e0944dee99
make test fail everytime
4 years ago
Alexander Strizhakov
712055612f
don't run tests which change env in async
4 years ago
Alexander Strizhakov
4ba913d641
{:error, :enoent} s3 fix
...
s3 tests were executed before temp file was uploaded
4 years ago
Alex Gleason
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
4 years ago
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController
4 years ago
Stephanie Wilde-Hobbs
a2fcfc78c9
Filter config descriptions by config whitelist
4 years ago
rinpatch
2b18b8a263
Merge branch 'streamer-get-topic' into 'develop'
...
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
4 years ago
href
68cca29dcf
Fix typo in test
4 years ago
rinpatch
24c8c13640
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
...
ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514
4 years ago
rinpatch
4cc71aad65
Merge branch '1748-remote-following-follower-count' into 'develop'
...
Transmogrifier: On incoming follow accept, update follow counts.
Closes #1748
See merge request pleroma/pleroma!2515
4 years ago
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist
4 years ago
href
e6d8cacf2d
Expand and authorize streams in Streamer directly
4 years ago
lain
c0ea5c60e4
ChatController: Don't return chats for user you've blocked.
4 years ago
lain
e44166b510
Credo fixes.
4 years ago
lain
ec72cba43e
Chat Controller: Add basic error handling.
4 years ago
lain
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
b5aa204eb8
ChatController: Support deletion of chat messages.
4 years ago
lain
dfb90a1fd6
Transmogrifier: Add tests for certain announces
4 years ago
lain
ca31af473c
Transmogrifier: On incoming follow accept, update follow counts.
4 years ago
lain
d0ba1844b0
ActivityPub: Fix non-federating blocks.
4 years ago
Maksim Pechnikov
63477d07ad
unsubscribes of friends when user deactivated
4 years ago
rinpatch
f8190aea5e
Merge branch 'fix/issue-1676' into 'develop'
...
[#1676 ] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
4 years ago
Ivan Tashkinov
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
4 years ago
lain
f28ed36b4d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
679afb2de4
SideEffects test: Add test for favorite deletion.
4 years ago
lain
5367a00257
Deletion: Handle the case of pruned objects.
4 years ago
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController
4 years ago
lain
fdb98715b8
Chat: Fix wrong query.
4 years ago
lain
1b1dfb54eb
Credo fixes.
4 years ago
lain
8d5597ff68
ChatController: Add GET /chats/:id
4 years ago
lain
f335e1404a
ChatView: Add the last message to the view.
4 years ago
lain
c272669909
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
4 years ago
Ivan Tashkinov
14a49a0483
[ #2456 ] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
4 years ago
Roman Chvanikov
5c368b004b
Fix refresh_counter_cache test
4 years ago
Roman Chvanikov
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Roman Chvanikov
cbe383ae83
Update stats admin endpoint
4 years ago
Ivan Tashkinov
bbdad85568
Initial implementation of image preview proxy. Media proxy tests refactoring.
4 years ago
Ivan Tashkinov
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
4 years ago
lain
03529f6a05
Transmogrifier: Don't modify attachments for chats.
4 years ago
rinpatch
570940a3fd
Merge branch 'bugfix/fix-like-notifications' into 'develop'
...
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
4 years ago
Alexander Strizhakov
287f781808
user deletion
4 years ago
lain
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
fbcc53760e
Merge branch 'feature/emojireactvalidator' into 'develop'
...
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
4 years ago
lain
7e9aaa0d02
Transmogrifier tests: Remove more double tests.
4 years ago
lain
f1274c3326
Transmogrifier tests: Remove double tests.
4 years ago
Maksim Pechnikov
4d71c4b805
fixed 'source' object in verify_credentials
4 years ago
lain
0cf43391f2
Merge branch 'issue/1276-2' into 'develop'
...
[#1276 ] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
4 years ago
lain
218a22c9a3
Merge branch 'fix/privacy-notification' into 'develop'
...
Privacy option affects all push notifications, not just Direct Messages
Closes #1745
See merge request pleroma/pleroma!2485
4 years ago
Maksim Pechnikov
b078e0567d
Merge branch 'develop' into issue/1276-2
4 years ago
Haelwenn
769d95644d
Merge branch 'feature/restrict-c2s' into 'develop'
...
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
4 years ago
lain
ef55d24054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
4 years ago
rinpatch
bef08b85e5
Merge branch 'feature/undo-validator-reduced' into 'develop'
...
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
4 years ago
Mark Felder
ea01e647df
Test Direct, Public, and Favorite notifications with privacy option
4 years ago
lain
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
7ac0cffb34
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
4 years ago
lain
788b7e7bbd
Merge fixes.
4 years ago
lain
f0c22df226
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
4 years ago
lain
f57fa2a00d
Notifications: Simplify recipient calculation for some Activities.
...
Fixes the 'getting notfications for other people's posts' bug.
4 years ago
Egor Kislitsyn
dc4a448f48
Add OpenAPI spec for SearchController
4 years ago
lain
4c92dfb73e
Merge branch 'openapi/polls' into 'develop'
...
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
4 years ago
lain
4061841846
Merge branch 'streamer-worker-registry' into 'develop'
...
Streamer rework
See merge request pleroma/pleroma!2426
4 years ago
href
9491ba3e49
Streamer rework
4 years ago
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
Mark Felder
a2580adc91
Hide the sender when privacy option is enabled
4 years ago
lain
1748e26948
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
473b0d9f3d
Merge branch 'feature/delete-validator' into 'develop'
...
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
4 years ago
lain
fc9d0b6eec
Credo fixes.
4 years ago
lain
20baa2eaf0
ChatMessages: Add attachments.
4 years ago
Maksim Pechnikov
bd261309cc
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
4 years ago
Maksim Pechnikov
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
4 years ago
lain
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
07e7c80bc9
Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
...
Refactoring of :if_func / :unless_func plug options
See merge request pleroma/pleroma!2446
4 years ago
lain
a716543267
Merge branch 'openapi/subscriptions' into 'develop'
...
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
4 years ago
lain
61ea8f1f5a
Merge branch 'openapi/markers' into 'develop'
...
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
4 years ago
lain
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
4 years ago
lain
c3f1ce80eb
Merge branch 'fix/1726-user-pagination' into 'develop'
...
Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452
4 years ago
lain
0a88bf6a9d
Merge branch 'openapi/follow_requests' into 'develop'
...
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
4 years ago
lain
957172a307
Merge branch 'openapi/filters' into 'develop'
...
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
4 years ago
lain
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
4 years ago
lain
1ee34d4acb
Merge branch 'openapi/instance' into 'develop'
...
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
4 years ago
lain
7fdc7078ae
Merge branch 'openapi/lists' into 'develop'
...
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
4 years ago
lain
76c1a7a34b
Merge branch 'openapi/conversations' into 'develop'
...
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
4 years ago
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
4 years ago
Egor Kislitsyn
332e016bcd
Add OpenAPI spec for ScheduledActivityController
4 years ago
lain
9637cded21
Chat: Fix missing chat id on second 'get'
4 years ago
Egor Kislitsyn
0a1394cc1a
Add OpenAPI spec for PollController
4 years ago
lain
92caae5923
Undoing: Move undoing blocks to the pipeline everywhere.
4 years ago
lain
a3bb2e5474
Undoing: Move undoing announcements to the pipeline everywhere.
4 years ago
lain
b34debe615
Undoing: Move undoing reactions to the pipeline everywhere.
4 years ago
Egor Kislitsyn
3a45952a3a
Add OpenAPI spec for ConversationController
4 years ago
Egor Kislitsyn
46aae346f8
Move single used schemas to Filter operation schema
4 years ago
Egor Kislitsyn
7e7a3e1544
Add OpenAPI spec for FilterController
4 years ago
lain
42a2acac46
Merge branch 'feature/1720-status-view' into 'develop'
...
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
4 years ago
Egor Kislitsyn
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
4 years ago
Egor Kislitsyn
88a14da817
Add OpenAPI spec for InstanceController
4 years ago
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
4 years ago
lain
a3071f0231
Undoing: Move undoing likes to the pipeline everywhere.
4 years ago
Egor Kislitsyn
5ec6aad567
Add OpenAPI spec for ListController
4 years ago
Egor Kislitsyn
babcae7130
Move single used schemas to Marker operation schema
4 years ago
Egor Kislitsyn
8096565653
Add OpenAPI spec for MarkerController
4 years ago
Egor Kislitsyn
d861b0790a
Add OpenAPI spec for SubscriptionController
4 years ago
lain
f1da8882f9
UndoValidator: Add UndoValidator.
4 years ago
rinpatch
33f2976020
Merge branch 'feature/1737-magic-key-field' into 'develop'
...
User, Webfinger: Remove OStatus vestiges
Closes #1737
See merge request pleroma/pleroma!2471
4 years ago
lain
8b2457bdbf
Transmogrifier tests: Extract Undo handling
4 years ago
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
lain
db55dc9445
ActivityPub: Remove `react_with_emoji`.
4 years ago
lain
ad771546d8
Transmogrifier: Move emoji reactions to common pipeline.
4 years ago
lain
142bf0957c
Transmogrifier: Extract EmojiReact tests.
4 years ago
lain
c297667f16
Merge branch 'fix/issue-1729' into 'develop'
...
Only update follower/following stats for actor types of users and bots.
Closes #1565 and #1729
See merge request pleroma/pleroma!2464
4 years ago
lain
2cb3f8a8cf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
6400998820
AP C2S: Restrict creation to `Note`s for now.
4 years ago
lain
6a2905ccf0
WebFinger Test: Add back test.
4 years ago
lain
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
4 years ago
Haelwenn (lanodan) Monnier
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
4 years ago
lain
c23cb8d37a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
0f9bed022f
LikeValidator: Fix up context.
4 years ago
lain
e03c301ebe
LikeValidator: Fix up missing recipients.
4 years ago
lain
335aabc39c
Transmogrifier tests: Extract like tests.
4 years ago
lain
ec24c70db8
ActivityPub: Don't fetch `Application` follower counts.
4 years ago
lain
b04328c3de
ChatController: Add mark_as_read
4 years ago
lain
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
4 years ago
lain
a7966f2080
Webfinger: Request account info with the acct scheme
4 years ago
lain
6c337489f4
Various testing fixes in relation to user deletion.
4 years ago
lain
6fb96f64c1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
4dfc617cdf
Transmogrifier: Don't fetch actor that's guaranteed to be there.
4 years ago
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
4 years ago
eugenijm
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
4 years ago
rinpatch
e55876409b
Deactivate local users on deletion instead of deleting the record
...
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
4 years ago
Ivan Tashkinov
2d07ed7747
[ #1732 ] Made AP C2S :followers and :following endpoints serve on no auth
...
(as for related :api pipeline endpoints).
4 years ago
Ivan Tashkinov
cf5ca7e45b
Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
4 years ago
rinpatch
e7b1df7252
Fix sporadic test compilation failure caused by unused alias
4 years ago
Ivan Tashkinov
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
4 years ago
lain
a912f72a36
Signature: Handle non-ap ids in key ids.
...
Mastodon and Gab sometimes send the format `acct:name@server`.
4 years ago
Alexander Strizhakov
aea781cbd8
credo fix
4 years ago
lain
3370bb0e46
Merge branch 'openapi/notifications' into 'develop'
...
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
4 years ago
lain
607e06c245
Merge branch 'openapi/reports' into 'develop'
...
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
4 years ago
lain
44fbd09709
Merge branch 'issue/1577' into 'develop'
...
[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372
4 years ago
lain
1ead5f49b8
AdminApiController: Use common pipeline for user deletion.
4 years ago
lain
ebbd9c7f36
AdminAPIController: Refactor.
4 years ago
lain
51f1dbf0a2
User deletion mix task: Use common pipeline.
4 years ago
lain
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
4 years ago
lain
ab01863abf
Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
5f42e6629d
DeleteValidator: Only allow deletion of certain types.
4 years ago
Alexander Strizhakov
ecf37b46d2
pagination fix for service users filters
4 years ago
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
4 years ago
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
lain
da4b79a56d
Merge branch 'tests/more-apc2s' into 'develop'
...
Increase tests on AP C2S
See merge request pleroma/pleroma!2449
4 years ago
Lain Soykaf
93f64aba78
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
4 years ago
lain
32b8386ede
DeleteValidator: Don't federate local deletions of remote objects.
...
Closes #1497
4 years ago
lain
a81342a234
Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
...
Dismiss the follow request notification on rejection
See merge request pleroma/pleroma!2447
4 years ago
lain
999d639873
ActivityPub: Remove `delete` function.
...
This is handled by the common pipeline now.
4 years ago
lain
5da08c2b73
SideEffects: Fix comment
4 years ago
lain
500f5ec14e
SideEffects: On deletion, reduce the reply count cache
4 years ago
Haelwenn (lanodan) Monnier
f1523f9acd
Increase tests on AP C2S
...
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
4 years ago
lain
ab60ee1776
SideEffects: On deletion, reduce the User note count.
4 years ago
lain
3d0dc58e2e
SideEffectsTest: Test streaming.
4 years ago
lain
315b773dd9
ObjectValidator: Refactor.
4 years ago
lain
4500fdc04c
DeleteValidator: Add internal helper field after validation.
4 years ago
lain
143353432a
StreamerTest: Separate deletion test.
4 years ago
eugenijm
bef34568f0
Dismiss the follow request notification on rejection
4 years ago
Ivan Tashkinov
2c4844237f
Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
4 years ago
lain
c9bfa51ea9
Credo fixes.
4 years ago
lain
417eed4a2b
SideEffects: Handle deletions.
4 years ago
lain
1fb383f368
DeleteValidator: Deleting a user is valid.
4 years ago
lain
4dc5302f45
Transmogrifier: Handle incoming deletes for non-user objects.
4 years ago
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update
4 years ago
Alexander Strizhakov
342f55fb92
refactor emoji api with fixes
4 years ago
lain
db184a8eb4
DeleteValidator: Mastodon sends unaddressed deletes.
4 years ago
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
4 years ago
lain
bd219ba7e8
Transmogrifier Tests: Extract deletion tests.
4 years ago
lain
4c4344b7b1
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
...
[#1364 ] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367
4 years ago
Egor Kislitsyn
9c1adb35de
Merge branch 'develop' into openapi/notifications
4 years ago
Egor Kislitsyn
1898054da4
Merge branch 'develop' into openapi/reports
4 years ago
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
4 years ago
lain
503de4b8df
ObjectValidator: Add validation for `Delete`s.
4 years ago
lain
b8056e69e0
Object Validator Types: Add Recipients.
4 years ago
lain
20587aa931
Chat message creation: Check actor.
4 years ago
lain
a88734a0a2
Transmogrifier: Fetch missing actors for chatmessages.
4 years ago
lain
e055b8d203
Pipeline: Always run common_pipeline in a transaction for now.
4 years ago
lain
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
7bd187bc5e
added test
4 years ago
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController
4 years ago
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
lain
dedffd100c
Pipeline: Unify, refactor, DRY.
4 years ago
lain
abd0928229
CreateChatMessageValidator: Validate object existence
4 years ago
lain
6aa116eca7
Create activity handling: Flip it and reverse it
...
Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object.
4 years ago
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController
4 years ago
lain
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
12bb7fc0dc
Merge branch 'openapi/account' into 'develop'
...
Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374
4 years ago
lain
906cf53ab9
Recipient Type: Cast all elements as ObjectIDs.
4 years ago
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration
4 years ago
lain
9994768312
Merge branch 'mongoose-secure' into 'develop'
...
mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432
4 years ago
Maksim Pechnikov
ea5142b94b
convert markdown content to html
4 years ago
fence
5ff20793e7
formating
4 years ago
Egor Kislitsyn
dda65f7799
Move single used schemas to operation schema
4 years ago
fence
d607b4d840
mongooseim test: explicitly set password for the deactivated used
4 years ago
fence
935ca2c132
requested changes to mongoose test
4 years ago
Egor Kislitsyn
2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
4 years ago
fence
5c7cc10917
add tests for deactivated users for mongoose auth
4 years ago
lain
ad82a216ff
Chat API: Align more to Pleroma/Mastodon API.
4 years ago
lain
49e673dfea
ChatView: Add actor_account_id
4 years ago
lain
3635a9c9c2
InstanceController: Add extensions to `/api/v1/instance`
4 years ago
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
lain
d2bbea1a80
ChatControllerTest: Use new schema testing functions.
4 years ago
lain
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
b4139cc547
[ #2409 ] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
4 years ago
rinpatch
8addbd948c
Merge branch 'bugfix/announce-race-condition' into 'develop'
...
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
4 years ago
lain
c30b3b2dc5
Merge branch 'reply-filtering-refactor' into 'develop'
...
Reply filtering refactor
See merge request pleroma/pleroma!2424
4 years ago
lain
d89cd0a197
Reply Filtering: Refactor.
4 years ago
lain
d862c7156a
Merge branch 'openapi-improvements' into 'develop'
...
Support validation for inline OpenAPI schema and automatic tests for examples
Closes #1696
See merge request pleroma/pleroma!2421
4 years ago
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
4 years ago
Ivan Tashkinov
00e62161f6
[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
4 years ago
Alexander
6e625a427c
reply filtering
4 years ago
lain
cb12585098
Announcements: Prevent race condition.
4 years ago
lain
bbf8554c97
ActivitPub: Remove `like` function.
...
We don't need another way to build likes.
4 years ago
Egor Kislitsyn
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
4 years ago
lain
1e28d34592
ChatMessage: Correctly ingest emoji tags.
4 years ago
lain
ec7335535d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
1b5f8d19ee
Merge branch 'bugfix/repeating-announce' into 'develop'
...
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
4 years ago
lain
7d38197894
CommonAPI: Don't make repeating announces possible
4 years ago
rinpatch
25eec6d72d
Merge branch 'bugfix/null-scheduled-at' into 'develop'
...
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
4 years ago
lain
850377a7b8
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
...
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
4 years ago
Haelwenn
af27e4dffd
Merge branch 'bugfix/1670-user-count' into 'develop'
...
Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414
4 years ago
lain
f5bda09de6
Stats: Use `invisible` property for filtering.
4 years ago
Ivan Tashkinov
e7fb593d13
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
e62173dfc8
SideEffects: Run in transaction.
...
This fixes race conditions.
4 years ago
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
Ivan Tashkinov
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Haelwenn
28f8fcf8b0
Merge branch 'fix/follow-and-blocks-import' into 'develop'
...
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
4 years ago
Haelwenn
468cc977be
Merge branch 'bugfix/following-fix-status-code' into 'develop'
...
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
4 years ago
Haelwenn
238058ecae
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
...
Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415
4 years ago
Egor Kislitsyn
6db52c3b36
Fix Oban warning
...
Warning example:
[warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.
4 years ago
Egor Kislitsyn
e7771424a8
Fix blocks import
4 years ago
Egor Kislitsyn
88b82e5c3e
Fix follow import
4 years ago
lain
7a3a88a13e
Streamer: Stream boosts to the boosting user.
4 years ago
Haelwenn
1855c597c2
Merge branch 'feature/voters-count' into 'develop'
...
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
4 years ago
Haelwenn
2e73c19edc
Merge branch 'worker-messages' into 'develop'
...
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
4 years ago
lain
8b88e2a6e2
Stats: Ignore internal users for user count.
4 years ago
lain
5b39526198
AccountController: Use code 400 for self-follow.
4 years ago
lain
69ecc39038
Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
...
Fix migrate to db config
Closes #1689
See merge request pleroma/pleroma!2394
4 years ago
lain
c10485db16
StatusController: Ignore nil scheduled_at parameters.
4 years ago
lain
5102468d0f
Polls: Persist and show voters' count
4 years ago
lain
923513b641
Federator: Return proper values for jobs
4 years ago
lain
f719a5b23a
WebPush: Return proper values for jobs.
4 years ago
lain
2e62a63749
ChatMessageValidator: Validation changes
...
Don't validate if the recipient is blocking the actor.
4 years ago
lain
6c8390fa4d
ChatControllerTest: Credo fixes.
4 years ago
lain
66c2eb670b
ChatController: Validate parameters.
4 years ago
lain
97ad0c4597
Chats: Add API specs.
4 years ago
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain
a185b5455f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
4 years ago
lain
5165287ff4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
5 years ago
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
5 years ago
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
5 years ago
Egor Kislitsyn
736fead494
Merge branch 'develop' into openapi/account
5 years ago
lain
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
5 years ago
Ilja
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
5 years ago
lain
b5df4a98e4
ChatMessageView: Support emoji.
5 years ago
lain
7e53da250e
ChatMessage: Support emoji.
5 years ago
lain
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
970b74383b
Credo fixes.
5 years ago
lain
5b6818b3e5
CommonAPI: Obey local limit for chat messages.
5 years ago
lain
ce23673ca1
ChatMessageValidator: Don't validate messages that are too long.
5 years ago
rinpatch
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
5 years ago
Ivan Tashkinov
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
5 years ago
Egor Kislitsyn
163341857a
Improve OpenAPI errors
5 years ago
lain
c845820911
Notifications: Create a chat notification.
5 years ago
lain
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
26d9c83316
SideEffects: Test for notification creation.
5 years ago
lain
372614cfd3
ChatView: Add a mastodon api representation of the recipient.
5 years ago
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
5 years ago
lain
d45ae64858
ChatController: Use OAuth scopes.
5 years ago
Alexander Strizhakov
6cda360fea
don't restart postgrex
5 years ago
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
5 years ago
Haelwenn
d8142ee6fe
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
...
Fix for logger configuration
Closes #1694
See merge request pleroma/pleroma!2396
5 years ago
Haelwenn
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
5 years ago
Alexander Strizhakov
304ea09f4c
fix for logger configuration
5 years ago
rinpatch
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
5 years ago
rinpatch
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
5 years ago
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
5 years ago
lain
f8c3ae7a62
ChatController: Handle pagination.
5 years ago
lain
e983f70884
ChatMessagesHandling: Strip HTML of incoming messages.
5 years ago
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities
5 years ago
rinpatch
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
5 years ago
lain
41fdcb7282
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
ca598e9c27
AccountView: Return user ap_id.
5 years ago
lain
e2ced04917
ChatMessages: Better validation.
5 years ago
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
5 years ago
lain
3d4eca5dd4
CommonAPI: Escape HTML for chat messages.
5 years ago
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController
5 years ago
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
5 years ago
Ivan Tashkinov
bde1189c34
[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
5 years ago
lain
6ace22b56a
Chat: Add views, don't return them in timeline queries.
5 years ago
Ivan Tashkinov
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
5 years ago
lain
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag
5 years ago
Ivan Tashkinov
0cda80f266
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
Egor Kislitsyn
247e6fcb90
Merge branch 'develop' into openapi/account
5 years ago
feld
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
5 years ago
Ivan Tashkinov
650853fc89
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
5 years ago
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
5 years ago
Egor Kislitsyn
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
5 years ago
Egor Kislitsyn
ab185d3ea4
Add spec for AccountController.follows
5 years ago
Egor Kislitsyn
68a979b824
Add specs for AccountController.block and AccountController.unblock
5 years ago
Egor Kislitsyn
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
5 years ago
Egor Kislitsyn
aa958a6dda
Add spec for AccountController.unfollow
5 years ago
Egor Kislitsyn
854780c72b
Add spec for AccountController.follow
5 years ago
Egor Kislitsyn
1b680a98ae
Add spec for AccountController.lists
5 years ago
Egor Kislitsyn
e105cc12b6
Add spec for AccountController.following
5 years ago
Egor Kislitsyn
bd6e2b300f
Add spec for AccountController.followers
5 years ago
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses
5 years ago
Egor Kislitsyn
278b3fa0ad
Add spec for AccountController.show
5 years ago
Egor Kislitsyn
d7d6a83233
Add spec for AccountController.relationships
5 years ago
Egor Kislitsyn
ab400b2ddb
Add specs for ActorType and VisibilityScope
5 years ago
Egor Kislitsyn
260cbddc94
Add spec for AccountController.update_credentials
5 years ago
Egor Kislitsyn
f80116125f
Add spec for AccountController.verify_credentials
5 years ago
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create
5 years ago
Egor Kislitsyn
dc8fa04192
Merge branch 'develop' into global-status-expiration
5 years ago
Ivan Tashkinov
f00ff20768
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/following_relationship.ex
5 years ago
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
Alexander Strizhakov
a050f3e015
fix for logger configuration through admin-fe
5 years ago
Maksim Pechnikov
c5c09fc61b
fix mediaType of object
5 years ago
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy
5 years ago
Ivan Tashkinov
c556efb761
[ #1364 ] Enabled notifications on followed domain-blocked users' activities.
5 years ago
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
rinpatch
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
5 years ago
Ivan Tashkinov
88b16fdfb7
[ #1364 ] Disabled notifications on activities from blocked domains.
5 years ago
Egor Kislitsyn
dd612f86ae
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
lain
64c78581fe
Chat: Only create them for valid users for now.
5 years ago
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
5 years ago
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
Haelwenn
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
5 years ago
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data
5 years ago
Haelwenn (lanodan) Monnier
3420dec494
Remove User.fields/1
5 years ago
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields
5 years ago
Haelwenn (lanodan) Monnier
369c03834c
formatter: Use user.uri instead of user.source_data.uri
5 years ago
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field
5 years ago
lain
2cc6841424
ChatController: Basic message posting.
5 years ago
lain
e8fd0dd689
ChatController: Basic support for returning messages.
5 years ago
lain
68abea313d
ChatController: Add creation and return of chats.
5 years ago
Egor Kislitsyn
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
lain
d35e114acd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
8e637ae1a7
CommonAPI: Basic ChatMessage support.
5 years ago
lain
4b04785071
SideEffects: Extend ChatMessage test.
5 years ago
lain
2e78686686
SideEffects: Handle ChatMessage creation.
5 years ago
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
5 years ago
Alexander Strizhakov
9795ff5b01
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
5 years ago
Alexander Strizhakov
365c34a7a9
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
5 years ago
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
5 years ago
rinpatch
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
5 years ago
Ivan Tashkinov
3965772b26
[ #1559 ] Minor change (analysis).
5 years ago
Ivan Tashkinov
f35c28bf07
[ #1559 ] Added / fixed tests for follow / follow_request notifications.
5 years ago
lain
3775683a04
ChatMessage: Basic incoming handling.
5 years ago
rinpatch
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
5 years ago
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
kPherox
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
5 years ago
lain
19335be24c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
5 years ago
lain
96ee0aadbf
Merge branch 'improving-test-coverage' into 'develop'
...
Tests for emoji mix task
See merge request pleroma/pleroma!2350
5 years ago
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
5 years ago
Alexander Strizhakov
a43e055916
using another fn for file deletion
5 years ago
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task
5 years ago
Ivan Tashkinov
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Ivan Tashkinov
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
5 years ago
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
lain
fd97b0e634
Chats: Basic implementation.
5 years ago
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
23219e6fb3
Add OpenAPI
5 years ago
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint
5 years ago
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
feld
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
5 years ago
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
rinpatch
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
5 years ago
Alexander Strizhakov
94ddbe4098
restrict remote users from indexing
5 years ago
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn (lanodan) Monnier
b30fb1f3bb
User: Fix use of source_data in profile_url/1
5 years ago
Haelwenn (lanodan) Monnier
2553400a66
Initial failing test statement against funkwhale channels
5 years ago
kPherox
dbf9d719f9
split test for update profile fields
5 years ago
lain
aebec1bac9
Validator Test: Small refactor.
5 years ago
Alexander Strizhakov
df5f89c0d6
test for default features and changelog entry
5 years ago
lain
643f15e77b
Validators: ObjectID is an http uri.
5 years ago
Alexander Strizhakov
b607ae1a1c
removing grouped reports admin api endpoint
5 years ago
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
5 years ago
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
lain
0adaab8e75
Bump copyright dates.
5 years ago
Ivan Tashkinov
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
5 years ago
rinpatch
de62e633d3
Merge branch '1364-notifications-sending-control' into 'develop'
...
[#1364 ] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
5 years ago
Ivan Tashkinov
ff1baae7e9
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
5 years ago
Egor Kislitsyn
9081a071ee
Add a test for accounts/update_credentials
5 years ago
Ivan Tashkinov
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Ivan Tashkinov
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
5 years ago
Haelwenn (lanodan) Monnier
03a18cf037
node_info_test: Bump default features list
5 years ago
Haelwenn (lanodan) Monnier
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
5 years ago
Haelwenn (lanodan) Monnier
64165d1df9
node_info_test.exs: Add test on the default feature list
5 years ago
Ivan Tashkinov
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
feld
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
5 years ago
lain
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
5 years ago
Egor Kislitsyn
4a2538967c
Support pagination in conversations
5 years ago
Egor Kislitsyn
d1a9716a98
Fix activity deletion
5 years ago
Egor Kislitsyn
3189c44a0c
Remove some TwitterAPI endpoints
5 years ago
lain
eec1fcaf55
Home timeline tests: Add failing test for relationships
5 years ago
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Haelwenn (lanodan) Monnier
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
5 years ago
Egor Kislitsyn
fc2eb1fbd6
Fix formatter warnings
5 years ago
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov
7f9b5284fa
updating clear_config
5 years ago
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
lain
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
...
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
5 years ago
Ivan Tashkinov
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
Ivan Tashkinov
0e27c274f4
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
...
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
5 years ago
lain
6c1232b486
NotificationController: Fix test.
5 years ago
lain
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
5 years ago
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
Haelwenn (lanodan) Monnier
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
5 years ago
Haelwenn (lanodan) Monnier
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
5 years ago
lain
3c2c32b460
Merge branch 'remake-remodel' into develop
5 years ago
Haelwenn (lanodan) Monnier
f9d622d25a
WIP
5 years ago
Ivan Tashkinov
ec3719f539
Improved in-test config management functions.
5 years ago
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier
d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media
5 years ago
Ivan Tashkinov
7438833685
[ #1364 ] Improved notification-related tests.
5 years ago
eugenijm
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
eugenijm
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
5 years ago
Alexander Strizhakov
f3791add99
removing with_move parameter
5 years ago
Ivan Tashkinov
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Egor Kislitsyn
5ad54d1bd5
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Alexander Strizhakov
3805e09b9c
Merge branch 'develop' into gun
5 years ago
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
dc2ec84c0f
warnings fix
5 years ago
Alexander Strizhakov
89e4b3ebbd
fix for content-type header for tag feed
5 years ago
Alexander Strizhakov
91870c8995
adding rss for user feed
5 years ago
Alexander Strizhakov
26e2076659
fix for feed page pagination
5 years ago
rinpatch
34fd1c2c9d
Merge branch 'bugfix/earmark_renderer_test' into 'develop'
...
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300
5 years ago
Haelwenn (lanodan) Monnier
0ac6e29654
static_fe: Sanitize HTML in posts
...
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
5 years ago
lain
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
5 years ago
Ivan Tashkinov
7c8003c3fc
[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
5 years ago
Haelwenn
d84670b9e1
Merge branch 'f' into 'develop'
...
rip out fetch_initial_posts
Closes #1422 and #1595
See merge request pleroma/pleroma!2297
5 years ago
Haelwenn (lanodan) Monnier
dca21cd1d6
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
...
Wasn't in the test suite otherwise
5 years ago
Haelwenn
67a27825b1
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
...
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes #1620
See merge request pleroma/pleroma!2296
5 years ago
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
5 years ago
Ivan Tashkinov
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
5 years ago
rinpatch
d88c8a9614
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
5 years ago
rinpatch
994ac4357c
Merge branch 'fix/hashtags-streaming' into 'develop'
...
Fix hashtags WebSocket streaming
Closes #1593
See merge request pleroma/pleroma!2294
5 years ago
rinpatch
fc4496d4fa
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
5 years ago
rinpatch
3e0f05f08e
Merge branch 'bugfix/br-vs-newline' into 'develop'
...
Formatting: Do not use \n and prefer <br> instead
Closes #1374 and #1375
See merge request pleroma/pleroma!2204
5 years ago
Mark Felder
c6eb1c1b92
Merge branch 'develop' into fix/cache-control-headers
5 years ago
Mark Felder
db36b48180
Remove test verifying we preserve cache-control headers; we don't
5 years ago
Mark Felder
470090471d
Fix test to use new cache-control settings
5 years ago
rinpatch
096c5c52e0
Merge branch 'revert/cache-control' into 'develop'
...
Revert "Set better Cache-Control header for static content"
Closes #1613
See merge request pleroma/pleroma!2290
5 years ago
Egor Kislitsyn
fffc382f13
Fix hashtags WebSocket streaming
5 years ago
Haelwenn (lanodan) Monnier
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
5 years ago
feld
802b991814
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
...
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
5 years ago
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
1306b92997
clean up
5 years ago
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Ivan Tashkinov
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
5 years ago
feld
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
5 years ago
rinpatch
7cdabdc0df
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
5 years ago
feld
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
5 years ago
rinpatch
c3b9fbd3a7
Revert "Set better Cache-Control header for static content"
...
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes #1613
5 years ago
Alexander Strizhakov
282a93554f
merging release default config on app start
5 years ago
Haelwenn (lanodan) Monnier
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
5 years ago
Ivan Tashkinov
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
Ivan Tashkinov
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Mark Felder
5af798f246
Fix enforcement of character limits
5 years ago
Alexander Strizhakov
f39e1b9eff
add verify tls_opts only when we open connection
...
for other requests tesla will add tls_opts
5 years ago
Alexander Strizhakov
426f5ee48a
tesla adapter can't be changed in adminFE
5 years ago
Ivan Tashkinov
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
Maksim Pechnikov
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
9f884a2639
tests changes
5 years ago
Alexander Strizhakov
14678a7708
using `stub` instead `expect`
5 years ago
Alexander Strizhakov
56ff02f2ef
removing GunMock to use Mox
5 years ago
Ivan Tashkinov
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Ivan Tashkinov
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
5 years ago
Alexander Strizhakov
931111fd55
removing integration tests
5 years ago
Alexander Strizhakov
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
5 years ago
eugenijm
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
5 years ago
lain
f1750b4658
Admin API tests: Fix wrong test.
5 years ago
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
5 years ago
Alexander Strizhakov
d6bebd4f9c
moving some logic to tesla adapter
...
- checking original inside gun adapter
- flushing streams on max_body error
5 years ago
lain
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
5 years ago
Alexander Strizhakov
22d52f5691
same copyright date format
5 years ago
Alexander Strizhakov
6b2fb9160c
otp version
5 years ago
Mark Felder
d9c5ae7c09
Update Copyrights for gun related files
5 years ago
Mark Felder
4427161ca3
Merge branch 'develop' into gun
5 years ago
Mark Felder
5592db4757
Older copyright updates
5 years ago
Mark Felder
05da5f5cca
Update Copyrights
5 years ago
Ivan Tashkinov
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago
Alexander Strizhakov
884d9710b2
refactoring for gun api modules
5 years ago
Alexander Strizhakov
23f407bf09
don't test gun itself
5 years ago
Alexander Strizhakov
f98ee730f0
adapter renaming to adapter_helper
5 years ago
Alexander Strizhakov
3723d72365
proxy parse tests fix
5 years ago
Alexander Strizhakov
7c0ed9302c
unnecessary mock
5 years ago
Alexander Strizhakov
e605e79df9
simplification of formatting host method
...
case for format_proxy method
5 years ago
Alexander Strizhakov
ee8071f0d5
removing unused method
5 years ago
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout
5 years ago
Alexander Strizhakov
4c8569d403
otp_version refactor
5 years ago
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
5 years ago
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Ivan Tashkinov
bd8624d649
[ #1560 ] Added tests for non-federating instance bahaviour to OStatusControllerTest.
5 years ago
Ivan Tashkinov
b4367125e9
[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
5 years ago
Ivan Tashkinov
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
Haelwenn
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
5 years ago
Alexander Strizhakov
137c600cae
stop connections manually
5 years ago
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow
5 years ago
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
5 years ago
Haelwenn (lanodan) Monnier
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
...
Done via the following command:
git diff 1e6c102b
--stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
5 years ago
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
rinpatch
4d416343fa
rate limiter: Fix a race condition
...
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
5 years ago
rinpatch
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
5 years ago
Ivan Tashkinov
c747260989
[ #2250 ] Tiny refactoring per merge request review.
5 years ago
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
5 years ago
feld
f2216287a7
Merge branch 'admin-status-list' into 'develop'
...
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
5 years ago
Ivan Tashkinov
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email
5 years ago
eugenijm
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
eugenijm
e2a6a40367
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
5 years ago
Egor Kislitsyn
f446744a6a
Allow account registration without an email
5 years ago
feld
97dae77240
Merge branch 'token-web-push-test' into 'develop'
...
Add a test to ensure OAuth tokens are tied to Push subscriptions
Closes #1551
See merge request pleroma/pleroma!2241
5 years ago
Egor Kislitsyn
c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions
5 years ago
Alexander Strizhakov
3eccdd15aa
compile fix
5 years ago
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
rinpatch
035c2c1415
Merge branch 'fix/instance-gen-custom-static' into 'develop'
...
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
5 years ago
rinpatch
5e4fe0e8f7
instance.gen task: fix crash when using custom static directory
...
Closes #1082
5 years ago
eugenijm
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Alexander Strizhakov
8efae966b1
open conn in separate task
5 years ago
lain
81f29e7c6a
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
...
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
5 years ago
Haelwenn (lanodan) Monnier
f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
Haelwenn (lanodan) Monnier
ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native
5 years ago
Ivan Tashkinov
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
Ivan Tashkinov
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
5 years ago
Alexander Strizhakov
ad8f26c0a4
more info in Connections.checkin timout errors
5 years ago
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun
5 years ago
Haelwenn
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
5 years ago
Egor Kislitsyn
819cd46717
Auto-expire Create activities only
5 years ago
lain
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
5 years ago
lain
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
5 years ago
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
lain
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
lain
cf4ecffcea
Merge branch 'tests-clear-config-tweaks' into 'develop'
...
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
5 years ago
lain
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
Alexander Strizhakov
c9db0507f8
removing retry option and changing some logger messages levels
5 years ago
Mark Felder
138a3c1fe4
Spelling was wrong in test as well
5 years ago
Mark Felder
cf94349287
Merge branch 'develop' into gun
5 years ago
lain
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
5 years ago
Ivan Tashkinov
226f4d5ef9
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
...
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
5 years ago
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
5 years ago
Egor Kislitsyn
ca7ac068f0
Add a test
5 years ago
Alexander Strizhakov
514c899275
adding gun adapter
5 years ago
Maksim Pechnikov
28701c08ad
Merge branch 'develop' into issue/1276
5 years ago
rinpatch
472132215e
Use floki's new APIs for parsing fragments
5 years ago
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
5 years ago
Egor Kislitsyn
e2d358f1fb
Fix typo
5 years ago
Ivan Tashkinov
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
Egor Kislitsyn
241a3d744a
Add ActivityExpirationPolicy
5 years ago
Maksim Pechnikov
6f9839c73c
Merge branch 'develop' into issue/1276
5 years ago
feld
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
5 years ago
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
19516af74e
Fix `status.expires_in` validation
5 years ago
Mark Felder
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
5 years ago
Egor Kislitsyn
58b2017aa0
Restore TwitterAPI tests
5 years ago
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment
5 years ago
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
5 years ago
rinpatch
ea1631d7e6
Make Floki use fast_html
5 years ago
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
Maksim Pechnikov
58574ef156
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
Ivan Tashkinov
b95dd5e217
[ #1505 ] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.
5 years ago
Maksim Pechnikov
cd040691bd
maked `unread_count` as virtual field
5 years ago
Maksim Pechnikov
b87533760b
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
5 years ago
Ivan Tashkinov
7c3991f59e
[ #1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids).
5 years ago
Ivan Tashkinov
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Ivan Tashkinov
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
5 years ago
Alexander Strizhakov
dad23e3766
need_reboot flag
5 years ago
Haelwenn
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
5 years ago
Lain Soykaf
d85bcc8627
Questions: Add timezone to `closed` property
5 years ago
Lain Soykaf
4538a1ee01
EmojiReactions: Remove old API endpoints
5 years ago
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
Egor Kislitsyn
bc2e98b200
Add User.get_follow_state/2
5 years ago
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
feld
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
5 years ago
Egor Kislitsyn
8b9742ecf5
Cancellation of a follow request for a remote user
5 years ago
Alexander Strizhakov
c85aa6e87f
removing confusing error
5 years ago
rinpatch
15cb1f6804
Merge branch 'fix/unpinnable-polls' into 'develop'
...
fix not being able to pin polls
See merge request pleroma/pleroma!2172
5 years ago
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api
5 years ago
rinpatch
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
5 years ago
Egor Kislitsyn
8c71f7e11a
Add support for cancellation of a follow request
5 years ago
Ivan Tashkinov
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
50f5a92021
fix not being able to pin polls
5 years ago
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
5 years ago
Roman Chvanikov
8057157ee3
Make attachments cleanup optional
5 years ago
rinpatch
c27d1d65bf
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
...
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
5 years ago
rinpatch
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
lain
01fb4dbeae
Emoji Reactions: Add fixtures
5 years ago
lain
a0d9d42eaa
Emoji Reactions: Actually use the validation.
5 years ago
feld
e2f2602fdc
Merge branch 'emoji-api-errors' into 'develop'
...
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
5 years ago
rinpatch
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
5 years ago
Haelwenn
946de2299c
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
5 years ago
Alexander Strizhakov
e7fee0d6fa
emoji api error on not writable dir
5 years ago
lain
7a60cd91ff
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
5 years ago
lain
e2e9299b8e
Streamer Tests: code readability improvements
5 years ago
lain
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
5 years ago
lain
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
Alexander Strizhakov
1f4fbe9d98
title parse improvement
5 years ago
Maksim Pechnikov
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
lain
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
5 years ago
lain
e8f22451da
Merge branch 'linkify-test-expansion' into 'develop'
...
Formatter: Add a test for domain / username clashes
See merge request pleroma/pleroma!2151
5 years ago
lain
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
5 years ago
lain
2c121b2623
Merge branch 'fix/1524-link_preview' into 'develop'
...
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
5 years ago
Alexander Strizhakov
7bd4c14581
meta tag parser respect first title header
5 years ago
lain
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
5 years ago
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
5 years ago
lain
e816edbb2f
Update streamer_test.exs
5 years ago
lain
77f24525ca
Streamer: Correctly handle reblog mutes
5 years ago
Alexander Strizhakov
33bd8fbffe
filename and test fixes
5 years ago
feld
d9cb8acd3e
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
5 years ago
Egor Kislitsyn
2ddd1bb088
Fix compatibility with Elixir v1.10
5 years ago
Roman Chvanikov
d18a2e4e36
Add test for custom base_url when deleting an attachment
5 years ago
lain
51283bf996
Formatter: Add a test for domain / username clashes
5 years ago
Maksim Pechnikov
be926863a8
fix test
5 years ago
Maksim Pechnikov
bcffa662dc
Merge branch 'develop' into feature/tag_feed
5 years ago
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
Mark Felder
d770cffce0
Merge branch 'develop' into issue/1280
5 years ago
Alexander Strizhakov
ac97d01fb6
right test
5 years ago
Alexander Strizhakov
e93cc561cd
restarting pleroma from outside application
5 years ago
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
5 years ago
Maksim Pechnikov
99c0a11c58
added atom feed
5 years ago
Maksim Pechnikov
055edd3d72
Merge branch 'develop' into feature/tag_feed
5 years ago
rinpatch
8533b63d1f
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
...
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
5 years ago
rinpatch
0fceeb44b3
Merge branch 'emoji-reaction-sanity-check' into 'develop'
...
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
5 years ago
lain
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
Alexander Strizhakov
6a0f0ac4a2
fix for non existing atom
5 years ago
Maksim Pechnikov
293281fcbd
Merge branch 'develop' into feature/tag_feed
5 years ago
feld
a182d400d7
Merge branch 'fix_for_migrate_to_db_test' into 'develop'
...
Fix for migrate to db test
See merge request pleroma/pleroma!2133
5 years ago
Alexander Strizhakov
6cd2e851d9
parsing Swoosh modules
5 years ago