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
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
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
4 years ago
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
4 years ago
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
Egor Kislitsyn
736fead494
Merge branch 'develop' into openapi/account
4 years ago
lain
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
4 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
4 years ago
lain
b5df4a98e4
ChatMessageView: Support emoji.
4 years ago
lain
7e53da250e
ChatMessage: Support emoji.
4 years ago
lain
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
970b74383b
Credo fixes.
4 years ago
lain
5b6818b3e5
CommonAPI: Obey local limit for chat messages.
4 years ago
lain
ce23673ca1
ChatMessageValidator: Don't validate messages that are too long.
4 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
4 years ago
Ivan Tashkinov
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
4 years ago
Egor Kislitsyn
163341857a
Improve OpenAPI errors
4 years ago
lain
c845820911
Notifications: Create a chat notification.
4 years ago
lain
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
26d9c83316
SideEffects: Test for notification creation.
4 years ago
lain
372614cfd3
ChatView: Add a mastodon api representation of the recipient.
4 years ago
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
d45ae64858
ChatController: Use OAuth scopes.
4 years ago
Alexander Strizhakov
6cda360fea
don't restart postgrex
4 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
4 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
4 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
4 years ago
Alexander Strizhakov
304ea09f4c
fix for logger configuration
4 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
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