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 |
|
Alexander
|
5cacb988b9
|
partially settings update
|
2020-01-10 15:52:00 +03:00 |
|
Alex S
|
2753285b77
|
config editing through database
|
2020-01-10 15:51:59 +03:00 |
|
Egor Kislitsyn
|
fc79c69173
|
Remove /api/account/register documentation from pleroma_api.md
|
2019-12-20 19:47:44 +07:00 |
|
Maxim Filippov
|
3ecf131511
|
Merge branch 'develop' into feature/report-notes
|
2019-12-12 02:16:23 +03:00 |
|
lain
|
1ae976ac51
|
Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
# CHANGELOG.md
|
2019-12-10 13:34:54 +00:00 |
|
Hakaba Hitoyo
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
2019-12-10 13:19:26 +00:00 |
|
Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
2019-12-10 08:55:14 +03:00 |
|
lain
|
e4ea0e20b3
|
Merge branch 'issue/1342' into 'develop'
[#1342] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
|
2019-12-09 14:30:35 +00:00 |
|
lain
|
4692919ea6
|
Update pleroma_api.md
|
2019-12-09 14:15:59 +00:00 |
|
Egor Kislitsyn
|
b4027e7187
|
Document with_move parameter of the notification API
|
2019-12-09 14:46:06 +07:00 |
|
Maksim Pechnikov
|
e260a16c05
|
update docs
|
2019-12-08 22:09:15 +03:00 |
|
Maxim Filippov
|
00c38cf28d
|
Docs
|
2019-12-08 11:29:33 +03:00 |
|
Ivan Tashkinov
|
93a80ee915
|
[#1427] Bugfix for enforce_oauth_admin_scope_usage. Admin API documentation entry.
|
2019-12-06 16:56:23 +03:00 |
|
Maksim Pechnikov
|
49bb0a130f
|
Merge branch 'develop' into issue/1276
|
2019-12-05 12:22:19 +03:00 |
|
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
2019-12-04 00:26:37 +09:00 |
|
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
2019-12-02 16:26:19 +00:00 |
|
Egor Kislitsyn
|
1fc28a4b44
|
Add a view for the move notification
|
2019-11-27 17:52:02 +07:00 |
|
lain
|
bd62946020
|
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
|
2019-11-22 15:39:19 +00:00 |
|
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
2019-11-19 20:14:02 +09:00 |
|
feld
|
adacf1b5e1
|
Remove deprecated endpoint from docs that is fully removed from backend now
|
2019-11-18 16:16:27 +00:00 |
|
feld
|
1afeaf82fa
|
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
|
2019-11-14 13:35:41 +00:00 |
|
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
2019-11-14 16:39:45 +07:00 |
|
Egor Kislitsyn
|
e6d7e27bd6
|
Add allow_following_move setting to User
|
2019-11-12 18:45:28 +07:00 |
|
Maxim Filippov
|
31343e4321
|
Code style fixes
|
2019-11-11 19:06:09 +09:00 |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-11-08 13:27:11 +01:00 |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-08 18:30:49 +09:00 |
|
eugenijm
|
7888803ffe
|
Mastodon API: Add the recipients parameter to GET /api/v1/conversations
|
2019-11-07 08:26:24 +03:00 |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-05 02:12:48 +03:00 |
|
Maxim Filippov
|
ab5c8ec9fa
|
Update docs
|
2019-11-01 20:27:16 +03:00 |
|
Maksim Pechnikov
|
58da7f6620
|
updated docs\changelog
|
2019-10-31 17:34:17 +03:00 |
|
Ivan Tashkinov
|
ee04fbc35a
|
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
2019-10-20 22:29:56 +03:00 |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
2019-10-20 20:43:18 +03:00 |
|
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
2019-10-20 13:42:42 +03:00 |
|