sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,859 Commits 1 Branch 0 Tags 184 MiB
578ed3a37f
Commit Graph

4647 Commits

Author SHA1 Message Date
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
814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-21 15:00:05 +02:00
lain
265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop' 
Add OpenAPI spec for EmojiPackController

See merge request pleroma/pleroma!2549
 2020-05-20 12:08:28 +00:00
Egor Kislitsyn
26f01744bc
Add background_image to InstanceOperation 2020-05-20 15:18:58 +04:00
Egor Kislitsyn
5ba6e1c322
Move notification actions to PleromaAPI.NotificationController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn
f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn
9a5de0f454
Move reaction actions to EmojiReactionController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController 2020-05-20 15:15:13 +04:00
Haelwenn
94ba5a7802 Merge branch 'exposed-background-image' into 'develop' 
InstanceView: Expose background image link.

See merge request pleroma/pleroma!2545
 2020-05-20 10:53:54 +00:00
lain
6dd1575c64 Merge branch 'issue/1509' into 'develop' 
[#1509]  purge media from cache after delete

See merge request pleroma/pleroma!2539
 2020-05-20 10:35:36 +00:00
lain
8a6ddf26ac InstanceOperation: Add background image to example 2020-05-20 12:12:07 +02:00
Egor Kislitsyn
47ed9ee441
Fix summary 2020-05-19 17:29:58 +04:00
Egor Kislitsyn
6609714d66
Move Scrobble views to ScrobbleView 2020-05-19 16:26:06 +04:00
Egor Kislitsyn
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController 2020-05-19 16:26:06 +04:00
Egor Kislitsyn
e4c720f14c
Fix typo 2020-05-19 14:59:50 +04:00
Haelwenn
58ccd2bbfd Merge branch 'openapi/pleroma-api/mascot' into 'develop' 
Add OpenAPI spec for MascotController

See merge request pleroma/pleroma!2553
 2020-05-19 09:41:57 +00:00
Maksim Pechnikov
41f8f17260 fix api/v1/accounts/update_credentials 2020-05-19 09:42:41 +03:00
Maksim Pechnikov
5f0a3ac74d added tests 2020-05-19 06:05:09 +03:00
lain
d19c716770 AttachmentValidator: Handle empty mediatypes 2020-05-18 20:17:28 +02:00
Egor Kislitsyn
fe5d423b43
Add OpenAPI spec for MascotController 2020-05-18 22:01:18 +04:00
Egor Kislitsyn
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies 2020-05-18 20:58:59 +04:00
lain
be4db41d71 ChatMessageValidator: Allow one message in an array, too. 2020-05-18 18:45:33 +02:00
lain
0d417e005d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-18 18:38:32 +02: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
Alexander Strizhakov
215daabdb4
copyright update 2020-05-18 15:15:51 +03: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
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
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
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
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
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
Egor Kislitsyn
e090191d03
[OpenAPI] Mark all not required request fields as nullable 2020-05-15 14:55:41 +04:00
rinpatch
e455ca3f3e Merge branch 'feature/database-configuration-whitelist' into 'develop' 
Database configuration whitelist

See merge request pleroma/pleroma!2522
 2020-05-14 16:07:37 +00:00
lain
4157c459b8 Merge branch 'bcrypt-auth' into 'develop' 
Handle bcrypt passwords for Mastodon migration

See merge request pleroma/pleroma!2527
 2020-05-14 14:36:56 +00:00
Alex Gleason
5b0f27d23d
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw 2020-05-14 08:57:38 -05:00
Egor Kislitsyn
bb03dfdb03
Do not require description in update action 2020-05-14 16:29:32 +04:00