rinpatch
|
d35be02e70
|
Merge branch 'refactor-add-mention-step-one' into 'develop'
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
|
2020-05-27 14:17:12 +00:00 |
|
rinpatch
|
91f73a7592
|
Merge branch 'notification-fixes' into 'develop'
Notification performance fixes
See merge request pleroma/pleroma!2595
|
2020-05-27 13:45:14 +00:00 |
|
Alexander Strizhakov
|
047a11c48f
|
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
|
2020-05-27 10:55:42 +00:00 |
|
Egor Kislitsyn
|
c6290be682
|
Fix typo
|
2020-05-27 14:42:21 +04:00 |
|
lain
|
b8e029b5ea
|
Notification: Actually preload objects.
|
2020-05-27 12:41:06 +02:00 |
|
lain
|
b9e2678b9e
|
Merge branch 'fav-speedup' into 'develop'
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
|
2020-05-27 08:02:00 +00:00 |
|
lain
|
7e13200869
|
ActivityPub: Change ordering to nulls last in favorites query
This makes it use our existing index and speeds up the query.
|
2020-05-27 09:46:12 +02:00 |
|
Alexander Strizhakov
|
3249141588
|
validate actor type
|
2020-05-27 10:14:22 +03:00 |
|
rinpatch
|
cf139b06a3
|
Merge branch 'fav-speedup' into 'develop'
Fix favorites query performance
See merge request pleroma/pleroma!2591
|
2020-05-26 16:33:13 +00:00 |
|
rinpatch
|
3601c0015c
|
Merge branch '1808-pleroma-sucks' into 'develop'
Resolve "Don't fail message ingestions when we can't update a user"
Closes #1808
See merge request pleroma/pleroma!2576
|
2020-05-26 15:57:01 +00:00 |
|
rinpatch
|
ed08da9135
|
Merge branch '1813-throttling' into 'develop'
Mastodon API Controllers: Use the correct params for rate limiting.
Closes #1813
See merge request pleroma/pleroma!2586
|
2020-05-26 15:55:09 +00:00 |
|
lain
|
d8d99fd4cf
|
Activity.Queries: Use correct actor restriction.
|
2020-05-26 17:46:16 +02:00 |
|
Egor Kislitsyn
|
2069ec5006
|
Fix Oban warnings
|
2020-05-26 16:11:42 +04:00 |
|
lain
|
51bc6674f6
|
Mastodon API Controllers: Use the correct params for rate limiting.
|
2020-05-26 13:45:54 +02:00 |
|
Egor Kislitsyn
|
fca48154a2
|
Add AdminAPI.InviteView
|
2020-05-26 15:21:33 +04:00 |
|
Egor Kislitsyn
|
2a4f965191
|
Add OpenAPI spec for AdminAPI.InviteTokenController
|
2020-05-26 15:03:07 +04:00 |
|
Egor Kislitsyn
|
95ebfb9190
|
Move invite actions to AdminAPI.InviteTokenController
|
2020-05-26 15:03:07 +04:00 |
|
Alexander Strizhakov
|
8f08384d80
|
another view for account in admin-fe status_show
|
2020-05-26 13:48:39 +03:00 |
|
Ivan Tashkinov
|
d7a57004ef
|
[#1501] Made user feed contain public and unlisted activities.
|
2020-05-25 23:27:47 +03:00 |
|
Egor Kislitsyn
|
0ba1f2631a
|
Add OpenAPI spec for AdminAPI.OAuthAppContoller
|
2020-05-25 22:04:06 +04:00 |
|
lain
|
dbd07d29a3
|
Streamer: Don't crash on streaming chat notifications
|
2020-05-25 17:27:45 +02:00 |
|
lain
|
6bd7070b00
|
Transmogrifier: Use a simpler way to get mentions.
|
2020-05-25 15:08:43 +02:00 |
|
lain
|
5fef405208
|
User: Change signature of get_users_from_set
|
2020-05-25 15:06:35 +02:00 |
|
Egor Kislitsyn
|
cbcd592300
|
Add OpenAPI spec for AdminAPI.RelayController
|
2020-05-25 16:51:16 +04:00 |
|
lain
|
f20dff451e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
|
2020-05-25 14:01:16 +02:00 |
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-25 13:57:27 +02:00 |
|
lain
|
ec470c4c77
|
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
|
2020-05-25 11:40:54 +00:00 |
|
lain
|
d0c26956da
|
User: Don't error out if we want to refresh a user but can't
|
2020-05-25 12:46:14 +02:00 |
|
rinpatch
|
7bc2ec0aa2
|
Merge branch 'mastodon-migration-compat' into 'develop'
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
|
2020-05-24 19:05:57 +00:00 |
|
lain
|
ddbbefeb2e
|
Merge branch 'feature/configure-filename-truncate' into 'develop'
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
|
2020-05-22 16:05:35 +00:00 |
|
Roman Chvanikov
|
5d60b25e69
|
Apply suggestion to lib/pleroma/web/common_api/utils.ex
|
2020-05-22 15:44:10 +00:00 |
|
Roman Chvanikov
|
cc82229ba7
|
Add filename_display_max_length config
|
2020-05-22 18:19:25 +03:00 |
|
lain
|
91c8467582
|
OStatusController: Add Mastodon activity compat route.
|
2020-05-22 17:11:59 +02:00 |
|
lain
|
355aa3bdc7
|
ActivityPubController: Add Mastodon activity compat route.
|
2020-05-22 17:06:12 +02:00 |
|
lain
|
8a4bd9e5d1
|
OStatusController: Add Mastodon compatibility route for objects.
|
2020-05-22 16:47:22 +02:00 |
|
rinpatch
|
1fa7aa9fc5
|
Merge branch 'emoji-react-better-errors' into 'develop'
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
|
2020-05-22 14:36:08 +00:00 |
|
Egor Kislitsyn
|
ba106aa9c8
|
Fix notifications mark as read API
|
2020-05-22 18:15:36 +04:00 |
|
lain
|
ca755f9a73
|
ActivityPubController: Add Mastodon compatibility route.
|
2020-05-22 16:15:29 +02:00 |
|
lain
|
bcb549531f
|
EmojiReactionController: Return more appropriate error.
|
2020-05-22 14:38:28 +02:00 |
|
Haelwenn
|
7b02bfca51
|
Merge branch 'announce-validator' into 'develop'
Announce validator
See merge request pleroma/pleroma!2567
|
2020-05-22 05:47:53 +00:00 |
|
Haelwenn
|
a57e7f3503
|
Merge branch '1113-op-mentioning' into 'develop'
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
|
2020-05-22 05:22:07 +00:00 |
|
lain
|
ab1154e13f
|
Merge branch 'admin-logo-upload' into 'develop'
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
|
2020-05-21 14:30:34 +00:00 |
|
lain
|
578ed3a37f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:35:13 +02:00 |
|
lain
|
a42a0716ec
|
Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
|
2020-05-21 13:31:49 +00:00 |
|
lain
|
f166316f50
|
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
|
2020-05-21 13:30:09 +00:00 |
|
lain
|
283fb1e05b
|
Merge branch 'issue/749' into 'develop'
[#749] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
|
2020-05-21 13:27:44 +00:00 |
|
Egor Kislitsyn
|
45d2c4157f
|
Add OpenAPI spec for AdminAPI.StatusController
|
2020-05-21 17:23:12 +04:00 |
|
lain
|
cc0d462e91
|
Attachments: Have the mediaType on the root, too.
|
2020-05-21 15:08:56 +02:00 |
|
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:00:05 +02:00 |
|
lain
|
cdc6ba8d7b
|
AnnounceValidator: Check for announcability
|
2020-05-21 13:58:18 +02:00 |
|