Ivan Tashkinov
|
012d428e1f
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
|
5 years ago |
|
Ivan Tashkinov
|
e743c22329
|
Fixed incorrect usage of "relations" as a short form of "relationships".
|
5 years ago |
|
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
|
5 years ago |
|
Alexander Strizhakov
|
fe15f0ba15
|
restrict_unauthenticated setting
|
5 years ago |
|
eugenijm
|
13cce9c0de
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
|
5 years ago |
|
rinpatch
|
38f796a5c6
|
Merge branch 'feature/mastofe-admin-scope' into 'develop'
auth_controller.ex: Add admin scope to MastoFE
See merge request pleroma/pleroma!2256
|
5 years ago |
|
feld
|
2019f3b3ff
|
Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email
See merge request pleroma/pleroma!2246
|
5 years ago |
|
lain
|
4bce13fa2f
|
MastodonController: Return 404 errors correctly.
|
5 years ago |
|
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
5 years ago |
|
Egor Kislitsyn
|
4a45b96a91
|
Merge branch 'develop' into fix/signup-without-email
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
5 years ago |
|
rinpatch
|
b5465bf385
|
timeline controller: add a TODO for replacing copypaste with a macro
|
5 years ago |
|
rinpatch
|
ffcebe7e22
|
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
3ef2ff3e47
|
auth_controller.ex: Add admin scope to MastoFE
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
|
5 years ago |
|
Egor Kislitsyn
|
f446744a6a
|
Allow account registration without an email
|
5 years ago |
|
Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Hakaba Hitoyo
|
dabd535e43
|
Remove user recommendation by third party engine
|
5 years ago |
|
Maksim Pechnikov
|
8589632d09
|
fixed delete ScheduledActivity
|
5 years ago |
|
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
5 years ago |
|
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
5 years ago |
|
Haelwenn
|
e8759cb5ba
|
Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks
See merge request pleroma/pleroma!2116
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
5 years ago |
|
lain
|
2ee6754095
|
Mix Tasks: Add pleroma.benchmarks.tags
|
5 years ago |
|
Egor Kislitsyn
|
34d85f8a54
|
Return 404 if account to filter notifications from is not found
|
5 years ago |
|
Maksim Pechnikov
|
67cb46e15d
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Mark Felder
|
9ef912aecf
|
Merge branch 'develop' into issue/1411
|
5 years ago |
|
Hakaba Hitoyo
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
5 years ago |
|
Maksim Pechnikov
|
5876a9cb79
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
lain
|
e8cee4d9a0
|
ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
|
5 years ago |
|
Maksim Pechnikov
|
e21afdb7c7
|
Merge branch 'develop' into issue/1411
|
5 years ago |
|
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
|
Maksim Pechnikov
|
29a98b86b7
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Maksim Pechnikov
|
652cc6ba4b
|
updated ScheduledActivity
|
5 years ago |
|
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
5 years ago |
|
Maksim Pechnikov
|
88f7cf51d4
|
Merge branch 'develop' into issue/1411
|
5 years ago |
|
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
|
5 years ago |
|
lain
|
8feb5dcb42
|
Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
|
5 years ago |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
|
Maksim Pechnikov
|
0937895182
|
updated fetch_favorites
|
5 years ago |
|
Maksim Pechnikov
|
9da4c88b49
|
fix test
|
5 years ago |
|
Maksim Pechnikov
|
4beb3ce5c5
|
/api/v1/favourites: added sorting for activites by adds to favorites
|
5 years ago |
|
Ivan Tashkinov
|
01d9c093c3
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
5 years ago |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
|
5 years ago |
|
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
5 years ago |
|
Egor Kislitsyn
|
e6d7e27bd6
|
Add `allow_following_move` setting to User
|
5 years ago |
|
Steven Fuchs
|
94627baa5c
|
New rate limiter
|
5 years ago |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
5 years ago |
|
Maksim Pechnikov
|
9d0b989521
|
add subject to atom feed
|
5 years ago |
|
Maksim Pechnikov
|
4b7c11e3f9
|
excluded invisible actors from gets /api/v1/accounts/:id
|
5 years ago |
