Maksim Pechnikov
|
fb38b7339c
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 05:55:39 +03:00 |
|
Alexander Strizhakov
|
e7d8ab8303
|
admin_api fetch status by id
|
2020-05-05 16:18:56 +03: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 |
|
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
|
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 |
|
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
|
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 |
|
Egor Kislitsyn
|
1b06a27746
|
Update Flake ID description
|
2020-04-22 20:20:19 +04:00 |
|
Haelwenn
|
a17bfb5fab
|
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
|
2020-04-17 09:19:35 +00:00 |
|
Alexander Strizhakov
|
72ef6cc4f2
|
added need_reboot endpoint to admin api
|
2020-04-16 16:03:26 +03:00 |
|
Maksim Pechnikov
|
4b3b1fec4e
|
added an endpoint for getting unread notification count
|
2020-04-15 21:19:43 +03:00 |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
2020-04-14 16:32:22 +00:00 |
|
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
2020-04-13 21:19:27 +03:00 |
|
lain
|
b87b798ca1
|
Merge branch 'fix/1658-invite-send' into 'develop'
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
|
2020-04-09 10:42:43 +00:00 |
|
Alexander Strizhakov
|
c8bfbf511e
|
Apply suggestion to docs/API/admin_api.md
|
2020-04-09 10:17:24 +00:00 |
|
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
2020-04-07 14:09:43 +03:00 |
|
lain
|
1d4ab06505
|
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
|
2020-04-06 12:51:35 +00:00 |
|
Egor Kislitsyn
|
8a0ffaa9ea
|
Fix formatting in documentation
|
2020-04-02 23:10:13 +04:00 |
|
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
2020-04-02 14:47:17 +03:00 |
|
Alexander Strizhakov
|
2d64500a9d
|
error improvement for email_invite endpoint
|
2020-04-01 20:26:33 +03:00 |
|
Alexander Strizhakov
|
7af0959a07
|
updating docs
|
2020-03-31 18:30:19 +03:00 |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
2020-03-30 12:15:23 +03:00 |
|
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
2020-03-29 06:57:34 +03:00 |
|
lain
|
1d75d0ed7a
|
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
|
2020-03-24 17:34:13 +00:00 |
|
Alexander Strizhakov
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
2020-03-23 10:44:47 +03:00 |
|
Alexander Strizhakov
|
9bae9b1b1b
|
Merge branch 'develop' into gun
|
2020-03-20 20:47:54 +03:00 |
|
Alexander Strizhakov
|
98a60df41f
|
include_types parameter in /api/v1/notifications
|
2020-03-20 13:18:12 +03:00 |
|
Alexander Strizhakov
|
f9ecb513fa
|
Merge branch 'develop' into gun
|
2020-03-18 14:08:21 +03:00 |
|
eugenijm
|
13cce9c0de
|
Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.
|
2020-03-16 20:42:37 +03:00 |
|
eugenijm
|
d198e7fa2a
|
Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password
|
2020-03-16 20:32:07 +03:00 |
|
Alexander Strizhakov
|
f3791add99
|
removing with_move parameter
|
2020-03-16 20:07:45 +03:00 |
|
Alexander Strizhakov
|
f0651730bd
|
Merge branch 'develop' into gun
|
2020-03-16 14:25:55 +03:00 |
|
Ivan Tashkinov
|
ecb7809e92
|
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
|
2020-03-14 15:37:02 +03:00 |
|
rinpatch
|
4db88242e5
|
Merge branch 'docs/direct_conversation_id' into 'develop'
pleroma_api.md: direct_conversation_id vs. conversation_id
See merge request pleroma/pleroma!2263
|
2020-03-13 18:58:22 +00:00 |
|
Maksim Pechnikov
|
edb659dc57
|
Merge branch 'develop' into issue/1276
|
2020-03-08 14:10:59 +03:00 |
|
Alexander Strizhakov
|
b2eb1124d1
|
Merge branch 'develop' into gun
|
2020-03-07 12:41:37 +03:00 |
|
Ivan Tashkinov
|
027714b519
|
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
|
2020-03-06 11:48:30 +03:00 |
|
Ivan Tashkinov
|
b4367125e9
|
[#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
|
2020-03-02 21:43:18 +03:00 |
|
eugenijm
|
7af431c150
|
Exclude reblogs from GET /api/pleroma/admin/statuses by default
|
2020-03-02 16:47:31 +03:00 |
|
Haelwenn (lanodan) Monnier
|
deb5f5c40e
|
pleroma_api.md: direct_conversation_id vs. conversation_id
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
|
2020-03-02 04:01:37 +01:00 |
|
Alexander Strizhakov
|
814b275af7
|
Merge branch 'develop' into gun
|
2020-02-29 11:34:50 +03:00 |
|
eugenijm
|
4ab07cf0d5
|
Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses
|
2020-02-26 22:35:57 +03:00 |
|
Maksim Pechnikov
|
10f452ad1f
|
Merge branch 'develop' into issue/1276
|
2020-02-25 07:22:56 +03:00 |
|
eugenijm
|
7ad5c51f23
|
Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope
|
2020-02-24 21:46:37 +03:00 |
|
Alexander Strizhakov
|
13918cb545
|
Merge branch 'develop' into gun
|
2020-02-21 10:02:37 +03:00 |
|
lain
|
3af6d3f8e2
|
Emoji Reactions: Add documentation
|
2020-02-19 17:17:05 +01:00 |
|
Mark Felder
|
cf94349287
|
Merge branch 'develop' into gun
|
2020-02-18 09:06:27 -06:00 |
|
lain
|
c07efd5b42
|
Merge branch 'need-reboot-flag' into 'develop'
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
|
2020-02-18 14:32:03 +00:00 |
|
Alexander Strizhakov
|
514c899275
|
adding gun adapter
|
2020-02-18 08:19:01 +03:00 |
|
Maksim Pechnikov
|
da44ee5b0f
|
Merge branch 'develop' into issue/1276
|
2020-02-13 09:20:34 +03:00 |
|
lain
|
24c526a0b1
|
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
|
2020-02-11 13:58:36 +01:00 |
|
Haelwenn (lanodan) Monnier
|
ad16f38b9c
|
differences_in_mastoapi_responses.md: Add note about unlisted results
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
|
2020-02-11 01:59:27 +01:00 |
|
Maksim Pechnikov
|
b87533760b
|
Merge branch 'develop' into issue/1276
|
2020-02-10 07:59:52 +03:00 |
|
Alexander Strizhakov
|
dad23e3766
|
need_reboot flag
|
2020-02-08 13:00:02 +03:00 |
|
lain
|
57098713c0
|
Apply suggestion to docs/API/pleroma_api.md
|
2020-02-07 15:18:05 +00:00 |
|
lain
|
713645d5c5
|
Apply suggestion to docs/API/pleroma_api.md
|
2020-02-07 15:17:42 +00:00 |
|
Lain Soykaf
|
ce95882009
|
EmojiReactions: Add docs and Changelog
|
2020-02-07 14:59:26 +01:00 |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
2020-02-06 18:09:57 +01:00 |
|
Alexander Strizhakov
|
c85aa6e87f
|
removing confusing error
|
2020-02-06 12:50:36 +03:00 |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
2020-02-05 20:36:21 +03:00 |
|
rinpatch
|
49e80a1537
|
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
|
2020-02-05 16:59:21 +00:00 |
|
lain
|
d378550d2d
|
Emoji Reactions: Document changes
|
2020-01-29 11:40:57 +01:00 |
|
Alexander Strizhakov
|
7c6e5c541d
|
docs update
|
2020-01-27 19:48:20 +03:00 |
|
Maksim Pechnikov
|
e442ea5722
|
Merge branch 'develop' into issue/1276
|
2020-01-27 15:20:47 +03:00 |
|
lain
|
9a994878f1
|
Emoji reactions: Update docs and changelog
|
2020-01-24 10:53:01 +01:00 |
|
Haelwenn
|
dddebee047
|
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
|
2020-01-23 02:12:03 +00:00 |
|
lain
|
85f45c7689
|
Document new EmojiReaction notifications
|
2020-01-22 20:11:18 +01:00 |
|
feld
|
be27777156
|
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
|
2020-01-22 17:13:17 +00:00 |
|
Alexander Strizhakov
|
f3e074e949
|
little fixes
|
2020-01-22 18:22:54 +03:00 |
|
Alexander Strizhakov
|
a9c6f119ac
|
docs update
|
2020-01-22 18:08:53 +03:00 |
|
lain
|
043cd5aa54
|
Emoji reactions: Document changes
|
2020-01-22 13:58:02 +01:00 |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
2020-01-22 11:22:31 +03:00 |
|
lain
|
4c5b5f14dc
|
StatusView: Add emoji_reactions
|
2020-01-20 16:24:20 +01:00 |
|
Alexander Strizhakov
|
70c7a26de8
|
Merge branch 'develop' into admin-be
|
2020-01-14 14:52:00 +03:00 |
|
Alibek Omarov
|
e1308f10bd
|
docs: API: update Mastodon API link
|
2020-01-11 05:06:40 +00:00 |
|
Alexander Strizhakov
|
d933fd3d61
|
more renamings
|
2020-01-10 19:51:32 +03:00 |
|
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
2020-01-10 19:34:19 +03:00 |
|
Alexander Strizhakov
|
958d0452e4
|
fix for pleroma assets group update
|
2020-01-10 18:18:09 +03:00 |
|
Alexander
|
bb9a43c3ae
|
typo fix
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
fea734ca70
|
errors on endpoints
|
2020-01-10 15:52:00 +03:00 |
|