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 |
|
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 |
|
Egor Kislitsyn
|
d4a7577cde
|
Fix API documentation
|
2020-05-18 22:01:38 +04: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
|
15c7e3b4bf
|
Merge branch 'docs/storing-remote-media' into 'develop'
Document how to store remote media permanently
See merge request pleroma/pleroma!1871
|
2020-05-18 11:59:07 +00:00 |
|
Roman Chvanikov
|
01bd6a1e54
|
Merge branch 'develop' into feature/admin-api-status-count-per-instance
|
2020-05-18 11:56:27 +03:00 |
|
Maksim Pechnikov
|
c33a4315fb
|
updated docs
|
2020-05-18 06:48:19 +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 |
|
Stephanie Wilde-Hobbs
|
80308c5c26
|
Add config migration disclaimer to config whitelist documentation
|
2020-05-14 15:56:14 +01:00 |
|
Stephanie Wilde-Hobbs
|
20cbfb5cb5
|
Allow whitelisting whole groups
|
2020-05-14 12:43:53 +01:00 |
|
lain
|
41db52729e
|
Apply suggestion to docs/configuration/storing_remote_media.md
|
2020-05-14 09:14:59 +00:00 |
|
Haelwenn (lanodan) Monnier
|
e688d4ee69
|
MRF.StealEmojiPolicy: New Policy
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
|
2020-05-14 09:59:56 +02:00 |
|
lain
|
0f0acc740d
|
Chat: Allow posting without content if an attachment is present.
|
2020-05-13 15:31:28 +02:00 |
|
Stephanie Wilde-Hobbs
|
620247a015
|
Add database configuration whitelist
|
2020-05-12 17:12:27 +01:00 |
|
lain
|
a61120f497
|
Documention: Add chat message deletion docs
|
2020-05-12 13:25:25 +02:00 |
|
lain
|
8cc8d960af
|
Documentation: Add GET /chats/:id
|
2020-05-10 13:27:40 +02:00 |
|
lain
|
17be3ff669
|
Documentation: Add last_message to chat docs.
|
2020-05-10 13:01:20 +02:00 |
|
lain
|
e297d8c649
|
Documentation: Add attachment docs
|
2020-05-10 12:34:12 +02:00 |
|
Roman Chvanikov
|
4c19702390
|
Add docs
|
2020-05-09 14:32:08 +03:00 |
|
lain
|
7637ef4203
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-08 13:13:37 +02:00 |
|
Maksim Pechnikov
|
b078e0567d
|
Merge branch 'develop' into issue/1276-2
|
2020-05-08 08:51:09 +03:00 |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-07 15:05:40 +02:00 |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
2020-05-07 08:14:54 +00:00 |
|
lain
|
1748e26948
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 17:36:08 +02:00 |
|
Mark Felder
|
d7537a37c7
|
Add :chat to cheatsheet
|
2020-05-06 08:55:09 -05:00 |
|
Maksim Pechnikov
|
bd261309cc
|
added unread_notifications_count for /api/v1/accounts/verify_credentials
|
2020-05-06 15:08:38 +03:00 |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 11:44:30 +02:00 |
|
Maksim Pechnikov
|
fb38b7339c
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 05:55:39 +03:00 |
|
lain
|
42a2acac46
|
Merge branch 'feature/1720-status-view' into 'develop'
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
|
2020-05-05 13:40:12 +00:00 |
|
Alexander Strizhakov
|
e7d8ab8303
|
admin_api fetch status by id
|
2020-05-05 16:18:56 +03:00 |
|
Egor Kislitsyn
|
cc922e7d8c
|
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate
|
2020-05-05 15:01:33 +04:00 |
|
Egor Kislitsyn
|
decaa64f75
|
Merge branch 'develop' into global-status-expiration
|
2020-05-05 14:28:54 +04:00 |
|
lain
|
7ff2a7dae2
|
Docs: Add Chat mark_as_read docs
|
2020-05-04 13:12:21 +02:00 |
|
lain
|
c40afe5ba0
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-04 10:43:20 +02:00 |
|
Maksim Pechnikov
|
fe7a0d660e
|
Merge branch 'develop' into issue/1276-2
|
2020-05-04 06:08:49 +03:00 |
|
lain
|
095635453a
|
Replace deprecated Roma by Fedi.
|
2020-05-02 18:10:50 +00:00 |
|
rinpatch
|
3126f8a334
|
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
|
2020-05-02 16:44:55 +00:00 |
|
lain
|
2008fa9c7f
|
Merge branch 'fix/captcha' into 'develop'
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
|
2020-05-01 11:47:58 +00:00 |
|
Maksim Pechnikov
|
a92c713d9c
|
Merge branch 'develop' into issue/1276-2
|
2020-05-01 06:21:59 +03:00 |
|
Alexander Strizhakov
|
631e8c1feb
|
docs update
|
2020-04-30 16:09:23 +03:00 |
|
Alexander Strizhakov
|
1fd40532ae
|
docs fix
|
2020-04-30 16:09:23 +03:00 |
|
Alexander Strizhakov
|
1c1b7e22af
|
list of options for pack metadata
|
2020-04-30 16:09:22 +03:00 |
|
Alexander Strizhakov
|
ddb757f743
|
emoji api packs changes in routes with docs update
|
2020-04-30 16:09:18 +03:00 |
|
Alexander Strizhakov
|
95759310ab
|
docs update
|
2020-04-30 15:45:56 +03:00 |
|
Alexander Strizhakov
|
5839e67eb8
|
return data only for updated emoji
|
2020-04-30 15:24:02 +03:00 |
|
lain
|
528ea779a6
|
Apply suggestion to docs/API/chats.md
|
2020-04-29 17:56:24 +00:00 |
|
Egor Kislitsyn
|
8148d76ec5
|
Document captcha_answer_data parameter
|
2020-04-29 21:26:07 +04:00 |
|
lain
|
0c491b904d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-29 13:19:04 +02:00 |
|
Ivan Tashkinov
|
908cf22a6c
|
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
|
2020-04-28 19:56:20 +03:00 |
|
lain
|
30ea6bb167
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-28 17:48:05 +02:00 |
|
Mark Felder
|
4b3298133b
|
Document DELETE /api/v1/notifications/destroy_multiple
|
2020-04-28 10:13:58 -05:00 |
|
lain
|
b5dc59c8fa
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-28 14:16:21 +02:00 |
|
Egor Kislitsyn
|
764b4f95a8
|
Merge branch 'develop' into global-status-expiration
|
2020-04-28 14:13:53 +04:00 |
|
Maksim Pechnikov
|
270c3fe446
|
fix markdown format
|
2020-04-28 06:45:59 +03:00 |
|
lain
|
b550ef5611
|
Docs: Align chat api changes with docs.
|
2020-04-27 17:52:16 +02:00 |
|
lain
|
4cadaf7e96
|
Docs: Add /api/v1/instance information
|
2020-04-27 14:33:21 +02:00 |
|
lain
|
e62f8542a1
|
Docs: Add chat motivation and api description.
|
2020-04-27 13:48:09 +02:00 |
|
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
2020-04-27 14:33:00 +04:00 |
|
lain
|
c86143ed73
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-27 12:07:08 +02:00 |
|
Alex Gleason
|
1bd9749a8f
|
Let blob: pass CSP
|
2020-04-26 00:29:42 -05:00 |
|
Egor Kislitsyn
|
c56c0a3d23
|
Merge branch 'develop' into global-status-expiration
|
2020-04-24 18:37:58 +04:00 |
|
lain
|
8480f84615
|
Update differences_in_mastoapi_responses.md
|
2020-04-24 15:43:54 +03:00 |
|
Alexander
|
be34672d67
|
formatting
|
2020-04-24 15:43:54 +03:00 |
|
Alexander
|
6e625a427c
|
reply filtering
|
2020-04-24 15:43:49 +03:00 |
|
lain
|
a51cdafc01
|
Docs: Add documentation about chatmessages
|
2020-04-23 16:55:50 +02:00 |
|
Egor Kislitsyn
|
1b06a27746
|
Update Flake ID description
|
2020-04-22 20:20:19 +04:00 |
|
Ivan Tashkinov
|
0062116e07
|
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
|
2020-04-22 18:51:59 +03:00 |
|
Ivan Tashkinov
|
2958a7d246
|
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
|
2020-04-22 18:50:25 +03:00 |
|
lain
|
c466e739b6
|
Merge branch 'docs/debian-packages' into 'develop'
debian_based_*.md: Use erlang-nox metapackage
See merge request pleroma/pleroma!2268
|
2020-04-22 12:10:27 +00:00 |
|
lain
|
568f48435e
|
Apply suggestion to docs/installation/debian_based_en.md
|
2020-04-22 12:10:20 +00:00 |
|
Ivan Tashkinov
|
f685cbd309
|
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
|
2020-04-21 16:29:19 +03:00 |
|