lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aae669d05e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/webpush-and-emojireact' into 'develop'  
							
							 
							
							... 
							
							
							
							Push notifications: add pleroma:emoji_reaction, improve tests
Closes  #2185 
See merge request pleroma/pleroma!3141  
							
						 
						
							2020-11-18 18:33:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								80e21903d4 
								
							 
						 
						
							
							
								
								Spelling  
							
							 
							
							
							
						 
						
							2020-11-17 20:20:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1433d3c59c 
								
							 
						 
						
							
							
								
								Document the API extensions for push subscriptions  
							
							 
							
							
							
						 
						
							2020-11-17 20:20:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e6d4d62f85 
								
							 
						 
						
							
							
								
								Docs: Add info about frontend install error response  
							
							 
							
							
							
						 
						
							2020-11-17 16:44:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f69fe36ebf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into frontend-admin-api  
							
							 
							
							
							
						 
						
							2020-11-17 18:34:04 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fec1ed802e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope  
							
							 
							
							
							
						 
						
							2020-11-17 15:01:38 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								70e4b86250 
								
							 
						 
						
							
							
								
								Make notifs view work for reports  
							
							 
							
							... 
							
							
							
							* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet) 
							
						 
						
							2020-11-13 13:35:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								81145ecdf5 
								
							 
						 
						
							
							
								
								Fix markdown  
							
							 
							
							
							
						 
						
							2020-11-11 20:42:05 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d26a449396 
								
							 
						 
						
							
							
								
								Change endpoint path  
							
							 
							
							
							
						 
						
							2020-11-11 20:39:57 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								08cbd655d1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into frontend-admin-api  
							
							 
							
							
							
						 
						
							2020-11-11 19:53:40 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0118ccb53c 
								
							 
						 
						
							
							
								
								Add local visibility  
							
							 
							
							
							
						 
						
							2020-11-11 18:54:01 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9b2ed14277 
								
							 
						 
						
							
							
								
								Docs: Add info about expiring mutes.  
							
							 
							
							
							
						 
						
							2020-11-05 13:23:58 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								329aa19c9f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain  
							
							 
							
							
							
						 
						
							2020-11-04 15:05:01 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ca95cbe0b4 
								
							 
						 
						
							
							
								
								Add with_muted param to ChatController.index/2  
							
							 
							
							
							
						 
						
							2020-11-04 16:40:12 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c7bcbfbc1d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope  
							
							 
							
							
							
						 
						
							2020-11-04 11:47:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								6163fbf553 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'frontend-admin-api'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/router.ex 
							
						 
						
							2020-11-02 10:43:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								38b481d112 
								
							 
						 
						
							
							
								
								Merge branch 'feature/account-export' into 'develop'  
							
							 
							
							... 
							
							
							
							Add account export
Closes  #847 
See merge request pleroma/pleroma!2918  
							
						 
						
							2020-10-31 17:03:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								8e41baff40 
								
							 
						 
						
							
							
								
								Add idempotency_key to the chat_message entity.  
							
							 
							
							
							
						 
						
							2020-10-31 05:50:59 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2113428c0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into feature/account-export  
							
							 
							
							
							
						 
						
							2020-10-30 19:34:02 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								1cc8e94506 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/local-only-scope'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-10-30 11:18:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								1cce1bd729 
								
							 
						 
						
							
							
								
								Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'  
							
							 
							
							... 
							
							
							
							[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016  
							
						 
						
							2020-10-29 21:06:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								75d131ba18 
								
							 
						 
						
							
							
								
								Add documentation and update CHANGELOG  
							
							 
							
							
							
						 
						
							2020-10-29 16:37:51 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								1bfd8528bb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/local-only-scope'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-10-27 18:59:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								291189357b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/account-export  
							
							 
							
							
							
						 
						
							2020-10-27 12:54:33 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								51189ad365 
								
							 
						 
						
							
							
								
								update docs  
							
							 
							
							
							
						 
						
							2020-10-22 11:53:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								524fb0e4c2 
								
							 
						 
						
							
							
								
								[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.  
							
							 
							
							... 
							
							
							
							Added tests and documentation. 
							
						 
						
							2020-10-18 21:22:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f79bbbc31 
								
							 
						 
						
							
							
								
								Add local-only statuses  
							
							 
							
							
							
						 
						
							2020-10-15 18:37:44 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9c672ecbb5 
								
							 
						 
						
							
							
								
								Remote Timeline: add Streaming support  
							
							 
							
							
							
						 
						
							2020-10-08 20:07:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d5f02a1da 
								
							 
						 
						
							
							
								
								Fix API documentation  
							
							 
							
							
							
						 
						
							2020-10-07 18:35:28 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								17562bf414 
								
							 
						 
						
							
							
								
								Move API endpoints to /api/v1/pleroma/backups  
							
							 
							
							
							
						 
						
							2020-10-07 18:35:27 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								386199063b 
								
							 
						 
						
							
							
								
								Document /api/pleroma/backups API endpoint  
							
							 
							
							
							
						 
						
							2020-10-07 18:34:30 +04: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 force option 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 sender and recipient fields  
							
							 
							
							
							
						 
						
							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