lain
|
0f0acc740d
|
Chat: Allow posting without content if an attachment is present.
|
2020-05-13 15:31:28 +02:00 |
|
lain
|
06cad239e5
|
InstanceView: Add pleroma chat messages to nodeinfo
|
2020-05-13 14:05:22 +02:00 |
|
lain
|
3cff4e24cd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-13 12:44:16 +02:00 |
|
Egor Kislitsyn
|
bcadbf964a
|
Add OpenAPI spec for SuggestionController
|
2020-05-13 14:15:24 +04:00 |
|
lain
|
156c8a5088
|
Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
|
2020-05-13 09:34:30 +00:00 |
|
lain
|
1307d6ca3c
|
Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
|
2020-05-13 09:33:37 +00:00 |
|
Alex Gleason
|
b46811a074
|
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
|
2020-05-12 17:14:59 -05:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
rinpatch
|
2b18b8a263
|
Merge branch 'streamer-get-topic' into 'develop'
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
|
2020-05-12 17:02:57 +00:00 |
|
href
|
68cca29dcf
|
Fix typo in test
|
2020-05-12 18:51:10 +02:00 |
|
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
|
2020-05-12 16:45:46 +00:00 |
|
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
|
2020-05-12 16:44:58 +00:00 |
|
href
|
e6d8cacf2d
|
Expand and authorize streams in Streamer directly
|
2020-05-12 18:04:47 +02:00 |
|
lain
|
c0ea5c60e4
|
ChatController: Don't return chats for user you've blocked.
|
2020-05-12 16:43:04 +02:00 |
|
lain
|
e44166b510
|
Credo fixes.
|
2020-05-12 14:44:11 +02:00 |
|
lain
|
ec72cba43e
|
Chat Controller: Add basic error handling.
|
2020-05-12 13:23:09 +02:00 |
|
lain
|
dcb5cda324
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-12 13:13:43 +02:00 |
|
lain
|
b5aa204eb8
|
ChatController: Support deletion of chat messages.
|
2020-05-12 13:13:03 +02:00 |
|
lain
|
dfb90a1fd6
|
Transmogrifier: Add tests for certain announces
|
2020-05-12 12:50:48 +02:00 |
|
lain
|
ca31af473c
|
Transmogrifier: On incoming follow accept, update follow counts.
|
2020-05-12 12:29:37 +02:00 |
|
lain
|
d0ba1844b0
|
ActivityPub: Fix non-federating blocks.
|
2020-05-12 10:52:46 +02:00 |
|
rinpatch
|
f8190aea5e
|
Merge branch 'fix/issue-1676' into 'develop'
[#1676] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
|
2020-05-11 22:30:36 +00: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
|
679afb2de4
|
SideEffects test: Add test for favorite deletion.
|
2020-05-11 15:38:19 +02:00 |
|
lain
|
5367a00257
|
Deletion: Handle the case of pruned objects.
|
2020-05-11 15:06:23 +02:00 |
|
Egor Kislitsyn
|
3bde0fa3f6
|
Add OpenAPI spec for TimelineController
|
2020-05-11 15:43:03 +04:00 |
|
lain
|
fdb98715b8
|
Chat: Fix wrong query.
|
2020-05-11 10:58:14 +02:00 |
|
lain
|
1b1dfb54eb
|
Credo fixes.
|
2020-05-10 13:28:05 +02:00 |
|
lain
|
8d5597ff68
|
ChatController: Add GET /chats/:id
|
2020-05-10 13:26:14 +02:00 |
|
lain
|
f335e1404a
|
ChatView: Add the last message to the view.
|
2020-05-10 13:00:01 +02:00 |
|
lain
|
c272669909
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-10 12:32:57 +02:00 |
|
lain
|
03529f6a05
|
Transmogrifier: Don't modify attachments for chats.
|
2020-05-08 18:26:35 +02:00 |
|
rinpatch
|
570940a3fd
|
Merge branch 'bugfix/fix-like-notifications' into 'develop'
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
|
2020-05-08 15:00:43 +00: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
|
7e9aaa0d02
|
Transmogrifier tests: Remove more double tests.
|
2020-05-08 11:43:07 +02:00 |
|
lain
|
f1274c3326
|
Transmogrifier tests: Remove double tests.
|
2020-05-08 11:41:13 +02:00 |
|
Maksim Pechnikov
|
4d71c4b805
|
fixed 'source' object in verify_credentials
|
2020-05-08 12:35:34 +03: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 |
|
Mark Felder
|
ea01e647df
|
Test Direct, Public, and Favorite notifications with privacy option
|
2020-05-07 09:13:43 -05: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
|
f57fa2a00d
|
Notifications: Simplify recipient calculation for some Activities.
Fixes the 'getting notfications for other people's posts' bug.
|
2020-05-07 12:43:30 +02:00 |
|