Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-01-27 | Merge branch 'develop' into feature/tag_feed | Maksim Pechnikov | |
2020-01-17 | updated error messages for authentication process | Maksim Pechnikov | |
2020-01-14 | Merge branch 'develop' into feature/tag_feed | Maksim Pechnikov | |
2020-01-08 | fix create service actor | Maksim Pechnikov | |
2019-12-17 | Merge branch 'develop' into feature/tag_feed | Maksim Pechnikov | |
2019-12-10 | Merge branch 'develop' into 'domain-block-precedence' | Sadposter | |
# Conflicts: # lib/pleroma/user.ex | |||
2019-12-06 | init tag feed | Maksim Pechnikov | |
2019-12-04 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex | |||
2019-11-30 | Merge branch 'remove-info-from-users' into 'develop' | rinpatch | |
Removed users.info field See merge request pleroma/pleroma!2006 | |||
2019-11-29 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1335-user-api-id-fields-relations # Conflicts: # mix.lock | |||
2019-11-28 | obligatory format commit | Sadposter | |
2019-11-28 | make follows take precedence over domain blocks | Sadposter | |
2019-11-27 | Remove User.user_info/2 | Egor Kislitsyn | |
2019-11-23 | Removed users.info and remaining usages. | Ivan Tashkinov | |
2019-11-21 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs | |||
2019-11-21 | Merge branch 'issue/1348' into 'develop' | lain | |
[#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937 | |||
2019-11-21 | Fix user.following_count | Egor Kislitsyn | |
2019-11-20 | [#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵ | Ivan Tashkinov | |
UserRelationship-related functionality. | |||
2019-11-19 | [#1335] Implemented notification mutes and reblog mutes as ↵ | Ivan Tashkinov | |
UserRelationships. User to UserRelationship relations and functions refactoring. | |||
2019-11-15 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1335-user-api-id-fields-relations | |||
2019-11-15 | [#1335] Reorganized `users.mutes` as relation to UserMute entity. | Ivan Tashkinov | |
2019-11-11 | User: Don't let deactivated users authenticate. | lain | |
2019-11-10 | [#1335] User: refactored :blocks field into :blocked_users relation. | Ivan Tashkinov | |
Introduced UserBlock. | |||
2019-11-04 | excluded invisible actors from gets /api/v1/accounts/:id | Maksim Pechnikov | |
2019-10-30 | Update test for get_recipients_from_activity | kPherox | |
2019-10-24 | Merge remote-tracking branch 'upstream/develop' into ↵ | Egor Kislitsyn | |
refactor/following-relationships | |||
2019-10-21 | [#1304] Merged `develop`, handled User.Info.invisible. | Ivan Tashkinov | |
2019-10-21 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1304-user-info-deprecation # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex | |||
2019-10-21 | Merge branch 'develop' into refactor/following-relationships | Egor Kislitsyn | |
2019-10-20 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
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 | [#1304] Moved remaining fields from User.Info to User. | Ivan Tashkinov | |
Misc. fixes / improvements. | |||
2019-10-19 | user: implement User.invisible?/1 | Ariadne Conill | |
2019-10-18 | fix up some tests | Ariadne Conill | |
2019-10-18 | websub: remove entirely | Ariadne Conill | |
2019-10-16 | [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. | Ivan Tashkinov | |
2019-10-14 | Do not add `follower_address` to `following` for non local users | Egor Kislitsyn | |
2019-10-11 | Replace `user.following` with Pleroma.FollowingRelationship | Egor Kislitsyn | |
2019-10-07 | Extract RSS Feed functionality from OStatus | Sergey Suprunenko | |
2019-10-06 | Move local keys out of `user.info` | rinpatch | |
2019-10-04 | Fix get_cached_by_nickname_or_id not allowing to get local users by | rinpatch | |
nickname Closes #1293 | |||
2019-09-24 | Add User.change_info/2 and User.update_info/2 | Egor Kislitsyn | |
2019-09-24 | Do not return tuple when unneeded | Egor Kislitsyn | |
2019-09-23 | Merge branch 'feature/force-password-reset' into 'develop' | kaniini | |
Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705 | |||
2019-09-22 | Admin API: Add ability to force user's password reset | Maxim Filippov | |
2019-09-19 | Add `rel="ugc"` to hashtags and mentions | Egor Kislitsyn | |
2019-09-18 | Bump copyright years of files changed in 2019 | Haelwenn (lanodan) Monnier | |
Done via the following command: git diff 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' | |||
2019-09-15 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1149-oban-job-queue # Conflicts: # docs/config.md | |||
2019-09-14 | Merge branch 'fix/truncate-remote-user-fields' into 'develop' | rinpatch | |
Truncate remote user fields See merge request pleroma/pleroma!1619 | |||
2019-09-14 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock | |||
2019-09-13 | Merge branch 'cleanup-activity' into 'develop' | lain | |
Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623 |