alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,847 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

9847 Commits

Author SHA1 Message Date
lain c4a5cead51 UploadTest: Fix test. 2020-05-21 15:17:39 +02: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
Haelwenn 42b06d78df Merge branch 'chore/update-config-fe' into 'develop' 
Synchronize :fe settings in config.exs

See merge request pleroma/pleroma!2560
 2020-05-20 17:45:19 +00:00
Mark Felder 4c48626585 Also add new sidebarRight setting 2020-05-20 12:22:31 -05: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
lain 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop' 
User deletion

Closes #1734

See merge request pleroma/pleroma!2493
 2020-05-20 11:43:49 +00:00
lain 67844a8b11 Merge branch 'openapi/fix-spec' into 'develop' 
Add `background_image` to `InstanceOperation`

See merge request pleroma/pleroma!2562
 2020-05-20 11:40:05 +00:00
Egor Kislitsyn 26f01744bc
Add `background_image` to `InstanceOperation` 2020-05-20 15:18:58 +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 2a74565090 Changelog: Add background to instance 2020-05-20 12:14:17 +02:00
lain 5b8105928b Docs: Add background_image in instance 2020-05-20 12:13:57 +02:00
lain 8a6ddf26ac InstanceOperation: Add background image to example 2020-05-20 12:12:07 +02:00
lain c3cfe87c60 Merge branch 'mastofe/bundle-2020-05-20' into 'develop' 
MastoFE: update to bundle-2020-05-20

See merge request pleroma/pleroma!2561
 2020-05-20 09:12:35 +00:00
Haelwenn (lanodan) Monnier c2dd4639d6
MastoFE: update to bundle-2020-05-20 2020-05-20 07:55:14 +02:00
Maksim 376147fb82 Apply suggestion to installation/nginx-cache-purge.sh.example 2020-05-20 04:12:21 +00:00
Haelwenn 5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop' 
Add OpenAPI spec for PleromaAPI.ScrobbleController

See merge request pleroma/pleroma!2559
 2020-05-20 04:00:46 +00:00
Maksim Pechnikov b5b9d161cd update purge script 2020-05-20 06:56:04 +03:00
Mark Felder 918ee46417 Synchronize :fe settings in config.exs 2020-05-19 16:05:39 -05:00
rinpatch 48bcb22146 Merge branch 'recipients-query-speedup' into 'develop' 
Greatly speed up recipients query

See merge request pleroma/pleroma!2558
 2020-05-19 14:32:27 +00:00
Egor Kislitsyn 47ed9ee441
Fix summary 2020-05-19 17:29:58 +04:00
lain be322541c8 User.Query: Remove superfluous `distinct` 2020-05-19 14:36:34 +02:00
lain 2328eff09c UserTest: Hide warning in tests. 2020-05-19 14:36:13 +02: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
lain a985bd57b4 User.Query: Speed up recipients query. 2020-05-19 14:11:32 +02:00
lain 7075fa92a5 Merge branch 'deps/update-crypt' into 'develop' 
Update crypt library

See merge request pleroma/pleroma!2557
 2020-05-19 11:57:01 +00:00
Roman Chvanikov 512261c97d Update crypt library 2020-05-19 14:46:06 +03: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
Haelwenn 7e3814390e Merge branch 'issue/1667' into 'develop' 
[#1667] fix api/v1/accounts/update_credentials

See merge request pleroma/pleroma!2556
 2020-05-19 06:56:44 +00:00
Haelwenn 86f50a809f Merge branch 'support/docs' into 'develop' 
fix docs

See merge request pleroma/pleroma!2555
 2020-05-19 06:43:57 +00:00
Maksim Pechnikov 41f8f17260 fix api/v1/accounts/update_credentials 2020-05-19 09:42:41 +03:00
Maksim Pechnikov ed442a225a removed Quantum from docs 2020-05-19 06:15:42 +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 d4a7577cde
Fix API documentation 2020-05-18 22:01:38 +04:00
Egor Kislitsyn fe5d423b43
Add OpenAPI spec for MascotController 2020-05-18 22:01:18 +04:00
rinpatch a66da971ff Merge branch 'openapi/use-boolean-like-in-requests' into 'develop' 
[OpenAPI] Use BooleanLike in all request bodies

Closes #1782

See merge request pleroma/pleroma!2551
 2020-05-18 17:13:53 +00: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
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 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