lain
|
3d040b1a87
|
Credo fixes.
|
2020-04-27 17:55:29 +02:00 |
|
lain
|
ad82a216ff
|
Chat API: Align more to Pleroma/Mastodon API.
|
2020-04-27 17:48:34 +02:00 |
|
lain
|
49e673dfea
|
ChatView: Add actor_account_id
|
2020-04-27 16:08:03 +02:00 |
|
lain
|
00e956528b
|
Credo fixes.
|
2020-04-27 14:02:11 +02:00 |
|
lain
|
15ba3700af
|
Chat Schemas: Inline unimportant Schemas.
|
2020-04-27 12:45:59 +02:00 |
|
lain
|
c86143ed73
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-27 12:07:08 +02:00 |
|
Ivan Tashkinov
|
e16437ff19
|
[#1706] Formatting fix.
|
2020-04-25 18:42:08 +03:00 |
|
Ivan Tashkinov
|
0d05e1fe39
|
[#1706] Prevented error on unresolved activity actors for timeline actions.
|
2020-04-25 18:24:10 +03:00 |
|
rinpatch
|
8addbd948c
|
Merge branch 'bugfix/announce-race-condition' into 'develop'
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
|
2020-04-24 16:58:24 +00:00 |
|
lain
|
c30b3b2dc5
|
Merge branch 'reply-filtering-refactor' into 'develop'
Reply filtering refactor
See merge request pleroma/pleroma!2424
|
2020-04-24 16:32:13 +00:00 |
|
lain
|
d89cd0a197
|
Reply Filtering: Refactor.
|
2020-04-24 18:25:26 +02:00 |
|
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
|
2020-04-24 16:10:43 +00:00 |
|
Alexander
|
6e625a427c
|
reply filtering
|
2020-04-24 15:43:49 +03:00 |
|
lain
|
cb12585098
|
Announcements: Prevent race condition.
|
2020-04-24 14:37:53 +02:00 |
|
lain
|
1df6af2a4c
|
Credo fixes.
|
2020-04-24 13:59:48 +02:00 |
|
lain
|
bbf8554c97
|
ActivitPub: Remove like function.
We don't need another way to build likes.
|
2020-04-24 13:48:13 +02:00 |
|
Egor Kislitsyn
|
f362836742
|
Support validation for inline OpenAPI schema and automatic tests for examples
|
2020-04-24 15:16:15 +04:00 |
|
lain
|
1e28d34592
|
ChatMessage: Correctly ingest emoji tags.
|
2020-04-23 16:19:49 +02:00 |
|
lain
|
ec7335535d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-23 15:47:08 +02:00 |
|
rinpatch
|
1b5f8d19ee
|
Merge branch 'bugfix/repeating-announce' into 'develop'
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
|
2020-04-23 12:40:38 +00:00 |
|
lain
|
7d38197894
|
CommonAPI: Don't make repeating announces possible
|
2020-04-23 13:33:30 +02:00 |
|
rinpatch
|
25eec6d72d
|
Merge branch 'bugfix/null-scheduled-at' into 'develop'
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
|
2020-04-23 11:22:30 +00:00 |
|
lain
|
850377a7b8
|
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
|
2020-04-22 19:26:32 +00:00 |
|
lain
|
1bcbdc7a9f
|
SideEffects: Use less cryptic syntax.
|
2020-04-22 21:21:21 +02:00 |
|
lain
|
e62173dfc8
|
SideEffects: Run in transaction.
This fixes race conditions.
|
2020-04-22 18:40:53 +02:00 |
|
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
|
2020-04-22 15:46:04 +00:00 |
|
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
|
2020-04-22 15:33:04 +00:00 |
|
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
|
2020-04-22 15:31:51 +00:00 |
|
Egor Kislitsyn
|
e7771424a8
|
Fix blocks import
|
2020-04-22 19:27:28 +04:00 |
|
Egor Kislitsyn
|
88b82e5c3e
|
Fix follow import
|
2020-04-22 19:27:28 +04:00 |
|
lain
|
7a3a88a13e
|
Streamer: Stream boosts to the boosting user.
|
2020-04-22 17:21:13 +02:00 |
|
Haelwenn
|
1855c597c2
|
Merge branch 'feature/voters-count' into 'develop'
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
|
2020-04-22 15:12:19 +00:00 |
|
Haelwenn
|
2e73c19edc
|
Merge branch 'worker-messages' into 'develop'
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
|
2020-04-22 15:09:10 +00:00 |
|
Karol Kosek
|
452072ec95
|
static_fe: Add microformats2 classes
|
2020-04-22 16:02:40 +02:00 |
|
lain
|
5b39526198
|
AccountController: Use code 400 for self-follow.
|
2020-04-22 15:04:26 +02:00 |
|
lain
|
c10485db16
|
StatusController: Ignore nil scheduled_at parameters.
|
2020-04-22 14:26:19 +02:00 |
|
lain
|
5102468d0f
|
Polls: Persist and show voters' count
|
2020-04-22 14:06:39 +02:00 |
|
lain
|
923513b641
|
Federator: Return proper values for jobs
|
2020-04-22 13:28:52 +02:00 |
|
lain
|
f719a5b23a
|
WebPush: Return proper values for jobs.
|
2020-04-22 13:28:34 +02:00 |
|
lain
|
2e62a63749
|
ChatMessageValidator: Validation changes
Don't validate if the recipient is blocking the actor.
|
2020-04-22 12:48:52 +02:00 |
|
lain
|
66c2eb670b
|
ChatController: Validate parameters.
|
2020-04-21 18:23:00 +02:00 |
|
lain
|
97ad0c4597
|
Chats: Add API specs.
|
2020-04-21 17:51:06 +02:00 |
|
lain
|
a185b5455f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-21 14:24:27 +02:00 |
|
lain
|
3c828016d9
|
Merge branch 'openapi/custom-emojis' into 'develop'
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
|
2020-04-21 10:13:50 +00:00 |
|
lain
|
5165287ff4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-21 12:00:33 +02:00 |
|
rinpatch
|
e57c1b60e4
|
Merge branch 'accept-deletes' into 'develop'
Always accept deletions through SimplePolicy, add :reject_deletes group
See merge request pleroma/pleroma!2371
|
2020-04-20 18:30:01 +00:00 |
|
rinpatch
|
7e456ac7f6
|
Merge branch 'router-cleanup' into 'develop'
Cleanup and DRY the Router
See merge request pleroma/pleroma!2406
|
2020-04-20 18:29:03 +00:00 |
|
Alex Gleason
|
bedc558809
|
Merge remote-tracking branch 'upstream/develop' into accept-deletes
|
2020-04-20 10:15:40 -05:00 |
|
Alex Gleason
|
b54c8813d6
|
Add :reject_deletes option to SimplePolicy
|
2020-04-20 10:11:06 -05:00 |
|
lain
|
28165dad3a
|
Merge branch 'cleanup-subscription-controller' into 'develop'
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
|
2020-04-20 13:01:17 +00:00 |
|