| 
							
						 | 
						
							
							
								
							
							
	9ba3ee13a8
						 | 
						
							
							
								
								
								Use an insert to avoid duplicates and for analyzing
							
							
							
							
							
						 | 
						
							2019-07-14 10:22:19 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5bba0e7d39
						 | 
						
							
							
								
								
								Hopefully avoiding duplicated relay entries
							
							
							
							
							
						 | 
						
							2019-07-13 23:53:15 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	2df17fc0c0
						 | 
						
							
							
								
								
								Fix SQL problem with "not null"
							
							
							
							
							
						 | 
						
							2019-07-13 07:39:53 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	002963f198
						 | 
						
							
							
								
								
								Fix wrong variable
							
							
							
							
							
						 | 
						
							2019-07-13 07:29:56 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	9b8396620b
						 | 
						
							
							
								
								
								Fix duplicated contacts due to relay probing
							
							
							
							
							
						 | 
						
							2019-07-13 07:25:01 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	7dfadf7e7e
						 | 
						
							
							
								
								
								Simplify the contact update in "getIdForURL"
							
							
							
							
							
						 | 
						
							2019-07-12 21:07:47 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c34204cf50
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into contact-update
							
							
							
							
							
						 | 
						
							2019-07-12 20:51:27 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	b56709d802
						 | 
						
							
							
								
								
								Merge pull request #7358 from nupplaphil/bug/installer_db
							
							
							
							
							
							
							
							Bugfixing DB/Installer (Simplify Config Part 1) 
							
						 | 
						
							2019-07-12 16:48:17 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	8cbdc7939e
						 | 
						
							
							
								
								
								Fetch more comtact data from probing, remove duplicated contacts
							
							
							
							
							
						 | 
						
							2019-07-12 14:55:23 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Philipp
								
							 
						 | 
						
							
							
								
							
							
	
	
	108f15a94e
						 | 
						
							
							
								
								
								Merge pull request #7368 from annando/fix-switch
							
							
							
							
							
							
							
							Use standard function to update the contact to avoid SQL errors 
							
						 | 
						
							2019-07-12 07:24:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	807d2665ea
						 | 
						
							
							
								
								
								Use standard function to update the contact to avoid SQL errors
							
							
							
							
							
						 | 
						
							2019-07-11 22:11:51 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Philipp Holzer
								
							 
						 | 
						
							
							
								
							
							
	
	
	d533e819e2
						 | 
						
							
							
								
								
								temporary deactivate console installation tests due complex mocking situation.
							
							
							
							
							
						 | 
						
							2019-07-10 22:33:26 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	a06de3127f
						 | 
						
							
							
								
								
								Merge pull request #7361 from JeroenED/bugfix/frio-header-color-php
							
							
							
							
							
							
							
							[FRIO] fixing chromium mobile navbar color when not logged in 
							
						 | 
						
							2019-07-10 11:16:18 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	4ccc8b87b5
						 | 
						
							
							
								
								
								Code style
							
							
							
							
							
						 | 
						
							2019-07-10 16:54:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	9b7b718b43
						 | 
						
							
							
								
								
								Using global $nav_bg if undefined
							
							
							
							
							
						 | 
						
							2019-07-10 16:51:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Philipp
								
							 
						 | 
						
							
							
								
							
							
	
	
	1b2b2259b1
						 | 
						
							
							
								
								
								Merge pull request #7360 from annando/fix-fatal
							
							
							
							
							
							
							
							Fix fatal error with incomplete contact data upon delivery 
							
						 | 
						
							2019-07-10 08:39:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6b25fd5b2f
						 | 
						
							
							
								
								
								added logging
							
							
							
							
							
						 | 
						
							2019-07-10 05:19:54 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	54d96da94a
						 | 
						
							
							
								
								
								Fix fatal error with incomplete contact data upon delivery
							
							
							
							
							
						 | 
						
							2019-07-10 05:16:50 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Philipp Holzer
								
							 
						 | 
						
							
							
								
							
							
	
	
	e1d135238a
						 | 
						
							
							
								
								
								Revert default password setting & using "HiddenString" even for empty strings
							
							
							
							
							
						 | 
						
							2019-07-09 22:38:54 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Philipp Holzer
								
							 
						 | 
						
							
							
								
							
							
	
	
	ab7c6499ff
						 | 
						
							
							
								
								
								Bugfixing DB/Installer
							
							
							
							
							
							
							
							- default value with HiddenString
- Fixing checkDB during installation 
							
						 | 
						
							2019-07-09 22:22:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	1f42f51351
						 | 
						
							
							
								
								
								Merge pull request #7355 from JeroenED/task/relationship-status2/no-dead-nodes
							
							
							
							
							
							
							
							Changed unavailable to in a relation (Resubmit) 
							
						 | 
						
							2019-07-09 08:00:59 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	0328e930af
						 | 
						
							
							
								
								
								Merge pull request #7354 from annando/toplevel-hashtag
							
							
							
							
							
							
							
							Only fetch toplevel posts when searching for hashtags on network page 
							
						 | 
						
							2019-07-09 08:00:04 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	01dc0c031c
						 | 
						
							
							
								
								
								There are no dead nodes anymore
							
							
							
							
							
						 | 
						
							2019-07-09 09:23:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5d5a10fb9c
						 | 
						
							
							
								
								
								Only fetch toplevel posts when searching for hashtags on network page
							
							
							
							
							
						 | 
						
							2019-07-09 05:20:34 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Philipp
								
							 
						 | 
						
							
							
								
							
							
	
	
	5accf11c8d
						 | 
						
							
							
								
								
								Merge pull request #7349 from MrPetovan/bug/fatal-errors
							
							
							
							
							
							
							
							Rewrite conditions for photo linked item to prevent crash on old photos 
							
						 | 
						
							2019-07-09 07:14:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	949b5c4111
						 | 
						
							
							
								
								
								Merge pull request #7353 from friendica/revert-7347-task/relationship-status
							
							
							
							
							
							
							
							Revert "Changed unavailable to in a relation" 
							
						 | 
						
							2019-07-08 16:10:55 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	fe8a53425a
						 | 
						
							
							
								
								
								Revert "Changed unavailable to in a relation"
							
							
							
							
							
						 | 
						
							2019-07-08 15:55:08 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	8e2d1fad17
						 | 
						
							
							
								
								
								Merge pull request #7347 from JeroenED/task/relationship-status
							
							
							
							
							
							
							
							Changed unavailable to in a relation 
							
						 | 
						
							2019-07-08 13:02:36 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	e5a29cf979
						 | 
						
							
							
								
								
								Merge pull request #7352 from annando/ap-probe
							
							
							
							
							
							
							
							Add ActivityPub related fields to the "uri" function 
							
						 | 
						
							2019-07-08 13:00:56 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	d1435bef61
						 | 
						
							
							
								
								
								Add ActivityPub related fields to the "uri" function
							
							
							
							
							
						 | 
						
							2019-07-08 12:00:11 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	0b2f5be1c0
						 | 
						
							
							
								
								
								code style
							
							
							
							
							
						 | 
						
							2019-07-08 09:35:32 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	9af20096a3
						 | 
						
							
							
								
								
								Added return Update::Success
							
							
							
							
							
						 | 
						
							2019-07-08 09:34:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	98b6764bfd
						 | 
						
							
							
								
								
								Fixed DB_UPDATE_VERSION in database.sql
							
							
							
							
							
							
							
							thanks @nupplaphil 
							
						 | 
						
							2019-07-08 08:11:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	6811ee5d16
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'friendica.github.com/develop' into task/relationship-status
							
							
							
							
							
						 | 
						
							2019-07-08 07:48:07 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	898fd0353b
						 | 
						
							
							
								
								
								Updated DB_UPDATE_VERSION
							
							
							
							
							
							
							
							request by mrpetovan 
							
						 | 
						
							2019-07-08 07:45:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	b124c414dc
						 | 
						
							
							
								
								
								Rewrite conditions for photo linked item to prevent crash on old photos
							
							
							
							
							
							
							
							- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-509064260 
							
						 | 
						
							2019-07-07 23:51:23 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De meerleer
								
							 
						 | 
						
							
							
								
							
							
	e33733f297
						 | 
						
							
							
								
								
								not needed update contacts as marital status is not there
							
							
							
							
							
						 | 
						
							2019-07-08 00:00:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	8146ff1505
						 | 
						
							
							
								
								
								Merge pull request #7348 from annando/item-received
							
							
							
							
							
							
							
							Use "received" instead of "created" for sorting items 
							
						 | 
						
							2019-07-07 17:57:45 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6bb418c5a7
						 | 
						
							
							
								
								
								Use "received" instead of "created" when displaying posts in creation order
							
							
							
							
							
						 | 
						
							2019-07-07 21:30:33 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	884638c093
						 | 
						
							
							
								
								
								Whoops
							
							
							
							
							
						 | 
						
							2019-07-07 23:14:03 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De Meerleer
								
							 
						 | 
						
							
							
								
							
							
	9c8051ef64
						 | 
						
							
							
								
								
								Created updatescript
							
							
							
							
							
						 | 
						
							2019-07-07 23:10:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jeroen De meerleer
								
							 
						 | 
						
							
							
								
							
							
	dea0bfd01f
						 | 
						
							
							
								
								
								changed unavailable to In a relation, deleted available
							
							
							
							
							
						 | 
						
							2019-07-07 22:51:05 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	9b8b2b36cd
						 | 
						
							
							
								
								
								Merge pull request #7339 from annando/gcontact-update
							
							
							
							
							
							
							
							Restructured Contact/GContact handling 
							
						 | 
						
							2019-07-07 13:28:20 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	0d27d410b0
						 | 
						
							
							
								
								
								Merge pull request #7343 from MrPetovan/bug/notices
							
							
							
							
							
							
							
							Various small fixes 
							
						 | 
						
							2019-07-06 08:19:42 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	e6ac576903
						 | 
						
							
							
								
								
								Merge pull request #7342 from MrPetovan/bug/fatal-errors
							
							
							
							
							
							
							
							Ensure $link_item variable type when calling get_responses() in mod/photos 
							
						 | 
						
							2019-07-06 08:16:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a58e90fa12
						 | 
						
							
							
								
								
								Display correct total blocked contact count in accordion header
							
							
							
							
							
						 | 
						
							2019-07-05 13:42:22 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	27c7d233ac
						 | 
						
							
							
								
								
								[frio] Add expected "none.png" background image
							
							
							
							
							
						 | 
						
							2019-07-05 13:41:48 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	f92752c9b4
						 | 
						
							
							
								
								
								Ensure $link_item variable type when calling get_responses() in mod/photos
							
							
							
							
							
							
							
							- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-508622668 
							
						 | 
						
							2019-07-05 13:40:33 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	dda86f6dfc
						 | 
						
							
							
								
								
								Basepath function now uses the contact field
							
							
							
							
							
						 | 
						
							2019-07-05 06:41:48 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	be0a102333
						 | 
						
							
							
								
								
								Simplified the Contact update
							
							
							
							
							
						 | 
						
							2019-07-04 21:19:23 +00:00 | 
						
						
							
							
							
							
								
							
							
						 |