Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	1a170c8743
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
							
							
							
							
							
							
							
							Conflicts:
	mod/contacts.php
	mod/crepair.php 
							
						 | 
						
							2015-12-03 14:38:04 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	89c5989cfb
						 | 
						
							
							
								
								
								unify hcard and vcard
							
							
							
							
							
						 | 
						
							2015-12-01 18:31:08 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	06a4b0dc5e
						 | 
						
							
							
								
								
								Header removed in the contact area
							
							
							
							
							
						 | 
						
							2015-12-01 18:21:05 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	1c93729c46
						 | 
						
							
							
								
								
								Tab is added to "all friends" and "common friends"
							
							
							
							
							
						 | 
						
							2015-12-01 08:12:05 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	42d903dd68
						 | 
						
							
							
								
								
								Redesign of the contact pages, new tab for contact statuses
							
							
							
							
							
						 | 
						
							2015-11-29 23:22:05 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	ea2b3b2f76
						 | 
						
							
							
								
								
								move html from crepair.php to template
							
							
							
							
							
						 | 
						
							2015-10-24 15:57:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	61c3ce7a21
						 | 
						
							
							
								
								
								Bugfix: The contact names had to be escaped
							
							
							
							
							
						 | 
						
							2015-10-08 00:25:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	1067718018
						 | 
						
							
							
								
								
								little revision
							
							
							
							
							
						 | 
						
							2015-05-27 12:44:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	f309f3a681
						 | 
						
							
							
								
								
								remove html and use vcard-widget.tpl
							
							
							
							
							
						 | 
						
							2015-05-26 14:32:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	64e343ed4b
						 | 
						
							
							
								
								
								Some refinement to the contact update
							
							
							
							
							
						 | 
						
							2015-04-12 10:32:02 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2c3e2908b2
						 | 
						
							
							
								
								
								There is now a new possibility to update contact data.
							
							
							
							
							
						 | 
						
							2015-04-11 23:51:47 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	59517f6e58
						 | 
						
							
							
								
								
								Remote self is now working for diaspora contacts as well.
							
							
							
							
							
						 | 
						
							2014-10-29 01:42:43 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	3e57954807
						 | 
						
							
							
								
								
								remote-self: Moved the code in a single function and cleaned it up.
							
							
							
							
							
						 | 
						
							2014-10-29 01:05:09 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	f6522658f6
						 | 
						
							
							
								
								
								Using "remote self" to synchronize Frandiaca accounts
							
							
							
							
							
						 | 
						
							2014-10-22 08:30:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c8482ae19e
						 | 
						
							
							
								
								
								Bugfix: When repairing the url, the nurl wasn't set.
							
							
							
							
							
						 | 
						
							2014-09-11 23:37:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	3b6c6d0cd9
						 | 
						
							
							
								
								
								Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it.
							
							
							
							
							
						 | 
						
							2014-09-06 17:22:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e35c55dd3b
						 | 
						
							
							
								
								
								Remote-self: It is now possible to chose between two different modes of mirroring.
							
							
							
							
							
						 | 
						
							2014-09-01 14:00:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6e7bd68ebb
						 | 
						
							
							
								
								
								More "LIMIT 1" removed - and some other SQL improvements.
							
							
							
							
							
						 | 
						
							2014-03-11 23:52:32 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	8eedebfee3
						 | 
						
							
							
								
								
								Cleaning up some changes from the merge
							
							
							
							
							
						 | 
						
							2014-01-05 16:28:42 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	aed28a24f1
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	mod/crepair.php 
							
						 | 
						
							2014-01-05 16:22:42 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	28df35052a
						 | 
						
							
							
								
								
								Send notifications for each new post of a contact, option for creating a summary for a feed post
							
							
							
							
							
						 | 
						
							2014-01-05 16:10:02 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	25d83f780d
						 | 
						
							
							
								
								
								only show the remote_self option if admin allows it
							
							
							
							
							
						 | 
						
							2013-12-22 19:30:09 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	f515def280
						 | 
						
							
							
								
								
								added remote_self as option to the contact repair dislog
							
							
							
							
							
						 | 
						
							2013-12-22 17:05:49 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	e684324032
						 | 
						
							
							
								
								
								use explicit include paths
							
							
							
							
							
						 | 
						
							2012-12-28 14:51:50 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Kampmann
								
							 
						 | 
						
							
							
								
							
							
	355c42cb30
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/friendica/friendica
							
							
							
							
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 | 
						
							2012-04-05 13:39:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	8aa2552372
						 | 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
							
							
							
							
							
						 | 
						
							2012-01-18 16:21:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	df14d7abc4
						 | 
						
							
							
								
								
								allow crepair to change name - as long as it isn't blank
							
							
							
							
							
						 | 
						
							2012-01-12 18:54:35 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	15f2ce5459
						 | 
						
							
							
								
								
								contact edit updates
							
							
							
							
							
						 | 
						
							2011-11-09 19:30:14 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ecd714ae54
						 | 
						
							
							
								
								
								provide ability to repair contact photo
							
							
							
							
							
						 | 
						
							2011-10-05 20:01:42 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	7e8100d2cd
						 | 
						
							
							
								
								
								custom attags
							
							
							
							
							
						 | 
						
							2011-09-04 22:40:36 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	e1107b55c6
						 | 
						
							
							
								
								
								add info() function. Works like notice() but show messages in a div with class info-message.
							
							
							
							
							
							
							
							update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes 
							
						 | 
						
							2011-05-23 11:39:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	b2e92e0af3
						 | 
						
							
							
								
								
								deprecate load_view_file
							
							
							
							
							
						 | 
						
							2011-05-11 04:37:13 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c052d68828
						 | 
						
							
							
								
								
								don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
							
							
							
							
							
						 | 
						
							2011-05-10 16:12:50 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	974077c06c
						 | 
						
							
							
								
								
								contact "repair/relocate URL" tool
							
							
							
							
							
						 | 
						
							2011-04-13 20:14:30 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |