| 
								
								
									 feld | 86b4149a13 | Merge branch '1668-prometheus-access-restrictions' into 'develop' [#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093 | 2020-11-05 16:22:35 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 346cc3ac24 | Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination | 2020-10-05 12:40:53 -05:00 |  | 
				
					
						| 
								
								
									 lain | 9a56ec25cb | Changelog: Add info about relay unfollowing | 2020-09-29 16:24:02 +02:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | de993b856b | added forceoption to the unfollow operation | 2020-09-28 09:16:42 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 871fac3e4c | docs update | 2020-09-24 09:41:40 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 8c6ec4c111 | pack routes change | 2020-09-24 09:16:14 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 9b6d89ff8c | support for special chars in pack name | 2020-09-24 09:12:37 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 2159daa9af | update changelog | 2020-09-18 07:09:53 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 2ec0dcf001 | Merge branch 'develop' into issue/2099 | 2020-09-18 07:08:37 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | c711a2b157 | Return the file content for GET /api/pleroma/admin/instance_document/:document_name | 2020-09-17 16:55:53 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 582ad5d4e1 | AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API | 2020-09-17 16:48:07 +03:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | dfb831ca39 | Chat moderation: add tests for unauthorized access | 2020-09-11 14:11:07 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | e229536e5c | Chat Moderation: use explicit senderandrecipientfields | 2020-09-11 14:11:00 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | c361df11b4 | Docs: AdminAPI chat moderation | 2020-09-11 14:10:45 -05:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 917d325972 | added api spec | 2020-09-07 07:17:30 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 5ae56aafb2 | added import mutes | 2020-09-06 21:42:51 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 7dc275b69b | relay fix for admin-fe | 2020-08-19 08:41:39 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 644effc63b | update docs | 2020-08-12 08:51:09 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 052833f8ee | Fix example json response | 2020-07-30 15:57:41 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 33f0427809 | Expose seconds_valid in Pleroma Captcha API endpoint | 2020-07-29 16:07:22 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 6931dbfa58 | Merge remote-tracking branch 'upstream/develop' into by-approval | 2020-07-26 15:46:14 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 20a496d2cb | Expose the post formats in /api/v1/instance | 2020-07-17 10:45:41 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 20d24741af | AdminAPI: Add PATCH /api/pleroma/admin/users/approveendpoint | 2020-07-14 18:02:44 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 33f1b29b2c | AdminAPI: Filter users by need_approval | 2020-07-14 14:29:03 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | b750129da1 | AdminAPI: Return approval_pendingwith users | 2020-07-14 13:47:05 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | a1570ba6ad | AdminAPI: Return registration_reasonwith users | 2020-07-14 13:08:39 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 80c21100db | Merge branch 'develop' into refactor/notification_settings | 2020-07-13 13:32:21 -05:00 |  | 
				
					
						| 
								
								
									 Alibek Omarov | d885540590 | docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths | 2020-07-11 11:02:13 +00:00 |  | 
				
					
						| 
								
								
									 lain | b39eb6ecc5 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information | 2020-07-10 12:26:53 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 31fef95e35 | Add changelog and documentation | 2020-07-08 06:29:24 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1adda637d3 | Docs: Document resetting of images | 2020-07-07 16:53:12 +02:00 |  | 
				
					
						| 
								
								
									 lain | 729506c56a | Docs: document instance differences | 2020-07-06 11:16:58 +02:00 |  | 
				
					
						| 
								
								
									 lain | 01695716c8 | Docs: Document accepts_chat_messagessetting. | 2020-07-03 15:55:18 +02:00 |  | 
				
					
						| 
								
								
									 lain | b374fd622b | Docs: Document the added accepts_chat_messagesuser property. | 2020-07-03 14:24:54 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 02d855b2b9 | Document the new API extension of /api/v1/instance | 2020-07-02 12:59:45 -05:00 |  | 
				
					
						| 
								
								
									 lain | 577da132da | Merge branch '1031-parent-visible' into 'develop' Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679 | 2020-06-29 08:39:51 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | efb5d64e50 | differences_in_mastoapi_responses: Update account fields | 2020-06-29 02:40:32 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 69848d5c97 | Rename notification "privacy_option" setting | 2020-06-26 12:45:46 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | fd5e797379 | Simplify notification filtering settings further | 2020-06-26 11:24:28 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | b950fb01db | Merge branch 'develop' into refactor/notification_settings | 2020-06-26 10:23:19 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 433c01b370 | Merge branch 'develop' into refactor/notification_settings | 2020-06-25 14:26:21 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 28d4e60f66 | MastoAPI differences: Document not implemented features | 2020-06-25 12:32:06 -05:00 |  | 
				
					
						| 
								
								
									 lain | 637bae42b4 | Docs: Document added parent_visible field. | 2020-06-24 13:31:42 +02:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 1471b70ef1 | Merge develop | 2020-06-23 20:56:55 +03:00 |  | 
				
					
						| 
								
								
									 lain | 8b5bdd164e | Merge branch 'fix/1825-admin-api-error-codes' into 'develop' Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665 | 2020-06-22 12:25:12 +00:00 |  | 
				
					
						| 
								
								
									 lain | 93ae1c8bd3 | Merge branch 'feature/1854-emoji-pagination' into 'develop' Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658 | 2020-06-22 08:41:09 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | c5863438ba | proper error codes for error in adminFE | 2020-06-20 13:53:57 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 02ca8a363f | default page size for files | 2020-06-19 14:46:38 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 3e3f9253e6 | adding overall count for packs and files | 2020-06-19 10:17:24 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 4975ed86bc | emoji pagination for pack show action | 2020-06-18 18:50:03 +03:00 |  |