Commit Graph

943 Commits

Author SHA1 Message Date
Alexander Strizhakov 02ca8a363f
default page size for files 2020-06-19 14:46:38 +03:00
Alexander Strizhakov 3e3f9253e6
adding overall count for packs and files 2020-06-19 10:17:24 +03:00
Alexander Strizhakov 4975ed86bc
emoji pagination for pack show action 2020-06-18 18:50:03 +03:00
href cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy 2020-06-13 12:08:46 +03:00
lain e557265a03 Merge branch 'global-status-expiration' into 'develop'
Global status expiration

See merge request pleroma/pleroma!2208
2020-06-12 14:14:09 +00:00
Mark Felder 34593d6aa5 Merge branch 'develop' into features/mix-task-reset-mfa 2020-06-12 08:43:50 -05:00
Haelwenn (lanodan) Monnier 40970f6bb9
New mix task: pleroma.user reset_mfa <nickname> 2020-06-11 22:54:48 +02:00
Mark Felder 7c47f791a8 Add command to reload emoji packs from cli for OTP users
Not useful for source releases as we don't have a way to automate connecting to the running instance.
2020-06-10 13:02:08 -05:00
Egor Kislitsyn da22119c2f
Merge branch 'develop' into global-status-expiration 2020-06-08 17:21:47 +04:00
lain 89b85f6529 ChatController: Remove nonsensical pagination. 2020-06-08 11:09:53 +02:00
lain 1a2acce7c5 Docs: Document new mandatory parameter. 2020-06-07 20:23:17 +02:00
lain 680fa5fa36 Docs: Update docs on mark as read. 2020-06-07 15:41:46 +02:00
lain c5e3f2454c Docs: Unify parameters in examples. 2020-06-06 10:35:38 +02:00
lain a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-05 16:53:56 +02:00
lain 6e103a18af Docs: Document WebPush changes. 2020-06-04 14:49:36 +02:00
lain 286bd8eb83 Docs: Add `mark_message_as_read` to docs 2020-06-03 19:24:37 +02:00
Egor Kislitsyn c16315d055
Add OpenAPI spec for AdminAPI.ReportController 2020-06-03 19:17:05 +04:00
Alibek Omarov 030240ee8f docs: clients.md: Add Husky 2020-06-03 04:36:09 +00:00
lain 127ccc4e1c NotificationController: Don't return chat_mentions by default. 2020-06-02 14:05:53 +02:00
Egor Kislitsyn a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-06-01 15:48:51 +04:00
lain 6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-30 12:31:12 +02:00
rinpatch 32ba2b7f9f Merge branch 'media-docs' into 'develop'
Docs: Attachement limitations in MastoAPI differences

See merge request pleroma/pleroma!2607
2020-05-29 21:20:36 +00:00
feld 81db758e8e Merge branch 'mix/database-vacuum-options' into 'develop'
Database vacuum mix task

See merge request pleroma/pleroma!2599
2020-05-29 15:33:35 +00:00
Mark Felder 1b586ff3ae Document new database vacuum tasks 2020-05-29 10:17:06 -05:00
lain 32431ad1ee Docs: Also add the streaming docs to the Chat api doc. 2020-05-29 16:07:40 +02:00
lain b08baf905b Docs: Document streaming differences 2020-05-29 16:03:55 +02:00
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-29 12:36:17 +02:00
Alex Gleason 394258d548
Docs: Attachement limitations in MastoAPI differences 2020-05-28 16:11:33 -05:00
lain f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop'
Validate actor type

See merge request pleroma/pleroma!2593
2020-05-28 16:58:28 +00:00
Egor Kislitsyn 800e624058
Update installation guides 2020-05-28 19:32:56 +04:00
Alexander Strizhakov 3249141588
validate actor type 2020-05-27 10:14:22 +03:00
lain af3568a6d9 Docs: sql -> SQL 2020-05-25 19:26:07 +02:00
lain f7cb3f4cfc Apply suggestion to docs/installation/otp_en.md 2020-05-25 17:11:35 +00:00
lain 6a85fe1f9d Docs: Document reasonable Postgres settings. 2020-05-25 15:53:14 +02:00
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-25 13:57:27 +02:00
Roman Chvanikov 8eb1dfadca Update CHANGELOG and docs 2020-05-22 18:30:13 +03:00
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 283fb1e05b Merge branch 'issue/749' into 'develop'
[#749] unsubscribes of friends when user deactivated

See merge request pleroma/pleroma!2513
2020-05-21 13:27:44 +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 4ae2f75c3e Apply suggestion to docs/administration/CLI_tasks/user.md 2020-05-21 10:27:06 +00:00
Maksim Pechnikov 9bc5e18ade rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate` 2020-05-21 08:06:57 +03: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 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 5b8105928b Docs: Add background_image in instance 2020-05-20 12:13:57 +02: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