Commit graph

4502 commits

Author SHA1 Message Date
Maksim Pechnikov
cb40602a16 added media proxy invalidation 2020-05-15 21:39:42 +03: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
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
Steph
5c6f575315
Style fixes 2020-05-14 12:15:48 +01:00
lain
359d7b0a6d Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex 2020-05-14 09:09:11 +00:00
lain
1c2629328d Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex 2020-05-14 09:07:09 +00:00
Egor Kislitsyn
6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController 2020-05-13 19:06:46 +04:00
Egor Kislitsyn
bcadbf964a
Add OpenAPI spec for SuggestionController 2020-05-13 14:15:24 +04:00
lain
156c8a5088 Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController

See merge request pleroma/pleroma!2521
2020-05-13 09:34:30 +00:00
lain
1307d6ca3c Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController

See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
Alex Gleason
b46811a074
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
Egor Kislitsyn
79ad12064d
Fix format 2020-05-13 01:59:17 +04:00
minibikini
cb1a3e196c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:43 +00:00
minibikini
5a2333925c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:36 +00:00
minibikini
822e9c09aa Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:21 +00:00
minibikini
40646a7e0e Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:14:52 +00:00
minibikini
0bb164a3e1 Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:12:22 +00:00
minibikini
648cc0d72d Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:09:26 +00:00
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
Stephanie Wilde-Hobbs
a2fcfc78c9
Filter config descriptions by config whitelist 2020-05-12 21:07:33 +01:00
rinpatch
2b18b8a263 Merge branch 'streamer-get-topic' into 'develop'
Expand and authorize streams in Streamer directly

See merge request pleroma/pleroma!2519
2020-05-12 17:02:57 +00:00
rinpatch
24c8c13640 Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
ActivityPub: Fix non-federating blocks.

Closes #1757

See merge request pleroma/pleroma!2514
2020-05-12 16:45:46 +00:00
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist 2020-05-12 17:12:27 +01:00
href
e6d8cacf2d Expand and authorize streams in Streamer directly 2020-05-12 18:04:47 +02:00
lain
ca31af473c Transmogrifier: On incoming follow accept, update follow counts. 2020-05-12 12:29:37 +02:00
lain
d0ba1844b0 ActivityPub: Fix non-federating blocks. 2020-05-12 10:52:46 +02:00
rinpatch
f8190aea5e Merge branch 'fix/issue-1676' into 'develop'
[#1676] fixed 'source' object in verify_credentials

See merge request pleroma/pleroma!2492
2020-05-11 22:30:36 +00:00
href
e2b15e8ad3 Fix streamer timeout (closes #1753).
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
2020-05-11 16:51:34 +02:00
lain
5367a00257 Deletion: Handle the case of pruned objects. 2020-05-11 15:06:23 +02:00
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController 2020-05-11 15:43:03 +04:00
lain
fbcc53760e Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.

See merge request pleroma/pleroma!2473
2020-05-08 10:41:41 +00:00
Maksim Pechnikov
4d71c4b805 fixed 'source' object in verify_credentials 2020-05-08 12:35:34 +03:00
lain
6acbe45eb2 Builder: Extract common features of likes and reactions. 2020-05-08 11:30:31 +02:00
lain
0cf43391f2 Merge branch 'issue/1276-2' into 'develop'
[#1276] added an endpoint for getting unread notification count

See merge request pleroma/pleroma!2392
2020-05-08 09:23:01 +00:00
lain
218a22c9a3 Merge branch 'fix/privacy-notification' into 'develop'
Privacy option affects all push notifications, not just Direct Messages

Closes #1745

See merge request pleroma/pleroma!2485
2020-05-08 09:04:24 +00:00
Maksim Pechnikov
b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +03:00
Haelwenn
769d95644d Merge branch 'feature/restrict-c2s' into 'develop'
AP C2S: Restrict creation to `Note`s for now.

See merge request pleroma/pleroma!2472
2020-05-07 22:29:16 +00:00
lain
ef55d24054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 18:53:34 +02:00
rinpatch
bef08b85e5 Merge branch 'feature/undo-validator-reduced' into 'develop'
Move Undo (except undo follow) to the common pipeline

See merge request pleroma/pleroma!2489
2020-05-07 14:28:10 +00:00
lain
516ff945ce Merge branch 'openapi/search' into 'develop'
Add OpenAPI spec for SearchController

See merge request pleroma/pleroma!2484
2020-05-07 13:38:34 +00:00
rinpatch
eb1f2fcbc6 Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
2020-05-07 16:13:24 +03:00
lain
d11eea62b1 Credo fixes 2020-05-07 15:09:37 +02:00
lain
7ac0cffb34 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 15:03:12 +02:00
lain
788b7e7bbd Merge fixes. 2020-05-07 14:52:37 +02:00
lain
f0c22df226 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced 2020-05-07 14:45:20 +02:00
lain
3f867d8e9b Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex 2020-05-07 10:48:09 +00:00
Egor Kislitsyn
dc4a448f48
Add OpenAPI spec for SearchController 2020-05-07 14:04:48 +04:00