| 
								
								
									 Egor Kislitsyn | e7aef27c00 | Fix merge | 2019-09-30 19:10:54 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 98d1347a4e | Extract status actions from MastodonAPIControllerintoStatusController | 2019-09-27 10:51:15 +07:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | e7836adf21 | Merge branch 'develop' into feature/moderation-log-filters | 2019-09-26 19:01:54 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | a39e065916 | Merge branch 'feature/return-link-for-password-reset' into 'develop' Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691 | 2019-09-26 03:12:03 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 48a82c4609 | Merge branch 'refactor/user' into 'develop' Simplify updating user's `info`
See merge request pleroma/pleroma!1712 | 2019-09-26 03:00:38 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 60cbea5bb2 | Allow activities pagination via limit/offset | 2019-09-25 01:25:42 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 209395c7e6 | Add User.change_info/2 and User.update_info/2 | 2019-09-24 19:50:07 +07:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 5e9759cd7d | Merge branch 'develop' into feature/return-link-for-password-reset | 2019-09-24 13:00:48 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 29dd8ab9c0 | Merge branch 'feature/force-password-reset' into 'develop' Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705 | 2019-09-23 22:42:34 +00:00 |  | 
				
					
						| 
								
								
									 Steven Fuchs | e1d2d69c87 | Clean up views | 2019-09-23 22:33:59 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 02bbcd6180 | Merge branch 'develop' into feature/return-link-for-password-reset | 2019-09-22 16:58:39 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 72a01f1350 | Use router helper to generate reset password link | 2019-09-22 16:36:59 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 6f25668215 | Admin API: Add ability to force user's password reset | 2019-09-22 16:08:07 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | d51e5e447e | Move emoji reloading to admin api | 2019-09-19 00:16:33 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 384b7dd40d | Fix response | 2019-09-18 18:06:49 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f89728ad95 | Merge branch 'develop' into feature/return-link-for-password-reset | 2019-09-18 16:44:11 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | a18f1e7cd7 | namings | 2019-09-18 10:49:14 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | 2263c8b6b9 | little fixes | 2019-09-18 10:49:14 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | 4faf2b1555 | post for creating invite tokens in admin api | 2019-09-18 10:49:14 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f9dd121ad3 | Admin API: Return link alongside with token on password reset | 2019-09-17 23:09:08 +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 |  | 
				
					
						| 
								
								
									 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 |  |