feld
|
e7837bc14e
|
Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email
See merge request pleroma/pleroma!2246
|
2020-03-15 16:58:51 +03:00 |
|
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
2020-03-03 16:44:49 -06:00 |
|
Hakaba Hitoyo
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
2019-12-10 13:19:26 +00:00 |
|
lain
|
e8cee4d9a0
|
ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
|
2019-12-06 14:25:13 +01:00 |
|
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
2019-12-04 18:56:31 +03: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 |
|
Ivan Tashkinov
|
cad9b325e5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
|
2019-11-21 16:47:52 +03:00 |
|
lain
|
8feb5dcb42
|
Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
|
2019-11-21 13:13:14 +00:00 |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
2019-11-19 23:22:10 +03:00 |
|
Ivan Tashkinov
|
01d9c093c3
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
2019-11-15 21:40:14 +03:00 |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized users.mutes as relation to UserMute entity.
|
2019-11-15 21:38:54 +03: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 |
|
Steven Fuchs
|
94627baa5c
|
New rate limiter
|
2019-11-11 12:13:06 +00:00 |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
2019-11-10 16:30:21 +03:00 |
|
Maksim Pechnikov
|
4b7c11e3f9
|
excluded invisible actors from gets /api/v1/accounts/:id
|
2019-11-04 20:44:24 +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 |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
2019-10-16 21:59:21 +03:00 |
|
Ivan Tashkinov
|
b93856874d
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 17:12:17 +03:00 |
|
Ivan Tashkinov
|
06b3bb54c5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 11:43:49 +03:00 |
|
Haelwenn
|
9e34919dcd
|
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
|
2019-10-06 04:41:06 +00:00 |
|
Ivan Tashkinov
|
64095961fe
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-02 20:42:40 +03:00 |
|
Egor Kislitsyn
|
7f2bc57725
|
Move follows, mutes and blocks actions to AccountController
|
2019-10-02 21:22:21 +07:00 |
|
kPherox
|
a0f101ee80
|
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
|
2019-10-01 01:40:33 +09:00 |
|
Egor Kislitsyn
|
987e0b8be8
|
Move update_credentials to MastodonAPI.AccountController
|
2019-09-30 19:10:56 +07:00 |
|
Egor Kislitsyn
|
c0ce2d5faf
|
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
|
2019-09-30 19:10:55 +07:00 |
|
Egor Kislitsyn
|
3c5ecb70b4
|
Add PleromaAPI.AccountController
|
2019-09-30 19:10:55 +07:00 |
|
Egor Kislitsyn
|
e7aef27c00
|
Fix merge
|
2019-09-30 19:10:54 +07:00 |
|