362 Commits (d7af0294e6a3a690524e0a08a35c9c6dafbb9f79)

Author	SHA1	Message	Date
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	4 years ago
Mark Felder	44a86951a3	Merge branch 'develop' into refactor/approval_pending_user_field	4 years ago
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	4 years ago
Mark Felder	ebd7d1365b	Make setting user activation status explicit	4 years ago
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	4 years ago
Mark Felder	f7e59c28ed	Change user.approval_pending field to user.is_approved	4 years ago
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	4 years ago
Alex Gleason	20af025c65	AdminAPI: return user email	4 years ago
lain	20a269ed69	Merge branch 'fix/pagination-regression' into 'develop' ... Do not try to guess which pagination we need by the existence of an :offset param. Closes #2399 See merge request pleroma/pleroma!3230	4 years ago
Mark Felder	83f27282ba	Do not try to guess which pagination we need by the existence of an :offset param. ... Require explicit request to get offset pagination.	4 years ago
Alex Gleason	0ec7e9b8e9	AdminAPI: return id for moderation log entries	4 years ago
feld	afe9c152ab	Merge branch 'fix/reports-ordering' into 'develop' ... Do not reverse order of reports. We want newest ones sorted to the top. Closes #2364 See merge request pleroma/pleroma!3225	4 years ago
Mark Felder	085d4e6cfc	Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset	4 years ago
Mark Felder	4c5f75f4e9	Support pagination in AdminAPI for user statuses	4 years ago
Mark Felder	744b34709d	Do not reverse order of reports. We want newest ones sorted to the top.	4 years ago
lain	e4f1d8f48c	Merge branch 'cachex-test' into 'develop' ... Test framework overhaul (speed, reliability) See merge request pleroma/pleroma!3209	4 years ago
lain	95a9bdfc37	Tests: Use NullCache for async tests. ... Caching can't work in async tests, so for them it is mocked to a null cache that is always empty. Synchronous tests are stubbed with the real Cachex, which is emptied after every test.	4 years ago
lain	713612c377	Cachex: Make caching provider switchable at runtime. ... Defaults to Cachex.	4 years ago
Alex Gleason	80891e83d8	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
Alex Gleason	30ed7b502f	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
Maksim Pechnikov	66f411fba0	added subject actor to moderation log	4 years ago
lain	bb9650f3c2	FrontendController: Return error on installation error.	4 years ago
Alex Gleason	9546c1444c	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
Egor Kislitsyn	435bf1f945	Remove FrontendInstallerWorker	4 years ago
lain	e46c95b826	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api	4 years ago
Mark Felder	7efc074ead	Permit fetching individual reports with notes preloaded	4 years ago
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
feld	1cce1bd729	Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' ... [#2137] admin/users filters See merge request pleroma/pleroma!3016	4 years ago
Ivan Tashkinov	9f5f7dc9f9	Fixed User.is_discoverable attribute rendering in Admin API User view.	4 years ago
Mark Felder	9e54ef086b	Merge branch 'develop' into feature/account-export	4 years ago
Egor Kislitsyn	03e306785b	Add an API endpoint to install a new frontend	4 years ago
Maksim Pechnikov	ef627b9391	fix module name	4 years ago
Maksim Pechnikov	44e5a57d1a	admin api: added user filters by `actor_types`	4 years ago
Maksim Pechnikov	46b420aa60	need_confirmed -> unconfirmed	4 years ago
Maksim Pechnikov	cf4f393794	added AdminApi.UserController	4 years ago
Maksim Pechnikov	9ef46ce410	added 'unconfirmed' filter to admin/users	4 years ago
Egor Kislitsyn	ad605e3e16	Rename `Pleroma.Backup` to `Pleroma.User.Backup`	4 years ago
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	4 years ago
Mark Felder	1fb9452131	Merge branch 'develop' into feature/account-export	4 years ago
Alex Gleason	dc38dc8472	Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235	4 years ago
Mark Felder	64553ebae2	Merge branch 'develop' into chore/elixir-1.11	4 years ago
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	4 years ago
Mark Felder	9968b7efed	Change user.locked field to user.is_locked	4 years ago
Alexander Strizhakov	5f2071c458	changes after rebase	4 years ago
Alexander Strizhakov	9f4fe5485b	alias alphabetically order	4 years ago
Alexander Strizhakov	a6d8cef33e	OAuthScopesPlug module name	4 years ago
Alexander Strizhakov	b5b4395e4a	oauth consistency	4 years ago
Mark Felder	42e78a08b2	Fix rendering of reports	4 years ago
Egor Kislitsyn	bc3db72403	Use ModerationLog instead of Logger	4 years ago