| 
								
								
									 Ivan Tashkinov | 76068873db | [#1234] Defined admin OAuth scopes, refined other scopes. Added tests. | 2019-09-17 22:19:39 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | df15ed13d1 | Merge branch 'develop' into feature/moderation-log-filters | 2019-09-16 19:44:06 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 219dca1b00 | Merge branch 'develop' into feature/return-total-for-reports | 2019-09-16 14:40:17 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | efbc2edba1 | [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes # Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
#	lib/pleroma/web/router.ex | 2019-09-15 18:52:27 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e6f43a831b | [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). | 2019-09-15 18:22:08 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | a1f2dfb10a | expanding regex sigils to use modifiers | 2019-09-11 09:25:33 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 736165c082 | Reverse reports list | 2019-09-05 16:54:34 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | af746fa4a8 | Return total for reports | 2019-09-04 20:08:13 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 9c96b17e16 | Add pagination to logs | 2019-09-01 21:23:30 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f182f0f6bd | Add ability to search moderation logs | 2019-08-31 00:57:15 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 5e4fde1d3d | Filter logs by date | 2019-08-27 20:48:16 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 37dd3867bb | Log admin/moderator actions | 2019-08-25 19:39:37 +00:00 |  | 
				
					
						| 
								
								
									 lain | 90986667ce | Merge branch 'admin-create-users' into 'develop' user creation admin api will create multiple users
See merge request pleroma/pleroma!1170 | 2019-08-24 16:04:19 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | de0f3b73dd | Admin fixes | 2019-08-03 18:16:09 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 51b3b6d816 | Admin changes | 2019-07-30 16:36:05 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f46805bb40 | Merge branch 'develop' into feature/admin-api-user-statuses | 2019-07-24 02:42:28 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 03471151d6 | AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) | 2019-07-24 01:51:36 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 5e72554f3c | Admin config fix | 2019-07-23 19:17:00 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 05b5af8075 | Add tests for users tasks and PleromaAuthenticator | 2019-07-22 02:43:15 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | a9459ff98f | Admin API: Endpoint for fetching latest user's statuses | 2019-07-14 00:37:26 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 846ad9a463 | admin api configure changes | 2019-07-11 13:02:13 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5104f65b69 | Wrap error messages into gettext helpers | 2019-07-10 18:10:09 +07:00 |  | 
				
					
						| 
								
								
									 feld | 93a0eeab16 | Add license/copyright to all project files | 2019-07-10 05:13:23 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 6c50fbcd14 | Admin API: Allow querying user by ID | 2019-07-05 19:33:53 +03:00 |  | 
				
					
						| 
								
								
									 Eugenij | ab50c6b3ca | Add fallback value to the admin report view. This is to avoid 500 error when the reported user no longer exists
in the database. | 2019-07-02 01:27:00 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 452ca5250d | Merge admin and mastodon user views for reports | 2019-06-28 15:15:32 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | c6705144a2 | don't delete config settings on admin update | 2019-06-27 04:19:44 +00:00 |  | 
				
					
						| 
								
								
									 Alex S | 982cad0268 | support for config groups | 2019-06-23 08:16:16 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | 410add1c30 | support for tuples with more than 2 values | 2019-06-22 17:30:53 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | f0fccb7578 | fix for int and modules | 2019-06-22 09:01:30 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | bf6aa6f1a8 | Fix report content stopping to be nullable | 2019-06-16 13:06:12 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 44de34d170 | Credo fixes | 2019-06-16 01:35:45 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 641bcaa44e | Sanitize HTML in ReportView Closes #990 | 2019-06-16 01:30:32 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | c2ca1f22a2 | it is changed in compile time we can't change module attributes and endpoint settings in runtime | 2019-06-14 15:45:05 +00:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | ad5263c647 | Merge remote-tracking branch 'upstream/develop' into admin-create-users | 2019-06-01 11:42:37 +05:45 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 5534d4c676 | make bulk user creation from admin works as a transaction | 2019-06-01 11:17:53 +05:45 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 5c028b8f92 | user creation admin api will create multiple users | 2019-05-17 12:21:58 +05:45 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | e2b3a27204 | Add Reports to Admin API | 2019-05-16 19:09:18 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a2be420f94 | differences_in_mastoapi_responses.md: fullname & bio are optionnal [ci skip] | 2019-05-13 18:35:45 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | bfeb33e951 | Merge develop Merge conflict in lib/pleroma/activity.ex | 2019-05-08 14:34:36 +00:00 |  | 
				
					
						| 
								
								
									 Egor | b9cdf6d3b9 | Use User.get_cached*everywhere | 2019-04-22 07:20:43 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 184ae60b21 | Merge branch 'bugfix/pleroma-email-naming' into 'develop' Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029 | 2019-04-12 10:41:09 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 9c1b36856b | s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ | 2019-04-10 06:33:20 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 1791ee8ec4 | s/Pleroma.Mailer/Pleroma.Emails.Mailer/ | 2019-04-10 06:33:19 +02:00 |  | 
				
					
						| 
								
								
									 Alex S | 012bb5dcc9 | renaming expire_at -> expires_at keyword style change | 2019-04-08 16:01:28 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | 56c75aec12 | credo fix | 2019-04-07 20:59:53 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | b810aac117 | added docs to docs/api/admin_api.md code style and little renamings | 2019-04-07 19:48:52 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | dcc54f8cfa | admin api endpoints for invites | 2019-04-06 20:25:19 +07:00 |  | 
				
					
						| 
								
								
									 Mark Felder | b5a2d384f7 | Redundant Repo.get_by usage was recently removed from the codebase | 2019-04-05 11:41:41 -05:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7895ee37fa | Add user following / unfollowing to the admin api. | 2019-04-05 11:27:07 -05:00 |  | 
				
					
						| 
								
								
									 eugenijm | 10c81fc902 | Add user show endpoint for Pleroma admin API | 2019-03-27 21:44:15 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 3cf7539bca | Add more user filters + move search to its own module | 2019-03-27 03:51:59 +05:00 |  | 
				
					
						| 
								
								
									 kaniini | 59333f2d56 | Merge branch 'admin-api-account-view-namespace' into 'develop' MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930 | 2019-03-14 02:01:10 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | cc0f2f8ba3 | MastodonAPI.Admin.AccountView → AdminAPI.AccountView | 2019-03-13 12:17:57 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 2d30fc279f | Typo | 2019-03-05 02:11:15 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f620199836 | Merge search endpoint into /users | 2019-03-04 21:26:32 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 2ec8cf5665 | Add pagination to search | 2019-03-02 17:21:30 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f635b675b2 | Refactor a little bit | 2019-03-01 21:17:23 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f1a4c3163b | Show current user in users list as well | 2019-03-01 20:23:03 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 5b08b470f6 | Add "local" params to users search | 2019-03-01 20:13:02 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 46f29b9da1 | Add search users endpoint | 2019-02-28 19:04:47 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 72b7a0797e | Use Mastodon API views in Admin API | 2019-02-28 17:43:09 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 2883f75a3a | Add pagination to users admin API | 2019-02-28 01:11:56 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 90d0d055fc | Add more admin actions | 2019-02-27 00:13:38 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 25b9e7a8c3 | Added admin API for changing user activation status | 2019-02-19 19:37:02 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 32541172cd | Merge branch 'cleanup/admin-api-useless-if' into 'develop' Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612 | 2019-01-01 13:48:59 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 1e6c102bfc | Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete | 2018-12-31 19:50:14 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 980b5288ed | update copyright years to 2019 | 2018-12-31 15:41:47 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2791ce9a1f | add license boilerplate to pleroma core | 2018-12-23 20:56:42 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b86057cc7f | [#114] Refactored User.register_changeset to init confirmation data. Introduced User.register/1 to encapsulate User record creation and post-registration actions. | 2018-12-18 17:22:42 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a89e3b4b60 | [#114] Moved email_invite action to AdminAPIController, adjusted tests. | 2018-12-14 12:28:23 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | e94c3442f4 | updates | 2018-12-10 13:27:37 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 074fa790ba | fix compile warnings | 2018-12-09 20:50:08 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7b19487389 | [#394] Added users.tagsand admin routes to tag and untag users. Added tests. | 2018-12-06 20:06:50 +03:00 |  | 
				
					
						| 
								
								
									 lain | 1c67277c80 | Fix admin api. | 2018-12-01 09:03:16 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 0ca00b3a07 | Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit | 2018-11-17 22:12:14 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 12ccf0c4f8 | Change Relay from statusto{status, message} | 2018-11-17 22:12:13 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | e0b0fde713 | Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names) | 2018-11-17 20:25:57 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | ccd6b1956d | lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow | 2018-11-17 20:25:56 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f9d05902fe | lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves | 2018-11-17 20:25:56 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | a87ed2fad6 | Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format | 2018-11-17 20:25:55 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f48062488e | Add get endpoints for rights [AdminAPI] | 2018-11-17 20:25:55 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 59ce7fedce | Fix connection returns make generic right endpoint [AdminAPI] | 2018-11-17 20:25:55 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | c5a2bd6a65 | admin_api_controller.ex: fix remaining params at once | 2018-11-17 20:25:54 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 95b107b6cc | admin_api_controller.ex: Add documentation, fix get_invite_token | 2018-11-17 20:25:54 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 578a911737 | admin_api_controller.ex: get_password_reset: fix params and response | 2018-11-17 20:25:54 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5732eef16b | lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController | 2018-11-17 20:25:53 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 77d2fd54dd | admin_api_controller: Have some basic code | 2018-11-17 20:25:52 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | ee2e1328ad | admin_api_controller.ex: Create | 2018-11-17 20:25:52 +01:00 |  |