lain
56dfa0e0fb
Transmogrifier: Update notification after accepting.
4 years ago
lain
00748e9650
ChatMessageReferences: Change seen -> unread
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
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
5677b21e82
clean up
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
e46aecda55
Notification: Fix notifications backfill for compacted activities
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
Haelwenn
18b050dfd1
Merge branch 'openapi/update-admin-api/status' into 'develop'
...
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
4 years ago
lain
903955b189
FollowingRelationship: Remove meaningless change
4 years ago
lain
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
4 years ago
lain
73127cff75
Credo fixes.
4 years ago
lain
2591745fc2
ChatMessageReferences: Move tests
4 years ago
Egor Kislitsyn
8a43611e01
Use AdminAPI.StatusView in api/admin/users
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
7922e63825
Update OpenAPI spec for AdminAPI.StatusController
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
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
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
2860c66e88
Merge branch 'feature/embeddable-posts' into 'develop'
...
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
4 years ago
lain
2c6ebe709a
Credo fixes
4 years ago
lain
6cd2fa2a4c
Migrations: Add a migration to backfill notification types.
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
Egor Kislitsyn
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
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
Alex Gleason
954acdda20
Add `account_activation_required` to /api/v1/instance
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
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
rinpatch
d23b3701d8
Merge branch 'bugfix/csp-unproxied' into 'develop'
...
http_security_plug.ex: Fix non-proxied media
See merge request pleroma/pleroma!2610
4 years ago
rinpatch
109af93227
Apply suggestion to lib/pleroma/plugs/http_security_plug.ex
4 years ago
rinpatch
660d49227b
Merge branch 'connect-src' into 'develop'
...
Add blob: to connect-src CSP, fixes #1827
Closes #1827
See merge request pleroma/pleroma!2608
4 years ago
Ivan Tashkinov
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
4 years ago
Alex Gleason
d38f28870e
Add blob: to connect-src CSP
4 years ago
lain
219d2b3146
Merge branch 'fix-streaming' into 'develop'
...
Fix argument error in streamer
See merge request pleroma/pleroma!2609
4 years ago
feld
81db758e8e
Merge branch 'mix/database-vacuum-options' into 'develop'
...
Database vacuum mix task
See merge request pleroma/pleroma!2599
4 years ago
kPherox
de0e262839
Fix argument error in streamer
...
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
4 years ago
Haelwenn (lanodan) Monnier
da1e31fae3
http_security_plug.ex: Fix non-proxied media
4 years ago
Haelwenn (lanodan) Monnier
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
4 years ago
Haelwenn (lanodan) Monnier
2c18830d0d
Bugfix: router: allow basic_auth for outbox
4 years ago
Haelwenn (lanodan) Monnier
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain
3898dd69a6
SideEffects: Ensure a chat is present before streaming something out.
4 years ago
lain
767ce8b803
StreamerView: Actually send Chats, not ChatMessages.
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
kPherox
228ff3760e
Use `User.is_internal_user?` instead
4 years ago
kPherox
9df5b1e6ae
Don't make relay announce notification
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
rinpatch
27180611df
HTTP Security plug: make starting csp string generation more readable
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
lain
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
4 years ago
Alex Gleason
d4a18d44fe
Update default instance description
4 years ago
Mark Felder
30f96b19c1
Abstract out the database maintenance. I'd like to use this from AdminFE too.
4 years ago
Mark Felder
95f6240889
Fix minor spelling error
4 years ago
rinpatch
29ff6d414b
HTTP security plug: Harden img-src and media-src when MediaProxy is enabled
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
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
Alexander Strizhakov
047a11c48f
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
4 years ago
Egor Kislitsyn
c6290be682
Fix typo
4 years ago
lain
b8e029b5ea
Notification: Actually preload objects.
4 years ago
lain
b9e2678b9e
Merge branch 'fav-speedup' into 'develop'
...
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
4 years ago
lain
7e13200869
ActivityPub: Change ordering to `nulls last` in favorites query
...
This makes it use our existing index and speeds up the query.
4 years ago
Alexander Strizhakov
3249141588
validate actor type
4 years ago
rinpatch
cf139b06a3
Merge branch 'fav-speedup' into 'develop'
...
Fix favorites query performance
See merge request pleroma/pleroma!2591
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
rinpatch
ed08da9135
Merge branch '1813-throttling' into 'develop'
...
Mastodon API Controllers: Use the correct params for rate limiting.
Closes #1813
See merge request pleroma/pleroma!2586
4 years ago
lain
d8d99fd4cf
Activity.Queries: Use correct actor restriction.
4 years ago
Egor Kislitsyn
2069ec5006
Fix Oban warnings
4 years ago
lain
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
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
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
0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
4 years ago
lain
dbd07d29a3
Streamer: Don't crash on streaming chat notifications
4 years ago
lain
6bd7070b00
Transmogrifier: Use a simpler way to get mentions.
4 years ago
lain
5fef405208
User: Change signature of get_users_from_set
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
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
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
5d60b25e69
Apply suggestion to lib/pleroma/web/common_api/utils.ex
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
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
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
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
eugenijm
b7fc61e17b
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
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
26f01744bc
Add `background_image` to `InstanceOperation`
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
lain
8a6ddf26ac
InstanceOperation: Add background image to example
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
Egor Kislitsyn
47ed9ee441
Fix summary
4 years ago
lain
be322541c8
User.Query: Remove superfluous `distinct`
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
lain
a985bd57b4
User.Query: Speed up recipients query.
4 years ago
Egor Kislitsyn
e4c720f14c
Fix typo
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
Ivan Tashkinov
5735b5c8be
Fixed missing support for `with_muted` param in direct timeline.
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
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
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
Maksim Pechnikov
c33a4315fb
updated docs
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
Maksim Pechnikov
3f8d68bdf3
added example cache purge script
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
2dcb26a6e5
CommonAPI: Unblock a user even if we don't have an activity.
4 years ago
Maksim Pechnikov
cb40602a16
added media proxy invalidation
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
lain
1d18721a3c
Chats: Add updated_at to Schema and docs.
4 years ago
Egor Kislitsyn
e090191d03
[OpenAPI] Mark all not required request fields as nullable
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
Alex Gleason
5b0f27d23d
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
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
Steph
5c6f575315
Style fixes
4 years ago
Haelwenn (lanodan) Monnier
099e314a1b
Add OpenAPISpex for MediaController
4 years ago
lain
39ec1af993
Merge branch 'openapi/pleroma-api/accounts' into 'develop'
...
Add OpenAPI spec for PleromaAPI.AccountController
See merge request pleroma/pleroma!2528
4 years ago
lain
359d7b0a6d
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
4 years ago
lain
1c2629328d
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
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
Alex Gleason
249e009c5e
Add `pleroma_internal` as an internal field
4 years ago
Roman Chvanikov
8a383707ae
Merge develop
4 years ago
Ivan Tashkinov
8062d590dd
[ #2456 ] OpenAPI-related tweaks. Removed support for `with_relationships` param in `GET /api/v1/accounts/search`.
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
0f0acc740d
Chat: Allow posting without content if an attachment is present.
4 years ago
Ivan Tashkinov
59b6d5f2aa
[ #2456 ] Changed `embed_relationships` param to `with_relationships`.
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
33b798425f
[ #2456 ] Post-merge fix.
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
Alex Gleason
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
4 years ago
Egor Kislitsyn
79ad12064d
Fix format
4 years ago
minibikini
cb1a3e196c
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
4 years ago
minibikini
5a2333925c
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
4 years ago
minibikini
822e9c09aa
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
4 years ago
minibikini
40646a7e0e
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
4 years ago
minibikini
0bb164a3e1
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
4 years ago
minibikini
648cc0d72d
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
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
Ivan Tashkinov
bfb48e3db6
[ #2456 ] OpenAPI: added `embed_relationships` param definition.
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
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