| 
							
						 | 
						
							
							
								
							
							
	d53ff9c34d
						 | 
						
							
							
								
								
								Add support for FULLTEXT indices in Database\DBStructure
							
							
							
							
							
						 | 
						
							2018-12-23 15:40:49 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	21783f61b4
						 | 
						
							
							
								
								
								[Composer] Add ext-curl dependency
							
							
							
							
							
						 | 
						
							2018-12-23 15:32:38 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	48a356dba2
						 | 
						
							
							
								
								
								Fix formatting in Database\DBStructure
							
							
							
							
							
						 | 
						
							2018-12-23 15:32:23 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	d7d685ad6b
						 | 
						
							
							
								
								
								Merge pull request #6311 from annando/issue-6308
							
							
							
							
							
							
							
							Issue 6308 - and again ... 
							
						 | 
						
							2018-12-22 18:15:52 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	2af0542eaa
						 | 
						
							
							
								
								
								Merge pull request #6310 from annando/issue-6122
							
							
							
							
							
							
							
							Handles issue 6122 - the self contact will be updated when invalid 
							
						 | 
						
							2018-12-22 18:15:02 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	f19f67add5
						 | 
						
							
							
								
								
								Issue 6308 - and again ...
							
							
							
							
							
						 | 
						
							2018-12-22 20:25:23 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	faa30adf68
						 | 
						
							
							
								
								
								Handles issue 6122 - the self contact will be updated when it seems to be invalid
							
							
							
							
							
						 | 
						
							2018-12-22 20:12:32 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	1c2e5ae708
						 | 
						
							
							
								
								
								Merge pull request #6306 from annando/curl-fix
							
							
							
							
							
							
							
							The curl result is an object, not an array 
							
						 | 
						
							2018-12-22 14:35:30 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	6f8c9a08a1
						 | 
						
							
							
								
								
								Merge pull request #6304 from JeroenED/bugfix/utzer-bug
							
							
							
							
							
							
							
							Fixed bug reported by Utzer 
							
						 | 
						
							2018-12-22 18:03:56 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c06f7ad11e
						 | 
						
							
							
								
								
								The curl result is an object, not an array
							
							
							
							
							
						 | 
						
							2018-12-22 17:00:28 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	2d9f4b560f
						 | 
						
							
							
								
								
								Too fast
							
							
							
							
							
						 | 
						
							2018-12-22 17:23:18 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	27eddfee27
						 | 
						
							
							
								
								
								Fixed bug
							
							
							
							
							
							
							
							$curlResult is not an array 
							
						 | 
						
							2018-12-22 17:19:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	92214b8867
						 | 
						
							
							
								
								
								Merge pull request #6302 from annando/issue-6300
							
							
							
							
							
							
							
							Isse 6300: And again templates ... 
							
						 | 
						
							2018-12-21 19:04:45 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	5fb7c3aebc
						 | 
						
							
							
								
								
								Merge pull request #6301 from annando/api-repeat
							
							
							
							
							
							
							
							API: Fix author of repeated items from Diaspora 
							
						 | 
						
							2018-12-21 19:02:53 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	97d278109d
						 | 
						
							
							
								
								
								Merge pull request #6299 from annando/issue-6296
							
							
							
							
							
							
							
							Issue 6296 - and again templates 
							
						 | 
						
							2018-12-21 19:02:06 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	6d4412ffea
						 | 
						
							
							
								
								
								Merge pull request #6298 from annando/issue-6297
							
							
							
							
							
							
							
							Issue 6297 - and again template stuff 
							
						 | 
						
							2018-12-21 19:01:17 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	3f4cead189
						 | 
						
							
							
								
								
								Isse 6300: And again templates ...
							
							
							
							
							
						 | 
						
							2018-12-21 23:02:43 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1f432d006b
						 | 
						
							
							
								
								
								API: Fix author of repeated items from Diaspora
							
							
							
							
							
						 | 
						
							2018-12-21 22:55:36 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	68f3ae5020
						 | 
						
							
							
								
								
								Issue 6296 - and again templates
							
							
							
							
							
						 | 
						
							2018-12-21 22:01:28 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4a633527d2
						 | 
						
							
							
								
								
								And some more templates
							
							
							
							
							
						 | 
						
							2018-12-21 21:50:18 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	768ad3cfd9
						 | 
						
							
							
								
								
								Issue 6297 - and again template stuff
							
							
							
							
							
						 | 
						
							2018-12-21 21:44:54 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	1cab44827f
						 | 
						
							
							
								
								
								Merge pull request #6280 from MrPetovan/bug/4738-fix-message-list-query
							
							
							
							
							
							
							
							Fix message list query 
							
						 | 
						
							2018-12-21 22:17:20 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	ef2b08c0c4
						 | 
						
							
							
								
								
								Merge pull request #6295 from annando/issue-6294
							
							
							
							
							
							
							
							Issue 6294: Fix templates 
							
						 | 
						
							2018-12-21 16:13:52 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	7c845dafc5
						 | 
						
							
							
								
								
								Issue 6294: Fix templates
							
							
							
							
							
						 | 
						
							2018-12-21 21:09:34 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	00e9a6fd85
						 | 
						
							
							
								
								
								Merge pull request #6290 from annando/issue-6289
							
							
							
							
							
							
							
							Fixes issue 6289 
							
						 | 
						
							2018-12-21 08:52:10 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	80ea1ea51f
						 | 
						
							
							
								
								
								This template change had been missing
							
							
							
							
							
						 | 
						
							2018-12-21 13:48:48 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	fd7c47ed55
						 | 
						
							
							
								
								
								Fixes issue 6289
							
							
							
							
							
						 | 
						
							2018-12-21 13:43:06 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	5019bcb5b8
						 | 
						
							
							
								
								
								Merge pull request #6286 from annando/fix-about
							
							
							
							
							
							
							
							Some more stuff to unescape 
							
						 | 
						
							2018-12-21 01:21:56 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	bd356a4149
						 | 
						
							
							
								
								
								Unescape tags
							
							
							
							
							
						 | 
						
							2018-12-21 06:15:22 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	f31ca8a818
						 | 
						
							
							
								
								
								Some more stuff to unescape
							
							
							
							
							
						 | 
						
							2018-12-21 05:26:29 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	be6031aa1b
						 | 
						
							
							
								
								
								Merge pull request #6285 from MrPetovan/task/6208-escape-html-true
							
							
							
							
							
							
							
							Smarty escaping fixes, AlfredSK edition 
							
						 | 
						
							2018-12-21 06:23:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	2776b1443b
						 | 
						
							
							
								
								
								Fix post location escaping
							
							
							
							
							
						 | 
						
							2018-12-21 00:06:37 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6b481aaac6
						 | 
						
							
							
								
								
								Fix advanced profile fields escaping
							
							
							
							
							
						 | 
						
							2018-12-21 00:06:22 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c8b6778cde
						 | 
						
							
							
								
								
								Fix home escaping
							
							
							
							
							
						 | 
						
							2018-12-21 00:05:55 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	989bfb53b1
						 | 
						
							
							
								
								
								Fix install escaping
							
							
							
							
							
						 | 
						
							2018-12-21 00:05:31 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1c58363696
						 | 
						
							
							
								
								
								Remove unused/empty template variables in register
							
							
							
							
							
						 | 
						
							2018-12-20 23:59:15 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	fdb41cbb71
						 | 
						
							
							
								
								
								Merge pull request #6284 from annando/fix-about
							
							
							
							
							
							
							
							Fixing templates - unescaping it again 
							
						 | 
						
							2018-12-20 17:45:39 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c7a636fe18
						 | 
						
							
							
								
								
								Fixing templates - unescaping it again
							
							
							
							
							
						 | 
						
							2018-12-20 21:57:53 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	0fe8b849bb
						 | 
						
							
							
								
								
								Merge pull request #6262 from MrPetovan/task/6208-escape-html-true
							
							
							
							
							
							
							
							Smarty: Add default HTML escaping to template variables 
							
						 | 
						
							2018-12-20 20:27:25 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	66bf39216b
						 | 
						
							
							
								
								
								Remove unreliable ANY_VALUE from message list query
							
							
							
							
							
						 | 
						
							2018-12-19 06:41:08 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c7abb1d82b
						 | 
						
							
							
								
								
								Remove unused template variable $tabcontent in mail_head.tpl
							
							
							
							
							
						 | 
						
							2018-12-19 06:39:36 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a01bdbbe2d
						 | 
						
							
							
								
								
								Fix wrong merge + nofilter in contact_edit
							
							
							
							
							
						 | 
						
							2018-12-18 08:39:26 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	21a055f670
						 | 
						
							
							
								
								
								Merge branch '2018.12-rc' into task/6208-escape-html-true
							
							
							
							
							
						 | 
						
							2018-12-18 08:36:36 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	091193ad64
						 | 
						
							
							
								
								
								Merge pull request #6278 from annando/fix-contact-edit
							
							
							
							
							
							
							
							Fix: Contacts can now be edited again 
							
						 | 
						
							2018-12-18 08:02:49 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	99e69e30a3
						 | 
						
							
							
								
								
								Fix: Contacts can now be edited again
							
							
							
							
							
						 | 
						
							2018-12-18 06:52:09 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	9aee4cb174
						 | 
						
							
							
								
								
								Merge pull request #6251 from JonnyTischbein/issue_bg_for_pages
							
							
							
							
							
							
							
							[frio] Background wrapper + bootstrap buttons for newmember, un/follow 
							
						 | 
						
							2018-12-17 23:26:43 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonny Tischbein
								
							 
						 | 
						
							
							
								
							
							
	5d81738034
						 | 
						
							
							
								
								
								Add page-wrapper for probe + webfinder
							
							
							
							
							
						 | 
						
							2018-12-17 23:15:14 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonny Tischbein
								
							 
						 | 
						
							
							
								
							
							
	dc7e6edca9
						 | 
						
							
							
								
								
								Add page-wrapper to oauth/edit in frio
							
							
							
							
							
						 | 
						
							2018-12-17 23:09:08 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonny Tischbein
								
							 
						 | 
						
							
							
								
							
							
	443210b4f0
						 | 
						
							
							
								
								
								move templates to frio theme
							
							
							
							
							
						 | 
						
							2018-12-17 23:09:08 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonny Tischbein
								
							 
						 | 
						
							
							
								
							
							
	58067cdfbf
						 | 
						
							
							
								
								
								Add generic content wrapper + frio btn primary buttons class to newmemeber, unfollow, follow (auto + dfrn)
							
							
							
							
							
						 | 
						
							2018-12-17 23:09:08 +01:00 | 
						
						
							
							
							
							
								
							
							
						 |