lain
|
3635a9c9c2
|
InstanceController: Add extensions to /api/v1/instance
|
2020-04-27 14:28:08 +02:00 |
|
lain
|
00e956528b
|
Credo fixes.
|
2020-04-27 14:02:11 +02:00 |
|
lain
|
e62f8542a1
|
Docs: Add chat motivation and api description.
|
2020-04-27 13:48:09 +02:00 |
|
lain
|
15ba3700af
|
Chat Schemas: Inline unimportant Schemas.
|
2020-04-27 12:45:59 +02:00 |
|
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
2020-04-27 14:33:00 +04:00 |
|
lain
|
d2bbea1a80
|
ChatControllerTest: Use new schema testing functions.
|
2020-04-27 12:19:27 +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 |
|
Alexander Strizhakov
|
66acfa6882
|
descriptions that module names are shortened
|
2020-04-27 10:28:05 +03:00 |
|
rinpatch
|
01cc93b687
|
Merge branch 'img-src-blob' into 'develop'
Let blob: pass CSP
See merge request pleroma/pleroma!2427
|
2020-04-26 11:39:17 +00:00 |
|
Alex Gleason
|
1bd9749a8f
|
Let blob: pass CSP
|
2020-04-26 00:29:42 -05:00 |
|
lain
|
dbc4791d9d
|
Merge branch '1706-dm-timeline-failure-fix' into 'develop'
[#1706] Prevented error on unresolved activity actors for timeline actions
Closes #1706
See merge request pleroma/pleroma!2425
|
2020-04-25 19:24:22 +00: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 |
|
Ivan Tashkinov
|
b4139cc547
|
[#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.
|
2020-04-24 22:25:27 +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 |
|
Egor Kislitsyn
|
c56c0a3d23
|
Merge branch 'develop' into global-status-expiration
|
2020-04-24 18:37:58 +04:00 |
|
Ivan Tashkinov
|
00e62161f6
|
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
|
2020-04-24 16:52:38 +03:00 |
|
lain
|
e2f3030c86
|
Apply suggestion to CHANGELOG.md
|
2020-04-24 15:43:54 +03:00 |
|
lain
|
8480f84615
|
Update differences_in_mastoapi_responses.md
|
2020-04-24 15:43:54 +03:00 |
|
Alexander Strizhakov
|
375ab05234
|
bench sync
|
2020-04-24 15:43:54 +03:00 |
|
Alexander Strizhakov
|
1a75ef63b2
|
updating benchmarks
|
2020-04-24 15:43:54 +03:00 |
|
Alexander
|
be34672d67
|
formatting
|
2020-04-24 15:43:54 +03: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
|
2430b9bf90
|
Merge branch 'feature/remove-unused-like-code' into 'develop'
ActivitPub: Remove `like` function.
See merge request pleroma/pleroma!2422
|
2020-04-24 12:09:15 +00: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 |
|
Ivan Tashkinov
|
89f38d94c7
|
[#2409] Fixed before-action callback results persistence.
|
2020-04-23 21:47:33 +03:00 |
|
lain
|
a51cdafc01
|
Docs: Add documentation about chatmessages
|
2020-04-23 16:55:50 +02: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 |
|
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
|
2020-04-22 17:37:09 +00:00 |
|
lain
|
f5bda09de6
|
Stats: Use invisible property for filtering.
|
2020-04-22 19:02:22 +02:00 |
|
Ivan Tashkinov
|
e7fb593d13
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
|
2020-04-22 20:00:51 +03:00 |
|
lain
|
e62173dfc8
|
SideEffects: Run in transaction.
This fixes race conditions.
|
2020-04-22 18:40:53 +02:00 |
|
Egor Kislitsyn
|
1b06a27746
|
Update Flake ID description
|
2020-04-22 20:20:19 +04:00 |
|
Egor Kislitsyn
|
6c26feed01
|
Merge branch 'develop' into openapi/account
|
2020-04-22 20:18:12 +04:00 |
|
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
|
2020-04-22 18:51:59 +03:00 |
|
Ivan Tashkinov
|
2958a7d246
|
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
|
2020-04-22 18:50:25 +03: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 |
|