| 
							
						 | 
						
							
							
								
							
							
	a69e128fe4
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data
							
							
							
							
							
						 | 
						
							2021-05-23 20:17:50 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	102e05124d
						 | 
						
							
							
								
								
								Changed variable type
							
							
							
							
							
						 | 
						
							2021-05-23 19:59:51 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	2d15587744
						 | 
						
							
							
								
								
								coding standards
							
							
							
							
							
						 | 
						
							2021-05-23 19:54:14 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4889687659
						 | 
						
							
							
								
								
								Set the content type at another location
							
							
							
							
							
						 | 
						
							2021-05-23 19:50:02 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	d758f58ff2
						 | 
						
							
							
								
								
								Coding standards
							
							
							
							
							
						 | 
						
							2021-05-23 19:37:31 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a0c52a8253
						 | 
						
							
							
								
								
								Added real test data
							
							
							
							
							
						 | 
						
							2021-05-23 19:34:28 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	c064a39341
						 | 
						
							
							
								
								
								Adapt tests using a content file
							
							
							
							
							
						 | 
						
							2021-05-23 20:30:27 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	a0da84b6b0
						 | 
						
							
							
								
								
								Enable testability for HTTPInputData and create a failing test for it :-)
							
							
							
							
							
						 | 
						
							2021-05-23 19:58:09 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	280d0ee961
						 | 
						
							
							
								
								
								Merge pull request #10305 from annando/warnings
							
							
							
							
							
							
							
							Fix warning "reset() expects parameter 1 to be array, null given" 
							
						 | 
						
							2021-05-23 18:43:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4ac68394c3
						 | 
						
							
							
								
								
								Fix warning "reset() expects parameter 1 to be array, null given"
							
							
							
							
							
						 | 
						
							2021-05-23 16:37:34 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	48a783c91a
						 | 
						
							
							
								
								
								Merge pull request #10300 from annando/issue-10264
							
							
							
							
							
							
							
							Issue 10264: Remote comments for visitors 
							
						 | 
						
							2021-05-23 12:00:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	0ca929dccd
						 | 
						
							
							
								
								
								Merge pull request #10304 from annando/fix-emptymissing-photos
							
							
							
							
							
							
							
							Fix missing media on posts to Mastodon 
							
						 | 
						
							2021-05-23 15:34:34 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	e2ad000273
						 | 
						
							
							
								
								
								Merge pull request #10303 from annando/issue-10232
							
							
							
							
							
							
							
							Issue 10232: Improved search for embedded media links 
							
						 | 
						
							2021-05-23 15:30:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	36c5e360f6
						 | 
						
							
							
								
								
								Fix missing media on posts to Mastodon
							
							
							
							
							
						 | 
						
							2021-05-23 13:29:25 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	b7a7ae58e9
						 | 
						
							
							
								
								
								Issue 10232: Improved search for embedded media links
							
							
							
							
							
						 | 
						
							2021-05-23 12:35:05 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	4d214bd9cb
						 | 
						
							
							
								
								
								Merge pull request #10292 from annando/fix-mail
							
							
							
							
							
							
							
							Fix inserting mails 
							
						 | 
						
							2021-05-23 07:39:00 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	0238a15809
						 | 
						
							
							
								
								
								Merge pull request #10295 from nupplaphil/bug/php7_cs
							
							
							
							
							
							
							
							Fix PHP 7.0 Coding Standards 
							
						 | 
						
							2021-05-23 07:38:38 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	050bc673aa
						 | 
						
							
							
								
								
								Issue 10264: Remote comments for visitors
							
							
							
							
							
						 | 
						
							2021-05-23 10:39:11 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	edbbaaadea
						 | 
						
							
							
								
								
								Merge pull request #10299 from annando/issue-10287
							
							
							
							
							
							
							
							Issue 10287: Make block and ignore work for the API as well 
							
						 | 
						
							2021-05-23 12:03:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	8f9033633c
						 | 
						
							
							
								
								
								Issue 10287: Make block and ignore work for the API as well
							
							
							
							
							
						 | 
						
							2021-05-23 08:56:24 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	37898776bd
						 | 
						
							
							
								
								
								Merge pull request #10297 from tobiasd/20210523-followuptest
							
							
							
							
							
							
							
							fix failing test for the installer wizard 
							
						 | 
						
							2021-05-23 09:55:00 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6ea52cfbf8
						 | 
						
							
							
								
								
								now...
							
							
							
							
							
						 | 
						
							2021-05-23 09:47:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	390fa23bce
						 | 
						
							
							
								
								
								fix failing test for the installer wizard
							
							
							
							
							
						 | 
						
							2021-05-23 09:43:02 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	03edb94447
						 | 
						
							
							
								
								
								Merge pull request #10296 from tobiasd/20210522-issue10293
							
							
							
							
							
							
							
							mention the required function in the install wizard (issue10293) 
							
						 | 
						
							2021-05-23 08:52:51 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	918f869aef
						 | 
						
							
							
								
								
								regen messages.po
							
							
							
							
							
						 | 
						
							2021-05-23 07:50:37 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	55dda47f39
						 | 
						
							
							
								
								
								Issue 10293: mention the required function in the error message
							
							
							
							
							
						 | 
						
							2021-05-23 07:50:32 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	d00a4eacdc
						 | 
						
							
							
								
								
								Update src/Model/Mail.php
							
							
							
							
							
							
							
							Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com> 
							
						 | 
						
							2021-05-23 07:37:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	965cd8b096
						 | 
						
							
							
								
								
								Fix PHP 7.0 Coding Standards
							
							
							
							
							
						 | 
						
							2021-05-22 23:47:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	fd3706b72e
						 | 
						
							
							
								
								
								Coding standards again
							
							
							
							
							
						 | 
						
							2021-05-22 20:33:26 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	684f9cdb96
						 | 
						
							
							
								
								
								Coding standards
							
							
							
							
							
						 | 
						
							2021-05-22 20:31:50 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	2c6db3ccac
						 | 
						
							
							
								
								
								Coding standards
							
							
							
							
							
						 | 
						
							2021-05-22 20:29:15 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6f44476c56
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data
							
							
							
							
							
						 | 
						
							2021-05-22 20:26:32 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c18cbe95a6
						 | 
						
							
							
								
								
								Fix inserting mails
							
							
							
							
							
						 | 
						
							2021-05-22 18:20:11 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	83cb4edc36
						 | 
						
							
							
								
								
								Merge pull request #10291 from annando/no-summary
							
							
							
							
							
							
							
							Don't create automated summaries 
							
						 | 
						
							2021-05-22 18:17:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	978b33fcd2
						 | 
						
							
							
								
								
								Merge pull request #10290 from annando/notice
							
							
							
							
							
							
							
							Fixes notice 
							
						 | 
						
							2021-05-22 18:14:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	77092157fe
						 | 
						
							
							
								
								
								Don't create automated summaries
							
							
							
							
							
						 | 
						
							2021-05-22 16:11:10 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	ede808f449
						 | 
						
							
							
								
								
								Fixes "Undefined index: upubkey" by replacing the profile load mechanism
							
							
							
							
							
						 | 
						
							2021-05-22 15:50:05 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a5c8c4d8b7
						 | 
						
							
							
								
								
								Fixes notice
							
							
							
							
							
						 | 
						
							2021-05-22 15:41:25 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	3893c6210f
						 | 
						
							
							
								
								
								Merge pull request #10288 from annando/mail-uri-id
							
							
							
							
							
							
							
							API: improved mail handling 
							
						 | 
						
							2021-05-22 16:38:42 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6fe916a390
						 | 
						
							
							
								
								
								API: improved mail handling
							
							
							
							
							
						 | 
						
							2021-05-22 13:37:04 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	3c8a08840b
						 | 
						
							
							
								
								
								Merge pull request #10286 from annando/local-contacts-tombstone
							
							
							
							
							
							
							
							Don't delete local tombstone contacts 
							
						 | 
						
							2021-05-22 06:50:07 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	93546ce93d
						 | 
						
							
							
								
								
								Merge pull request #10284 from very-ape/vier-notifications-fix
							
							
							
							
							
							
							
							[vier] Keep the introductions notification badge from claiming its own line! 
							
						 | 
						
							2021-05-22 06:47:20 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	0c21588ab9
						 | 
						
							
							
								
								
								Don't delete local tombstone contacts
							
							
							
							
							
						 | 
						
							2021-05-22 08:25:30 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	aa32abbdb4
						 | 
						
							
							
								
								
								Merge pull request #10285 from annando/revert-10280
							
							
							
							
							
							
							
							Fix for empty profile pages 
							
						 | 
						
							2021-05-22 07:47:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	9d4b29d9c0
						 | 
						
							
							
								
								
								Fix for empty profile pages
							
							
							
							
							
						 | 
						
							2021-05-22 05:34:10 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									very-ape
								
							 
						 | 
						
							
							
								
							
							
	857e14636f
						 | 
						
							
							
								
								
								Bug fix: Keep the introductions notification badge from claiming its own line!
							
							
							
							
							
						 | 
						
							2021-05-21 15:58:35 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	dccf241702
						 | 
						
							
							
								
								
								Merge pull request #10281 from annando/api-documentation
							
							
							
							
							
							
							
							New section for dummy endpoints 
							
						 | 
						
							2021-05-21 18:38:51 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	46301b7951
						 | 
						
							
							
								
								
								Changed description
							
							
							
							
							
						 | 
						
							2021-05-21 20:45:01 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	26d3f5433b
						 | 
						
							
							
								
								
								Merge pull request #10280 from very-ape/fix-message-button
							
							
							
							
							
							
							
							Fix Message button. 
							
						 | 
						
							2021-05-21 14:57:28 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									very-ape
								
							 
						 | 
						
							
							
								
							
							
	97a9ec4e40
						 | 
						
							
							
								
								
								Bug fix: last commit results in logged-in user's contacts being displayed on contact profile sidebar.
							
							
							
							
							
						 | 
						
							2021-05-21 11:38:50 -07:00 | 
						
						
							
							
							
							
								
							
							
						 |