49 Commits (9b61df1fb64c49a4ad6277862d1405a27ad1c0da)

Author	SHA1	Message	Date
feld	7b67bf4e97	Merge branch 'fix/configdb-error' into 'develop' ... Improve error message for ConfigDB See merge request pleroma/pleroma!3289	4 years ago
feld	8d2ea95402	Merge branch 'feature/2438-users-posts-total-count' into 'develop' ... Feature/2438 users/instances posts total count Closes #2438 See merge request pleroma/pleroma!3270	4 years ago
Mark Felder	5fcab23aa3	Improve error message for ConfigDB	4 years ago
Alexander Strizhakov	d4158e8bf0	added total ... to the instance adminAPI endpoint	4 years ago
Alexander Strizhakov	6806c03e85	added total ... to the user statuses adminAPI endpoint	4 years ago
Mark Felder	e854c35e65	Convert tests to all use clear_config instead of Pleroma.Config.put	4 years ago
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	2c0fe2ea9e	Remove toggle_confirmation; require explicit state change ... Also cosmetic changes to make the code clearer	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
lain	cf0eb0c1c5	Merge branch 'object-normalize-refactor' into 'develop' ... Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229	4 years ago
Alex Gleason	20af025c65	AdminAPI: return user email	4 years ago
lain	e1e7e4d379	Object: Rework how Object.normalize works ... Now it defaults to not fetching, and the option is named.	4 years ago
Mark Felder	4c5f75f4e9	Support pagination in AdminAPI for user statuses	4 years ago
lain	9d5ce82221	Test: More async/sync tweaks.	4 years ago
lain	9ba60f70d2	Tests: Make as many tests as possible async. ... In general, tests that match these criteria can be made async: - Doesn't use real Cachex. - Doesn't write to the Config / Application Environment. - Uses Mock. Using Mox is fine. - Uses the streamer.	4 years ago
lain	b4b68b71fc	Tests: Remove unneeded explicit cachex use. ... Only use cachex when we're actually testing it.	4 years ago
Ivan Tashkinov	c8e7ace812	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements ... # Conflicts: # CHANGELOG.md	4 years ago
lain	ed76323776	Merge branch 'feature/configdb-mix-tasks' into 'develop' ... Add mix tasks to give additional ConfigDB recovery and debugging options See merge request pleroma/pleroma!3174	4 years ago
Ivan Tashkinov	e00c667145	[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests. ... Minor fixes.	4 years ago
Ivan Tashkinov	a010c5b16a	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Ivan Tashkinov	e9859b68fc	[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.	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
Egor Kislitsyn	d26a449396	Change endpoint path	4 years ago
Egor Kislitsyn	435bf1f945	Remove FrontendInstallerWorker	4 years ago
Egor Kislitsyn	08cbd655d1	Merge branch 'develop' into frontend-admin-api	4 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
lain	e46c95b826	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api	4 years ago
Mark Felder	53dd048590	Test the note is returned when fetching a single report	4 years ago
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	4 years ago
Egor Kislitsyn	a2a7a1f2ff	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	1a98476f48	Remove unused aliases	4 years ago
Egor Kislitsyn	d83c2bd330	Add support for install via `file` and `build_url` params	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	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
Mark Felder	1fb9452131	Merge branch 'develop' into feature/account-export	4 years ago
Alex Gleason	755f58168b	Merge remote-tracking branch 'upstream/develop' into restrict-domain	4 years ago
Alexander Strizhakov	5f2071c458	changes after rebase	4 years ago
Alexander Strizhakov	7acf09beb8	more tests	4 years ago
Alexander Strizhakov	7dffaef479	tests consistency	4 years ago