lain
|
b5aa204eb8
|
ChatController: Support deletion of chat messages.
|
2020-05-12 13:13:03 +02:00 |
|
lain
|
f28ed36b4d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-11 17:14:58 +02:00 |
|
lain
|
5367a00257
|
Deletion: Handle the case of pruned objects.
|
2020-05-11 15:06:23 +02:00 |
|
lain
|
8d5597ff68
|
ChatController: Add GET /chats/:id
|
2020-05-10 13:26:14 +02:00 |
|
lain
|
172d9b1193
|
Chat: Add last_message to schema.
|
2020-05-10 13:08:01 +02:00 |
|
lain
|
f335e1404a
|
ChatView: Add the last message to the view.
|
2020-05-10 13:00:01 +02:00 |
|
lain
|
1054e89762
|
ChatOperation: Add media id to example
|
2020-05-10 12:30:24 +02:00 |
|
lain
|
03529f6a05
|
Transmogrifier: Don't modify attachments for chats.
|
2020-05-08 18:26:35 +02:00 |
|
lain
|
d0bf8cfb8f
|
Credo fixes.
|
2020-05-08 14:11:58 +02:00 |
|
lain
|
7637ef4203
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-08 13:13:37 +02:00 |
|
lain
|
fbcc53760e
|
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
|
2020-05-08 10:41:41 +00:00 |
|
lain
|
6acbe45eb2
|
Builder: Extract common features of likes and reactions.
|
2020-05-08 11:30:31 +02:00 |
|
lain
|
0cf43391f2
|
Merge branch 'issue/1276-2' into 'develop'
[#1276] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
|
2020-05-08 09:23:01 +00:00 |
|
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
|
2020-05-08 09:04:24 +00:00 |
|
Maksim Pechnikov
|
b078e0567d
|
Merge branch 'develop' into issue/1276-2
|
2020-05-08 08:51:09 +03:00 |
|
Haelwenn
|
769d95644d
|
Merge branch 'feature/restrict-c2s' into 'develop'
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
|
2020-05-07 22:29:16 +00:00 |
|
lain
|
ef55d24054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
2020-05-07 18:53:34 +02:00 |
|
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
|
2020-05-07 14:28:10 +00:00 |
|
lain
|
516ff945ce
|
Merge branch 'openapi/search' into 'develop'
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
|
2020-05-07 13:38:34 +00:00 |
|
rinpatch
|
eb1f2fcbc6
|
Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
|
2020-05-07 16:13:24 +03:00 |
|
lain
|
d11eea62b1
|
Credo fixes
|
2020-05-07 15:09:37 +02:00 |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-07 15:05:40 +02:00 |
|
lain
|
7ac0cffb34
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
2020-05-07 15:03:12 +02:00 |
|
lain
|
788b7e7bbd
|
Merge fixes.
|
2020-05-07 14:52:37 +02:00 |
|
lain
|
f0c22df226
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
|
2020-05-07 14:45:20 +02:00 |
|
lain
|
3f867d8e9b
|
Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex
|
2020-05-07 10:48:09 +00:00 |
|
Egor Kislitsyn
|
dc4a448f48
|
Add OpenAPI spec for SearchController
|
2020-05-07 14:04:48 +04:00 |
|
Egor Kislitsyn
|
cdca62e8d4
|
Add schema for Tag
|
2020-05-07 14:04:07 +04:00 |
|
lain
|
4c92dfb73e
|
Merge branch 'openapi/polls' into 'develop'
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
|
2020-05-07 09:19:45 +00:00 |
|
lain
|
4061841846
|
Merge branch 'streamer-worker-registry' into 'develop'
Streamer rework
See merge request pleroma/pleroma!2426
|
2020-05-07 09:13:32 +00:00 |
|
href
|
9491ba3e49
|
Streamer rework
|
2020-05-07 09:13:32 +00:00 |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
2020-05-07 08:14:54 +00:00 |
|
Mark Felder
|
a2580adc91
|
Hide the sender when privacy option is enabled
|
2020-05-06 16:42:27 -05:00 |
|
Mark Felder
|
57736c1833
|
Privacy option affects all push notifications, not just Direct Messages
|
2020-05-06 16:30:05 -05:00 |
|
lain
|
1748e26948
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 17:36:08 +02:00 |
|
rinpatch
|
473b0d9f3d
|
Merge branch 'feature/delete-validator' into 'develop'
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
|
2020-05-06 14:32:58 +00:00 |
|
lain
|
fc9d0b6eec
|
Credo fixes.
|
2020-05-06 16:31:21 +02:00 |
|
lain
|
20baa2eaf0
|
ChatMessages: Add attachments.
|
2020-05-06 16:12:36 +02:00 |
|
Maksim Pechnikov
|
bd261309cc
|
added unread_notifications_count for /api/v1/accounts/verify_credentials
|
2020-05-06 15:08:38 +03:00 |
|
Maksim Pechnikov
|
8b97b6f5ba
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 14:47:50 +03:00 |
|
Egor Kislitsyn
|
06c69c0a0a
|
Fix description
|
2020-05-06 14:18:19 +04:00 |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 11:44:30 +02:00 |
|
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
|
2020-05-06 09:14:05 +00:00 |
|
lain
|
a716543267
|
Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
|
2020-05-06 09:10:17 +00:00 |
|
lain
|
61ea8f1f5a
|
Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
|
2020-05-06 09:06:50 +00:00 |
|
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
|
2020-05-06 09:04:13 +00:00 |
|
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
|
2020-05-06 09:01:42 +00:00 |
|
lain
|
0a88bf6a9d
|
Merge branch 'openapi/follow_requests' into 'develop'
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
|
2020-05-06 09:00:39 +00:00 |
|
lain
|
957172a307
|
Merge branch 'openapi/filters' into 'develop'
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
|
2020-05-06 08:51:10 +00:00 |
|
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
|
2020-05-06 08:46:45 +00:00 |
|