friendica
								
							 
						 | 
						
							
							
								
							
							
	5d10672fb8
						 | 
						
							
							
								
								
								fix join group notifications
							
							
							
							
							
						 | 
						
							2012-04-30 04:11:42 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	ecc4962bd1
						 | 
						
							
							
								
								
								pass zrl to dfrn_request as fallback
							
							
							
							
							
						 | 
						
							2012-04-27 16:23:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f265863435
						 | 
						
							
							
								
								
								more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips
							
							
							
							
							
						 | 
						
							2012-04-23 18:28:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	8f0f644295
						 | 
						
							
							
								
								
								protect jappixmini/proxy from typo check, more work on email2 connector
							
							
							
							
							
						 | 
						
							2012-04-23 05:16:57 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	19b636e7e8
						 | 
						
							
							
								
								
								more backend work on mail2 followers
							
							
							
							
							
						 | 
						
							2012-04-10 19:15:52 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	de3b9e9584
						 | 
						
							
							
								
								
								send zrl after dfrn_request homecoming for manual entries
							
							
							
							
							
						 | 
						
							2012-04-08 17:28:36 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Willingham
								
							 
						 | 
						
							
							
								
							
							
	d0ddd380e7
						 | 
						
							
							
								
								
								Moved Diaspora notes away from top, per user request
							
							
							
							
							
						 | 
						
							2012-04-02 00:18:03 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	b06c5983a4
						 | 
						
							
							
								
								
								don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
							
							
							
							
							
						 | 
						
							2012-03-14 21:58:54 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	427362c324
						 | 
						
							
							
								
								
								Merge branch 'pull'
							
							
							
							
							
						 | 
						
							2012-03-13 15:41:13 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	dc84da520d
						 | 
						
							
							
								
								
								invite potential connectees to the free social web
							
							
							
							
							
						 | 
						
							2012-03-13 15:40:16 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tobias Hößl
								
							 
						 | 
						
							
							
								
							
							
	36a1a43f06
						 | 
						
							
							
								
								
								Avoid notices
							
							
							
							
							
						 | 
						
							2012-02-28 13:42:12 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Abinoam P. Marques Jr
								
							 
						 | 
						
							
							
								
							
							
	12a8796854
						 | 
						
							
							
								
								
								mod/dfrn_request.php and templates - Friendika -> Friendica
							
							
							
							
							
						 | 
						
							2012-02-20 19:38:43 -03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	1b9c03f6fc
						 | 
						
							
							
								
								
								new notifications - implement storage
							
							
							
							
							
						 | 
						
							2012-02-18 02:57:42 -08: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
								
							 
						 | 
						
							
							
								
							
							
	fc7d0360bb
						 | 
						
							
							
								
								
								add verb and item to notifications to aid in localisation
							
							
							
							
							
						 | 
						
							2012-01-03 20:26:20 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	5c7df6e964
						 | 
						
							
							
								
								
								notify_intro
							
							
							
							
							
						 | 
						
							2011-12-26 15:47:40 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	cbdc667ba2
						 | 
						
							
							
								
								
								separate dfrn introductions from email when it comes to expiration of blocked requests
							
							
							
							
							
						 | 
						
							2011-12-11 23:33:56 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	573670fa0c
						 | 
						
							
							
								
								
								more social graph stuff
							
							
							
							
							
						 | 
						
							2011-11-01 16:08:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d4644d7339
						 | 
						
							
							
								
								
								name change continued, social graph tools and stuctures, fix for spanish province name
							
							
							
							
							
						 | 
						
							2011-10-31 20:39:04 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	a5125359d8
						 | 
						
							
							
								
								
								faster friend requests (DFRN)
							
							
							
							
							
						 | 
						
							2011-09-06 18:06:19 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	e921b97a7f
						 | 
						
							
							
								
								
								bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings
							
							
							
							
							
						 | 
						
							2011-09-05 18:34:30 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	bc5935061b
						 | 
						
							
							
								
								
								dfrn friendship issue
							
							
							
							
							
						 | 
						
							2011-08-18 16:47:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	48ffa880f0
						 | 
						
							
							
								
								
								cleanup
							
							
							
							
							
						 | 
						
							2011-08-07 16:15:54 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	2637831d90
						 | 
						
							
							
								
								
								some more zot changes migrating back to f9a mainline
							
							
							
							
							
						 | 
						
							2011-08-01 21:02:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	df8ac668b8
						 | 
						
							
							
								
								
								more calendar work, undo strict_privacy flag to use different approach
							
							
							
							
							
						 | 
						
							2011-06-08 21:06:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c0094aa4f8
						 | 
						
							
							
								
								
								strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues
							
							
							
							
							
						 | 
						
							2011-06-06 16:26:11 -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
								
							 
						 | 
						
							
							
								
							
							
	639d52ec18
						 | 
						
							
							
								
								
								block_public should also block the contacts page and 'Connect' page if not logged in
							
							
							
							
							
						 | 
						
							2011-04-21 19:12:22 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	44c47f118c
						 | 
						
							
							
								
								
								"profile locator/address" is now called "Identity Address" to reduce confusion
							
							
							
							
							
						 | 
						
							2011-04-14 20:37:42 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	de131c9e58
						 | 
						
							
							
								
								
								set utf-8 on all emails
							
							
							
							
							
						 | 
						
							2011-04-14 17:13:13 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4043ede080
						 | 
						
							
							
								
								
								more templates
							
							
							
							
							
						 | 
						
							2011-04-06 23:03:54 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	0fe997490d
						 | 
						
							
							
								
								
								dfrn remote profile protocol revision
							
							
							
							
							
						 | 
						
							2011-03-30 15:04:18 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	04cd865cc9
						 | 
						
							
							
								
								
								placeholder arg in dfrn conversations
							
							
							
							
							
						 | 
						
							2011-03-30 04:20:40 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	f198c5cff8
						 | 
						
							
							
								
								
								secure profile failure
							
							
							
							
							
						 | 
						
							2011-03-30 04:07:47 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	a7af6df962
						 | 
						
							
							
								
								
								Fix spaces around t() and tt()
							
							
							
							
							
						 | 
						
							2011-03-13 13:50:44 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	9f7878057f
						 | 
						
							
							
								
								
								update source strings
							
							
							
							
							
						 | 
						
							2011-03-11 00:22:21 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	a80ab19483
						 | 
						
							
							
								
								
								typo
							
							
							
							
							
						 | 
						
							2011-01-22 02:51:31 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d347026094
						 | 
						
							
							
								
								
								don't urlencode $_GET vars
							
							
							
							
							
						 | 
						
							2011-01-21 05:21:13 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	0147520e90
						 | 
						
							
							
								
								
								add contact edit hooks
							
							
							
							
							
						 | 
						
							2011-01-07 03:15:52 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ffbdad7041
						 | 
						
							
							
								
								
								friend request homecoming - ensure login redirects back to confirmation page,
							
							
							
							
							
							
							
							prune old introductions that remain blocked over 30 minutes. 
							
						 | 
						
							2011-01-07 02:57:26 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	502d59089b
						 | 
						
							
							
								
								
								schema typo
							
							
							
							
							
						 | 
						
							2011-01-06 23:41:14 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d8985b3a54
						 | 
						
							
							
								
								
								try to auto-fill the profile address if we actually do know it.
							
							
							
							
							
						 | 
						
							2011-01-01 13:12:31 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	294dc27e17
						 | 
						
							
							
								
								
								double profile image on friend requests
							
							
							
							
							
						 | 
						
							2010-12-22 17:27:14 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	878067101f
						 | 
						
							
							
								
								
								block connection/friend request spam
							
							
							
							
							
						 | 
						
							2010-12-20 00:27:00 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	70f4f172dc
						 | 
						
							
							
								
								
								pull strings from connection request templates
							
							
							
							
							
						 | 
						
							2010-12-16 19:38:52 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	83939f1541
						 | 
						
							
							
								
								
								clean up comments
							
							
							
							
							
						 | 
						
							2010-12-14 16:34:49 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	0e39f60c04
						 | 
						
							
							
								
								
								replace quick fix with correct fix
							
							
							
							
							
						 | 
						
							2010-12-12 14:33:04 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |