lain
|
0d417e005d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-18 18:38:32 +02:00 |
|
lain
|
8e9c939e42
|
Merge branch 'direct-timeline-with-muted-param-fix' into 'develop'
Fixed missing support for `with_muted` param in direct timeline
See merge request pleroma/pleroma!2548
|
2020-05-18 16:27:54 +00:00 |
|
Ivan Tashkinov
|
5735b5c8be
|
Fixed missing support for with_muted param in direct timeline.
|
2020-05-18 19:00:00 +03:00 |
|
Egor Kislitsyn
|
aef31c69df
|
Rename EmojiAPIController to EmojiPackController
|
2020-05-18 19:43:25 +04:00 |
|
Egor Kislitsyn
|
8bde8dfec2
|
Cleanup Pleroma.Emoji.Pack
|
2020-05-18 19:43:23 +04:00 |
|
Egor Kislitsyn
|
6e4de715b3
|
Add OpenAPI spec for PleromaAPI.EmojiAPIController
|
2020-05-18 19:28:46 +04:00 |
|
lain
|
0d5bce018d
|
AnnounceValidator: Validate for existing announce
|
2020-05-18 16:54:10 +02:00 |
|
lain
|
17a8342c1e
|
ObjectValidators: Add basic Announce validator.
|
2020-05-18 16:45:11 +02:00 |
|
lain
|
63ab2743ce
|
TransmogrifierTest: Fix tests.
|
2020-05-18 15:47:26 +02:00 |
|
lain
|
7d381b16b7
|
Transmogrifier Test: Extract Announce handling.
|
2020-05-18 14:48:37 +02:00 |
|
lain
|
20a22362b8
|
Merge branch 'copyright' into 'develop'
Copyright update
See merge request pleroma/pleroma!2547
|
2020-05-18 12:35:27 +00:00 |
|
Alexander Strizhakov
|
215daabdb4
|
copyright update
|
2020-05-18 15:15:51 +03:00 |
|
lain
|
5c502eb3ad
|
Merge branch '1778-benchmark-fix' into 'develop'
Load Testing: adjust to new CommonAPI.post format.
Closes #1778
See merge request pleroma/pleroma!2546
|
2020-05-18 12:14:24 +00:00 |
|
lain
|
15c7e3b4bf
|
Merge branch 'docs/storing-remote-media' into 'develop'
Document how to store remote media permanently
See merge request pleroma/pleroma!1871
|
2020-05-18 11:59:07 +00:00 |
|
lain
|
7b500d6b4f
|
Load Testing: adjust to new CommonAPI.post format.
|
2020-05-18 13:56:58 +02:00 |
|
lain
|
188b32145e
|
InstanceView: Expose background image link.
This will make it easier for more clients to support this feature.
|
2020-05-18 13:29:30 +02:00 |
|
lain
|
96f7b1b140
|
Merge branch 'show-media-endpoint-fixes' into 'develop'
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
|
2020-05-18 10:57:59 +00:00 |
|
Roman Chvanikov
|
1be6b3056e
|
Use indexed split_part/3 to get a hostname rather than ts_ functions
|
2020-05-18 12:38:16 +03:00 |
|
Roman Chvanikov
|
01bd6a1e54
|
Merge branch 'develop' into feature/admin-api-status-count-per-instance
|
2020-05-18 11:56:27 +03:00 |
|
rinpatch
|
1199cf3a78
|
Merge branch '1763-password-updates' into 'develop'
Authentication Plug: Update bcrypt password on login.
Closes #1763
See merge request pleroma/pleroma!2542
|
2020-05-18 07:57:13 +00:00 |
|
Alexander Strizhakov
|
0321a3e078
|
test naming fix
|
2020-05-18 10:34:50 +03:00 |
|
Alexander Strizhakov
|
1671864d88
|
return :visible instead of boolean
|
2020-05-18 10:34:50 +03:00 |
|
Alexander Strizhakov
|
b1aa402229
|
removing 410 status
|
2020-05-18 10:34:50 +03:00 |
|
Alexander Strizhakov
|
e7bc2f980c
|
account visibility
|
2020-05-18 10:34:49 +03:00 |
|
Ivan Tashkinov
|
9b76565264
|
MediaController: enforced owner-only access in :show action.
Improved error response on denied access (now 403). Adjusted tests.
|
2020-05-18 09:51:53 +03:00 |
|
Maksim Pechnikov
|
c33a4315fb
|
updated docs
|
2020-05-18 06:48:19 +03:00 |
|
lain
|
baf051a59e
|
SideEffects: Don't update unread count for actor in chatmessages.
|
2020-05-17 12:22:26 +02:00 |
|
lain
|
9c17109765
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-17 12:14:49 +02:00 |
|
lain
|
8bfd9710ae
|
Pleroma Authenticator: Also update passwords here.
|
2020-05-17 11:53:17 +02:00 |
|
lain
|
bfdd90f6d7
|
AuthenticationPlug: Also update crypt passwords.
|
2020-05-17 11:40:25 +02:00 |
|
lain
|
baef35bcc8
|
Authentication Plug: Update bcrypt password on login.
|
2020-05-17 10:31:01 +02:00 |
|
lain
|
b0ccdb5af4
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2535
|
2020-05-17 07:58:24 +00:00 |
|
Jędrzej Tomaszewski
|
4b6190baec
|
Translated using Weblate (Polish)
Currently translated at 65.0% (69 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
|
2020-05-17 07:49:01 +00:00 |
|
Fristi
|
5725e03f55
|
Added translation using Weblate (Dutch)
|
2020-05-17 07:49:01 +00:00 |
|
lain
|
64b3d81e50
|
Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
Remove settings that shouldn't be altered
Closes admin-fe#110
See merge request pleroma/pleroma!2540
|
2020-05-17 07:48:52 +00:00 |
|
lain
|
21c85a106c
|
Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'
PleromaFE bundle supporting `with_relationships` param
See merge request pleroma/pleroma!2530
|
2020-05-17 07:26:56 +00:00 |
|
lain
|
4b28d812cf
|
Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
|
2020-05-17 07:26:51 +00:00 |
|
Ivan Tashkinov
|
af9dfdce6b
|
MediaController OAuth scope assignments fix.
Typo fix (`def get_media` instead of `def show`).
|
2020-05-17 08:46:43 +03:00 |
|
Maksim Pechnikov
|
3f8d68bdf3
|
added example cache purge script
|
2020-05-17 05:56:20 +03:00 |
|
Angelina Filippova
|
4a925b964a
|
Remove description of the settings that should't be altered
|
2020-05-16 20:39:42 +03:00 |
|
lain
|
d96f8f17e8
|
Merge branch 'features/mastoapi_v2_media' into 'develop'
MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439
|
2020-05-16 17:13:38 +00:00 |
|
rinpatch
|
3bc1138dd9
|
Merge branch '1757-fix-unblocks-too' into 'develop'
CommonAPI: Unblock a user even if we don't have an activity.
Closes #1757
See merge request pleroma/pleroma!2538
|
2020-05-16 11:17:14 +00:00 |
|
lain
|
2dcb26a6e5
|
CommonAPI: Unblock a user even if we don't have an activity.
|
2020-05-16 12:28:24 +02:00 |
|
Maksim Pechnikov
|
cb40602a16
|
added media proxy invalidation
|
2020-05-15 21:39:42 +03:00 |
|
lain
|
aeacfb2479
|
Merge branch 'chore/update-fe-settings-and-docs' into 'develop'
Synchronize PleromaFE settings
See merge request pleroma/pleroma!2532
|
2020-05-15 14:37:38 +00:00 |
|
lain
|
5633637862
|
Merge branch 'fix/digest-task-otp' into 'develop'
Fix digest mix task on OTP releases
See merge request pleroma/pleroma!2526
|
2020-05-15 14:22:59 +00:00 |
|
lain
|
fee3aa82e8
|
Merge branch 'fix/database-config' into 'develop'
Returning partial chain
Closes #1772
See merge request pleroma/pleroma!2537
|
2020-05-15 13:45:02 +00:00 |
|
Alexander Strizhakov
|
3c29f4f957
|
returning partial chain
|
2020-05-15 16:16:02 +03:00 |
|
lain
|
f012c3a202
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-15 13:33:04 +02:00 |
|
lain
|
1d18721a3c
|
Chats: Add updated_at to Schema and docs.
|
2020-05-15 13:18:41 +02:00 |
|