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

6088 Commits

Author SHA1 Message Date
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
Alexander Strizhakov 215daabdb4
copyright update 2020-05-18 15:15:51 +03: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
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 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
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
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
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
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
Egor Kislitsyn 0f885b4b86
Fix OpenAPI spec 2020-05-14 16:18:30 +04:00
Stephanie Wilde-Hobbs 20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
lain 3342846ac2 ChatView: Add update_at field. 2020-05-14 13:20:28 +02:00
Steph 5c6f575315
Style fixes 2020-05-14 12:15:48 +01:00
Haelwenn (lanodan) Monnier 099e314a1b
Add OpenAPISpex for MediaController 2020-05-14 12:13:25 +02:00
lain 39ec1af993 Merge branch 'openapi/pleroma-api/accounts' into 'develop' 
Add OpenAPI spec for PleromaAPI.AccountController

See merge request pleroma/pleroma!2528
 2020-05-14 09:25:18 +00: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
Haelwenn (lanodan) Monnier cb363f0183
MastodonAPI: /api/v2/media endpoints 2020-05-14 10:14:28 +02:00
Alex Gleason 249e009c5e
Add `pleroma_internal` as an internal field 2020-05-13 16:14:24 -05:00
Ivan Tashkinov 8062d590dd [#2456] OpenAPI-related tweaks. Removed support for `with_relationships` param in `GET /api/v1/accounts/search`. 2020-05-13 18:56:45 +03:00
Alex Gleason 9cbf17d59f
Handle bcrypt passwords for Mastodon migration 2020-05-13 10:53:56 -05:00
Egor Kislitsyn 6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController 2020-05-13 19:06:46 +04:00
lain 0f0acc740d Chat: Allow posting without content if an attachment is present. 2020-05-13 15:31:28 +02:00
Ivan Tashkinov 59b6d5f2aa [#2456] Changed `embed_relationships` param to `with_relationships`. 2020-05-13 15:08:07 +03:00
lain 06cad239e5 InstanceView: Add pleroma chat messages to nodeinfo 2020-05-13 14:05:22 +02:00
Michael Weiss ae3b0b4c0d
Fix digest mix task on OTP releases 
This is based on #2191, credit belongs to @rinpatch.
 2020-05-13 13:34:03 +02:00
lain 3cff4e24cd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-13 12:44:16 +02:00
Egor Kislitsyn bcadbf964a
Add OpenAPI spec for SuggestionController 2020-05-13 14:15:24 +04:00
Ivan Tashkinov 33b798425f [#2456] Post-merge fix. 2020-05-13 12:50:52 +03:00
Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs
 2020-05-13 12:42:36 +03: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